Clean up old revisions.

Package-Manager: portage-2.2_rc91/cvs/Linux x86_64

8 files changed, 21 insertions, 439 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index eb69b76b1daa..83cb2d9024d1 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.473 2010/10/07 20:03:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.474 2010/10/08 19:54:04 eva Exp $
+
+  08 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gtk+-2.16.5-jpeg-backward-compatibility.patch, -gtk+-2.16.6.ebuild,
+  -files/gtk+-2.16.6-fix-pltcheck-test.patch, -gtk+-2.18.6.ebuild,
+  gtk+-2.18.7.ebuild, -files/gtk+-2.18.7-destroy-crash.patch:
+  Clean up old revisions.
 
   07 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> gtk+-2.20.1-r1.ebuild:
   ppc64 stable wrt #324077
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 7ce0cb433fda..cbae02582fee 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,13 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gtk+-1.2-locale_fix.patch 419 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a SHA1 569c877ff692a7694e8aca5aceae9558844ba5dd SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb
 AUX gtk+-1.2.10-as-needed.patch 19865 RMD160 17c6b5d447b2d1c56fcc89dad676156caf0d700e SHA1 1027f38d29492c6f77205fc40992d8e625da8dbe SHA256 0864194a1e2be5f1b3df91d7dceb50bbe038fbb29f24901891c22829d55d4da7
 AUX gtk+-1.2.10-automake.patch 3270 RMD160 fce6e376c7581db2a15e0e7024eb28c0712f0f8e SHA1 1ba127d50f7eddc86e07a37c819b9dd233d27926 SHA256 f36beb9303dcf08b87ffc404576c001003c1068ae0ad66fe1585a7c1f0c462d2
 AUX gtk+-1.2.10-cleanup.patch 246 RMD160 edc29b9cbf43115f8630c465e1ba91a631e733c7 SHA1 2766b89116c95ec13b7eb740f5ff79de6a48862d SHA256 6db4c8163e3e9032b5195acf230773d9bfd0c383157d65f2d42e4300e2b6a35f
 AUX gtk+-1.2.10-m4.patch 220 RMD160 c3f0ac9022a32aeef80ccf77493779fd58884b10 SHA1 898e6846de5d4c57ecc2e2503ed56355324fd2ee SHA256 88f45c2f0413f29d62ca138c87b41d24a73b47456f5b469277843de827717324
 AUX gtk+-2.14.3-limit-gtksignal-includes.patch 513 RMD160 ad967a5fb6b9fe2d96119d478429f10032bad8a5 SHA1 5c0df3e543303dfe456479359fea2cbd0d4b723e SHA256 20e7536c29e2675d18fd3aff933621a4fcab9b5615ff96593e9f36ab4febb734
-AUX gtk+-2.16.5-jpeg-backward-compatibility.patch 937 RMD160 f72974e2c5b6f7d0f9ad453b2770e394edc483c0 SHA1 6919f1b87172341693152165f6912fc81dd557fe SHA256 7be9129b2b259b4c5be0150d55eb1e5b7c6ef6f1db4f188a48f2c8cb9a72de8f
-AUX gtk+-2.16.6-fix-pltcheck-test.patch 567 RMD160 5f17d717cd7479fb477c8be407ce41f99b5e537f SHA1 49f802b744dc5775d889902c168f669a7710d432 SHA256 67b3649bc2e57de17af2919d49d759a0e358da878cb36f8d7b083dec2738ca5d
 AUX gtk+-2.18.5-macosx-aqua.patch 5521 RMD160 2f61c470952043229de027b23f67f634eaa86ffa SHA1 b0babc33bc3abca2069a5674996aeffd6fbf4120 SHA256 53cab4a8880c1add44304c7bdb83831adc16b69d938759ab3fc996d744d9e5b6
-AUX gtk+-2.18.7-destroy-crash.patch 1236 RMD160 e266ee532854f01a7b6dbcf61626d83e2133d0b2 SHA1 76671cca0245d8b0e25acb43eb6f65442461a573 SHA256 61ead70a439f873cc66676ef8a0b4076d2c0f44534c1e5d8898c42ef3a659b33
 AUX gtk+-2.18.9-notifications-gtkentry.patch 1274 RMD160 d397d677b76be6ea2614b33c328dcd5d237423f1 SHA1 1f9b4de6827798f7358b38ede143d2d29482a06c SHA256 fd656e194d3e734d21b6afd0d8cf9e002679d8f41da73ec41790341a0d355798
 AUX gtk+-2.20.1-GtkOffscreenWindow.patch 942 RMD160 b6cb30a8c9ced7ccbbf979c8e04373147ec12c71 SHA1 b4e43ecaf84a0c22fb51d150d0b19a50b12a7d55 SHA256 6a3c8f0d18c6f5b824712c404de33d01313faaa537b9caddd50622ccaf176b7c
 AUX gtk+-2.20.1-darwin8.patch 2852 RMD160 710c816851dc85a103fac997bac97878cf23a71f SHA1 855c735cd595d003166ad9dd07164052a063a949 SHA256 bcfb7e27d100d22ce9c71ad33034f6efa3d58027dc971f18df838c3a9e6a832e
@@ -20,18 +20,21 @@ AUX gtk+-2.8.0-multilib.patch 2456 RMD160 ba94fb0b16f9002dec8e92700ff3f7931f6005
 AUX gtkrc 627 RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 SHA1 cdb4665e94e1b9e8bc3985390eecca463469c3b3 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294
 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 RMD160 fa41bb12e41f0c60c605dbeac03a1aaa905f4333 SHA1 7350d1ed147e52ddc870a4d4b52073f7407d9f0d SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684
 DIST gtk+-1.2.10.tar.gz 2868322 RMD160 9b38310d2768e947c4f6173db009243dd11db288 SHA1 a5adcb909257da01ae4d4761e1d41081d06e4d7c SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34
-DIST gtk+-2.16.6.tar.bz2 18518781 RMD160 1048704042ffbbabe0de60278f49f8b7700f2d1f SHA1 f69cb48311d60664bac7cf68351c175c7a214ae6 SHA256 18e0f9792028e6cc5108447678f17d396f9a2cdfec1e6ab5dca98cb844f954af
-DIST gtk+-2.18.6.tar.bz2 18137401 RMD160 1e9b36cd2de8a472a3e550a1995978a3b783e455 SHA1 6190838c6c5e5cd3b0499d2a59ae06e517598bc9 SHA256 5629944917b739152d89b69279aefcc3de9fe12a12fd7adb3ca39c840df9354d
 DIST gtk+-2.18.7.tar.bz2 18304767 RMD160 0ac304503a23eb6911254a64218e3fe6aed9ff69 SHA1 92a40180ef4a097a867dc2eca1f209328581c5b3 SHA256 602d4f8098e1620231788770e1d9b520d5824da3f01d86e3b4fb59f1d67e1464
 DIST gtk+-2.18.9.tar.bz2 18194639 RMD160 4499af3cef1c53cddda989f35aaf2e030aab5bcf SHA1 1f50dbc0de230e1b3df7d461bdfaeceedcc5f65b SHA256 5dcd8c406acbb8779c0b081a089fa87dfd7ab4d7d4c6075db478997ce96aa9b4
 DIST gtk+-2.20.1.tar.bz2 19089076 RMD160 bcd5f20f9e3f8d4e6f9bd91388de2fe9851ef361 SHA1 a80953b4e81c6a5bc2a986852f7fe60c8704cc02 SHA256 0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65
 DIST gtk+-2.22.0.tar.bz2 18146592 RMD160 50da72c8f1f7416e79ffbd458252e65fe7ba96af SHA1 3af12d8eb3520516b25fa82873f87473dfb42cc0 SHA256 d9522c80d4b8a954f7474e32bd5a99ba3051996f1c4681426db5f79a1c1b4602
 EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9bd5 SHA1 93a6ec39cde941b4939c04da955475d017a6ff6f SHA256 e4874d2dd01bc266e7e0f5b691fcf4e54f6bd3a79658dcec6d5374c5910aa78b
-EBUILD gtk+-2.16.6.ebuild 4831 RMD160 9075d2db529208d4bb9fbf49f3662d268e39a525 SHA1 66db2a66ad200ad7e2d740bcc898dc4d850841dc SHA256 78efc032b7dc0f442f132ffe1223288522b3cf2c7f13ab0f788a9ae9e5909d93
-EBUILD gtk+-2.18.6.ebuild 5680 RMD160 a3bd7b9ca61f298d0164a53cde2c5e220d669836 SHA1 b18587878f3796d51d8f6a4244d4c915165959fe SHA256 7572ae590585f2ef94ad73f2ddf605c1ba8a1b16f3457b70abbd1f69d1348d77
-EBUILD gtk+-2.18.7.ebuild 5883 RMD160 1f8f3ad8ba596d2ace059cad8d838af8f569ceb7 SHA1 2658f1b41c1648c312d1b5de24c6190be1d1447f SHA256 3f392441329741992c57cb4d39240b47d55d1b03402399ebe0628541e94049df
+EBUILD gtk+-2.18.7.ebuild 5685 RMD160 1f458d0d255aca17a6c0079d4fa9a55d4cb3691b SHA1 8f27cc9f7252c46c7aa61ba247a299daaebfb28b SHA256 7232eec8cb44074eddf743fcf2398c23e5c5e049dc3edf955f1c9fc829609c7d
 EBUILD gtk+-2.18.9.ebuild 5892 RMD160 59252178f671f97124d5baaa5754328c62aa96d1 SHA1 4705696a1f4656f169afb3cc227a19a3b0c76bbe SHA256 de1aff3e032a77e0db94a78dd2dfb0f9246df2044de80b8d2302ab2113a72104
 EBUILD gtk+-2.20.1-r1.ebuild 6354 RMD160 5f4f61a2b0b71e52ad231c696f29d0b995d85d14 SHA1 fb5d6ec6a84ec86e1b253f56ab18f054929c960e SHA256 1bb31c35d0469def9171c4e82e59db112e80ca8e1702962793aa43b53b3f4939
 EBUILD gtk+-2.22.0.ebuild 5428 RMD160 6c0249ba94b2f9e1df53b40eed739e36addf3d9f SHA1 491e9e237910ee5d051a6833ed7ab77425a0f204 SHA256 99da9dec5609ee627a19e64b8fd8a1648bb184e82f010b9f0cf78dd6b2793b9a
-MISC ChangeLog 69489 RMD160 4aa3c273ef6ac4405db0f1687930b55c43e3f724 SHA1 45316c420ccdc6f18081f8db80758626dfab9306 SHA256 13c557c78e99e466983e1ce7dfd123d96f718e4400b9ef21a6383d7f37597b60
+MISC ChangeLog 69770 RMD160 e9f442c8f6e090480356c42be3c63203e1f5493c SHA1 332f1dfc2577f652a2d419dddef61f283a7ff903 SHA256 6def5e1f5711407c13cd703f12532c26781d2a0ce031a56b1c201c9786ece4ee
 MISC metadata.xml 549 RMD160 8d6692e4cf18e0c75421ddef09e2881624c5ce3e SHA1 ce3ed4bec69816eb61b5ca9d48c2db396085a923 SHA256 2e7f82b302d91c37ecf915de09e4b85ef093b790baacbef0325b6fe9b1bb304b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyvdvsACgkQ1fmVwcYIWAbe+ACgg8smfc9okJzPvjUQ+2EFjqps
+rykAoMoF0cOFMufG290+O5UqCDj0Rziv
+=Dhyr
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/gtk+-2.16.5-jpeg-backward-compatibility.patch b/x11-libs/gtk+/files/gtk+-2.16.5-jpeg-backward-compatibility.patch
deleted file mode 100644
index e359d0ce0c3e..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.16.5-jpeg-backward-compatibility.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Romain Perier <mrpouet@gentoo.org>
-Subject: Ensure gdk-pixbuf is backward compatible with jpeg6, even if it's works with jpeg7
-Date: 2009-09-01 10:27 UTC
-
-Fix blured images in gdk-pixbuf due to jpeg7 scale specs changes.
-
----
- gdk-pixbuf/io-jpeg.c |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c
-index cf8c9ed..9af55ba 100644
---- a/gdk-pixbuf/io-jpeg.c
-+++ b/gdk-pixbuf/io-jpeg.c
-@@ -921,8 +921,11 @@ gdk_pixbuf__jpeg_image_load_increment (gpointer data,
- 					return FALSE;
- 				}
- 			}
--			
-+#if JPEG_LIB_VERSION >= 70			
-+			for (cinfo->scale_denom = 2; cinfo->scale_denom <= 16; cinfo->scale_denom *= 2) {
-+#else
- 			for (cinfo->scale_denom = 2; cinfo->scale_denom <= 8; cinfo->scale_denom *= 2) {
-+#endif
- 				jpeg_calc_output_dimensions (cinfo);
- 				if (cinfo->output_width < width || cinfo->output_height < height) {
- 					cinfo->scale_denom /= 2;
diff --git a/x11-libs/gtk+/files/gtk+-2.16.6-fix-pltcheck-test.patch b/x11-libs/gtk+/files/gtk+-2.16.6-fix-pltcheck-test.patch
deleted file mode 100644
index b21d224b608b..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.16.6-fix-pltcheck-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 05d39e4085d70d0693af1afb24ad08dee14b3d99
-Author: Matthias Clasen <mclasen@redhat.com>
-Date:   Wed Sep 2 22:14:47 2009 -0400
-
-    Add a missing include
-    
-    This was reported in bug 593606.
-
-diff --git a/gtk/gtkcellrendereraccel.c b/gtk/gtkcellrendereraccel.c
-index 4b25289..dedbfda 100644
---- a/gtk/gtkcellrendereraccel.c
-+++ b/gtk/gtkcellrendereraccel.c
-@@ -24,6 +24,7 @@
- #include "gtkcellrendereraccel.h"
- #include "gtklabel.h"
- #include "gtkeventbox.h"
-+#include "gtkmain.h"
- #include "gtkprivate.h"
- #include "gdk/gdkkeysyms.h"
- #include "gtkalias.h"
diff --git a/x11-libs/gtk+/files/gtk+-2.18.7-destroy-crash.patch b/x11-libs/gtk+/files/gtk+-2.18.7-destroy-crash.patch
deleted file mode 100644
index d6129844e995..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.18.7-destroy-crash.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 325cbef27edd58b801509a2016aee6ab6e49d2f1 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Tue, 23 Feb 2010 17:32:36 +0000
-Subject: Protect against X errors when clearing the DND cache
-
-This was reported as a problem in bug 609952.
----
-diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
-index 2da9567..824f96d 100644
---- a/gdk/x11/gdkdnd-x11.c
-+++ b/gdk/x11/gdkdnd-x11.c
-@@ -573,15 +573,21 @@ static void
- gdk_window_cache_destroy (GdkWindowCache *cache)
- {
-   GdkWindow *root_window = gdk_screen_get_root_window (cache->screen);
--  
--  XSelectInput (GDK_WINDOW_XDISPLAY (root_window), 
-+
-+  XSelectInput (GDK_WINDOW_XDISPLAY (root_window),
- 		GDK_WINDOW_XWINDOW (root_window),
- 		cache->old_event_mask);
-   gdk_window_remove_filter (root_window, gdk_window_cache_filter, cache);
-   gdk_window_remove_filter (NULL, gdk_window_cache_shape_filter, cache);
- 
--  g_list_foreach (cache->children, (GFunc)free_cache_child, 
-+  gdk_error_trap_push ();
-+
-+  g_list_foreach (cache->children, (GFunc)free_cache_child,
-       gdk_screen_get_display (cache->screen));
-+
-+  gdk_flush ();
-+  gdk_error_trap_pop ();
-+
-   g_list_free (cache->children);
-   g_hash_table_destroy (cache->child_hash);
- 
---
-cgit v0.8.3.1
diff --git a/x11-libs/gtk+/gtk+-2.16.6.ebuild b/x11-libs/gtk+/gtk+-2.16.6.ebuild
deleted file mode 100644
index 3fc952a35648..000000000000
--- a/x11-libs/gtk+/gtk+-2.16.6.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.16.6.ebuild,v 1.10 2009/10/26 18:12:02 armin76 Exp $
-
-EAPI="2"
-
-inherit gnome.org flag-o-matic eutils libtool virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="cups debug doc jpeg jpeg2k tiff test vim-syntax xinerama"
-
-# FIXME: configure says >=xrandr-1.2.99 but remi tells me it's broken
-RDEPEND="x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXt
-	x11-libs/libXext
-	>=x11-libs/libXrandr-1.2
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.19.7
-	>=x11-libs/pango-1.20
-	>=dev-libs/atk-1.13
-	>=x11-libs/cairo-1.6[X]
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.2.1
-	cups? ( net-print/cups )
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	jpeg2k? ( media-libs/jasper )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	!<gnome-base/gail-1000"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/inputproto
-	x11-proto/damageproto
-	xinerama? ( x11-proto/xineramaproto )
-	>=dev-util/gtk-doc-am-1.11
-	doc? (
-		>=dev-util/gtk-doc-1.11
-		~app-text/docbook-xml-dtd-4.1.2 )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
-}
-
-src_prepare() {
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	has_multilib_profile && epatch "${FILESDIR}/${PN}-2.8.0-multilib.patch"
-
-	# Don't break inclusion of gtkclist.h, upstream bug 536767
-	epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
-
-	# Fix blured images when using jpeg7 in gdk-pixbuf, upstream
-	# bug #588740, gentoo bug #282744.
-	epatch "${FILESDIR}/${PN}-2.16.5-jpeg-backward-compatibility.patch"
-
-	# Fix pltcheck.sh test, bug 285698
-	epatch "${FILESDIR}/${P}-fix-pltcheck-test.patch"
-
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	use ppc64 && append-flags -mminimal-toc
-
-	# Non-working test in gentoo's env
-	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
-		-i gtk/tests/testing.c || die "sed 1 failed"
-	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
-		-i gtk/tests/recentmanager.c || die "sed 2 failed"
-	elibtoolize
-}
-
-src_configure() {
-	# png always on to display icons (foser)
-	local myconf="$(use_enable doc gtk-doc) \
-		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k libjasper) \
-		$(use_with tiff libtiff) \
-		$(use_enable xinerama) \
-		$(use_enable cups cups auto) \
-		--disable-papi \
-		--with-libpng \
-		--with-gdktarget=x11 \
-		--with-xinput"
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	econf ${myconf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	set_gtk2_confdir
-	dodir ${GTK2_CONFDIR}
-	keepdir ${GTK2_CONFDIR}
-
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${D}/${GTK2_CONFDIR}/gtkrc"
-
-	# Enable xft in environment as suggested by <utx@gentoo.org>
-	dodir /etc/env.d
-	echo "GDK_USE_XFT=1" > "${D}/etc/env.d/50gtk2"
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
-
-	# This has to be removed, because it's multilib specific; generated in
-	# postinst
-	rm "${D}/etc/gtk-2.0/gtk.immodules"
-}
-
-pkg_postinst() {
-	set_gtk2_confdir
-
-	if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then
-		gtk-query-immodules-2.0  > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
-		gdk-pixbuf-query-loaders > "${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
-	else
-		ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;"
-		ewarn "to complete the installation of GTK+, please create the"
-		ewarn "directory and then manually run:"
-		ewarn "  cd ${ROOT}${GTK2_CONFDIR}"
-		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
-		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
-	fi
-
-	if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]*
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)"
-	fi
-
-	elog "Please install app-text/evince for print preview functionality."
-	elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-	elog "add it to your gtkrc."
-}
diff --git a/x11-libs/gtk+/gtk+-2.18.6.ebuild b/x11-libs/gtk+/gtk+-2.18.6.ebuild
deleted file mode 100644
index da80b0fb2c1b..000000000000
--- a/x11-libs/gtk+/gtk+-2.18.6.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.18.6.ebuild,v 1.7 2010/05/11 19:46:10 ranger Exp $
-
-EAPI="2"
-
-inherit gnome.org flag-o-matic eutils libtool virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="aqua cups debug doc jpeg jpeg2k tiff test vim-syntax xinerama"
-
-# FIXME: configure says >=xrandr-1.2.99 but remi tells me it's broken
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-RDEPEND="!aqua? (
-		x11-libs/libXrender
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXt
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.2
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		>=x11-libs/cairo-1.6[X,svg]
-	)
-	aqua? (
-		>=x11-libs/cairo-1.6[aqua,svg]
-	)
-	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.21.3
-	>=x11-libs/pango-1.20
-	>=dev-libs/atk-1.13
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.2.1
-	cups? ( net-print/cups )
-	jpeg? ( >=media-libs/jpeg-6b-r2:0 )
-	jpeg2k? ( media-libs/jasper )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	!<gnome-base/gail-1000"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	!aqua? (
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/damageproto
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	>=dev-util/gtk-doc-am-1.11
-	doc? (
-		>=dev-util/gtk-doc-1.11
-		~app-text/docbook-xml-dtd-4.1.2 )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
-}
-
-pkg_setup() {
-	use prefix || EPREFIX=
-}
-
-src_prepare() {
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	has_multilib_profile && epatch "${FILESDIR}/${PN}-2.8.0-multilib.patch"
-
-	# Don't break inclusion of gtkclist.h, upstream bug 536767
-	epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
-
-	# add correct framework linking options, for aqua
-	epatch "${FILESDIR}/${PN}-2.18.5-macosx-aqua.patch"
-
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	use ppc64 && append-flags -mminimal-toc
-
-	# Non-working test in gentoo's env
-	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
-		-i gtk/tests/testing.c || die "sed 1 failed"
-	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
-		-i gtk/tests/recentmanager.c || die "sed 2 failed"
-	elibtoolize
-}
-
-src_configure() {
-	# png always on to display icons (foser)
-	local myconf="$(use_enable doc gtk-doc) \
-		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k libjasper) \
-		$(use_with tiff libtiff) \
-		$(use_enable xinerama) \
-		$(use_enable cups cups auto) \
-		--disable-papi \
-		--with-libpng"
-	if use aqua; then
-		myconf="${myconf} --with-gdktarget=quartz"
-	else
-		myconf="${myconf} --with-gdktarget=x11 --with-xinput"
-	fi
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	# need libdir here to avoid a double slash in a path that libtool doesn't
-	# grok so well during install (// between $EPREFIX and usr ...)
-	econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	set_gtk2_confdir
-	dodir ${GTK2_CONFDIR}
-	keepdir ${GTK2_CONFDIR}
-
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
-	insinto ${GTK2_CONFDIR}
-	doins "${T}"/gtkrc
-
-	# Enable xft in environment as suggested by <utx@gentoo.org>
-	echo "GDK_USE_XFT=1" > "${T}"/50gtk2
-	doenvd "${T}"/50gtk2
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
-
-	# This has to be removed, because it's multilib specific; generated in
-	# postinst
-	rm "${D%/}${EPREFIX}/etc/gtk-2.0/gtk.immodules"
-
-	# add -framework Carbon to the .pc files
-	use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do
-		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${D%/}${EPREFIX}"/usr/lib/pkgconfig/$i || die "sed failed"
-	done
-}
-
-pkg_postinst() {
-	set_gtk2_confdir
-
-	if [ -d "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}" ]; then
-		gtk-query-immodules-2.0  > "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-		gdk-pixbuf-query-loaders > "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
-	else
-		ewarn "The destination path ${ROOT%/}${EPREFIX}${GTK2_CONFDIR} doesn't exist;"
-		ewarn "to complete the installation of GTK+, please create the"
-		ewarn "directory and then manually run:"
-		ewarn "  cd ${ROOT%/}${EPREFIX}${GTK2_CONFDIR}"
-		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
-		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
-	fi
-
-	if [ -e "${ROOT%/}${EPREFIX}"/usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" "${ROOT%/}${EPREFIX}"/usr/lib/gtk-2.0/2.[^1]*
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
-	fi
-
-	elog "Please install app-text/evince for print preview functionality."
-	elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-	elog "add it to your gtkrc."
-}
diff --git a/x11-libs/gtk+/gtk+-2.18.7.ebuild b/x11-libs/gtk+/gtk+-2.18.7.ebuild
index c18836563445..55aefdddbce1 100644
--- a/x11-libs/gtk+/gtk+-2.18.7.ebuild
+++ b/x11-libs/gtk+/gtk+-2.18.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.18.7.ebuild,v 1.5 2010/05/07 15:22:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.18.7.ebuild,v 1.6 2010/10/08 19:54:04 eva Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="ppc"
 IUSE="aqua cups debug doc jpeg jpeg2k tiff test vim-syntax xinerama"
 
 # FIXME: configure says >=xrandr-1.2.99 but remi tells me it's broken