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

Gentoo Archives: gentoo-commits

From: "Nirbheek Chauhan (nirbheek)" <nirbheek@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/clutter: clutter-1.6.6.ebuild ChangeLog clutter-9999.ebuild clutter-1.6.4.ebuild
Date: Mon, 21 Feb 2011 20:57:05
Message-Id: 20110221205654.0D9D220054@flycatcher.gentoo.org
1 nirbheek 11/02/21 20:56:54
2
3 Modified: ChangeLog clutter-9999.ebuild clutter-1.6.4.ebuild
4 Added: clutter-1.6.6.ebuild
5 Log:
6 Bump to 1.6.6, fix slot-deps, do only one inherit: avoids DESCRIPTION and other variables from being overriden by eclasses
7
8 (Portage version: 2.1.9.40/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.22 media-libs/clutter/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/clutter/ChangeLog?rev=1.22&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/clutter/ChangeLog?rev=1.22&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/clutter/ChangeLog?r1=1.21&r2=1.22
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v
20 retrieving revision 1.21
21 retrieving revision 1.22
22 diff -u -r1.21 -r1.22
23 --- ChangeLog 19 Feb 2011 23:37:19 -0000 1.21
24 +++ ChangeLog 21 Feb 2011 20:56:53 -0000 1.22
25 @@ -1,6 +1,13 @@
26 # ChangeLog for media-libs/clutter
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.21 2011/02/19 23:37:19 nirbheek Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.22 2011/02/21 20:56:53 nirbheek Exp $
30 +
31 +*clutter-1.6.6 (21 Feb 2011)
32 +
33 + 21 Feb 2011; Nirbheek Chauhan <nirbheek@g.o> clutter-1.6.4.ebuild,
34 + +clutter-1.6.6.ebuild, clutter-9999.ebuild:
35 + Bump to 1.6.6, fix slot-deps, do only one inherit: avoids DESCRIPTION and
36 + other variables from being overriden by eclasses
37
38 19 Feb 2011; Nirbheek Chauhan <nirbheek@g.o> -clutter-1.6.2.ebuild,
39 -clutter-1.6.2-r1.ebuild, clutter-9999.ebuild:
40
41
42
43 1.3 media-libs/clutter/clutter-9999.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/clutter/clutter-9999.ebuild?rev=1.3&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/clutter/clutter-9999.ebuild?rev=1.3&content-type=text/plain
47 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/clutter/clutter-9999.ebuild?r1=1.2&r2=1.3
48
49 Index: clutter-9999.ebuild
50 ===================================================================
51 RCS file: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-9999.ebuild,v
52 retrieving revision 1.2
53 retrieving revision 1.3
54 diff -u -r1.2 -r1.3
55 --- clutter-9999.ebuild 19 Feb 2011 23:37:19 -0000 1.2
56 +++ clutter-9999.ebuild 21 Feb 2011 20:56:53 -0000 1.3
57 @@ -1,18 +1,18 @@
58 # Copyright 1999-2011 Gentoo Foundation
59 # Distributed under the terms of the GNU General Public License v2
60 -# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-9999.ebuild,v 1.2 2011/02/19 23:37:19 nirbheek Exp $
61 +# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-9999.ebuild,v 1.3 2011/02/21 20:56:53 nirbheek Exp $
62
63 EAPI="2"
64 WANT_AUTOMAKE="1.11"
65 +[[ ${PV} = 9999 ]] && GIT_ECLASS="autotools git"
66
67 -inherit clutter
68 +inherit clutter ${GIT_ECLASS}
69
70 DESCRIPTION="Clutter is a library for creating graphical user interfaces"
71
72 SLOT="1.0"
73 IUSE="debug doc +introspection"
74 if [[ ${PV} = 9999 ]]; then
75 - inherit autotools git
76 EGIT_BOOTSTRAP="echo > build/config.rpath
77 gtkdocize
78 cp "${ROOT}/usr/share/gettext/po/Makefile.in.in" po/
79 @@ -28,11 +28,11 @@
80 # NOTE: glx flavour uses libdrm + >=mesa-7.3
81 # We always use the gdk-pixbuf backend now since it's been split out
82 RDEPEND="${RDEPEND}
83 - >=dev-libs/glib-2.26
84 + >=dev-libs/glib-2.26:2
85 >=x11-libs/cairo-1.10
86 >=x11-libs/pango-1.20[introspection?]
87 >=dev-libs/json-glib-0.12[introspection?]
88 - >=dev-libs/atk-1.7
89 + >=dev-libs/atk-1.17
90
91 virtual/opengl
92 x11-libs/libdrm
93 @@ -44,8 +44,8 @@
94 >=x11-libs/libXfixes-3
95 >=x11-libs/libXcomposite-0.4
96
97 - || ( x11-libs/gdk-pixbuf
98 - >=x11-libs/gtk+-2.0 )
99 + || ( x11-libs/gdk-pixbuf:2
100 + >=x11-libs/gtk+-2.0:2 )
101
102 introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
103 "
104
105
106
107 1.3 media-libs/clutter/clutter-1.6.4.ebuild
108
109 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/clutter/clutter-1.6.4.ebuild?rev=1.3&view=markup
110 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/clutter/clutter-1.6.4.ebuild?rev=1.3&content-type=text/plain
111 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/clutter/clutter-1.6.4.ebuild?r1=1.2&r2=1.3
112
113 Index: clutter-1.6.4.ebuild
114 ===================================================================
115 RCS file: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.6.4.ebuild,v
116 retrieving revision 1.2
117 retrieving revision 1.3
118 diff -u -r1.2 -r1.3
119 --- clutter-1.6.4.ebuild 19 Feb 2011 18:00:29 -0000 1.2
120 +++ clutter-1.6.4.ebuild 21 Feb 2011 20:56:53 -0000 1.3
121 @@ -1,19 +1,18 @@
122 # Copyright 1999-2011 Gentoo Foundation
123 # Distributed under the terms of the GNU General Public License v2
124 -# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.6.4.ebuild,v 1.2 2011/02/19 18:00:29 xarthisius Exp $
125 +# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.6.4.ebuild,v 1.3 2011/02/21 20:56:53 nirbheek Exp $
126
127 EAPI="2"
128 WANT_AUTOMAKE="1.11"
129 -CLUTTER_LA_PUNT="yes"
130 +[[ ${PV} = 9999 ]] && GIT_ECLASS="autotools git"
131
132 -inherit clutter
133 +inherit clutter ${GIT_ECLASS}
134
135 DESCRIPTION="Clutter is a library for creating graphical user interfaces"
136
137 SLOT="1.0"
138 IUSE="debug doc +introspection"
139 if [[ ${PV} = 9999 ]]; then
140 - inherit autotools git
141 EGIT_BOOTSTRAP="echo > build/config.rpath
142 gtkdocize
143 cp "${ROOT}/usr/share/gettext/po/Makefile.in.in" po/
144 @@ -29,7 +28,7 @@
145 # NOTE: glx flavour uses libdrm + >=mesa-7.3
146 # We always use the gdk-pixbuf backend now since it's been split out
147 RDEPEND="${RDEPEND}
148 - >=dev-libs/glib-2.26
149 + >=dev-libs/glib-2.26:2
150 >=x11-libs/cairo-1.10
151 >=x11-libs/pango-1.20[introspection?]
152 >=dev-libs/json-glib-0.12[introspection?]
153 @@ -45,8 +44,8 @@
154 >=x11-libs/libXfixes-3
155 >=x11-libs/libXcomposite-0.4
156
157 - || ( x11-libs/gdk-pixbuf
158 - >=x11-libs/gtk+-2.0 )
159 + || ( x11-libs/gdk-pixbuf:2
160 + >=x11-libs/gtk+-2.0:2 )
161
162 introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
163 "
164
165
166
167 1.1 media-libs/clutter/clutter-1.6.6.ebuild
168
169 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/clutter/clutter-1.6.6.ebuild?rev=1.1&view=markup
170 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/clutter/clutter-1.6.6.ebuild?rev=1.1&content-type=text/plain
171
172 Index: clutter-1.6.6.ebuild
173 ===================================================================
174 # Copyright 1999-2011 Gentoo Foundation
175 # Distributed under the terms of the GNU General Public License v2
176 # $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.6.6.ebuild,v 1.1 2011/02/21 20:56:53 nirbheek Exp $
177
178 EAPI="2"
179 WANT_AUTOMAKE="1.11"
180 [[ ${PV} = 9999 ]] && GIT_ECLASS="autotools git"
181
182 inherit clutter ${GIT_ECLASS}
183
184 DESCRIPTION="Clutter is a library for creating graphical user interfaces"
185
186 SLOT="1.0"
187 IUSE="debug doc +introspection"
188 if [[ ${PV} = 9999 ]]; then
189 EGIT_BOOTSTRAP="echo > build/config.rpath
190 gtkdocize
191 cp "${ROOT}/usr/share/gettext/po/Makefile.in.in" po/
192 eautoreconf"
193 EGIT_REPO_URI="git://git.clutter-project.org/${PN}.git"
194 SRC_URI=""
195 KEYWORDS=""
196 DEPEND=">=dev-util/gtk-doc-1.13"
197 else
198 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
199 fi
200
201 # NOTE: glx flavour uses libdrm + >=mesa-7.3
202 # We always use the gdk-pixbuf backend now since it's been split out
203 RDEPEND="${RDEPEND}
204 >=dev-libs/glib-2.26:2
205 >=x11-libs/cairo-1.10
206 >=x11-libs/pango-1.20[introspection?]
207 >=dev-libs/json-glib-0.12[introspection?]
208 >=dev-libs/atk-1.17
209
210 virtual/opengl
211 x11-libs/libdrm
212 x11-libs/libX11
213 x11-libs/libXext
214 x11-libs/libXdamage
215 x11-proto/inputproto
216 >=x11-libs/libXi-1.3
217 >=x11-libs/libXfixes-3
218 >=x11-libs/libXcomposite-0.4
219
220 || ( x11-libs/gdk-pixbuf:2
221 >=x11-libs/gtk+-2.0:2 )
222
223 introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
224 "
225 DEPEND="${RDEPEND}
226 ${DEPEND}
227 sys-devel/gettext
228 dev-util/pkgconfig
229 >=dev-util/gtk-doc-am-1.13
230 doc? (
231 >=dev-util/gtk-doc-1.13
232 >=app-text/docbook-sgml-utils-0.6.14[jadetex]
233 dev-libs/libxslt )
234 "
235 DOCS="AUTHORS README NEWS ChangeLog*"
236
237 src_configure() {
238 # We only need conformance tests, the rest are useless for us
239 sed -e 's/^\(SUBDIRS =\).*/\1/g' \
240 -i tests/Makefile.am || die "am tests sed failed"
241 sed -e 's/^\(SUBDIRS =\).*/\1/g' \
242 -i tests/Makefile.in || die "in tests sed failed"
243
244 # XXX: Conformance test suite (and clutter itself) does not work under Xvfb
245 # XXX: Profiling, coverage disabled for now
246 # XXX: What about eglx/eglnative/opengl-egl-xlib/osx/wayland/etc flavours?
247 # Uses gudev-1.0 and libxkbcommon for eglnative/cex1000
248 local myconf="
249 --enable-debug=minimum
250 --enable-cogl-debug=minimum
251 --enable-conformance=no
252 --disable-gcov
253 --enable-profile=no
254 --enable-maintainer-flags=no
255 --enable-xinput
256 --with-flavour=glx
257 --with-imagebackend=gdk-pixbuf
258 $(use_enable introspection)
259 $(use_enable doc docs)"
260
261 if use debug; then
262 myconf="${myconf}
263 --enable-debug=yes
264 --enable-cogl-debug=yes"
265 fi
266
267 econf ${myconf}
268 }
Report Message
Find on MARC Find on Google Groups