summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Peterson <lavajoe@gentoo.org>2008-08-21 19:03:37 +0000
committerJoe Peterson <lavajoe@gentoo.org>2008-08-21 19:03:37 +0000
commit7cfbc6e63c4d9ee1c8779a79c91d4c0016bc1929 (patch)
treeea869154e285560d23bf512c99414740974c230f /sys-fs/btrfs-progs
parentStable on sparc, bug #234927 (diff)
downloadgentoo-2-7cfbc6e63c4d9ee1c8779a79c91d4c0016bc1929.tar.gz
gentoo-2-7cfbc6e63c4d9ee1c8779a79c91d4c0016bc1929.tar.bz2
gentoo-2-7cfbc6e63c4d9ee1c8779a79c91d4c0016bc1929.zip
Only build/install btrfs-convert program if acl USE flag is set (bug #235328)
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686)
Diffstat (limited to 'sys-fs/btrfs-progs')
-rw-r--r--sys-fs/btrfs-progs/ChangeLog7
-rw-r--r--sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild21
-rw-r--r--sys-fs/btrfs-progs/btrfs-progs-9999.ebuild21
3 files changed, 36 insertions, 13 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/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