gentoo resync : 10.04.2018

3 files changed, 33 insertions, 7 deletions

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index a4ca0a854048..273ad43842a7 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -14,8 +14,8 @@ EBUILD btrfs-progs-4.1.2.ebuild 1891 BLAKE2B 6164d918d4452a4d91ee812a84fe7a2859f
 EBUILD btrfs-progs-4.10.2.ebuild 2195 BLAKE2B b2fc7318648463c6a9dd12fdca7f92fd4e6f03c85b84cc5e25f6f7ce8c471e8c2830cae58125145a794f42f17724edd82aaf0de71ad73db05b6e4b32da0ea177 SHA512 ad7aee9448e252f09291ddf82ca9e4c992cbb7b3cf25dfe968b3ed1d5a3958b6c63289f49d829621f2d08bbe3fe75f8e8a1888a6802c186db2a1617576a5b2c8
 EBUILD btrfs-progs-4.14.1.ebuild 2481 BLAKE2B 3e4db698cb95fdcdb982b424364cced1aa3087eeb77f2d5e86f51995dba2c85b557c5546f659798d593e36cc03307d436a11a98ab768bce47ffa186c7a2da6d2 SHA512 01032adb19e4ebef2bc923c16284274b5177701551c578e8813596f13e938b5504b1735e438f4633cc9131a2e20decd6e5bc58a45b3955f08b7d9c9144f60512
 EBUILD btrfs-progs-4.15.1.ebuild 2586 BLAKE2B a4f784458b56797d6018ed5bcc84d5270419c3507cc861af002ee7756420e864889414deb713f5f78154d7e0c84bf2ec63e2509ae62cc1b00560f85b37a4a9f8 SHA512 94662ed43680e269ad10be9209b59e5e882839d30ff28e6311420f6298d4e37aeff328ec889b66f661f61bae0b21d0541c79733521dec0b4b8cc0d0c8ab652dc
-EBUILD btrfs-progs-4.16.ebuild 2522 BLAKE2B e837b8da7893edbe50e9de208b0f0270d326fd4e572111928dcfe5f842083d7dfa4a0351b2f10463a133c971fd28f0d88c2952e691dcab4f10a882f9d0cc5ef4 SHA512 9c60d81ffcb0b44ad8168d93c16b3b5216cfd4208ca9009b395e9938acb36eb0aca99894ac75e6c77a1059b71bce4930f11d337abce8ebf5b3ceb192b5de44dc
+EBUILD btrfs-progs-4.16.ebuild 2861 BLAKE2B cd4e072ef8183ff769336767957e2b9528b4c9811170f91758cfc296fde24d23077d72cb6fe44af4b75e6ce8510e5f8db2b54545b461a6d358d75fc1705a93af SHA512 edb7fbdc799d29430afb45d6249ff533079d7fe8b60be61e9601fe285a3b332ddce80cd36e50d1a92cfd12be683e57c2ddacffd0b3c52a716903429af3967f2c
 EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb338508f8b9a9c060decb0ff4999e87bfd67e4e6d2f00d811b818f13ba75d38972235b8f1685d4d072b8473cbaaa6d43 SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd
 EBUILD btrfs-progs-4.9.1.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1e61c41636821ec85e07c67c1fcbbbf60ecc6cff41bff77ddb0bae82b8b83c411ceb9f2b765fecb043790305c2bfe SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4
-EBUILD btrfs-progs-9999.ebuild 2515 BLAKE2B 1ea8bdd9f1162533c673c95f251b214260f1bbea58c806803cdf0795e688d624774705765745b63cae047a7f89539e42e10fae7c58b34b35ebeb187c97734477 SHA512 ef7f69cf25c524e26aba8cf2e0889c623faf3aa6dd88a8cf2f944756c52918b825570e6f92581ea8343fb96db0c565541855409afef6e3bed056cf397089276e
+EBUILD btrfs-progs-9999.ebuild 2861 BLAKE2B cd4e072ef8183ff769336767957e2b9528b4c9811170f91758cfc296fde24d23077d72cb6fe44af4b75e6ce8510e5f8db2b54545b461a6d358d75fc1705a93af SHA512 edb7fbdc799d29430afb45d6249ff533079d7fe8b60be61e9601fe285a3b332ddce80cd36e50d1a92cfd12be683e57c2ddacffd0b3c52a716903429af3967f2c
 MISC metadata.xml 934 BLAKE2B eb3a4c7fba09e537bcb97c3bdcc70b1cf7adf6c66a60abc7ab977f3d35ab0189ece1eb3994490a0418c3ad513a2896ee8bd19edbcef6f57ff3ab1d2af060289e SHA512 83c68333a33df7b836f3fe90c2dfe09789b8c3ecab7c1573534c37d745d565127ec291a91df400cf83d88ec7c284f1bf1a2f37130ec33b7f5e149f10edd80cee
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild
index 1a8e2474dfbe..0936ade75910 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=6
 
-inherit bash-completion-r1
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit bash-completion-r1 python-single-r1
 
 libbtrfs_soname=0
 
@@ -25,7 +27,7 @@ HOMEPAGE="https://btrfs.wiki.kernel.org"
 
 LICENSE="GPL-2"
 SLOT="0/${libbtrfs_soname}"
-IUSE="+convert reiserfs static static-libs +zstd"
+IUSE="+convert python reiserfs static static-libs +zstd"
 
 RESTRICT=test # tries to mount repared filesystems
 
@@ -40,6 +42,7 @@ RDEPEND="
 			>=sys-fs/reiserfsprogs-3.6.27
 		)
 	)
+	python? ( ${PYTHON_DEPS} )
 	zstd? ( app-arch/zstd:0= )
 "
 DEPEND="${RDEPEND}
@@ -47,6 +50,7 @@ DEPEND="${RDEPEND}
 	>=app-text/asciidoc-8.6.0
 	app-text/docbook-xml-dtd:4.5
 	app-text/xmlto
+	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
 	static? (
 		dev-libs/lzo:2[static-libs(+)]
 		sys-apps/util-linux:0[static-libs(+)]
@@ -66,6 +70,12 @@ if [[ ${PV} == 9999 ]]; then
 	DEPEND+=" sys-devel/gnuconfig"
 fi
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	default
 	if [[ ${PV} == 9999 ]]; then
@@ -84,6 +94,7 @@ src_configure() {
 		--bindir="${EPREFIX}"/sbin
 		$(use_enable convert)
 		$(use_enable elibc_glibc backtrace)
+		$(use_enable python)
 		$(use_enable zstd)
 		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
 	)
@@ -96,9 +107,11 @@ src_compile() {
 
 src_install() {
 	local makeargs=(
+		$(usex python install_python '')
 		$(usex static-libs '' 'libs_static=')
 		$(usex static install-static '')
 	)
 	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
 	newbashcomp btrfs-completion btrfs
+	use python && python_optimize
 }
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 0b955eb22a02..0936ade75910 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -3,14 +3,16 @@
 
 EAPI=6
 
-inherit bash-completion-r1
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit bash-completion-r1 python-single-r1
 
 libbtrfs_soname=0
 
 if [[ ${PV} != 9999 ]]; then
 	MY_PV="v${PV/_/-}"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
 	S="${WORKDIR}"/${PN}-${MY_PV}
 else
@@ -25,7 +27,7 @@ HOMEPAGE="https://btrfs.wiki.kernel.org"
 
 LICENSE="GPL-2"
 SLOT="0/${libbtrfs_soname}"
-IUSE="+convert reiserfs static static-libs +zstd"
+IUSE="+convert python reiserfs static static-libs +zstd"
 
 RESTRICT=test # tries to mount repared filesystems
 
@@ -40,6 +42,7 @@ RDEPEND="
 			>=sys-fs/reiserfsprogs-3.6.27
 		)
 	)
+	python? ( ${PYTHON_DEPS} )
 	zstd? ( app-arch/zstd:0= )
 "
 DEPEND="${RDEPEND}
@@ -47,6 +50,7 @@ DEPEND="${RDEPEND}
 	>=app-text/asciidoc-8.6.0
 	app-text/docbook-xml-dtd:4.5
 	app-text/xmlto
+	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
 	static? (
 		dev-libs/lzo:2[static-libs(+)]
 		sys-apps/util-linux:0[static-libs(+)]
@@ -66,6 +70,12 @@ if [[ ${PV} == 9999 ]]; then
 	DEPEND+=" sys-devel/gnuconfig"
 fi
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	default
 	if [[ ${PV} == 9999 ]]; then
@@ -84,6 +94,7 @@ src_configure() {
 		--bindir="${EPREFIX}"/sbin
 		$(use_enable convert)
 		$(use_enable elibc_glibc backtrace)
+		$(use_enable python)
 		$(use_enable zstd)
 		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
 	)
@@ -96,9 +107,11 @@ src_compile() {
 
 src_install() {
 	local makeargs=(
+		$(usex python install_python '')
 		$(usex static-libs '' 'libs_static=')
 		$(usex static install-static '')
 	)
 	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
 	newbashcomp btrfs-completion btrfs
+	use python && python_optimize
 }