Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Joe Peterson (lavajoe)" <lavajoe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/btrfs-progs: btrfs-progs-0.16-r1.ebuild btrfs-progs-9999.ebuild ChangeLog
Date: Thu, 21 Aug 2008 19:03:40
Message-Id: E1KWFRZ-0000Nh-P6@stork.gentoo.org
1 lavajoe 08/08/21 19:03:37
2
3 Modified: btrfs-progs-0.16-r1.ebuild btrfs-progs-9999.ebuild
4 ChangeLog
5 Log:
6 Only build/install btrfs-convert program if acl USE flag is set (bug #235328)
7 (Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686)
8
9 Revision Changes Path
10 1.2 sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild?r1=1.1&r2=1.2
15
16 Index: btrfs-progs-0.16-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- btrfs-progs-0.16-r1.ebuild 7 Aug 2008 17:29:45 -0000 1.1
23 +++ btrfs-progs-0.16-r1.ebuild 21 Aug 2008 19:03:37 -0000 1.2
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2008 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $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 $
28 +# $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 $
29
30 inherit eutils
31
32 @@ -11,9 +11,12 @@
33 LICENSE="GPL-2"
34 SLOT="0"
35 KEYWORDS="~amd64 ~x86"
36 -IUSE=""
37 +IUSE="acl"
38
39 -DEPEND="sys-fs/e2fsprogs"
40 +DEPEND="acl? (
41 + sys-apps/acl
42 + sys-fs/e2fsprogs
43 + )"
44 RDEPEND="${DEPEND}"
45
46 src_unpack() {
47 @@ -27,13 +30,14 @@
48 src_compile() {
49 emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
50 all || die
51 - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
52 - convert || die
53 + if use acl; then
54 + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
55 + convert || die
56 + fi
57 }
58
59 src_install() {
60 into /
61 - dosbin btrfs-convert
62 dosbin btrfs-show
63 dosbin btrfs-vol
64 dosbin btrfsctl
65 @@ -43,6 +47,11 @@
66 newsbin debug-tree btrfs-debug-tree
67 newsbin mkfs.btrfs mkbtrfs
68 dosym mkbtrfs /sbin/mkfs.btrfs
69 + if use acl; then
70 + dosbin btrfs-convert
71 + else
72 + ewarn "Note: btrfs-convert not built/installed (requires acl USE flag)"
73 + fi
74
75 into /usr
76 newbin bcp btrfs-bcp
77
78
79
80 1.6 sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
81
82 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild?rev=1.6&view=markup
83 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild?rev=1.6&content-type=text/plain
84 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild?r1=1.5&r2=1.6
85
86 Index: btrfs-progs-9999.ebuild
87 ===================================================================
88 RCS file: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v
89 retrieving revision 1.5
90 retrieving revision 1.6
91 diff -u -r1.5 -r1.6
92 --- btrfs-progs-9999.ebuild 7 Aug 2008 17:29:45 -0000 1.5
93 +++ btrfs-progs-9999.ebuild 21 Aug 2008 19:03:37 -0000 1.6
94 @@ -1,6 +1,6 @@
95 # Copyright 1999-2008 Gentoo Foundation
96 # Distributed under the terms of the GNU General Public License v2
97 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.5 2008/08/07 17:29:45 lavajoe Exp $
98 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.6 2008/08/21 19:03:37 lavajoe Exp $
99
100 inherit eutils mercurial
101
102 @@ -11,9 +11,12 @@
103 LICENSE="GPL-2"
104 SLOT="0"
105 KEYWORDS="~amd64 ~x86"
106 -IUSE=""
107 +IUSE="acl"
108
109 -DEPEND="sys-fs/e2fsprogs"
110 +DEPEND="acl? (
111 + sys-apps/acl
112 + sys-fs/e2fsprogs
113 + )"
114 RDEPEND="${DEPEND}"
115
116 S="${WORKDIR}/progs-unstable"
117 @@ -26,13 +29,14 @@
118 src_compile() {
119 emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
120 all || die
121 - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
122 - convert || die
123 + if use acl; then
124 + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
125 + convert || die
126 + fi
127 }
128
129 src_install() {
130 into /
131 - dosbin btrfs-convert
132 dosbin btrfs-show
133 dosbin btrfs-vol
134 dosbin btrfsctl
135 @@ -42,6 +46,11 @@
136 newsbin debug-tree btrfs-debug-tree
137 newsbin mkfs.btrfs mkbtrfs
138 dosym mkbtrfs /sbin/mkfs.btrfs
139 + if use acl; then
140 + dosbin btrfs-convert
141 + else
142 + ewarn "Note: btrfs-convert not built/installed (requires acl USE flag)"
143 + fi
144
145 into /usr
146 newbin bcp btrfs-bcp
147
148
149
150 1.13 sys-fs/btrfs-progs/ChangeLog
151
152 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/btrfs-progs/ChangeLog?rev=1.13&view=markup
153 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/btrfs-progs/ChangeLog?rev=1.13&content-type=text/plain
154 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/btrfs-progs/ChangeLog?r1=1.12&r2=1.13
155
156 Index: ChangeLog
157 ===================================================================
158 RCS file: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v
159 retrieving revision 1.12
160 retrieving revision 1.13
161 diff -u -r1.12 -r1.13
162 --- ChangeLog 7 Aug 2008 17:37:51 -0000 1.12
163 +++ ChangeLog 21 Aug 2008 19:03:37 -0000 1.13
164 @@ -1,6 +1,11 @@
165 # ChangeLog for sys-fs/btrfs-progs
166 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
167 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.12 2008/08/07 17:37:51 lavajoe Exp $
168 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.13 2008/08/21 19:03:37 lavajoe Exp $
169 +
170 + 21 Aug 2008; Joe Peterson <lavajoe@g.o> btrfs-progs-0.16-r1.ebuild,
171 + btrfs-progs-9999.ebuild:
172 + Only build/install btrfs-convert program if acl USE flag is set (bug
173 + #235328)
174
175 *btrfs-progs-0.16-r1 (07 Aug 2008)
Report Message
Find on MARC Find on Google Groups