Make btrfs-convert optional. Move binaries back to /sbin.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

5 files changed, 43 insertions, 16 deletions

diff --git a/sys-fs/btrfs-progs/ChangeLog b/sys-fs/btrfs-progs/ChangeLog
index f5bb0731b71b..41d36d6d7cec 100644
--- a/sys-fs/btrfs-progs/ChangeLog
+++ b/sys-fs/btrfs-progs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/btrfs-progs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.99 2015/03/25 00:20:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.100 2015/03/25 00:47:28 floppym Exp $
+
+  25 Mar 2015; Mike Gilbert <floppym@gentoo.org> btrfs-progs-3.19.ebuild,
+  btrfs-progs-9999.ebuild, metadata.xml:
+  Make btrfs-convert optional. Move binaries back to /sbin.
 
 *btrfs-progs-3.19 (25 Mar 2015)
 
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 015cd8ceeea5..cea94a6c47f1 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -42,14 +42,14 @@ EBUILD btrfs-progs-3.17.3.ebuild 1377 SHA256 9acc82972b8a89a04dda69bbd699482cede
 EBUILD btrfs-progs-3.17.ebuild 1374 SHA256 afffe34a5be5c30fd44eb93ce55dd579b1f82fd905b6d8614f47f86b96212a87 SHA512 3df391fae3037637c725627c9f37f2df62b339d3f7e0a88346fd759c4ddbf40d67dbd5d250e6ba990f2ee251d081828b3ddc9db1bf39f94e119b2d3b3548c99e WHIRLPOOL 170f5b158501ad17cfd618d3d11c8bac553ed4021e07130bf02587c75e89c97af0a9a76658e696afbac099a72878599f88b3bcb32ca68769678ef70b40717074
 EBUILD btrfs-progs-3.18.2.ebuild 1381 SHA256 b132133a7d6f697097b86db98defb7731a7d2f30e2415b9c6bd2689f280e1b3b SHA512 c3512536e76a005de90beeb6a32673e7a32e6d501bff711263d6e09e614ba7200995abc62cfafec4d28fd47b57db7aca955f2b332b8f1d6c92dc421aef2ab3e1 WHIRLPOOL 520d7482fb4fba789e12364d5b9bcf303b79f4fdb9db829a1733f471abba53423fecf4741c24f06fadf56cec082aebce12c16584fff6857f477db242f9835b87
 EBUILD btrfs-progs-3.18.ebuild 1375 SHA256 18f9d479a3cc3d50005c35fcf5dbab77a15deae51f7883c8f8460d50afce46a2 SHA512 1d83b3205d8384a5f3ce8ee77e3a3d0f71e42e20129462d1c743287a2ac406a990d6468c7b5d6c1e2c23a18399e713d6c87aa67805004afb4f51cf7fd6cecfa4 WHIRLPOOL 5e5a1fa370542b6a6f9540e3a5a7f9b661086651f55e0fdbe6cdbf6808da158005b55a2047dbafce8462f03be3911d5489d8470d54209b38a910b4bbabb4fd3c
-EBUILD btrfs-progs-3.19.ebuild 1668 SHA256 bca35583e52c12bb7ace54b77fb0b33d4ceae7e925a5055d97fa5d0ba03dfe37 SHA512 96932b8ce299270e2cd1c894f92dde15c3f83ef4d8df73a309e56561e64f0d66b8b2a67e9294cd03a290adf6b500ff262d2b0ff16f605aecb34afbc6e5d410b7 WHIRLPOOL 3d0b40e1427c347acbc62f9c4e6a0f44f3343f92838bbd640338b9688595462df3fbbe803faa7ac0f86a294283a8ef5bb4842bd801a7226f83f1b005d557d8f1
-EBUILD btrfs-progs-9999.ebuild 1669 SHA256 db60f59357fada187bab0302af151225b9368f935652e0a46685e5226efe8e7d SHA512 60e8a2313465eb8edc5de3f2435acd4a1fc34d01494dea46f42bb2d76a652156bec275fde8eff293ed34d15bba3de4c105688c422f5f93afdf24bcec0267297e WHIRLPOOL 420f673ea87fcf4b66bcb4ba45b29157b67ecdc698332ced8684270ef9bce629e305c72c386d2978ef51f6ecf36182642108314a32be789a552e2999fed93b5b
-MISC ChangeLog 15175 SHA256 6385282d8ffa0f32844838af1f773832253fca067974871283cb78b96323642b SHA512 d871046fede3f9681c48a015552b00af6dab0c15b66e391042590f5adfbbf5121e9037de4991b13c181801d8986b42af8466ef68f616942632da17264efbc3ca WHIRLPOOL ef3ebc48879cbd7e6d804b8f6ff9893b3ad3fc023bb7e90da5936217ddbf1f51f260c09ac23a422ff4eddce5d9839d706e77a3eeccc98df1cc9e74ce44317099
-MISC metadata.xml 432 SHA256 45049c27e84490ae5258d3beaa9c6defe80360aa7f03733da492fd38d026a5e0 SHA512 1dda7aa3a62062d6b42579efff9468c08fcca001b28e180c8257291332ac1874f749a19a4053daec072d7b878c13873557f05d82ad42428f105556c4cd304460 WHIRLPOOL 970b4a981f1afbe87ad4240fc2dd5ebfc4bb134a2e3c188519ecb6a87d230b196a902381de3e6346855e68c6e92f883c4d6b4aa01bcdb090e2de8f230e1cecff
+EBUILD btrfs-progs-3.19.ebuild 1874 SHA256 6a437c7f661ffeecff3f03682c2bacf5ddbabee74e321eb12a331e2a5d5bd738 SHA512 61d5b0c9a517f1531f64f93f313322e0e81a1fe37b3ae83b9329b586f8963cd9b1dc51c3dfb5bdd11ca079983f1a0ca06010291dd66ce534de634d72703a7607 WHIRLPOOL 7a4b8c560c65faf4ff7a8ad392a58ed71cf6b02d9fe507c64758778dd5f85e8b705521af1854e71834e67f0137d9f13ff9526ae0b0c209c9ec58afd4b3bf5055
+EBUILD btrfs-progs-9999.ebuild 1875 SHA256 f14d342c6f10f7e3dd042e8d32e3597b33474190e2779c5a7b49284c7718b798 SHA512 d204f2d103e101c7f1407df20e4e8a74a4e750e18acc653e41e09261ca7431eb6b164895bef7aa54a18c21665cc47f37447ee8207ae2196a8d582233f34c8571 WHIRLPOOL ecf31f5ca2d63eeafbb56e371a66515adf9d560dc832c5b1e015052d7d3fbc13b801a26834df4cd3639a4fea27cb03f0662666518dca7c2cec603edd06f19eb1
+MISC ChangeLog 15352 SHA256 453ba98886691fd7489cac30e4d529596fd77ee606259270d96d154b7d869285 SHA512 44b561680ebc9fb4f25ca3df65015353814ad27c6c74fd284e97749668691010d38561f098734e1368357313aeb21aef0bb3b8bb72c3bf37d611debafdc78f01 WHIRLPOOL 53f5b7cc00c25ce4dddc0e8705222a9880778bcc967b7a62086d951722bd81b2e7a1758f3b1dc2ca6f1215ac07097e689be05f2df02f1676b26e2c40f9cbb4dd
+MISC metadata.xml 510 SHA256 9ee234e55d228cbf75a49949089b9cb9075bccd89918a73f8b95822f96778fd6 SHA512 ea29beac8f737c269cb51a5e7a6971defbc6c3e76f009e3fd587298c12542930d521f211f3024e965cf0e0bbc8fb59b187bfa8d65bb564d76205917cf3c0f665 WHIRLPOOL 1cadd8850d532c009f3d5cfb6f2615db5e36d72f1c3b1d3f1cc1f44f2c4f68e93f295afdab6a0627b20a71602bf2a8857e01beffdcb43dc82ba2017e964ec744
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlUR/zsACgkQC77qH+pIQ6S2QAEAveEa0TKrRvYp8hNbtkReyFO/
-3zOyT+xSNZQzV86L2dIA/2ZnPdjlheoYylOI4ikhmj/vQjq5XuVnTr5R5YO2hBAY
-=OtuC
+iF4EAREIAAYFAlUSBaEACgkQC77qH+pIQ6QPwAD7BdMXvDGLZaF01iwsswnzF8L9
+CzqsuygcA81SrHAzcpUA/04l1VSEamKbX52CES0XrYt+VmarkJY+UDqhbciyJox7
+=2MKC
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/btrfs-progs/btrfs-progs-3.19.ebuild b/sys-fs/btrfs-progs/btrfs-progs-3.19.ebuild
index 507ac7e60361..a8d61a23faa7 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-3.19.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-3.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-3.19.ebuild,v 1.1 2015/03/25 00:20:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-3.19.ebuild,v 1.2 2015/03/25 00:47:28 floppym Exp $
 
 EAPI=5
 
@@ -25,17 +25,20 @@ HOMEPAGE="https://btrfs.wiki.kernel.org"
 
 LICENSE="GPL-2"
 SLOT="0/${libbtrfs_soname}"
-IUSE=""
+IUSE="+convert"
 
 RESTRICT=test # tries to mount repared filesystems
 
 RDEPEND="
 	dev-libs/lzo:2=
 	sys-libs/zlib:0=
-	sys-fs/e2fsprogs:0=
+	convert? (
+		sys-fs/e2fsprogs:0=
+		sys-libs/e2fsprogs-libs:0=
+	)
 "
 DEPEND="${RDEPEND}
-	sys-apps/acl
+	convert? ( sys-apps/acl )
 	app-text/asciidoc
 	app-text/docbook-xml-dtd:4.5
 	app-text/xmlto
@@ -58,6 +61,14 @@ src_prepare() {
 	fi
 }
 
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/sbin
+		$(usex convert '' --disable-convert)
+	)
+	econf "${myeconfargs[@]}"
+}
+
 src_compile() {
 	emake V=1
 }
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 7b779b42383a..fbd360446670 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.40 2015/03/25 00:20:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.41 2015/03/25 00:47:28 floppym Exp $
 
 EAPI=5
 
@@ -25,17 +25,20 @@ HOMEPAGE="https://btrfs.wiki.kernel.org"
 
 LICENSE="GPL-2"
 SLOT="0/${libbtrfs_soname}"
-IUSE=""
+IUSE="+convert"
 
 RESTRICT=test # tries to mount repared filesystems
 
 RDEPEND="
 	dev-libs/lzo:2=
 	sys-libs/zlib:0=
-	sys-fs/e2fsprogs:0=
+	convert? (
+		sys-fs/e2fsprogs:0=
+		sys-libs/e2fsprogs-libs:0=
+	)
 "
 DEPEND="${RDEPEND}
-	sys-apps/acl
+	convert? ( sys-apps/acl )
 	app-text/asciidoc
 	app-text/docbook-xml-dtd:4.5
 	app-text/xmlto
@@ -58,6 +61,14 @@ src_prepare() {
 	fi
 }
 
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/sbin
+		$(usex convert '' --disable-convert)
+	)
+	econf "${myeconfargs[@]}"
+}
+
 src_compile() {
 	emake V=1
 }
diff --git a/sys-fs/btrfs-progs/metadata.xml b/sys-fs/btrfs-progs/metadata.xml
index dc0d44b8f38a..cb356ab9aa4e 100644
--- a/sys-fs/btrfs-progs/metadata.xml
+++ b/sys-fs/btrfs-progs/metadata.xml
@@ -10,6 +10,7 @@
     <name>Sergei Trofimovich</name>
   </maintainer>
   <use>
+    <flag name='convert'>Build ext2 conversion utility (btrfs-convert)</flag>
     <flag name='debug-utils'>Build additional utils for debugging</flag>
   </use>
 </pkgmetadata>