1 |
commit: cca7f069242ad8ddf26d519bed338f6f65797f78 |
2 |
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org> |
3 |
AuthorDate: Fri Oct 28 22:11:41 2011 +0000 |
4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 28 22:11:41 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=cca7f069 |
7 |
|
8 |
x11-libs/gtk+: Remove 3.1.{6,10} as 3.2.1 is in main tree now |
9 |
|
10 |
--- |
11 |
x11-libs/gtk+/files/settings.ini | 4 - |
12 |
x11-libs/gtk+/gtk+-3.1.10.ebuild | 199 -------------------------------------- |
13 |
x11-libs/gtk+/gtk+-3.1.6.ebuild | 191 ------------------------------------ |
14 |
3 files changed, 0 insertions(+), 394 deletions(-) |
15 |
|
16 |
diff --git a/x11-libs/gtk+/files/settings.ini b/x11-libs/gtk+/files/settings.ini |
17 |
deleted file mode 100644 |
18 |
index a65c0a8..0000000 |
19 |
--- a/x11-libs/gtk+/files/settings.ini |
20 |
+++ /dev/null |
21 |
@@ -1,4 +0,0 @@ |
22 |
-[Settings] |
23 |
-gtk-theme-name = Adwaita |
24 |
-gtk-icon-theme-name = gnome |
25 |
-gtk-cursor-theme-name = Adwaita |
26 |
|
27 |
diff --git a/x11-libs/gtk+/gtk+-3.1.10.ebuild b/x11-libs/gtk+/gtk+-3.1.10.ebuild |
28 |
deleted file mode 100644 |
29 |
index 9acc43a..0000000 |
30 |
--- a/x11-libs/gtk+/gtk+-3.1.10.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,199 +0,0 @@ |
33 |
-# Copyright 1999-2011 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
-# $Header: $ |
36 |
- |
37 |
-EAPI="4" |
38 |
- |
39 |
-inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx |
40 |
-if [[ ${PV} = 9999 ]]; then |
41 |
- inherit gnome2-live |
42 |
-fi |
43 |
- |
44 |
-DESCRIPTION="Gimp ToolKit +" |
45 |
-HOMEPAGE="http://www.gtk.org/" |
46 |
- |
47 |
-LICENSE="LGPL-2" |
48 |
-SLOT="3" |
49 |
-# NOTE: *-macos support is BROKEN. See `quartz-backend` etc in configure |
50 |
-# NOTE: This gtk+ has multi-gdk-backend support, see: |
51 |
-# * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/ |
52 |
-# * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html |
53 |
-# NOTE: Lots of aqua stuff in this ebuild is probably very broken |
54 |
-IUSE="aqua colord cups debug doc examples +introspection packagekit test vim-syntax xinerama" |
55 |
-if [[ ${PV} = 9999 ]]; then |
56 |
- KEYWORDS="" |
57 |
-else |
58 |
- KEYWORDS="" # due to deps with KEYWORDS="" |
59 |
-fi |
60 |
- |
61 |
-# FIXME: introspection data is built against system installation of gtk+:3 |
62 |
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) |
63 |
-# Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert |
64 |
-# >=x11-libs/gtk+-2.24:2 is needed for bug 359555 |
65 |
-COMMON_DEPEND="!aqua? ( |
66 |
- x11-libs/libXrender |
67 |
- x11-libs/libX11 |
68 |
- x11-libs/libXi |
69 |
- x11-libs/libXt |
70 |
- x11-libs/libXext |
71 |
- >=x11-libs/libXrandr-1.3 |
72 |
- x11-libs/libXcursor |
73 |
- x11-libs/libXfixes |
74 |
- x11-libs/libXcomposite |
75 |
- x11-libs/libXdamage |
76 |
- >=x11-libs/cairo-1.10.0[X,svg] |
77 |
- >=x11-libs/gdk-pixbuf-2.23.5:2[X,introspection?] |
78 |
- ) |
79 |
- aqua? ( |
80 |
- >=x11-libs/cairo-1.10.0[aqua,svg] |
81 |
- >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] |
82 |
- ) |
83 |
- xinerama? ( x11-libs/libXinerama ) |
84 |
- >=dev-libs/glib-2.29.14 |
85 |
- >=x11-libs/pango-1.29.0[introspection?] |
86 |
- >=dev-libs/atk-2.1.0[introspection?] |
87 |
- >=x11-libs/gtk+-2.24:2 |
88 |
- media-libs/fontconfig |
89 |
- x11-misc/shared-mime-info |
90 |
- colord? ( >=x11-misc/colord-0.1.9 ) |
91 |
- cups? ( net-print/cups ) |
92 |
- introspection? ( >=dev-libs/gobject-introspection-0.10.1 )" |
93 |
-DEPEND="${COMMON_DEPEND} |
94 |
- >=dev-util/pkgconfig-0.9 |
95 |
- !aqua? ( |
96 |
- x11-proto/xextproto |
97 |
- x11-proto/xproto |
98 |
- x11-proto/inputproto |
99 |
- x11-proto/damageproto |
100 |
- ) |
101 |
- x86-interix? ( |
102 |
- sys-libs/itx-bind |
103 |
- ) |
104 |
- xinerama? ( x11-proto/xineramaproto ) |
105 |
- >=dev-util/gtk-doc-am-1.11 |
106 |
- doc? ( |
107 |
- >=dev-util/gtk-doc-1.11 |
108 |
- ~app-text/docbook-xml-dtd-4.1.2 ) |
109 |
- test? ( |
110 |
- media-fonts/font-misc-misc |
111 |
- media-fonts/font-cursor-misc )" |
112 |
-RDEPEND="${COMMON_DEPEND} |
113 |
- !<gnome-base/gail-1000 |
114 |
- packagekit? ( app-admin/packagekit-base )" |
115 |
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )" |
116 |
- |
117 |
-strip_builddir() { |
118 |
- local rule=$1 |
119 |
- shift |
120 |
- local directory=$1 |
121 |
- shift |
122 |
- sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ |
123 |
- || die "Could not strip director ${directory} from build." |
124 |
-} |
125 |
- |
126 |
-src_prepare() { |
127 |
- # -O3 and company cause random crashes in applications. Bug #133469 |
128 |
- replace-flags -O3 -O2 |
129 |
- strip-flags |
130 |
- |
131 |
- # Non-working test in gentoo's env |
132 |
- sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \ |
133 |
- -i gtk/tests/testing.c || die "sed 1 failed" |
134 |
- sed '\%/recent-manager/add%,/recent_manager_purge/ d' \ |
135 |
- -i gtk/tests/recentmanager.c || die "sed 2 failed" |
136 |
- |
137 |
- if use x86-interix; then |
138 |
- # activate the itx-bind package... |
139 |
- append-flags "-I${EPREFIX}/usr/include/bind" |
140 |
- append-ldflags "-L${EPREFIX}/usr/lib/bind" |
141 |
- fi |
142 |
- |
143 |
- if ! use test; then |
144 |
- # don't waste time building tests |
145 |
- strip_builddir SRC_SUBDIRS tests Makefile.am |
146 |
- [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in |
147 |
- fi |
148 |
- |
149 |
- if ! use examples; then |
150 |
- # don't waste time building demos |
151 |
- strip_builddir SRC_SUBDIRS demos Makefile.am |
152 |
- [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in |
153 |
- fi |
154 |
- |
155 |
- gnome2_src_prepare |
156 |
-} |
157 |
- |
158 |
-src_configure() { |
159 |
- # png always on to display icons (foser) |
160 |
- local myconf="$(use_enable doc gtk-doc) |
161 |
- $(use_enable xinerama) |
162 |
- $(use_enable packagekit) |
163 |
- $(use_enable cups cups auto) |
164 |
- $(use_enable colord) |
165 |
- $(use_enable introspection) |
166 |
- --disable-papi |
167 |
- --enable-gtk2-dependency" |
168 |
- |
169 |
- # XXX: Maybe with multi-backend we should enable x11 all the time? |
170 |
- if use aqua; then |
171 |
- myconf="${myconf} --enable-quartz-backend --disable-xinput" |
172 |
- else |
173 |
- myconf="${myconf} --enable-x11-backend --enable-xinput" |
174 |
- fi |
175 |
- |
176 |
- # Passing --disable-debug is not recommended for production use |
177 |
- use debug && myconf="${myconf} --enable-debug=yes" |
178 |
- |
179 |
- # need libdir here to avoid a double slash in a path that libtool doesn't |
180 |
- # grok so well during install (// between $EPREFIX and usr ...) |
181 |
- econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf} |
182 |
-} |
183 |
- |
184 |
-src_test() { |
185 |
- unset DBUS_SESSION_BUS_ADDRESS |
186 |
- # Exporting HOME fixes tests using XDG directories spec since all defaults |
187 |
- # are based on $HOME. It is also backward compatible with functions not |
188 |
- # yet ported to this spec. |
189 |
- XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed" |
190 |
-} |
191 |
- |
192 |
-src_install() { |
193 |
- emake DESTDIR="${D}" install || die "Installation failed" |
194 |
- |
195 |
- # see bug #133241 |
196 |
- echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc" |
197 |
- insinto /etc/gtk-3.0 |
198 |
- doins "${T}"/gtkrc || die "doins gtkrc failed" |
199 |
- |
200 |
- dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed" |
201 |
- |
202 |
- # Remove unneeded *.la files |
203 |
- find "${ED}" -name "*.la" -delete |
204 |
- |
205 |
- # add -framework Carbon to the .pc files |
206 |
- use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do |
207 |
- sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed" |
208 |
- done |
209 |
-} |
210 |
- |
211 |
-pkg_preinst() { |
212 |
- gnome2_schemas_savelist |
213 |
-} |
214 |
- |
215 |
-pkg_postinst() { |
216 |
- gnome2_schemas_update |
217 |
- |
218 |
- local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0" |
219 |
- gtk-query-immodules-3.0 > "${GTK3_MODDIR}/immodules.cache" \ |
220 |
- || ewarn "Failed to run gtk-query-immodules-3.0" |
221 |
- |
222 |
- if ! has_version "app-text/evince"; then |
223 |
- elog "Please install app-text/evince for print preview functionality." |
224 |
- elog "Alternatively, check \"gtk-print-preview-command\" documentation and" |
225 |
- elog "add it to your gtkrc." |
226 |
- fi |
227 |
-} |
228 |
- |
229 |
-pkg_postrm() { |
230 |
- gnome2_schemas_update --uninstall |
231 |
-} |
232 |
|
233 |
diff --git a/x11-libs/gtk+/gtk+-3.1.6.ebuild b/x11-libs/gtk+/gtk+-3.1.6.ebuild |
234 |
deleted file mode 100644 |
235 |
index 7107c4a..0000000 |
236 |
--- a/x11-libs/gtk+/gtk+-3.1.6.ebuild |
237 |
+++ /dev/null |
238 |
@@ -1,191 +0,0 @@ |
239 |
-# Copyright 1999-2011 Gentoo Foundation |
240 |
-# Distributed under the terms of the GNU General Public License v2 |
241 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.0.12.ebuild,v 1.1 2011/07/28 18:04:54 pacho Exp $ |
242 |
- |
243 |
-EAPI="4" |
244 |
- |
245 |
-inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx |
246 |
- |
247 |
-DESCRIPTION="Gimp ToolKit +" |
248 |
-HOMEPAGE="http://www.gtk.org/" |
249 |
- |
250 |
-LICENSE="LGPL-2" |
251 |
-SLOT="3" |
252 |
-# NOTE: This gtk+ has multi-gdk-backend support, see: |
253 |
-# * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/ |
254 |
-# * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html |
255 |
-# I tried this and got it all compiling, but the end result is unusable as it |
256 |
-# horribly mixes up the backends -- grobian |
257 |
-IUSE="aqua cups debug doc examples +introspection test vim-syntax xinerama" |
258 |
-KEYWORDS="" # blind bump + patches disabled |
259 |
- |
260 |
-# FIXME: introspection data is built against system installation of gtk+:3 |
261 |
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) |
262 |
-# Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert |
263 |
-# >=x11-libs/gtk+-2.24:2 is needed for bug 359555 |
264 |
-COMMON_DEPEND="!aqua? ( |
265 |
- x11-libs/libXrender |
266 |
- x11-libs/libX11 |
267 |
- x11-libs/libXi |
268 |
- x11-libs/libXt |
269 |
- x11-libs/libXext |
270 |
- >=x11-libs/libXrandr-1.3 |
271 |
- x11-libs/libXcursor |
272 |
- x11-libs/libXfixes |
273 |
- x11-libs/libXcomposite |
274 |
- x11-libs/libXdamage |
275 |
- >=x11-libs/cairo-1.10.0[X,glib,svg] |
276 |
- >=x11-libs/gdk-pixbuf-2.22.0:2[X,introspection?] |
277 |
- ) |
278 |
- aqua? ( |
279 |
- >=x11-libs/cairo-1.10.0[aqua,glib,svg] |
280 |
- >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] |
281 |
- ) |
282 |
- xinerama? ( x11-libs/libXinerama ) |
283 |
- >=dev-libs/glib-2.29.4 |
284 |
- >=x11-libs/pango-1.24.0[introspection?] |
285 |
- >=dev-libs/atk-1.30[introspection?] |
286 |
- >=x11-libs/gtk+-2.24:2 |
287 |
- media-libs/fontconfig |
288 |
- x11-misc/shared-mime-info |
289 |
- cups? ( net-print/cups ) |
290 |
- introspection? ( >=dev-libs/gobject-introspection-0.10.1 )" |
291 |
-DEPEND="${COMMON_DEPEND} |
292 |
- >=dev-util/pkgconfig-0.9 |
293 |
- !aqua? ( |
294 |
- x11-proto/xextproto |
295 |
- x11-proto/xproto |
296 |
- x11-proto/inputproto |
297 |
- x11-proto/damageproto |
298 |
- ) |
299 |
- x86-interix? ( |
300 |
- sys-libs/itx-bind |
301 |
- ) |
302 |
- xinerama? ( x11-proto/xineramaproto ) |
303 |
- >=dev-util/gtk-doc-am-1.11 |
304 |
- doc? ( |
305 |
- >=dev-util/gtk-doc-1.11 |
306 |
- ~app-text/docbook-xml-dtd-4.1.2 ) |
307 |
- test? ( |
308 |
- media-fonts/font-misc-misc |
309 |
- media-fonts/font-cursor-misc )" |
310 |
-RDEPEND="${COMMON_DEPEND} |
311 |
- !<gnome-base/gail-1000" |
312 |
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )" |
313 |
- |
314 |
-strip_builddir() { |
315 |
- local rule=$1 |
316 |
- shift |
317 |
- local directory=$1 |
318 |
- shift |
319 |
- sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ |
320 |
- || die "Could not strip director ${directory} from build." |
321 |
-} |
322 |
- |
323 |
-src_prepare() { |
324 |
- # -O3 and company cause random crashes in applications. Bug #133469 |
325 |
- replace-flags -O3 -O2 |
326 |
- strip-flags |
327 |
- |
328 |
- # Non-working test in gentoo's env |
329 |
- sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \ |
330 |
- -i gtk/tests/testing.c || die "sed 1 failed" |
331 |
- sed '\%/recent-manager/add%,/recent_manager_purge/ d' \ |
332 |
- -i gtk/tests/recentmanager.c || die "sed 2 failed" |
333 |
- |
334 |
- if use x86-interix; then |
335 |
- # activate the itx-bind package... |
336 |
- append-flags "-I${EPREFIX}/usr/include/bind" |
337 |
- append-ldflags "-L${EPREFIX}/usr/lib/bind" |
338 |
- fi |
339 |
- |
340 |
- if ! use test; then |
341 |
- # don't waste time building tests |
342 |
- strip_builddir SRC_SUBDIRS tests Makefile.am |
343 |
- strip_builddir SRC_SUBDIRS tests Makefile.in |
344 |
- fi |
345 |
- |
346 |
- if ! use examples; then |
347 |
- # don't waste time building demos |
348 |
- strip_builddir SRC_SUBDIRS demos Makefile.am |
349 |
- strip_builddir SRC_SUBDIRS demos Makefile.in |
350 |
- fi |
351 |
- |
352 |
- # http://mail.gnome.org/archives/commits-list/2011-March/msg04372.html |
353 |
- ########## epatch "${FILESDIR}"/${PN}-3.0.8-darwin-quartz.patch |
354 |
- # fix building with gir #372953 |
355 |
- ########## epatch "${FILESDIR}"/${PN}-3.0.11-darwin-quartz-introspection.patch |
356 |
-} |
357 |
- |
358 |
-src_configure() { |
359 |
- # FIXME: PackageKit support |
360 |
- # png always on to display icons (foser) |
361 |
- local myconf="$(use_enable doc gtk-doc) |
362 |
- $(use_enable xinerama) |
363 |
- $(use_enable cups cups auto) |
364 |
- $(use_enable introspection) |
365 |
- --disable-packagekit |
366 |
- --disable-papi |
367 |
- --enable-gtk2-dependency" |
368 |
- |
369 |
- # XXX: Maybe with multi-backend we should enable x11 all the time? |
370 |
- if use aqua; then |
371 |
- myconf="${myconf} --enable-quartz-backend --disable-xinput" |
372 |
- else |
373 |
- myconf="${myconf} --enable-x11-backend --enable-xinput" |
374 |
- fi |
375 |
- |
376 |
- # Passing --disable-debug is not recommended for production use |
377 |
- use debug && myconf="${myconf} --enable-debug=yes" |
378 |
- |
379 |
- # need libdir here to avoid a double slash in a path that libtool doesn't |
380 |
- # grok so well during install (// between $EPREFIX and usr ...) |
381 |
- econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf} |
382 |
-} |
383 |
- |
384 |
-src_test() { |
385 |
- unset DBUS_SESSION_BUS_ADDRESS |
386 |
- # Exporting HOME fixes tests using XDG directories spec since all defaults |
387 |
- # are based on $HOME. It is also backward compatible with functions not |
388 |
- # yet ported to this spec. |
389 |
- XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed" |
390 |
-} |
391 |
- |
392 |
-src_install() { |
393 |
- emake DESTDIR="${D}" install |
394 |
- |
395 |
- insinto /etc/gtk-3.0 |
396 |
- doins "${FILESDIR}"/settings.ini |
397 |
- |
398 |
- dodoc AUTHORS ChangeLog* HACKING NEWS* README* |
399 |
- |
400 |
- # Remove unneeded *.la files |
401 |
- find "${ED}" -name "*.la" -delete |
402 |
- |
403 |
- # add -framework Carbon to the .pc files |
404 |
- use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do |
405 |
- sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed" |
406 |
- done |
407 |
-} |
408 |
- |
409 |
-pkg_preinst() { |
410 |
- gnome2_schemas_savelist |
411 |
-} |
412 |
- |
413 |
-pkg_postinst() { |
414 |
- gnome2_schemas_update |
415 |
- |
416 |
- local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0" |
417 |
- gtk-query-immodules-3.0 > "${GTK3_MODDIR}/immodules.cache" \ |
418 |
- || ewarn "Failed to run gtk-query-immodules-3.0" |
419 |
- |
420 |
- if ! has_version "app-text/evince"; then |
421 |
- elog "Please install app-text/evince for print preview functionality." |
422 |
- elog "Alternatively, check \"gtk-print-preview-command\" documentation and" |
423 |
- elog "add it to your settings.ini file." |
424 |
- fi |
425 |
-} |
426 |
- |
427 |
-pkg_postrm() { |
428 |
- gnome2_schemas_update --uninstall |
429 |
-} |