Only build/install btrfs-convert program if acl USE flag is set (bug #235328)

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686

4 files changed, 39 insertions, 16 deletions

diff --git a/sys-fs/btrfs-progs/ChangeLog b/sys-fs/btrfs-progs/ChangeLog
index 2b23f7b8f2d8..303b5bff9231 100644
--- a/sys-fs/btrfs-progs/ChangeLog
+++ b/sys-fs/btrfs-progs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/btrfs-progs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.12 2008/08/07 17:37:51 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.13 2008/08/21 19:03:37 lavajoe Exp $
+
+  21 Aug 2008; Joe Peterson <lavajoe@gentoo.org> btrfs-progs-0.16-r1.ebuild,
+  btrfs-progs-9999.ebuild:
+  Only build/install btrfs-convert program if acl USE flag is set (bug
+  #235328)
 
 *btrfs-progs-0.16-r1 (07 Aug 2008)
 
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 492d249dd0c4..5cc547b15318 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,8 +1,8 @@
 DIST btrfs-progs-0.15.tar.bz2 96480 RMD160 1b8c510266b318613ef94d9b5f1dfac7e47d9673 SHA1 df6a7c0e9b1d3ef158614e3442f7a3b1fa2a3969 SHA256 ca261e50a5a66f7169b60d7bb5b9835e6284f4fa81d58e17d942fd3b4934618a
 DIST btrfs-progs-0.16.tar.bz2 97344 RMD160 c2d3e1ec0eccafd381336841d5129f1c380c88df SHA1 506a0290553099a0b8694d69d41e63fbe0394835 SHA256 a0b7b2827db66f91be15afa497038fa13df55774ad77d6ab793d3c97d2c5dc4c
 EBUILD btrfs-progs-0.15-r2.ebuild 912 RMD160 b6707618c93841f0298f36284d856a46618c44b1 SHA1 59f9e65ef663ee6ca2ed31775c617da9854c1016 SHA256 5f31a363bbbc5178f402a5215380803c6fb10505dacce2ed80a47eb0b2a35c93
-EBUILD btrfs-progs-0.16-r1.ebuild 1200 RMD160 804c09102a4cce6ed81a7a5c7f0c97f61e499873 SHA1 2edaa22ab01a0106a455b7edf9d7d5c6eb26ebad SHA256 5e98fdfb162a385948439f7dc99563b2c7f07d57323c9dc95f3723a02b86a8d9
+EBUILD btrfs-progs-0.16-r1.ebuild 1360 RMD160 c324e672c2d42a7cd8c83d49393792484f30d639 SHA1 d62347f4ff8e15a644261307c9a4f3814f2bdaa7 SHA256 b46d28fb32005f13d6570c6e1707ede1cb4bb40995b74d2a8a555f318c655593
 EBUILD btrfs-progs-0.16.ebuild 970 RMD160 2cab96d4c7948ec6c08499514bae800fbb50c448 SHA1 6befcfffb2326790c0d5def4fc4ed4815a33235d SHA256 1764038729d0ef4abc97fd49ad541c917b6694090d542c34eaf4a19a0e430d30
-EBUILD btrfs-progs-9999.ebuild 1157 RMD160 7b570e5b2880cca28a988cee2b44eb42fa03e335 SHA1 b26ad61e11c4d92e0c280238ce02be1e015394a3 SHA256 a396d92d0be96ffe52ea828d85912d8a1d7ed1943fd0b0779fef661e33981c86
-MISC ChangeLog 2182 RMD160 296bd67777d8cefc63c7acfed10eb6b53c65dbca SHA1 51fe410124460954048c688b5deab8ae724b1776 SHA256 4c0bbd08ed1e67cd64f824af61ecc13f1f20a1be64ca06529faef9e05f5afde6
+EBUILD btrfs-progs-9999.ebuild 1317 RMD160 b0981c9aeba49469bf06d51e8e5e16cb0d6ab447 SHA1 caaef021125d6e83077b2807df2968f9451ad4ad SHA256 38dc45feb6356387ccd67a9454bfb1436bf3d146a40cb8137e167f226f7cdbea
+MISC ChangeLog 2369 RMD160 afb004614d65f95faa21017e1c8937039eea7736 SHA1 4bf18eb4410239bf68183ee0258f73ba66ae46d1 SHA256 fa5fbd57215d44c9e187bcc16dd6b85cf802fc41af31394ae2cd5ba13dcce07a
 MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055
diff --git a/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild
index 31366e4d5072..46d2e76c8a6d 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild,v 1.1 2008/08/07 17:29:45 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild,v 1.2 2008/08/21 19:03:37 lavajoe Exp $
 
 inherit eutils
 
@@ -11,9 +11,12 @@ SRC_URI="http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="acl"
 
-DEPEND="sys-fs/e2fsprogs"
+DEPEND="acl? (
+			sys-apps/acl
+			sys-fs/e2fsprogs
+		)"
 RDEPEND="${DEPEND}"
 
 src_unpack() {
@@ -27,13 +30,14 @@ src_unpack() {
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 		all || die
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		convert || die
+	if use acl; then
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+			convert || die
+	fi
 }
 
 src_install() {
 	into /
-	dosbin btrfs-convert
 	dosbin btrfs-show
 	dosbin btrfs-vol
 	dosbin btrfsctl
@@ -43,6 +47,11 @@ src_install() {
 	newsbin debug-tree btrfs-debug-tree
 	newsbin mkfs.btrfs mkbtrfs
 	dosym mkbtrfs /sbin/mkfs.btrfs
+	if use acl; then
+		dosbin btrfs-convert
+	else
+		ewarn "Note: btrfs-convert not built/installed (requires acl USE flag)"
+	fi
 
 	into /usr
 	newbin bcp btrfs-bcp
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 9fcb7b0ae3aa..2da3c895f79e 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-2008 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.5 2008/08/07 17:29:45 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.6 2008/08/21 19:03:37 lavajoe Exp $
 
 inherit eutils mercurial
 
@@ -11,9 +11,12 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="acl"
 
-DEPEND="sys-fs/e2fsprogs"
+DEPEND="acl? (
+			sys-apps/acl
+			sys-fs/e2fsprogs
+		)"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/progs-unstable"
@@ -26,13 +29,14 @@ src_unpack() {
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 		all || die
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		convert || die
+	if use acl; then
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+			convert || die
+	fi
 }
 
 src_install() {
 	into /
-	dosbin btrfs-convert
 	dosbin btrfs-show
 	dosbin btrfs-vol
 	dosbin btrfsctl
@@ -42,6 +46,11 @@ src_install() {
 	newsbin debug-tree btrfs-debug-tree
 	newsbin mkfs.btrfs mkbtrfs
 	dosym mkbtrfs /sbin/mkfs.btrfs
+	if use acl; then
+		dosbin btrfs-convert
+	else
+		ewarn "Note: btrfs-convert not built/installed (requires acl USE flag)"
+	fi
 
 	into /usr
 	newbin bcp btrfs-bcp