Gentoo Archives: gentoo-commits

From: "Thomas Anderson (gentoofan23)" <gentoofan23@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-wm/awesome: awesome-2.3.5.ebuild ChangeLog awesome-3.0-r1.ebuild awesome-2.3.4.ebuild
Date: Sun, 08 Mar 2009 19:38:23
Message-Id: E1LgOpG-0003cf-Tz@stork.gentoo.org
1 gentoofan23 09/03/08 19:38:18
2
3 Modified: awesome-2.3.5.ebuild ChangeLog
4 awesome-3.0-r1.ebuild awesome-2.3.4.ebuild
5 Log:
6 Transition to EAPI 2 usedeps
7 (Portage version: 2.1.6.7/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.3 x11-wm/awesome/awesome-2.3.5.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/awesome/awesome-2.3.5.ebuild?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/awesome/awesome-2.3.5.ebuild?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/awesome/awesome-2.3.5.ebuild?r1=1.2&r2=1.3
15
16 Index: awesome-2.3.5.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-2.3.5.ebuild,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- awesome-2.3.5.ebuild 1 Feb 2009 15:16:24 -0000 1.2
23 +++ awesome-2.3.5.ebuild 8 Mar 2009 19:38:18 -0000 1.3
24 @@ -1,7 +1,8 @@
25 # Copyright 1999-2009 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-2.3.5.ebuild,v 1.2 2009/02/01 15:16:24 matsuu Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-2.3.5.ebuild,v 1.3 2009/03/08 19:38:18 gentoofan23 Exp $
29
30 +EAPI="2"
31 inherit toolchain-funcs eutils
32
33 DESCRIPTION="A dynamic floating and tiling window manager"
34 @@ -14,7 +15,7 @@
35 IUSE="doc gtk"
36
37 RDEPEND=">=dev-libs/confuse-2.6
38 - x11-libs/cairo
39 + x11-libs/cairo[X]
40 x11-libs/pango
41 x11-libs/libX11
42 x11-libs/libXrandr
43 @@ -32,21 +33,14 @@
44 media-gfx/graphviz
45 )"
46
47 -pkg_setup() {
48 - if ! built_with_use --missing false x11-libs/cairo X ; then
49 - eerror "Your x11-libs/cairo packagehas been built without X support,"
50 - eerror "please enable the 'X' USE flag and re-emerge x11-libs/cairo."
51 - elog "You can enable this USE flag either globally in /etc/make.conf,"
52 - elog "or just for specific packages in /etc/portage/package.use."
53 - die "x11-libs/cairo missing X support"
54 - fi
55 +src_configure() {
56 + econf \
57 + $(use_with gtk) \
58 + --docdir="/usr/share/doc/${PF}"
59 }
60
61 src_compile() {
62 - econf \
63 - $(use_with gtk) \
64 - --docdir="/usr/share/doc/${PF}" || die
65 - emake || die
66 + default
67
68 if use doc; then
69 emake doc || die
70
71
72
73 1.59 x11-wm/awesome/ChangeLog
74
75 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/awesome/ChangeLog?rev=1.59&view=markup
76 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/awesome/ChangeLog?rev=1.59&content-type=text/plain
77 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/awesome/ChangeLog?r1=1.58&r2=1.59
78
79 Index: ChangeLog
80 ===================================================================
81 RCS file: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v
82 retrieving revision 1.58
83 retrieving revision 1.59
84 diff -u -r1.58 -r1.59
85 --- ChangeLog 27 Feb 2009 16:05:39 -0000 1.58
86 +++ ChangeLog 8 Mar 2009 19:38:18 -0000 1.59
87 @@ -1,6 +1,10 @@
88 # ChangeLog for x11-wm/awesome
89 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
90 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.58 2009/02/27 16:05:39 matsuu Exp $
91 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.59 2009/03/08 19:38:18 gentoofan23 Exp $
92 +
93 + 08 Mar 2009; Thomas Anderson <gentoofan23@g.o>
94 + awesome-2.3.4.ebuild, awesome-2.3.5.ebuild, awesome-3.0-r1.ebuild:
95 + Transition to EAPI 2 usedeps
96
97 *awesome-3.2_rc4 (27 Feb 2009)
98
99
100
101
102 1.2 x11-wm/awesome/awesome-3.0-r1.ebuild
103
104 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/awesome/awesome-3.0-r1.ebuild?rev=1.2&view=markup
105 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/awesome/awesome-3.0-r1.ebuild?rev=1.2&content-type=text/plain
106 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/awesome/awesome-3.0-r1.ebuild?r1=1.1&r2=1.2
107
108 Index: awesome-3.0-r1.ebuild
109 ===================================================================
110 RCS file: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.0-r1.ebuild,v
111 retrieving revision 1.1
112 retrieving revision 1.2
113 diff -u -r1.1 -r1.2
114 --- awesome-3.0-r1.ebuild 13 Oct 2008 23:39:01 -0000 1.1
115 +++ awesome-3.0-r1.ebuild 8 Mar 2009 19:38:18 -0000 1.2
116 @@ -1,9 +1,8 @@
117 -# Copyright 1999-2008 Gentoo Foundation
118 +# Copyright 1999-2009 Gentoo Foundation
119 # Distributed under the terms of the GNU General Public License v2
120 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.0-r1.ebuild,v 1.1 2008/10/13 23:39:01 matsuu Exp $
121 -
122 -EAPI=1
123 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.0-r1.ebuild,v 1.2 2009/03/08 19:38:18 gentoofan23 Exp $
124
125 +EAPI="2"
126 inherit cmake-utils eutils
127
128 DESCRIPTION="A dynamic floating and tiling window manager"
129 @@ -21,8 +20,8 @@
130 dev-libs/libev
131 dev-util/gperf
132 sys-libs/ncurses
133 - x11-libs/cairo
134 - x11-libs/libX11
135 + x11-libs/cairo[xcb]
136 + x11-libs/libX11[xcb]
137 >=x11-libs/libxcb-1.1
138 x11-libs/pango
139 >=x11-libs/xcb-util-0.3
140 @@ -65,30 +64,13 @@
141
142 DOCS="AUTHORS BUGS PATCHES README STYLE"
143
144 -pkg_setup() {
145 - if ! built_with_use --missing false x11-libs/cairo xcb ; then
146 - eerror "Your x11-libs/cairo packagehas been built without xcb support,"
147 - eerror "please enable the 'xcb' USE flag and re-emerge x11-libs/cairo."
148 - elog "You can enable this USE flag either globally in /etc/make.conf,"
149 - elog "or just for specific packages in /etc/portage/package.use."
150 - die "x11-libs/cairo missing xcb support"
151 - fi
152 - if ! built_with_use --missing false x11-libs/libX11 xcb ; then
153 - eerror "Your x11-libs/libX11 packagehas been built without xcb support,"
154 - eerror "please enable the 'xcb' USE flag and re-emerge x11-libs/libX11."
155 - elog "You can enable this USE flag either globally in /etc/make.conf,"
156 - elog "or just for specific packages in /etc/portage/package.use."
157 - die "x11-libs/libX11 missing xcb support"
158 - fi
159 -}
160 -
161 src_unpack() {
162 unpack ${A}
163 cd "${S}"
164 epatch "${FILESDIR}"/${P}-gentoo.patch
165 }
166
167 -src_compile() {
168 +src_configure() {
169 local myargs="all"
170
171 mycmakeargs="${mycmakeargs}
172 @@ -101,7 +83,7 @@
173 else
174 mycmakeargs="${mycmakeargs} -DGENERATE_LUADOC=OFF"
175 fi
176 - cmake-utils_src_compile ${myargs}
177 + cmake-utils_src_configure ${myargs}
178 }
179
180 src_install() {
181
182
183
184 1.6 x11-wm/awesome/awesome-2.3.4.ebuild
185
186 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/awesome/awesome-2.3.4.ebuild?rev=1.6&view=markup
187 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/awesome/awesome-2.3.4.ebuild?rev=1.6&content-type=text/plain
188 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/awesome/awesome-2.3.4.ebuild?r1=1.5&r2=1.6
189
190 Index: awesome-2.3.4.ebuild
191 ===================================================================
192 RCS file: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-2.3.4.ebuild,v
193 retrieving revision 1.5
194 retrieving revision 1.6
195 diff -u -r1.5 -r1.6
196 --- awesome-2.3.4.ebuild 1 Feb 2009 15:16:24 -0000 1.5
197 +++ awesome-2.3.4.ebuild 8 Mar 2009 19:38:18 -0000 1.6
198 @@ -1,7 +1,8 @@
199 # Copyright 1999-2009 Gentoo Foundation
200 # Distributed under the terms of the GNU General Public License v2
201 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-2.3.4.ebuild,v 1.5 2009/02/01 15:16:24 matsuu Exp $
202 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-2.3.4.ebuild,v 1.6 2009/03/08 19:38:18 gentoofan23 Exp $
203
204 +EAPI="2"
205 inherit toolchain-funcs eutils
206
207 DESCRIPTION="A dynamic floating and tiling window manager"
208 @@ -14,7 +15,7 @@
209 IUSE="doc gtk"
210
211 RDEPEND=">=dev-libs/confuse-2.6
212 - x11-libs/cairo
213 + x11-libs/cairo[X]
214 x11-libs/pango
215 x11-libs/libX11
216 x11-libs/libXrandr
217 @@ -32,21 +33,14 @@
218 media-gfx/graphviz
219 )"
220
221 -pkg_setup() {
222 - if ! built_with_use --missing false x11-libs/cairo X ; then
223 - eerror "Your x11-libs/cairo packagehas been built without X support,"
224 - eerror "please enable the 'X' USE flag and re-emerge x11-libs/cairo."
225 - elog "You can enable this USE flag either globally in /etc/make.conf,"
226 - elog "or just for specific packages in /etc/portage/package.use."
227 - die "x11-libs/cairo missing X support"
228 - fi
229 +src_configure() {
230 + econf \
231 + $(use_with gtk) \
232 + --docdir="/usr/share/doc/${PF}"
233 }
234
235 src_compile() {
236 - econf \
237 - $(use_with gtk) \
238 - --docdir="/usr/share/doc/${PF}" || die
239 - emake || die
240 + default
241
242 if use doc; then
243 emake doc || die