whatever...

svn path=/; revision=263

16 files changed, 280 insertions, 685 deletions

diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index ea995a1..27a714b 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,6 +1,9 @@
 AUX glib-2.10.3-ia64-atomic-ops.patch 1058 RMD160 066e63a99739dc412fbed7f773118323f53ea774 SHA1 13c22e2f75a77e9e0546e495fd28015ddcb8bade SHA256 ad9cad6793626b4e36a59aa6cb839607847aa57ebc37592fd1e273ccd23a53c8
 AUX glib-2.12.12-fbsd.patch 668 RMD160 d8bf399b7e0b417c4622b278282086418c1d3363 SHA1 b7a0f4d67083f2c9b4bbecd84a6d597dd0f0f9ed SHA256 23b0dc406d3d45fe125268b731af67147e83f6e38a63c7892828bdbfe1c31e8d
 AUX glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch 616 RMD160 dd06abe9298d6e3e4d3eda0d5d155f1545dfd1aa SHA1 92164aa1b29f49cf62fc366231f2046b8b3def52 SHA256 e64ad4fbd67f142f5a19b29eab323bf18856309ed064e7a9f838b6c1c38a8adb
+AUX glib-2.24-assert-test-failure.patch 724 RMD160 011da2b341281d14741e715eddd401968464608d SHA1 76149f52677a337569dbab1b5f664c8fc16d44ff SHA256 1e3d290455d6bbc3a4f69d7b8abdeb559a01c8cd30dc311641e1cb0b7f84c6af
+AUX glib-2.25-punt-python-check.patch 541 RMD160 93fe958f07c2e03abb3abf95eaa0273b0822d874 SHA1 a9b0b50847f00773254b55238785f65f516ff4ad SHA256 eea2b3a2692b93c98ff06b26b784a264391bc61f8434d101c30cb14802234a3e
+AUX glib-2.25-skip-tests-with-dbus-keyring.patch 933 RMD160 20eb4c83cffca42aca845dc74cc2a67803c5df6c SHA1 f845fa3cc991330aa3dcdfbec8426501261a8c70 SHA256 930cdfe8f3b46c20826057b5771f953172c97fed8b3e509f4fde13094ff1c251
 AUX glib-2.6.3-testglib-ssp.patch 344 RMD160 6709acf85c52e39553e2e5ee93637f7e9cc7eca6 SHA1 403b249a460a9700669e754a562fb6974f3d6898 SHA256 c2ece3d7b4533e3bfbe8100df5d0824176d9dfa0b18697a8919162956c8ebfa8
-DIST glib-2.24.1.tar.bz2 5332511 RMD160 c6ce09654c1bd28b8844435d150fcb51e6f4e872 SHA1 d4835bb1618fc1e1dfe88ef8443c12fcae69f90e SHA256 014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04
-EBUILD glib-2.24.1.ebuild 2783 RMD160 2aebbcf75dae5be295cb7702561481491ed6b915 SHA1 c1963fe3b51ccd47027638cfcb2584d31910daa1 SHA256 14ce4e157b424ad4dcfded60e2499fb532aeacd192f065be8f2c275089d0aaf3
+DIST glib-2.27.0.tar.bz2 6564913 RMD160 ca60738a232986b32dd014f7b69409654e52dc79 SHA1 cbb6176c7c7ae2ba9497f5d30746eb0ab2ad6665 SHA256 7266a9580e6984658b3c55bd2683289416e87a26c35e7b1b5f6d5ac87db9ddf4
+EBUILD glib-2.27.0.ebuild 4059 RMD160 e675219f386dfa235dc557defd7d502ecf0f79b4 SHA1 39ac9fd1af75c227886bc579607cd252bf6f64b6 SHA256 ff48c016a78d2266260cdbd07c88d5f6980682487485f3e710f7ea6b4b589626
diff --git a/dev-libs/glib/files/glib-2.24-assert-test-failure.patch b/dev-libs/glib/files/glib-2.24-assert-test-failure.patch
new file mode 100644
index 0000000..6d8e74f
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.24-assert-test-failure.patch
@@ -0,0 +1,19 @@
+Tests fail when upgrading glib from 2.22 to 2.24 if sys-devel/gdb is installed
+because gdb is run on .libs/assert-msg-test before LD_LIBRARY_PATH is set. This
+causes gdb to use the system-wide glib instead, and fail on the test.
+
+This patch exports LD_LIBRARY_PATH before running gdb
+
+https://bugzilla.gnome.org/621368
+
+---
+--- tests/run-assert-msg-test.sh
++++ tests/run-assert-msg-test.sh
+@@ -34,6 +34,7 @@ if [ -e ".libs/lt-$msg_test" ]; then
+        msg_test="lt-$msg_test"
+ fi
+ echo_v "Running gdb on assert-msg-test"
++export LD_LIBRARY_PATH="`dirname $PWD`/glib/.libs:$LD_LIBRARY_PATH"
+ OUT=$(gdb --batch --ex run --ex "print (char*) __glib_assert_msg" .libs/$msg_test 2> $error_out) || \
+   fail "failed to run gdb"
+ 
diff --git a/dev-libs/glib/files/glib-2.25-punt-python-check.patch b/dev-libs/glib/files/glib-2.25-punt-python-check.patch
new file mode 100644
index 0000000..077ebf4
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.25-punt-python-check.patch
@@ -0,0 +1,20 @@
+Remove python detection from configure.in, we won't be installing the gdb python
+scripts anymore. They use a redhat-specific gdb module that has not been
+upstreamed yet.
+
+https://bugs.gentoo.org/291328
+https://bugzilla.gnome.org/623552
+---
+--- configure.ac
++++ configure.ac
+@@ -379,10 +379,6 @@ if test "x$PERL_PATH" = x ; then
+ fi
+ AC_SUBST(PERL_PATH)
+ 
+-# Need suitable python path for greport
+-AM_PATH_PYTHON(2.4,,PYTHON="/usr/bin/env python2.4")
+-
+-
+ dnl ***********************
+ dnl *** Tests for iconv ***
+ dnl ***********************
diff --git a/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch b/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch
new file mode 100644
index 0000000..baca1ec
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch
@@ -0,0 +1,22 @@
+--- gio/tests/gdbus-peer.c.orig	2010-08-28 20:06:11.000000000 +0300
++++ gio/tests/gdbus-peer.c	2010-08-28 20:06:21.000000000 +0300
+@@ -1448,7 +1448,7 @@
+ 
+   g_test_add_func ("/gdbus/peer-to-peer", test_peer);
+   g_test_add_func ("/gdbus/delayed-message-processing", delayed_message_processing);
+-  g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp);
++  //g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp);
+   g_test_add_func ("/gdbus/credentials", test_credentials);
+   g_test_add_func ("/gdbus/overflow", test_overflow);
+ 
+--- gio/tests/gdbus-non-socket.c.orig	2010-08-28 20:36:52.000000000 +0300
++++ gio/tests/gdbus-non-socket.c	2010-08-28 20:37:02.000000000 +0300
+@@ -336,7 +336,7 @@
+   /* all the tests rely on a shared main loop */
+   loop = g_main_loop_new (NULL, FALSE);
+ 
+-  g_test_add_func ("/gdbus/non-socket", test_non_socket);
++  //g_test_add_func ("/gdbus/non-socket", test_non_socket);
+ 
+   ret = g_test_run();
+ 
diff --git a/dev-libs/glib/glib-2.24.1.ebuild b/dev-libs/glib/glib-2.27.0.ebuild
index 6586fe5..f04d677 100644
--- a/dev-libs/glib/glib-2.24.1.ebuild
+++ b/dev-libs/glib/glib-2.27.0.ebuild
@@ -4,17 +4,18 @@
 
 EAPI="2"
 
-inherit gnome.org libtool eutils flag-o-matic
+inherit autotools gnome.org libtool eutils flag-o-matic
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug doc fam hardened selinux xattr"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="debug doc fam hardened +introspection selinux static-libs test xattr"
 
 RDEPEND="virtual/libiconv
+	sys-libs/zlib
 	xattr? ( sys-apps/attr )
 	fam? ( virtual/fam )"
 DEPEND="${RDEPEND}
@@ -23,14 +24,12 @@ DEPEND="${RDEPEND}
 	doc? (
 		>=dev-libs/libxslt-1.0
 		>=dev-util/gtk-doc-1.11
-		~app-text/docbook-xml-dtd-4.1.2 )"
+		~app-text/docbook-xml-dtd-4.1.2 )
+	test? ( >=sys-apps/dbus-1.2.14 )"
+PDEPEND="introspection? ( dev-libs/gobject-introspection )"
+# XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
 
 src_prepare() {
-	if use ppc64 && use hardened ; then
-		replace-flags -O[2-3] -O1
-		epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
-	fi
-
 	if use ia64 ; then
 		# Only apply for < 4.1
 		local major=$(gcc-major-version)
@@ -47,45 +46,67 @@ src_prepare() {
 	# Fix gmodule issues on fbsd; bug #184301
 	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
 
-	# Do not try to remove files on live filesystem, bug #XXX ?
+	# Don't check for python, hence removing the build-time python dep.
+	# We remove the gdb python scripts in src_install due to bug 291328
+	epatch "${FILESDIR}/${PN}-2.25-punt-python-check.patch"
+
+	# Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368
+	epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch"
+
+	# skip tests that require writing to /root/.dbus, upstream bug ???
+	epatch "${FILESDIR}/${PN}-2.25-skip-tests-with-dbus-keyring.patch"
+
+	# Do not try to remove files on live filesystem, upstream bug #619274
 	sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
 		-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
 
+	# Needed for the punt-python-check patch.
+	eautoreconf
+
 	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
+
+	epunt_cxx
 }
 
 src_configure() {
 	local myconf
 
-	epunt_cxx
-
 	# Building with --disable-debug highly unrecommended.  It will build glib in
 	# an unusable form as it disables some commonly used API.  Please do not
 	# convert this to the use_enable form, as it results in a broken build.
 	# -- compnerd (3/27/06)
 	use debug && myconf="--enable-debug"
 
-	# Always build static libs, see #153807
 	# Always use internal libpcre, bug #254659
-	econf ${myconf}                 \
-		  $(use_enable xattr)       \
-		  $(use_enable doc man)     \
+	econf ${myconf} \
+		  $(use_enable xattr) \
+		  $(use_enable doc man) \
 		  $(use_enable doc gtk-doc) \
-		  $(use_enable fam)         \
-		  $(use_enable selinux)     \
-		  --enable-static           \
-		  --enable-regex            \
-		  --with-pcre=internal      \
+		  $(use_enable fam) \
+		  $(use_enable selinux) \
+		  $(use_enable static-libs static) \
+		  --enable-regex \
+		  --with-pcre=internal \
 		  --with-threads=posix
 }
 
 src_install() {
+	local f
 	emake DESTDIR="${D}" install || die "Installation failed"
 
 	# Do not install charset.alias even if generated, leave it to libiconv
 	rm -f "${D}/usr/lib/charset.alias"
 
+	# Don't install gdb python macros, bug 291328
+	rm -rf "${D}/usr/share/gdb/" "${D}/usr/share/glib-2.0/gdb/"
+
 	dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
+
+	insinto /usr/share/bash-completion
+	for f in gdbus gsettings; do
+		newins "${D}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die
+	done
+	rm -rf "${D}/etc"
 }
 
 src_test() {
@@ -95,3 +116,16 @@ src_test() {
 	export XDG_DATA_HOME="${T}"
 	emake check || die "tests failed"
 }
+
+pkg_preinst() {
+	# Only give the introspection message if: 
+	# * The user has it enabled
+	# * Has glib already installed
+	# * Previous version was different from new version
+	if use introspection && has_version "${CATEGORY}/${PN}"; then
+		if ! has_version "=${CATEGORY}/${PF}"; then
+			ewarn "You must rebuild gobject-introspection so that the installed"
+			ewarn "typelibs and girs are regenerated for the new APIs in glib"
+		fi
+	fi
+}
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index ea2e4c8..d30275d 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,10 +1,2 @@
-AUX gtk+-2.14.3-limit-gtksignal-includes.patch 513 RMD160 ad967a5fb6b9fe2d96119d478429f10032bad8a5 SHA1 5c0df3e543303dfe456479359fea2cbd0d4b723e SHA256 20e7536c29e2675d18fd3aff933621a4fcab9b5615ff96593e9f36ab4febb734
-AUX gtk+-2.18.5-macosx-aqua.patch 5521 RMD160 2f61c470952043229de027b23f67f634eaa86ffa SHA1 b0babc33bc3abca2069a5674996aeffd6fbf4120 SHA256 53cab4a8880c1add44304c7bdb83831adc16b69d938759ab3fc996d744d9e5b6
-AUX gtk+-2.20.1-GtkOffscreenWindow.patch 942 RMD160 b6cb30a8c9ced7ccbbf979c8e04373147ec12c71 SHA1 b4e43ecaf84a0c22fb51d150d0b19a50b12a7d55 SHA256 6a3c8f0d18c6f5b824712c404de33d01313faaa537b9caddd50622ccaf176b7c
-AUX gtk+-2.20.1-gail_cell_type.patch 2654 RMD160 1944303b539f52597c8e7dde409fa031adb1983b SHA1 8f163caf88cdd37ef2a74d750ebbc8831f5c42eb SHA256 0419bd47daadd11daf08829f8a9091f8510a2a45b9a82a8e33553ba460b07cbc
-AUX gtk+-2.20.1-gtkrange.patch 1266 RMD160 083f230d14be1bdae52a1c4d3563bcda41f6f88a SHA1 44d09fa98d9445571f0ad02fb938026704fff160 SHA256 b96bc9a669a3c941f65835fa4014ac458381afe6a003e833281a88da6e08d7af
-AUX gtk+-2.20.1-libpixbufloader-warning.patch 1633 RMD160 4535f72c05826ef14f4445f02ebc2fe930443711 SHA1 e579b8b10c79ca1f58dc2274e8df7d0e8d1b702d SHA256 800361dce46bef0b1a47b9614a55bc4789a32bed144324116fc00d7dec17844a
-AUX gtk+-2.20.1-libpng-fix.patch 2404 RMD160 0c5e577c8312585bcbdca2aff4e583200c3ea6ef SHA1 dcd9fdbb734efaacb067ce150acd4fa00ffc9feb SHA256 217456702e04bac746ee6139192596309541583fbc00103e894ed42e98469edd
-AUX gtk+-2.8.0-multilib.patch 2456 RMD160 ba94fb0b16f9002dec8e92700ff3f7931f600548 SHA1 e65e843c6f1beecee7a0e1f7ec3292596c2a65a4 SHA256 595bddaa3e50a54f47dbcf30381e11bce0baa1ccd683ac1ba30ca0221b78a4fd
-DIST gtk+-2.20.1.tar.bz2 19089076 RMD160 bcd5f20f9e3f8d4e6f9bd91388de2fe9851ef361 SHA1 a80953b4e81c6a5bc2a986852f7fe60c8704cc02 SHA256 0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65
-EBUILD gtk+-2.20.1-r1.ebuild 6375 RMD160 540548e285dceb4d23625c9db58448ce3df656f4 SHA1 bb997d6d9cb43be1652cf6dfe882f63c8d78e64e SHA256 3992454aef370c80ec518c804e2196308c72fc8126ac216dccdcaf64860de14b
+DIST gtk+-2.91.1.tar.bz2 16330299 RMD160 1848b3bd55543328bbb26b4d790d6b60fa31b799 SHA1 a468b6d35957265997d452b4868f1cd6fd7583af SHA256 465557060c4c3cef3f9aaa608da375e87500a27b531957eb67183ad9fa3cab6f
+EBUILD gtk+-2.91.1.ebuild 4628 RMD160 b9e7df432e1e3dd9ea3e44179804187b30384c59 SHA1 840f04930e275e28ddfcc3bc87b802eb9faec196 SHA256 a67d41e456ca05f386d78ef284faaa992d996be54db6110b95a367fb11e204f3
diff --git a/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch b/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch
deleted file mode 100644
index 3fe8cff..0000000
--- a/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugzilla.gnome.org/show_bug.cgi?id=536767
-
-Makes inkscape and claws-mail buildable again. Basically all packages still using
-GtkCList and single included headers.
---- gtk/gtksignal.h.orig	2008-06-12 01:40:59.000000000 -0400
-+++ gtk/gtksignal.h	2008-06-11 18:21:47.000000000 -0400
-@@ -29,7 +29,9 @@
- #ifndef __GTK_SIGNAL_H__
- #define __GTK_SIGNAL_H__
- 
--#include <gtk/gtk.h>
-+#include <gtk/gtkenums.h>
-+#include <gtk/gtktypeutils.h>
-+#include <gtk/gtkobject.h>
- #include <gtk/gtkmarshal.h>
- 
- G_BEGIN_DECLS
diff --git a/x11-libs/gtk+/files/gtk+-2.18.5-macosx-aqua.patch b/x11-libs/gtk+/files/gtk+-2.18.5-macosx-aqua.patch
deleted file mode 100644
index f13ffe6..0000000
--- a/x11-libs/gtk+/files/gtk+-2.18.5-macosx-aqua.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-This patch touches both the Makefile.am files as well as the Makefile.in files because
-eautoreconf doesn't work properly on gtk+, for some reason.
-
---- gtk+-2.18.5.orig/demos/gtk-demo/Makefile.am
-+++ gtk+-2.18.5/demos/gtk-demo/Makefile.am
-@@ -83,6 +83,10 @@ gtk_demo_DEPENDENCIES = $(DEPS)
- gtk_demo_LDADD = $(LDADDS)
- gtk_demo_LDFLAGS = -export-dynamic
- 
-+if USE_QUARTZ
-+gtk_demo_LDFLAGS += -framework AppKit -framework Carbon
-+endif
-+
- IMAGEFILES=	alphatest.png		\
- 	        apple-red.png		\
- 		background.jpg		\
---- gtk+-2.18.5.orig/demos/gtk-demo/Makefile.in
-+++ gtk+-2.18.5/demos/gtk-demo/Makefile.in
-@@ -40,6 +40,7 @@ host_triplet = @host@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(srcdir)/geninclude.pl.in $(top_srcdir)/Makefile.decl
- bin_PROGRAMS = gtk-demo$(EXEEXT)
-+@USE_QUARTZ_TRUE@am__append_1 = -framework AppKit -framework Carbon
- subdir = demos/gtk-demo
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-@@ -460,7 +461,7 @@ gtk_demo_SOURCES = \
- 
- gtk_demo_DEPENDENCIES = $(DEPS)
- gtk_demo_LDADD = $(LDADDS)
--gtk_demo_LDFLAGS = -export-dynamic
-+gtk_demo_LDFLAGS = -export-dynamic $(am__append_1)
- IMAGEFILES = alphatest.png		\
- 	        apple-red.png		\
- 		background.jpg		\
---- gtk+-2.18.5.orig/demos/Makefile.am
-+++ gtk+-2.18.5/demos/Makefile.am
-@@ -28,6 +28,10 @@ noinst_PROGRAMS = 		\
- 	testpixbuf-scale 	\
- 	pixbuf-demo
- 
-+if USE_QUARTZ
-+AM_LDFLAGS = -framework AppKit -framework Carbon
-+endif
-+
- # Need to build test-inline-pixbufs.h for testpixbuf
- if HAVE_PNG
- noinst_PROGRAMS += testpixbuf
---- gtk+-2.18.5.orig/demos/Makefile.in
-+++ gtk+-2.18.5/demos/Makefile.in
-@@ -433,6 +433,7 @@ LDADDS = \
- 	$(top_builddir)/gdk/$(gdktargetlib)        			\
- 	$(top_builddir)/gtk/$(gtktargetlib)
- 
-+@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon
- @HAVE_PNG_TRUE@BUILT_SOURCES = test-inline-pixbufs.h
- @CROSS_COMPILING_FALSE@pixbuf_csource = GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
- @CROSS_COMPILING_TRUE@pixbuf_csource = $(GDK_PIXBUF_CSOURCE)
---- gtk+-2.18.5.orig/gtk/Makefile.am
-+++ gtk+-2.18.5/gtk/Makefile.am
-@@ -888,7 +888,7 @@ libgtk_directfb_2_0_la_SOURCES = $(gtk_c
- 
- libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts)
- libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
--libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts)
-+libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) -framework AppKit -framework Carbon
- libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts)
- 
- libgtk_x11_2_0_la_LIBADD = $(libadd)
-@@ -901,6 +901,10 @@ libgtk_win32_2_0_la_DEPENDENCIES = $(gtk
- libgtk_quartz_2_0_la_DEPENDENCIES = $(deps)
- libgtk_directfb_2_0_la_DEPENDENCIES = $(deps)
- 
-+if USE_QUARTZ
-+AM_LDFLAGS = -framework AppKit -framework Carbon
-+endif
-+
- if USE_WIN32
- libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
- endif
---- gtk+-2.18.5.orig/gtk/Makefile.in
-+++ gtk+-2.18.5/gtk/Makefile.in
-@@ -1294,7 +1294,7 @@ libgtk_quartz_2_0_la_SOURCES = $(gtk_c_s
- libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources)
- libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts)
- libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
--libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts)
-+libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) -framework AppKit -framework Carbon
- libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts)
- libgtk_x11_2_0_la_LIBADD = $(libadd)
- libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
-@@ -1304,6 +1304,7 @@ libgtk_x11_2_0_la_DEPENDENCIES = $(deps)
- libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps)
- libgtk_quartz_2_0_la_DEPENDENCIES = $(deps)
- libgtk_directfb_2_0_la_DEPENDENCIES = $(deps)
-+@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon
- @USE_WIN32_TRUE@libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
- EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la
- DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib)
---- gtk+-2.18.5.orig/perf/Makefile.am
-+++ gtk+-2.18.5/perf/Makefile.am
-@@ -20,6 +20,10 @@ LDADDS =								\
- 	$(top_builddir)/gdk/$(gdktargetlib)				\
- 	$(top_builddir)/gtk/$(gtktargetlib)
- 
-+if USE_QUARTZ
-+AM_LDFLAGS = -framework AppKit -framework Carbon
-+endif
-+
- noinst_PROGRAMS	= 	\
- 	testperf
- 
---- gtk+-2.18.5.orig/perf/Makefile.in
-+++ gtk+-2.18.5/perf/Makefile.in
-@@ -373,6 +373,7 @@ LDADDS = \
- 	$(top_builddir)/gdk/$(gdktargetlib)				\
- 	$(top_builddir)/gtk/$(gtktargetlib)
- 
-+@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon
- testperf_DEPENDENCIES = $(TEST_DEPS)
- testperf_LDADD = $(LDADDS)
- testperf_SOURCES = \
---- gtk+-2.18.5.orig/tests/Makefile.am
-+++ gtk+-2.18.5/tests/Makefile.am
-@@ -20,6 +20,10 @@ LDADDS =								\
- 	$(top_builddir)/gdk/$(gdktargetlib)				\
- 	$(top_builddir)/gtk/$(gtktargetlib)
- 
-+if USE_QUARTZ
-+AM_LDFLAGS = -framework AppKit -framework Carbon
-+endif
-+
- if USE_X11
- testsocket_programs = testsocket testsocket_child
- endif
---- gtk+-2.18.5.orig/tests/Makefile.in
-+++ gtk+-2.18.5/tests/Makefile.in
-@@ -639,6 +639,7 @@ LDADDS = \
- 	$(top_builddir)/gdk/$(gdktargetlib)				\
- 	$(top_builddir)/gtk/$(gtktargetlib)
- 
-+@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon
- @USE_X11_TRUE@testsocket_programs = testsocket testsocket_child
- @HAVE_CXX_TRUE@autotestkeywords_SOURCES = autotestkeywords.cc
- @HAVE_CXX_TRUE@autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers \
diff --git a/x11-libs/gtk+/files/gtk+-2.20.1-GtkOffscreenWindow.patch b/x11-libs/gtk+/files/gtk+-2.20.1-GtkOffscreenWindow.patch
deleted file mode 100644
index 7845bfa..0000000
--- a/x11-libs/gtk+/files/gtk+-2.20.1-GtkOffscreenWindow.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4cf1f2c55c8d27052e43da932a5d5444bf1ed1f6 Mon Sep 17 00:00:00 2001
-From: Cody Russell <bratsche@gnome.org>
-Date: Tue, 01 Jun 2010 15:32:18 +0000
-Subject: Bug 608218 - GtkOffscreenWindow causes bad window with GtkEntry
-
-We now exit early from gdk_window_register_dnd() to avoid crashing if the
-window type is GDK_WINDOW_OFFSCREEN and does not support dnd operations.
-This makes it possible to use any dnd-enabled widgets, such as GtkEntry,
-within a GtkOffscreenWindow.
----
-diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
-index 4b7fd85..c0ad26d 100644
---- a/gdk/x11/gdkdnd-x11.c
-+++ b/gdk/x11/gdkdnd-x11.c
-@@ -3879,6 +3879,9 @@ gdk_window_register_dnd (GdkWindow      *window)
- 
-   g_return_if_fail (window != NULL);
- 
-+  if (gdk_window_get_window_type (window) == GDK_WINDOW_OFFSCREEN)
-+    return;
-+
-   base_precache_atoms (display);
- 
-   if (g_object_get_data (G_OBJECT (window), "gdk-dnd-registered") != NULL)
---
-cgit v0.8.3.1
diff --git a/x11-libs/gtk+/files/gtk+-2.20.1-gail_cell_type.patch b/x11-libs/gtk+/files/gtk+-2.20.1-gail_cell_type.patch
deleted file mode 100644
index 91c51a6..0000000
--- a/x11-libs/gtk+/files/gtk+-2.20.1-gail_cell_type.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 5d6ebcc17703e20560d55e34c8bef87d27ef0127 Mon Sep 17 00:00:00 2001
-From: Mike Gorse <mgorse@novell.com>
-Date: Fri, 21 May 2010 14:40:46 +0000
-Subject:     Implement action interface for gailcell.
-
-    Bug #580889.
----
-diff --git a/modules/other/gail/gailbooleancell.c b/modules/other/gail/gailbooleancell.c
-index 5c86d04..0aefcfa 100644
---- a/modules/other/gail/gailbooleancell.c
-+++ b/modules/other/gail/gailbooleancell.c
-@@ -36,8 +36,7 @@ gchar *gail_boolean_cell_property_list[] = {
-   NULL
- };
- 
--G_DEFINE_TYPE_WITH_CODE (GailBooleanCell, gail_boolean_cell, GAIL_TYPE_RENDERER_CELL,
--                         gail_cell_type_add_action_interface (g_define_type_id))
-+G_DEFINE_TYPE (GailBooleanCell, gail_boolean_cell, GAIL_TYPE_RENDERER_CELL)
- 
- static void 
- gail_boolean_cell_class_init (GailBooleanCellClass *klass)
-diff --git a/modules/other/gail/gailcell.c b/modules/other/gail/gailcell.c
-index 35e531e..bc8dd13 100644
---- a/modules/other/gail/gailcell.c
-+++ b/modules/other/gail/gailcell.c
-@@ -37,7 +37,7 @@ static gint         gail_cell_get_index_in_parent (AtkObject           *obj);
- 
- /* AtkAction */
- 
--static void         gail_cell_atk_action_interface_init 
-+static void         atk_action_interface_init 
-                                                   (AtkActionIface      *iface);
- static ActionInfo * _gail_cell_get_action_info    (GailCell            *cell,
- 			                           gint                index);
-@@ -76,6 +76,7 @@ static void         gail_cell_get_extents         (AtkComponent        *componen
- static gboolean     gail_cell_grab_focus         (AtkComponent        *component);
- 
- G_DEFINE_TYPE_WITH_CODE (GailCell, gail_cell, ATK_TYPE_OBJECT,
-+                         G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
-                          G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init))
- 
- static void	 
-@@ -285,7 +286,7 @@ gail_cell_get_index_in_parent (AtkObject *obj)
- }
- 
- static void
--gail_cell_atk_action_interface_init (AtkActionIface *iface)
-+atk_action_interface_init (AtkActionIface *iface)
- {
-   iface->get_n_actions = gail_cell_action_get_n_actions;
-   iface->do_action = gail_cell_action_do_action;
-@@ -298,14 +299,6 @@ gail_cell_atk_action_interface_init (AtkActionIface *iface)
- void
- gail_cell_type_add_action_interface (GType type)
- {
--  const GInterfaceInfo atk_action_info =
--  {
--    (GInterfaceInitFunc) gail_cell_atk_action_interface_init,
--    (GInterfaceFinalizeFunc) NULL,
--    NULL
--  };
--  g_type_add_interface_static (type, ATK_TYPE_ACTION,
--                                 &atk_action_info);
- }
- 
- gboolean
---
-cgit v0.8.3.1
diff --git a/x11-libs/gtk+/files/gtk+-2.20.1-gtkrange.patch b/x11-libs/gtk+/files/gtk+-2.20.1-gtkrange.patch
deleted file mode 100644
index 50d7c5a..0000000
--- a/x11-libs/gtk+/files/gtk+-2.20.1-gtkrange.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 84f88bbb1d2e12b1c582e87fa098b823e91bbf33 Mon Sep 17 00:00:00 2001
-From: Jan Arne Petersen <jap@gnome.org>
-Date: Tue, 18 May 2010 06:46:42 +0000
-Subject: GtkRange: Redraw if GtkRange is a GtkScale and value is drawn.
-
-* gtk/gtkrange.c: (gtk_range_adjustment_value_change):
-Queue the draw also if the range is a scale and the value is drawn,
-fixing bug #533946 (Markus Brinkmann), when two HScales use one
-adjustment.
----
-diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
-index 552eac7..a4fcee4 100644
---- a/gtk/gtkrange.c
-+++ b/gtk/gtkrange.c
-@@ -35,6 +35,7 @@
- #include "gtkmarshalers.h"
- #include "gtkorientable.h"
- #include "gtkrange.h"
-+#include "gtkscale.h"
- #include "gtkscrollbar.h"
- #include "gtkprivate.h"
- #include "gtkintl.h"
-@@ -2618,7 +2619,8 @@ gtk_range_adjustment_value_changed (GtkAdjustment *adjustment,
-   gtk_range_calc_layout (range, range->adjustment->value);
-   
-   /* now check whether the layout changed  */
--  if (layout_changed (range->layout, &layout))
-+  if (layout_changed (range->layout, &layout) ||
-+      (GTK_IS_SCALE (range) && GTK_SCALE (range)->draw_value))
-     {
-       gtk_widget_queue_draw (GTK_WIDGET (range));
-       /* setup a timer to ensure the range isn't lagging too much behind the scroll position */
---
-cgit v0.8.3.1
diff --git a/x11-libs/gtk+/files/gtk+-2.20.1-libpixbufloader-warning.patch b/x11-libs/gtk+/files/gtk+-2.20.1-libpixbufloader-warning.patch
deleted file mode 100644
index d2759b9..0000000
--- a/x11-libs/gtk+/files/gtk+-2.20.1-libpixbufloader-warning.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a6c4833d9a307a1905516fb497dfaf0f141e1c0d Mon Sep 17 00:00:00 2001
-From: Javier Jardón <jjardon@gnome.org>
-Date: Tue, 04 May 2010 13:27:08 +0000
-Subject: Remove the definition of libpixbufloader_gdip_png_la_*
-
-libstatic-pixbufloader-gdip-png.la should not be built or at least not
-included in STATIC_GDIPLUS_LIBS as we don't want to use the GDI+-based
-loader for PNG, because if we do, we can't get (or was it set?) the
-options of a PNG pixbuf that for instance some code in GIMP wants to do.
-
-Fixes https://bugzilla.gnome.org/show_bug.cgi?id=607839
----
-diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
-index cf1769b..52fd710 100644
---- a/gdk-pixbuf/Makefile.am
-+++ b/gdk-pixbuf/Makefile.am
-@@ -244,9 +244,6 @@ libstatic_pixbufloader_gdip_gif_la_SOURCES = 	\
- libstatic_pixbufloader_gdip_jpeg_la_SOURCES = 	\
- 	io-gdip-jpeg.c
- 
--libstatic_pixbufloader_gdip_png_la_SOURCES = 	\
--	io-gdip-png.c
--
- libstatic_pixbufloader_gdip_tiff_la_SOURCES = 	\
- 	io-gdip-tiff.c
- 
-@@ -327,17 +324,6 @@ libpixbufloader_gdip_jpeg_la_SOURCES = 	\
- 	io-gdip-jpeg.c
- libpixbufloader_gdip_jpeg_la_LIBADD = $(module_libs) $(libole32)
- 
--libpixbufloader_gdip_png_la_LDFLAGS = -avoid-version -module -no-undefined
--libpixbufloader_gdip_png_la_SOURCES = 	\
--	io-gdip-native.h		\
--	io-gdip-propertytags.h		\
--	io-gdip-utils.h			\
--	io-gdip-utils.c			\
--	io-gdip-animation.c		\
--	io-gdip-animation.h		\
--	io-gdip-png.c
--libpixbufloader_gdip_png_la_LIBADD = $(module_libs) $(libole32)
--
- libpixbufloader_gdip_tiff_la_LDFLAGS = -avoid-version -module -no-undefined
- libpixbufloader_gdip_tiff_la_SOURCES = 	\
- 	io-gdip-native.h		\
---
-cgit v0.8.3.1
diff --git a/x11-libs/gtk+/files/gtk+-2.20.1-libpng-fix.patch b/x11-libs/gtk+/files/gtk+-2.20.1-libpng-fix.patch
deleted file mode 100644
index 5c73327..0000000
--- a/x11-libs/gtk+/files/gtk+-2.20.1-libpng-fix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-commit 006d5718fa927d9d3509fca1a1c1ca6522110b57
-Author: Matthias Clasen <mclasen@redhat.com>
-Date:   Wed May 12 15:02:02 2010 -0400
-
-    Another attempt to handle pngs changing int types
-
-diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
-index 43db70a..844064a 100644
---- a/gdk-pixbuf/io-png.c
-+++ b/gdk-pixbuf/io-png.c
-@@ -261,7 +261,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
-         gchar *icc_profile_base64;
-         const gchar *icc_profile_title;
-         const gchar *icc_profile;
--        gulong icc_profile_size;
-+        png_uint_32 icc_profile_size;
-         guint32 retval;
-         gint compression_type;
- 
-@@ -344,7 +344,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
-                                (png_charpp) &icc_profile_title, &compression_type,
-                                (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
-         if (retval != 0) {
--                icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, icc_profile_size);
-+                icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, (gsize)icc_profile_size);
-                 gdk_pixbuf_set_option (pixbuf, "icc-profile", icc_profile_base64);
-                 g_free (icc_profile_base64);
-         }
-@@ -607,7 +607,7 @@ png_info_callback   (png_structp png_read_ptr,
-         gchar *icc_profile_base64;
-         const gchar *icc_profile_title;
-         const gchar *icc_profile;
--        gulong icc_profile_size;
-+        png_uint_32 icc_profile_size;
-         guint32 retval;
-         gint compression_type;
- 
-@@ -679,9 +679,9 @@ png_info_callback   (png_structp png_read_ptr,
-         /* Extract embedded ICC profile */
-         retval = png_get_iCCP (png_read_ptr, png_info_ptr,
-                                (png_charpp) &icc_profile_title, &compression_type,
--                               (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
-+                               (png_charpp) &icc_profile, &icc_profile_size);
-         if (retval != 0) {
--                icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, icc_profile_size);
-+                icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, (gsize)icc_profile_size);
-                 gdk_pixbuf_set_option (lc->pixbuf, "icc-profile", icc_profile_base64);
-                 g_free (icc_profile_base64);
-         }
diff --git a/x11-libs/gtk+/files/gtk+-2.8.0-multilib.patch b/x11-libs/gtk+/files/gtk+-2.8.0-multilib.patch
deleted file mode 100644
index 4a1b73d..0000000
--- a/x11-libs/gtk+/files/gtk+-2.8.0-multilib.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -urN gtk+-2.8.0.orig/gdk-pixbuf/Makefile.am gtk+-2.8.0/gdk-pixbuf/Makefile.am
---- gtk+-2.8.0.orig/gdk-pixbuf/Makefile.am	2005-07-09 01:10:11.000000000 +0100
-+++ gtk+-2.8.0/gdk-pixbuf/Makefile.am	2005-08-17 17:59:20.000000000 +0100
-@@ -271,6 +271,7 @@
- 	-I$(top_srcdir)/gdk-pixbuf 		\
- 	-I$(top_builddir)/gdk-pixbuf 		\
- 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"	\
-+	-DHOST=\"$(host_triplet)\"		\
- 	-DGTK_VERSION=\"$(GTK_VERSION)\"	\
- 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
- 	-DG_DISABLE_DEPRECATED			\
-diff -urN gtk+-2.8.0.orig/gdk-pixbuf/Makefile.in gtk+-2.8.0/gdk-pixbuf/Makefile.in
---- gtk+-2.8.0.orig/gdk-pixbuf/Makefile.in	2005-08-17 17:38:06.000000000 +0100
-+++ gtk+-2.8.0/gdk-pixbuf/Makefile.in	2005-08-17 17:59:35.000000000 +0100
-@@ -504,6 +504,7 @@
- 	-I$(top_srcdir)/gdk-pixbuf 		\
- 	-I$(top_builddir)/gdk-pixbuf 		\
- 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"	\
-+	-DHOST=\"$(host_triplet)\"		\
- 	-DGTK_VERSION=\"$(GTK_VERSION)\"	\
- 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
- 	-DG_DISABLE_DEPRECATED			\
-diff -urN gtk+-2.8.0.orig/gdk-pixbuf/gdk-pixbuf-io.c gtk+-2.8.0/gdk-pixbuf/gdk-pixbuf-io.c
---- gtk+-2.8.0.orig/gdk-pixbuf/gdk-pixbuf-io.c	2005-07-22 16:34:32.000000000 +0100
-+++ gtk+-2.8.0/gdk-pixbuf/gdk-pixbuf-io.c	2005-08-17 17:44:48.000000000 +0100
-@@ -276,8 +276,15 @@
-   gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
- 
-   if (!result)
--	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
--
-+  {
-+	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", HOST, "gdk-pixbuf.loaders", NULL);
-+	  if (!g_file_test (result, G_FILE_TEST_EXISTS))
-+	  {
-+		  g_free (result);
-+
-+		  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
-+	  }
-+  }
-   return result;
- }
- 
-diff -urN gtk+-2.8.0.orig/gtk/gtkrc.c gtk+-2.8.0/gtk/gtkrc.c
---- gtk+-2.8.0.orig/gtk/gtkrc.c	2005-04-06 14:49:28.000000000 +0100
-+++ gtk+-2.8.0/gtk/gtkrc.c	2005-08-17 17:54:36.000000000 +0100
-@@ -364,7 +364,15 @@
-       if (im_module_file)
- 	result = g_strdup (im_module_file);
-       else
--	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+	{
-+	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", GTK_HOST, "gtk.immodules", NULL);
-+	  if (!g_file_test (result, G_FILE_TEST_EXISTS))
-+	    {
-+	      g_free (result);
-+	      
-+	      result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+	    }
-+	}
-     }
- 
-   return result;
diff --git a/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild b/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild
deleted file mode 100644
index defb4ea..0000000
--- a/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild
+++ /dev/null
@@ -1,204 +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.20.1-r1.ebuild,v 1.1 2010/06/13 15:43:44 pacho Exp $
-
-EAPI="3"
-
-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 introspection jpeg jpeg2k tiff test vim-syntax xinerama"
-
-# 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.3
-		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.23.6
-	>=x11-libs/pango-1.20
-	>=dev-libs/atk-1.29.2
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.2.43-r2:0
-	cups? ( net-print/cups )
-	jpeg? ( >=media-libs/jpeg-6b-r9:0 )
-	jpeg2k? ( media-libs/jasper )
-	tiff? ( >=media-libs/tiff-3.9.2 )
-	!<gnome-base/gail-1000"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	!aqua? (
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/damageproto
-	)
-	x86-interix? (
-		sys-libs/itx-bind
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	>=dev-util/gtk-doc-am-1.11
-	introspection? (
-		>=dev-libs/gobject-introspection-0.6.4 )
-	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"
-
-	# add correct framework linking options, for aqua
-	epatch "${FILESDIR}/${PN}-2.18.5-macosx-aqua.patch"
-
-	# Remove the definition of libpixbufloader_gdip_png_la_*
-	epatch "${FILESDIR}/${P}-libpixbufloader-warning.patch"
-
-	# Redraw if GtkRange is a GtkScale and value is drawn.
-	epatch "${FILESDIR}/${P}-gtkrange.patch"
-
-	# Fix upstream "table cells do not implement action interface"
-	epatch "${FILESDIR}/${P}-gail_cell_type.patch"
-
-	# Upstream bg 608218: GtkOffscreenWindow causes bad window with GtkEntry
-	epatch "${FILESDIR}/${P}-GtkOffscreenWindow.patch"
-
-	# fix a 64-bit crasher in libpng 1.4 (upstream bug #617878)
-	epatch "${FILESDIR}/${P}-libpng-fix.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"
-
-	if use x86-interix; then
-		# activate the itx-bind package...
-		append-flags "-I${EPREFIX}/usr/include/bind"
-		append-ldflags "-L${EPREFIX}/usr/lib/bind"
-	fi
-
-	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) \
-		$(use_enable introspection) \
-		--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 "${ED%/}/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 :" "${ED%/}"/usr/lib/pkgconfig/$i || die "sed failed"
-	done
-}
-
-pkg_postinst() {
-	set_gtk2_confdir
-
-	if [ -d "${EROOT%/}${GTK2_CONFDIR}" ]; then
-		gtk-query-immodules-2.0  > "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules"
-		gdk-pixbuf-query-loaders > "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
-	else
-		ewarn "The destination path ${EROOT%/}${GTK2_CONFDIR} doesn't exist;"
-		ewarn "to complete the installation of GTK+, please create the"
-		ewarn "directory and then manually run:"
-		ewarn "  cd ${EROOT%/}${GTK2_CONFDIR}"
-		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
-		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
-	fi
-
-	if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/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.91.1.ebuild b/x11-libs/gtk+/gtk+-2.91.1.ebuild
new file mode 100644
index 0000000..61a6293
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.91.1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+inherit gnome.org flag-o-matic eutils libtool virtualx
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="3"
+#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="~x86"
+IUSE="aqua cups debug doc +introspection jpeg jpeg2k tiff test vim-syntax xinerama"
+
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+# glib-2.27.0 is required for GApplication
+RDEPEND="!aqua? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXt
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.3
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		>=x11-libs/cairo-1.9.10[X,svg]
+		x11-libs/gdk-pixbuf[X,introspection?,jpeg?,jpeg2k?,tiff?]
+	)
+	aqua? (
+		>=x11-libs/cairo-1.9.10[aqua,svg]
+		x11-libs/gdk-pixbuf[introspection?,jpeg?,jpeg2k?,tiff?]
+	)
+	xinerama? ( x11-libs/libXinerama )
+	>=dev-libs/glib-2.27.0
+	>=x11-libs/pango-1.20[introspection?]
+	>=dev-libs/atk-1.29.2[introspection?]
+	media-libs/fontconfig
+	x11-misc/shared-mime-info
+	cups? ( net-print/cups )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	!<gnome-base/gail-1000"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	!aqua? (
+		x11-proto/xextproto
+		x11-proto/xproto
+		x11-proto/inputproto
+		x11-proto/damageproto
+	)
+	x86-interix? (
+		sys-libs/itx-bind
+	)
+	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 )"
+
+src_prepare() {
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	# 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"
+
+	if use x86-interix; then
+		# activate the itx-bind package...
+		append-flags "-I${EPREFIX}/usr/include/bind"
+		append-ldflags "-L${EPREFIX}/usr/lib/bind"
+	fi
+
+	elibtoolize
+}
+
+src_configure() {
+	# png always on to display icons (foser)
+	local myconf="$(use_enable doc gtk-doc)
+		$(use_enable xinerama)
+		$(use_enable cups cups auto)
+		$(use_enable introspection)
+		--disable-papi"
+	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_compile() {
+	# Unfortunately, the parellel make breaks if USE=introspection
+	use introspection && export MAKEOPTS="${MAKEOPTS} -j1"
+	default
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation failed"
+
+	# see bug #133241
+	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
+	insinto /etc/gtk-3.0
+	doins "${T}"/gtkrc
+
+	# Enable xft in environment as suggested by <utx@gentoo.org>
+	echo "GDK_USE_XFT=1" > "${T}"/50gtk3
+	doenvd "${T}"/50gtk3
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
+
+	# Remove unneeded *.la files
+	find "${ED}" -name "*.la" -delete
+
+	# add -framework Carbon to the .pc files
+	use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+	done
+}
+
+pkg_postinst() {
+	local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0"
+	if [[ -d ${GTK3_MODDIR} ]]; then
+		gtk-query-immodules-3.0      > "${GTK3_MODDIR}/immodules.cache"
+	else
+		ewarn "The destination path ${GTK3_MODDIR} doesn't exist;"
+		ewarn "to complete the installation of GTK+, please create the"
+		ewarn "directory and then manually run:"
+		ewarn "  cd ${GTK3_MODDIR}"
+		ewarn "  gtk-query-immodules-3.0      > immodules.cache"
+	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."
+}