Merge updates from master

9 files changed, 54 insertions, 10 deletions

diff --git a/app-portage/repoman/repoman-2.3.0-r1.ebuild b/app-portage/repoman/repoman-2.3.0-r1.ebuild
index f3c1d217a337..65ded40f7ca6 100644
--- a/app-portage/repoman/repoman-2.3.0-r1.ebuild
+++ b/app-portage/repoman/repoman-2.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 
 PYTHON_COMPAT=(
 	pypy
-	python3_3 python3_4 python3_5
+	python3_3 python3_4 python3_5 python3_6
 	python2_7
 )
 PYTHON_REQ_USE='bzip2(+)'
diff --git a/app-portage/repoman/repoman-2.3.0-r2.ebuild b/app-portage/repoman/repoman-2.3.0-r2.ebuild
index aa0f82ac85d3..aef2b6809802 100644
--- a/app-portage/repoman/repoman-2.3.0-r2.ebuild
+++ b/app-portage/repoman/repoman-2.3.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
diff --git a/app-portage/repoman/repoman-2.3.1.ebuild b/app-portage/repoman/repoman-2.3.1.ebuild
index 1aca37487b5c..0415b6f1d75f 100644
--- a/app-portage/repoman/repoman-2.3.1.ebuild
+++ b/app-portage/repoman/repoman-2.3.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
diff --git a/app-portage/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild
index 0bc133884be6..f23304611964 100644
--- a/app-portage/repoman/repoman-9999.ebuild
+++ b/app-portage/repoman/repoman-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index 8089227a159f..d2140dc99bc0 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -125,6 +125,8 @@ cargo_src_install() {
 	cargo install --root="${D}/usr" $(usex debug --debug "") \
 		|| die "cargo install failed"
 	rm -f "${D}/usr/.crates.toml"
+
+	[ -d "${S}/man" ] && doman "${S}/man"
 }
 
 fi
diff --git a/sys-apps/portage/portage-2.3.3.ebuild b/sys-apps/portage/portage-2.3.3.ebuild
index 017199f9a5d9..20e8d629cde2 100644
--- a/sys-apps/portage/portage-2.3.3.ebuild
+++ b/sys-apps/portage/portage-2.3.3.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 PYTHON_COMPAT=(
 	pypy
-	python3_3 python3_4 python3_5
+	python3_3 python3_4 python3_5 python3_6
 	python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index f4f3fec7d67d..a2e9aba7ad9c 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 
 PYTHON_COMPAT=(
 	pypy
-	python3_3 python3_4 python3_5
+	python3_3 python3_4 python3_5 python3_6
 	python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 79dbb8ee9481..6d1041f004ae 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -6,3 +6,4 @@ DIST patch-4.10-rc4.xz 7486192 SHA256 95b8a31b423d4eb33af0963de41a1a657baf8f06eb
 DIST patch-4.10-rc5.xz 7529216 SHA256 5a692b4d43b90899ed0543199cc320ce650c68f1527d7fe05bfba2a191c58224 SHA512 5c51bce76af4e6f4637aaa059a9211c958d3d26332ef9efab421586069b1df5610b781908359da325dd114c9a6567f45be45a3c6bae6830586af69669d05910a WHIRLPOOL 410b804eb3a33062ae8729964f5f6582918c57111e73f58e7adcc52ab90d178f9b864286c24792519b89aa6dfd29a0eeda88d890ad45d943d08f4a28321bead2
 DIST patch-4.10-rc6.xz 7582156 SHA256 1ff82c02b097f63ad58b0ecd46657c020f3dc2f4e918fa7b96cfed8743661a08 SHA512 eb6dfcdcb427d198d955b6c2146abd5c6a74d01ab10855d713f33b9c87df05f20f2688cb354d5881dfb82ebdcf4ecac37b36956ff3645977f967f021b52ad507 WHIRLPOOL 8a37977897cdc50ea30385d2cd95b7a65361445627b0d3a987371fcacb8faa8f92d09b5f8a665ad249b9a8dda7ebb1637f7bfd52bb1ec56e6ba984a2a6bf4220
 DIST patch-4.10-rc7.xz 7615980 SHA256 08498cef41888d8d82b29b356011ed9531fb4e05105d36cc423e3def8bbe420a SHA512 206e5e97581bb376141398b6962fbbc4ee0a58b50fae1de83f3f6f3c06502b260f006628aab738d63994a6d1c0276717d49e882a8107b8f9c24d565a2a70ea9b WHIRLPOOL f08090c4dd0add76c0bc4cfca973a2d18dfaa8f45f4f08e2df970b22b6ba7b873a4af4d5eca28d7f9aee336159f70482a40c724864f1bec6234d2151b3feb7a8
+DIST patch-4.10-rc8.xz 7636280 SHA256 dd82a91266497c94eea0e3973faa8caf222b08c8693b4c8c1eb7084e774ad7ea SHA512 c89a8d13ba1fc265b3a08ee229fe2dace5af00034da430830c1f6fe75db46a0c849487c1a41bd4175cf08dc429a780e64a5cce9af10af45b3a788379e77d1b7d WHIRLPOOL 4094bf22c9cd7ccb8dcd354f9de7314e44a6b2b178b5ac14fdc836d83040e1ada23603fffe48f79b00f3cb0aaef479e579c42d4a435277c5250b728256b80f87
diff --git a/sys-kernel/git-sources/git-sources-4.10_rc8.ebuild b/sys-kernel/git-sources/git-sources-4.10_rc8.ebuild
new file mode 100644
index 000000000000..05f9017871b5
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.10_rc8.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="4.9"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.4"
+
+pkg_postinst() {
+	postinst_sources
+}