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

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

4 files changed, 36 insertions, 9 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/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>