1 |
gentoofan23 09/03/08 19:47:57 |
2 |
|
3 |
Modified: fluxbox-1.1.0.1.ebuild fluxbox-1.0.0.ebuild |
4 |
ChangeLog fluxbox-1.1.1.ebuild |
5 |
fluxbox-1.0.0-r2.ebuild |
6 |
Log: |
7 |
Transition to EAPI 2 usedeps |
8 |
(Portage version: 2.1.6.7/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.3 x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild?rev=1.3&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild?rev=1.3&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild?r1=1.2&r2=1.3 |
16 |
|
17 |
Index: fluxbox-1.1.0.1.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild,v |
20 |
retrieving revision 1.2 |
21 |
retrieving revision 1.3 |
22 |
diff -u -r1.2 -r1.3 |
23 |
--- fluxbox-1.1.0.1.ebuild 9 Jan 2009 15:03:15 -0000 1.2 |
24 |
+++ fluxbox-1.1.0.1.ebuild 8 Mar 2009 19:47:56 -0000 1.3 |
25 |
@@ -1,8 +1,8 @@ |
26 |
# Copyright 1999-2009 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild,v 1.2 2009/01/09 15:03:15 remi Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild,v 1.3 2009/03/08 19:47:56 gentoofan23 Exp $ |
30 |
|
31 |
-EAPI=1 |
32 |
+EAPI="2" |
33 |
inherit eutils |
34 |
|
35 |
IUSE="nls xinerama truetype gnome +imlib +slit +toolbar vim-syntax" |
36 |
@@ -23,11 +23,11 @@ |
37 |
x11-apps/xmessage |
38 |
x11-libs/libXft |
39 |
truetype? ( media-libs/freetype ) |
40 |
- imlib? ( >=media-libs/imlib2-1.2.0 ) |
41 |
+ imlib? ( >=media-libs/imlib2-1.2.0[X] ) |
42 |
vim-syntax? ( app-vim/fluxbox-syntax ) |
43 |
- !<x11-themes/fluxbox-styles-fluxmod-20040809-r1 |
44 |
- !<=x11-misc/fluxconf-0.9.9 |
45 |
- !<=x11-misc/fbdesk-1.2.1" |
46 |
+ !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 |
47 |
+ !!<=x11-misc/fluxconf-0.9.9 |
48 |
+ !!<=x11-misc/fbdesk-1.2.1" |
49 |
DEPEND="nls? ( sys-devel/gettext ) |
50 |
x11-proto/xextproto |
51 |
xinerama? ( x11-proto/xineramaproto ) |
52 |
@@ -38,15 +38,6 @@ |
53 |
LICENSE="MIT" |
54 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
55 |
|
56 |
-pkg_setup() { |
57 |
- if use imlib && ! built_with_use media-libs/imlib2 X ; then |
58 |
- eerror "To build fluxbox with imlib in USE, you need an X enabled" |
59 |
- eerror "media-libs/imlib2 . Either recompile imlib2 with the X" |
60 |
- eerror "USE flag turned on or disable the imlib USE flag for fluxbox." |
61 |
- die "USE=imlib requires imlib2 with USE=X" |
62 |
- fi |
63 |
-} |
64 |
- |
65 |
src_unpack() { |
66 |
unpack ${A} |
67 |
cd "${S}" |
68 |
@@ -67,7 +58,7 @@ |
69 |
version.h.in || die "version sed failed" |
70 |
} |
71 |
|
72 |
-src_compile() { |
73 |
+src_configure() { |
74 |
econf \ |
75 |
$(use_enable nls) \ |
76 |
$(use_enable xinerama) \ |
77 |
@@ -78,9 +69,11 @@ |
78 |
$(use_enable toolbar ) \ |
79 |
--sysconfdir=/etc/X11/${PN} \ |
80 |
--with-style=/usr/share/fluxbox/styles/Emerge \ |
81 |
- ${myconf} || die "configure failed" |
82 |
+ ${myconf} |
83 |
+} |
84 |
|
85 |
- emake || die "make failed" |
86 |
+src_compile() { |
87 |
+ default |
88 |
|
89 |
ebegin "Creating a menu file (may take a while)" |
90 |
mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed" |
91 |
|
92 |
|
93 |
|
94 |
1.10 x11-wm/fluxbox/fluxbox-1.0.0.ebuild |
95 |
|
96 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0.ebuild?rev=1.10&view=markup |
97 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0.ebuild?rev=1.10&content-type=text/plain |
98 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0.ebuild?r1=1.9&r2=1.10 |
99 |
|
100 |
Index: fluxbox-1.0.0.ebuild |
101 |
=================================================================== |
102 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0.ebuild,v |
103 |
retrieving revision 1.9 |
104 |
retrieving revision 1.10 |
105 |
diff -u -r1.9 -r1.10 |
106 |
--- fluxbox-1.0.0.ebuild 9 Jan 2009 15:03:15 -0000 1.9 |
107 |
+++ fluxbox-1.0.0.ebuild 8 Mar 2009 19:47:56 -0000 1.10 |
108 |
@@ -1,7 +1,8 @@ |
109 |
# Copyright 1999-2009 Gentoo Foundation |
110 |
# Distributed under the terms of the GNU General Public License v2 |
111 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0.ebuild,v 1.9 2009/01/09 15:03:15 remi Exp $ |
112 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0.ebuild,v 1.10 2009/03/08 19:47:56 gentoofan23 Exp $ |
113 |
|
114 |
+EAPI="2" |
115 |
inherit eutils |
116 |
|
117 |
IUSE="nls xinerama truetype kde gnome imlib disableslit disabletoolbar" |
118 |
@@ -22,10 +23,10 @@ |
119 |
x11-apps/xmessage |
120 |
x11-libs/libXft |
121 |
truetype? ( media-libs/freetype ) |
122 |
- imlib? ( >=media-libs/imlib2-1.2.0 ) |
123 |
- !<x11-themes/fluxbox-styles-fluxmod-20040809-r1 |
124 |
- !<=x11-misc/fluxconf-0.9.9 |
125 |
- !<=x11-misc/fbdesk-1.2.1" |
126 |
+ imlib? ( >=media-libs/imlib2-1.2.0[X] ) |
127 |
+ !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 |
128 |
+ !!<=x11-misc/fluxconf-0.9.9 |
129 |
+ !!<=x11-misc/fbdesk-1.2.1" |
130 |
DEPEND="nls? ( sys-devel/gettext ) |
131 |
x11-proto/xextproto |
132 |
xinerama? ( x11-proto/xineramaproto ) |
133 |
@@ -36,15 +37,6 @@ |
134 |
LICENSE="MIT" |
135 |
KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" |
136 |
|
137 |
-pkg_setup() { |
138 |
- if use imlib && ! built_with_use media-libs/imlib2 X ; then |
139 |
- eerror "To build fluxbox with imlib in USE, you need an X enabled" |
140 |
- eerror "media-libs/imlib2 . Either recompile imlib2 with the X" |
141 |
- eerror "USE flag turned on or disable the imlib USE flag for fluxbox." |
142 |
- die "USE=imlib requires imlib2 with USE=X" |
143 |
- fi |
144 |
-} |
145 |
- |
146 |
src_unpack() { |
147 |
unpack ${A} |
148 |
cd "${S}" |
149 |
@@ -65,7 +57,7 @@ |
150 |
version.h.in || die "version sed failed" |
151 |
} |
152 |
|
153 |
-src_compile() { |
154 |
+src_configure() { |
155 |
econf \ |
156 |
$(use_enable nls) \ |
157 |
$(use_enable xinerama) \ |
158 |
@@ -77,9 +69,11 @@ |
159 |
$(use_enable !disabletoolbar toolbar ) \ |
160 |
--sysconfdir=/etc/X11/${PN} \ |
161 |
--with-style=/usr/share/fluxbox/styles/Emerge \ |
162 |
- ${myconf} || die "configure failed" |
163 |
+ ${myconf} |
164 |
+} |
165 |
|
166 |
- emake || die "make failed" |
167 |
+src_compile() { |
168 |
+ default |
169 |
|
170 |
ebegin "Creating a menu file (may take a while)" |
171 |
mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed" |
172 |
|
173 |
|
174 |
|
175 |
1.263 x11-wm/fluxbox/ChangeLog |
176 |
|
177 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/ChangeLog?rev=1.263&view=markup |
178 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/ChangeLog?rev=1.263&content-type=text/plain |
179 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/ChangeLog?r1=1.262&r2=1.263 |
180 |
|
181 |
Index: ChangeLog |
182 |
=================================================================== |
183 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v |
184 |
retrieving revision 1.262 |
185 |
retrieving revision 1.263 |
186 |
diff -u -r1.262 -r1.263 |
187 |
--- ChangeLog 9 Jan 2009 15:03:15 -0000 1.262 |
188 |
+++ ChangeLog 8 Mar 2009 19:47:56 -0000 1.263 |
189 |
@@ -1,6 +1,11 @@ |
190 |
# ChangeLog for x11-wm/fluxbox |
191 |
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 |
192 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.262 2009/01/09 15:03:15 remi Exp $ |
193 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.263 2009/03/08 19:47:56 gentoofan23 Exp $ |
194 |
+ |
195 |
+ 08 Mar 2009; Thomas Anderson <gentoofan23@g.o> |
196 |
+ fluxbox-1.0.0.ebuild, fluxbox-1.0.0-r2.ebuild, fluxbox-1.1.0.1.ebuild, |
197 |
+ fluxbox-1.1.1.ebuild: |
198 |
+ Transition to EAPI 2 usedeps |
199 |
|
200 |
09 Jan 2009; Rémi Cardona <remi@g.o> fluxbox-1.0.0.ebuild, |
201 |
fluxbox-1.0.0-r2.ebuild, fluxbox-1.1.0.1.ebuild, fluxbox-1.1.1.ebuild, |
202 |
|
203 |
|
204 |
|
205 |
1.3 x11-wm/fluxbox/fluxbox-1.1.1.ebuild |
206 |
|
207 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1.ebuild?rev=1.3&view=markup |
208 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1.ebuild?rev=1.3&content-type=text/plain |
209 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1.ebuild?r1=1.2&r2=1.3 |
210 |
|
211 |
Index: fluxbox-1.1.1.ebuild |
212 |
=================================================================== |
213 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1.ebuild,v |
214 |
retrieving revision 1.2 |
215 |
retrieving revision 1.3 |
216 |
diff -u -r1.2 -r1.3 |
217 |
--- fluxbox-1.1.1.ebuild 9 Jan 2009 15:03:15 -0000 1.2 |
218 |
+++ fluxbox-1.1.1.ebuild 8 Mar 2009 19:47:56 -0000 1.3 |
219 |
@@ -1,8 +1,8 @@ |
220 |
# Copyright 1999-2009 Gentoo Foundation |
221 |
# Distributed under the terms of the GNU General Public License v2 |
222 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1.ebuild,v 1.2 2009/01/09 15:03:15 remi Exp $ |
223 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1.ebuild,v 1.3 2009/03/08 19:47:56 gentoofan23 Exp $ |
224 |
|
225 |
-EAPI=1 |
226 |
+EAPI="2" |
227 |
inherit eutils |
228 |
|
229 |
IUSE="nls xinerama truetype gnome +imlib +slit +toolbar vim-syntax" |
230 |
@@ -23,11 +23,11 @@ |
231 |
x11-apps/xmessage |
232 |
x11-libs/libXft |
233 |
truetype? ( media-libs/freetype ) |
234 |
- imlib? ( >=media-libs/imlib2-1.2.0 ) |
235 |
+ imlib? ( >=media-libs/imlib2-1.2.0[X] ) |
236 |
vim-syntax? ( app-vim/fluxbox-syntax ) |
237 |
- !<x11-themes/fluxbox-styles-fluxmod-20040809-r1 |
238 |
- !<=x11-misc/fluxconf-0.9.9 |
239 |
- !<=x11-misc/fbdesk-1.2.1" |
240 |
+ !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 |
241 |
+ !!<=x11-misc/fluxconf-0.9.9 |
242 |
+ !!<=x11-misc/fbdesk-1.2.1" |
243 |
DEPEND="nls? ( sys-devel/gettext ) |
244 |
x11-proto/xextproto |
245 |
xinerama? ( x11-proto/xineramaproto ) |
246 |
@@ -38,15 +38,6 @@ |
247 |
LICENSE="MIT" |
248 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
249 |
|
250 |
-pkg_setup() { |
251 |
- if use imlib && ! built_with_use media-libs/imlib2 X ; then |
252 |
- eerror "To build fluxbox with imlib in USE, you need an X enabled" |
253 |
- eerror "media-libs/imlib2 . Either recompile imlib2 with the X" |
254 |
- eerror "USE flag turned on or disable the imlib USE flag for fluxbox." |
255 |
- die "USE=imlib requires imlib2 with USE=X" |
256 |
- fi |
257 |
-} |
258 |
- |
259 |
src_unpack() { |
260 |
unpack ${A} |
261 |
cd "${S}" |
262 |
@@ -67,7 +58,7 @@ |
263 |
version.h.in || die "version sed failed" |
264 |
} |
265 |
|
266 |
-src_compile() { |
267 |
+src_configure() { |
268 |
econf \ |
269 |
$(use_enable nls) \ |
270 |
$(use_enable xinerama) \ |
271 |
@@ -78,9 +69,11 @@ |
272 |
$(use_enable toolbar ) \ |
273 |
--sysconfdir=/etc/X11/${PN} \ |
274 |
--with-style=/usr/share/fluxbox/styles/Emerge \ |
275 |
- ${myconf} || die "configure failed" |
276 |
+ ${myconf} |
277 |
+} |
278 |
|
279 |
- emake || die "make failed" |
280 |
+src_compile() { |
281 |
+ default |
282 |
|
283 |
ebegin "Creating a menu file (may take a while)" |
284 |
mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed" |
285 |
|
286 |
|
287 |
|
288 |
1.9 x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild |
289 |
|
290 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild?rev=1.9&view=markup |
291 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild?rev=1.9&content-type=text/plain |
292 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild?r1=1.8&r2=1.9 |
293 |
|
294 |
Index: fluxbox-1.0.0-r2.ebuild |
295 |
=================================================================== |
296 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild,v |
297 |
retrieving revision 1.8 |
298 |
retrieving revision 1.9 |
299 |
diff -u -r1.8 -r1.9 |
300 |
--- fluxbox-1.0.0-r2.ebuild 9 Jan 2009 15:03:15 -0000 1.8 |
301 |
+++ fluxbox-1.0.0-r2.ebuild 8 Mar 2009 19:47:56 -0000 1.9 |
302 |
@@ -1,8 +1,8 @@ |
303 |
# Copyright 1999-2009 Gentoo Foundation |
304 |
# Distributed under the terms of the GNU General Public License v2 |
305 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild,v 1.8 2009/01/09 15:03:15 remi Exp $ |
306 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild,v 1.9 2009/03/08 19:47:56 gentoofan23 Exp $ |
307 |
|
308 |
-EAPI=1 |
309 |
+EAPI="2" |
310 |
inherit eutils |
311 |
|
312 |
IUSE="nls xinerama truetype kde gnome +imlib +slit +toolbar vim-syntax" |
313 |
@@ -23,11 +23,11 @@ |
314 |
x11-apps/xmessage |
315 |
x11-libs/libXft |
316 |
truetype? ( media-libs/freetype ) |
317 |
- imlib? ( >=media-libs/imlib2-1.2.0 ) |
318 |
+ imlib? ( >=media-libs/imlib2-1.2.0[X] ) |
319 |
vim-syntax? ( app-vim/fluxbox-syntax ) |
320 |
- !<x11-themes/fluxbox-styles-fluxmod-20040809-r1 |
321 |
- !<=x11-misc/fluxconf-0.9.9 |
322 |
- !<=x11-misc/fbdesk-1.2.1" |
323 |
+ !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 |
324 |
+ !!<=x11-misc/fluxconf-0.9.9 |
325 |
+ !!<=x11-misc/fbdesk-1.2.1" |
326 |
DEPEND="nls? ( sys-devel/gettext ) |
327 |
x11-proto/xextproto |
328 |
xinerama? ( x11-proto/xineramaproto ) |
329 |
@@ -38,15 +38,6 @@ |
330 |
LICENSE="MIT" |
331 |
KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" |
332 |
|
333 |
-pkg_setup() { |
334 |
- if use imlib && ! built_with_use media-libs/imlib2 X ; then |
335 |
- eerror "To build fluxbox with imlib in USE, you need an X enabled" |
336 |
- eerror "media-libs/imlib2 . Either recompile imlib2 with the X" |
337 |
- eerror "USE flag turned on or disable the imlib USE flag for fluxbox." |
338 |
- die "USE=imlib requires imlib2 with USE=X" |
339 |
- fi |
340 |
-} |
341 |
- |
342 |
src_unpack() { |
343 |
unpack ${A} |
344 |
cd "${S}" |
345 |
@@ -73,7 +64,7 @@ |
346 |
version.h.in || die "version sed failed" |
347 |
} |
348 |
|
349 |
-src_compile() { |
350 |
+src_configure() { |
351 |
econf \ |
352 |
$(use_enable nls) \ |
353 |
$(use_enable xinerama) \ |
354 |
@@ -85,9 +76,11 @@ |
355 |
$(use_enable toolbar ) \ |
356 |
--sysconfdir=/etc/X11/${PN} \ |
357 |
--with-style=/usr/share/fluxbox/styles/Emerge \ |
358 |
- ${myconf} || die "configure failed" |
359 |
+ ${myconf} |
360 |
+} |
361 |
|
362 |
- emake || die "make failed" |
363 |
+src_compile() { |
364 |
+ default |
365 |
|
366 |
ebegin "Creating a menu file (may take a while)" |
367 |
mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed" |