in gnome overlay

26 files changed, 0 insertions, 1246 deletions

diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
deleted file mode 100644
index 03951da6..00000000
--- a/app-editors/gedit/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD gedit-2.31.5.ebuild 1163 RMD160 e00eb60f89f74ab3e2caa64d4bb90e87cda766a2 SHA1 eaadb3a897a02c72afbbb9bbb2f99b47f98a0b05 SHA256 20ca3a0ba7161efa13956cbd8e0d1238d3e29d7620598711371fd585c3c515d7
-DIST gedit-2.31.5.tar.bz2 4646909 RMD160 ea98448525508613760794166eaf1a22ec1ca744 SHA1 3fc5647598dcb07bbb95c8c98e9abaf707797822 SHA256 0dd0fed77da57738573239bf33a83a493c54d8b8a9b833eff12d9d984c8269a4
diff --git a/app-editors/gedit/gedit-2.31.5.ebuild b/app-editors/gedit/gedit-2.31.5.ebuild
deleted file mode 100644
index 7912d012..00000000
--- a/app-editors/gedit/gedit-2.31.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-inherit eutils gnome2
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc introspection spell"
-
-RDEPEND=">=x11-libs/libSM-1.0
-	>=dev-libs/libxml2-2.5.0
-	>=dev-libs/glib-2.25.10
-	>=x11-libs/gtk+-2.90:3[introspection?]
-	>=x11-libs/gtksourceview-2.11.2:3.0[introspection?]
-	dev-libs/libpeas
-	spell? (
-		>=app-text/enchant-1.2
-		>=app-text/iso-codes-0.35
-	)"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.17
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9
-	>=app-text/scrollkeeper-0.3.11
-	>=app-text/gnome-doc-utils-0.3.2
-	~app-text/docbook-xml-dtd-4.1.2
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-updater
-		$(use_enable spell)"
-}
-
-src_prepare() {
-	sed -i -e 's:--warn-all::g' gedit/Makefile.in || die
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
deleted file mode 100644
index 6be526c1..00000000
--- a/dev-libs/glib/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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.24-punt-python-check.patch 541 RMD160 8783f765b97814bc95a6143b75f317dbbdd8ba0c SHA1 dbaf420d3b8acd7691bc677f1fcc6e2fca04ed54 SHA256 0bdcc11d1434f695a5b5f6ec4c54ab7fa5a9f8a5c22d71b94f97378e92aaff84
-EBUILD glib-2.25.11.ebuild 2359 RMD160 ed9435902057f214d44cfc046ce6d03fa30f975c SHA1 5b1e81a2f98669fcd22ed27d715fdf506f15525d SHA256 5f1621e3a8ffbb3554df09f22b42d63182d7ec48ecd98b59d602a9602b821294
-DIST glib-2.25.11.tar.bz2 6021908 RMD160 a949384227eaa7491c2fa903d84771ea3be00215 SHA1 3794dac04e4a4c5dabf2452d1d7e98b3d0c83edb SHA256 f83cdc74b9a0a8514c496c68f3d4887d38d5de64ffb9b8cdede7e94bb140b16f
diff --git a/dev-libs/glib/files/glib-2.12.12-fbsd.patch b/dev-libs/glib/files/glib-2.12.12-fbsd.patch
deleted file mode 100644
index bba63296..00000000
--- a/dev-libs/glib/files/glib-2.12.12-fbsd.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN glib-2.12.12.orig/gmodule/gmodule-dl.c glib-2.12.12/gmodule/gmodule-dl.c
---- glib-2.12.12.orig/gmodule/gmodule-dl.c	2007-05-01 19:12:40.000000000 -0400
-+++ glib-2.12.12/gmodule/gmodule-dl.c	2007-07-05 20:10:51.000000000 -0400
-@@ -106,6 +106,7 @@ _g_module_open (const gchar *file_name,
- static gpointer
- _g_module_self (void)
- {
-+#ifndef __FreeBSD__
-   gpointer handle;
-   
-   /* to query symbols from the program itself, special link options
-@@ -117,6 +118,9 @@ _g_module_self (void)
-     g_module_set_error (fetch_dlerror (TRUE));
-   
-   return handle;
-+#else
-+  return RTLD_DEFAULT;
-+#endif
- }
- 
- static void
diff --git a/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch b/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch
deleted file mode 100644
index cabe56f5..00000000
--- a/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Temporary workaround for gio tests failure when ran without FEATURES=userpriv
-until upstream bug #552912 is fixed
-
---- gio/tests/live-g-file.c.orig	2008-09-25 05:44:12.848556034 +0300
-+++ gio/tests/live-g-file.c	2008-09-25 06:12:34.248726237 +0300
-@@ -769,11 +769,14 @@
- 	      if (posix_compat)
- 		{
- 		  /*  target directory is not accessible (no execute flag)  */
-+#if 0
-+/* Fails when ran as root */
- 		  do_copy_move (root, item, TEST_DIR_NO_ACCESS,
- 				TEST_NO_ACCESS);
- 		  /*  target directory is readonly  */
- 		  do_copy_move (root, item, TEST_DIR_NO_WRITE,
- 				TEST_NO_ACCESS);
-+#endif
- 		}
- 	    }
- 	}
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
deleted file mode 100644
index 6d8e74f3..00000000
--- a/dev-libs/glib/files/glib-2.24-assert-test-failure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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.24-punt-python-check.patch b/dev-libs/glib/files/glib-2.24-punt-python-check.patch
deleted file mode 100644
index 3cbd6dc1..00000000
--- a/dev-libs/glib/files/glib-2.24-punt-python-check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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.in
-+++ configure.in
-@@ -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/glib-2.25.11.ebuild b/dev-libs/glib/glib-2.25.11.ebuild
deleted file mode 100644
index 3b9cba7e..00000000
--- a/dev-libs/glib/glib-2.25.11.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-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="~amd64 ~x86"
-IUSE="debug doc fam hardened introspection selinux static-libs test xattr"
-
-RDEPEND="virtual/libiconv
-	xattr? ( sys-apps/attr )
-	fam? ( virtual/fam )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.16
-	>=sys-devel/gettext-0.11
-	doc? (
-		>=dev-libs/libxslt-1.0
-		>=dev-util/gtk-doc-1.11
-		~app-text/docbook-xml-dtd-4.1.2 )
-	test? ( >=sys-apps/dbus-1.2.14 )"
-PDEPEND="introspection? ( dev-libs/gobject-introspection )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
-	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-	epatch "${FILESDIR}/${PN}-2.24-punt-python-check.patch"
-	epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch"
-	sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-		-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
-	eautoreconf
-	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
-	epunt_cxx
-}
-
-src_configure() {
-	local myconf
-	use debug && myconf="--enable-debug"
-	econf ${myconf} \
-		  $(use_enable xattr) \
-		  $(use_enable doc man) \
-		  $(use_enable doc gtk-doc) \
-		  $(use_enable fam) \
-		  $(use_enable selinux) \
-		  $(use_enable static-libs static) \
-		  --enable-regex \
-		  --with-pcre=internal \
-		  --with-threads=posix
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-	rm -f "${D}/usr/lib/charset.alias"
-	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
-	newins "${D}/etc/bash_completion.d/gdbus-bash-completion.sh" gdbus || die
-	rm -rf "${D}/etc"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export XDG_DATA_HOME="${T}"
-	emake check || die "tests failed"
-}
-
-pkg_preinst() {
-	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/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
deleted file mode 100644
index e16834ed..00000000
--- a/dev-libs/libpeas/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD libpeas-0.5.2.ebuild 777 RMD160 bb99c15b109299b673ebe6d395be20bc52709f27 SHA1 e32e14d23bfbaa8ce04c0e0c18c8c9ca5ef5655a SHA256 6be74378b1cacbd6f37759afd490610af77f2c62d2257714f7ec819e59c14251
-DIST libpeas-0.5.2.tar.bz2 410691 RMD160 6ebb82d65c5d37cf5a18da80b80c78f90b0f92a6 SHA1 3605341978e7aa4df678529f708558d64b720022 SHA256 e5b1357920800abda2243ca78d00433676266f495a3146e07bf61aa998db31dc
diff --git a/dev-libs/libpeas/libpeas-0.5.2.ebuild b/dev-libs/libpeas/libpeas-0.5.2.ebuild
deleted file mode 100644
index 42efb15d..00000000
--- a/dev-libs/libpeas/libpeas-0.5.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.5"
-inherit python gnome2
-
-DESCRIPTION="A GObject plugins library"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc python"
-
-RDEPEND=">=dev-libs/glib-2.23.6:2
-	>=dev-libs/gobject-introspection-0.6.7
-	>=x11-libs/gtk+-2.90:3[introspection]
-	python? ( >=dev-python/pygobject-2.20 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	>=sys-devel/libtool-2.2.6
-	doc? ( >=dev-util/gtk-doc-1.11 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable python)
-		--disable-maintainer-mode
-		--disable-gtk2-test-build
-		--disable-seed"
-}
diff --git a/dev-libs/libunique/Manifest b/dev-libs/libunique/Manifest
deleted file mode 100644
index 130442bb..00000000
--- a/dev-libs/libunique/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX run-tests 480 RMD160 b3ffc82d664bc51977d0f4d5029eff4c346d2fea SHA1 3d2cb24e8ab1cd476f4f8bac54ba995d0fcb9c8e SHA256 67e908abb6c1f5c628766cb9179a8583af779812e8b64e9eb3c7c7c8036ade5e
-EBUILD libunique-2.90.1.ebuild 1156 RMD160 996106410d9bf8e7dd730c7a693116f44b39a8f9 SHA1 0cbeb579c5d58589e81821ff40078063227168e6 SHA256 7d00415e8afde3f4d623257fe64396bb0d3b9108e4e71f00d7a54fc40be81ea7
-DIST libunique-2.90.1.tar.bz2 344813 RMD160 5b099a40b0380f52da36970bce62518c0192952d SHA1 32ab9849994da70f461fc78c59a2b930d294f8c7 SHA256 94c46006557b9f981b801f90c1ce324dcd5385aa6ded5058cb06f39e32119993
diff --git a/dev-libs/libunique/files/run-tests b/dev-libs/libunique/files/run-tests
deleted file mode 100644
index 28a18098..00000000
--- a/dev-libs/libunique/files/run-tests
+++ /dev/null
@@ -1,18 +0,0 @@
-BINARY = ./test-unique
-TESTS = --new --activate --open-uri=http://localhost --foo
-
-all:
-	for test in $(TESTS); do \
-	  rm -f test_result; \
-	  $(BINARY) > test_result & \
-	  main_pid=$$!; \
-	  sleep 5; \
-	  $(BINARY) $$test & \
-	  test_pid=$$!; \
-	  sleep 5; \
-	  while ! test -s test_result; do sleep 0.5; done; \
-	  sleep 5; \
-	  kill $${test_pid}; \
-	  kill $${main_pid}; \
-	  grep -q 'Message received from.*' test_result || { echo "Test failed at $$test"; exit 1; }; \
-	done
diff --git a/dev-libs/libunique/libunique-2.90.1.ebuild b/dev-libs/libunique/libunique-2.90.1.ebuild
deleted file mode 100644
index 900a2035..00000000
--- a/dev-libs/libunique/libunique-2.90.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-inherit gnome2 virtualx
-
-DESCRIPTION="a library for writing single instance application"
-HOMEPAGE="http://live.gnome.org/LibUnique"
-
-LICENSE="LGPL-2.1"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus debug doc introspection"
-
-RDEPEND=">=dev-libs/glib-2.12.0
-	x11-libs/gtk+:3[introspection?]
-	x11-libs/libX11
-	dbus? ( >=dev-libs/dbus-glib-0.70 )
-	introspection? (
-		>=dev-libs/gobject-introspection-0.6.3
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.17
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.11 )"
-
-DOCS="AUTHORS NEWS ChangeLog README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-maintainer-flags
-		--disable-static
-		--enable-bacon
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable introspection)"
-}
-
-src_test() {
-	cd "${S}/tests"
-	unset DBUS_SESSION_BUS_ADDRESS
-	unset XAUTHORITY
-	unset DISPLAY
-	cp "${FILESDIR}/run-tests" . || die "Unable to cp \${FILESDIR}/run-tests"
-	Xemake -f run-tests || die "Tests failed"
-}
-
-src_install() {
-	gnome2_src_install
-	rm -rf ${D}/usr/share/gtk-doc
-}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
deleted file mode 100644
index b7698a3c..00000000
--- a/dev-python/pygobject/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX pygobject-2.15.4-fix-codegen-location.patch 1519 RMD160 e4721ae2d9a2d05e3b129627c762acf177521974 SHA1 02e9446db952de3b934a264ce77648d2cd5c6d97 SHA256 6ab22def2c57a4dd44dedc787cb660dc326a62b518c3dc747fbe600ca2c20b8c
-AUX pygobject-2.18.0-support_multiple_python_versions.patch 2349 RMD160 054080d2a62b466ffe2ba9e182e5e796c652161f SHA1 d1ac7d308cb82caab4a5c56256ebd53b13cb9a3b SHA256 d66bcf31acf8b310ad346b9803d5e41d9840cfbca3c62d19b5c99f605c58066d
-AUX pygobject-2.21.4-make_check.patch 1799 RMD160 299e2064b3685822957c45c9ae8a5007ff9c9c04 SHA1 553bb63d96eb5cb0dae511a4c3a9505bd8076b8d SHA256 f03bb8460ce6bcef8d9c6dfab6b39a96860ea7528ed8b840e375c26a2726f38e
-EBUILD pygobject-2.21.5.ebuild 3150 RMD160 adf0ed7b0d70e359c525549e9ebbe6b373c1bb2c SHA1 9df6146ec6aca54dd8b677be46ef8d9247eb2ee3 SHA256 b576e64c2d45c1b52738d8cf799ef5dafe483d2ce6c22cc08deeec0d9570b410
-DIST pygobject-2.21.5.tar.bz2 767809 RMD160 f1341e01cfd14399ba6b4a5dad8638da67d8de9d SHA1 8017d5dba28278727501194d45310d3156937c70 SHA256 14dc23bd8adb3626cfbaa7b7df1070c8da260e60925ec83beac517d7155cfed8
diff --git a/dev-python/pygobject/files/pygobject-2.15.4-fix-codegen-location.patch b/dev-python/pygobject/files/pygobject-2.15.4-fix-codegen-location.patch
deleted file mode 100644
index 8882cd07..00000000
--- a/dev-python/pygobject/files/pygobject-2.15.4-fix-codegen-location.patch
+++ /dev/null
@@ -1,50 +0,0 @@
----
- Fix FHS compliance of codegen
-
- codegen/Makefile.am          |    2 +-
- codegen/pygtk-codegen-2.0.in |    3 ++-
- pygtk-2.0.pc.in              |    2 +-
- 3 files changed, 4 insertions(+), 3 deletions(-)
-
---- a/codegen/Makefile.am	2007-11-01 12:20:22.000000000 -0400
-+++ b/codegen/Makefile.am	2008-05-28 22:21:04.000000000 -0400
-@@ -2,7 +2,7 @@ PLATFORM_VERSION = 2.0
- 
- bin_SCRIPTS = pygobject-codegen-$(PLATFORM_VERSION)
- 
--codegendir = $(pkgdatadir)/$(PLATFORM_VERSION)/codegen
-+codegendir = $(pyexecdir)/gtk-2.0/codegen
- 
- codegen_PYTHON = \
- 	__init__.py \
---- a/codegen/pygobject-codegen-2.0.in	2007-11-01 12:20:22.000000000 -0400
-+++ b/codegen/pygobject-codegen-2.0.in	2008-05-28 22:24:38.000000000 -0400
-@@ -1,9 +1,10 @@
- #!/bin/sh
- 
- prefix=@prefix@
-+exec_prefix=@exec_prefix@
- datarootdir=@datarootdir@
- datadir=@datadir@
--codegendir=${datadir}/pygobject/2.0/codegen
-+codegendir=@pyexecdir@/gtk-2.0/codegen
- 
- PYTHONPATH=$codegendir
- export PYTHONPATH
---- a/pygobject-2.0.pc.in	2007-11-01 12:20:22.000000000 -0400
-+++ b/pygobject-2.0.pc.in	2008-05-28 22:21:04.000000000 -0400
-@@ -4,6 +4,7 @@
- datarootdir=@datarootdir@
- datadir=@datadir@
- libdir=@libdir@
-+pyexecdir=@pyexecdir@
- 
- # you can use the --variable=pygtkincludedir argument to
- # pkg-config to get this value.  You might want to use this to
-@@ -12,5 +12,5 @@
- defsdir=${datadir}/pygobject/2.0/defs
--codegendir=${datadir}/pygobject/2.0/codegen
-+codegendir=${pyexecdir}/gtk-2.0/codegen
- 
- Name: PyGObject
- Description: Python bindings for GObject
diff --git a/dev-python/pygobject/files/pygobject-2.18.0-support_multiple_python_versions.patch b/dev-python/pygobject/files/pygobject-2.18.0-support_multiple_python_versions.patch
deleted file mode 100644
index b27d408d..00000000
--- a/dev-python/pygobject/files/pygobject-2.18.0-support_multiple_python_versions.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- codegen/pygobject-codegen-2.0.in
-+++ codegen/pygobject-codegen-2.0.in
-@@ -4,7 +4,7 @@
- exec_prefix=@exec_prefix@
- datarootdir=@datarootdir@
- datadir=@datadir@
--codegendir=@pyexecdir@/gtk-2.0/codegen
-+codegendir=$(@PYTHON@ -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, prefix='@exec_prefix@')")/gtk-2.0/codegen
- 
- PYTHONPATH=$codegendir
- export PYTHONPATH
---- gio/Makefile.am
-+++ gio/Makefile.am
-@@ -56,7 +56,7 @@
- gio.c: $(GIO_DEFS) $(GIO_OVERRIDES)
- _gio_la_CFLAGS = $(GIO_CFLAGS)
- _gio_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gio
--_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
-+_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- _gio_la_SOURCES = \
- 	giomodule.c \
- 	pygio-utils.c \
---- glib/Makefile.am
-+++ glib/Makefile.am
-@@ -4,7 +4,7 @@
- pkgincludedir = $(includedir)/pygtk-2.0
- pkginclude_HEADERS = pyglib.h
- 
--lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@.la
-+lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- 
- pkgpyexecdir = $(pyexecdir)/gtk-2.0
- 
-@@ -19,9 +19,9 @@
- common_ldflags += -no-undefined
- endif
- 
--libpyglib_2_0_@PYTHON_BASENAME@_la_CFLAGS = $(GLIB_CFLAGS)
--libpyglib_2_0_@PYTHON_BASENAME@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
--libpyglib_2_0_@PYTHON_BASENAME@_la_SOURCES = 	\
-+libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_CFLAGS = $(GLIB_CFLAGS)
-+libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
-+libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_SOURCES = 	\
- 	pyglib.c		\
- 	pyglib.h		\
- 	pyglib-private.h 	\
-@@ -29,7 +29,7 @@
- 
- _glib_la_CFLAGS = $(GLIB_CFLAGS)
- _glib_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_glib|PyInit__glib"
--_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@.la
-+_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- _glib_la_SOURCES = 	 	\
- 	glibmodule.c	 	\
- 	pygiochannel.c 	 	\
---- gobject/Makefile.am
-+++ gobject/Makefile.am
-@@ -42,7 +42,7 @@
- _gobject_la_LIBADD = \
- 	$(GLIB_LIBS) \
- 	$(FFI_LIBS) \
--	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
-+	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- _gobject_la_SOURCES =           \
-         gobjectmodule.c         \
-         pygboxed.c              \
diff --git a/dev-python/pygobject/files/pygobject-2.21.4-make_check.patch b/dev-python/pygobject/files/pygobject-2.21.4-make_check.patch
deleted file mode 100644
index 7b1c20d9..00000000
--- a/dev-python/pygobject/files/pygobject-2.21.4-make_check.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- pygobject-2.21.4.orig/tests/Makefile.am
-+++ pygobject-2.21.4/tests/Makefile.am
-@@ -12,7 +12,7 @@ EXTRA_DIST = \
- 	test-thread.h \
- 	test-unknown.h
- 
--noinst_LTLIBRARIES = testhelper.la
-+check_LTLIBRARIES = testhelper.la
- linked_LIBS = testhelper.la
- 
- testhelper_la_LDFLAGS = -module -avoid-version
-@@ -46,13 +46,11 @@ endif
- testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
- 	$(LINK) -rpath $(pkgpyexecdir) $(testhelper_la_LDFLAGS) $(testhelper_la_OBJECTS) $(testhelper_la_LIBADD) $(LIBS)
- 
--check-local: $(LTLIBRARIES:.la=.so)
-+check-local: $(check_LTLIBRARIES:.la=.so)
- 	$(EXEC_NAME) $(PYTHON) $(srcdir)/runtests.py $(top_builddir) $(tests)
- 
--all: $(LTLIBRARIES:.la=.so)
--
- clean-local:
--	rm -f $(LTLIBRARIES:.la=.so)
-+	rm -f $(check_LTLIBRARIES:.la=.so)
- 
- .la.so:
- 	$(LN_S) .libs/$@ $@ || true
---- pygobject-2.21.4.orig/tests/runtests.py
-+++ pygobject-2.21.4/tests/runtests.py
-@@ -6,6 +6,9 @@ import unittest
- 
- import common
- 
-+# Some tests fail with translated messages.
-+os.environ["LC_ALL"] = "C"
-+
- program = None
- if len(sys.argv) < 2:
-     raise ValueError('Need at least 2 parameters: runtests.py <build-dir> '
---- pygobject-2.21.4.orig/tests/test_gio.py
-+++ pygobject-2.21.4/tests/test_gio.py
-@@ -410,9 +410,10 @@ class TestFile(unittest.TestCase):
- 
-     def testQueryWritableNamespaces(self):
-         infolist = self.file.query_writable_namespaces()
--        for info in infolist:
--            if info.name == "xattr":
--                self.assertEqual(info.type, gio.FILE_ATTRIBUTE_TYPE_STRING)
-+        if infolist:
-+            for info in infolist:
-+                if info.name == "xattr":
-+                    self.assertEqual(info.type, gio.FILE_ATTRIBUTE_TYPE_STRING)
- 
-     def testSetAttribute(self):
-         self._f.write("testing attributes")
diff --git a/dev-python/pygobject/pygobject-2.21.5.ebuild b/dev-python/pygobject/pygobject-2.21.5.ebuild
deleted file mode 100644
index b17d1f86..00000000
--- a/dev-python/pygobject/pygobject-2.21.5.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.5"
-inherit alternatives autotools gnome2 python virtualx
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples +introspection libffi test"
-
-# FIXME: add introspection support
-RDEPEND=">=dev-libs/glib-2.22.4
-	introspection? (
-		>=dev-libs/gobject-introspection-0.6.14
-		>=dev-python/pycairo-1.0.2
-	)
-	!<dev-python/pygtk-2.13
-	libffi? ( virtual/libffi )"
-DEPEND="${RDEPEND}
-	doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 )
-	test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc )
-	>=dev-util/pkgconfig-0.12.0"
-
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-DOCS="AUTHORS ChangeLog* NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-dependency-tracking
-		$(use_enable doc docs)
-		$(use_enable introspection)
-		$(use_with libffi ffi)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix FHS compliance, see upstream bug #535524
-	epatch "${FILESDIR}/${PN}-2.15.4-fix-codegen-location.patch"
-
-	# Do not build tests if unneeded, bug #226345
-	epatch "${FILESDIR}/${PN}-2.21.4-make_check.patch"
-
-	# Support installation for multiple Python versions
-	epatch "${FILESDIR}/${PN}-2.18.0-support_multiple_python_versions.patch"
-
-	# needed to build on a libtool-1 system, bug #255542
-	rm m4/lt* m4/libtool.m4 ltmain.sh
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-	eautoreconf
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
-	python_execute_function -d -s
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	testing() {
-		if has ${PYTHON_ABI} 2.4 2.5; then
-			einfo "Skipping tests with Python ${PYTHON_ABI}. dev-python/pycairo supports only Python >=2.6."
-			return 0
-		fi
-
-		Xemake check
-	}
-	python_execute_function -s testing
-}
-
-src_install() {
-	[[ -z ${ED} ]] && local ED="${D}"
-	installation() {
-		gnome2_src_install
-		mv "${ED}$(python_get_sitedir)/pygtk.py" "${ED}$(python_get_sitedir)/pygtk.py-2.0"
-		mv "${ED}$(python_get_sitedir)/pygtk.pth" "${ED}$(python_get_sitedir)/pygtk.pth-2.0"
-	}
-	python_execute_function -s installation
-
-	if use examples; then
-		insinto /usr/share/doc/${P}
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	create_symlinks() {
-		alternatives_auto_makesym $(python_get_sitedir)/pygtk.py pygtk.py-[0-9].[0-9]
-		alternatives_auto_makesym $(python_get_sitedir)/pygtk.pth pygtk.pth-[0-9].[0-9]
-	}
-	python_execute_function create_symlinks
-
-	python_mod_optimize gtk-2.0 pygtk.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup gtk-2.0 pygtk.py
-
-	create_symlinks() {
-		alternatives_auto_makesym $(python_get_sitedir)/pygtk.py pygtk.py-[0-9].[0-9]
-		alternatives_auto_makesym $(python_get_sitedir)/pygtk.pth pygtk.pth-[0-9].[0-9]
-	}
-	python_execute_function create_symlinks
-}
diff --git a/profiles/categories b/profiles/categories
index 4d7b8f3e..90560eb1 100644
--- a/profiles/categories
+++ b/profiles/categories
@@ -1,4 +1,3 @@
-app-editors
 app-backup
 app-crypt
 app-laptop
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
deleted file mode 100644
index a4ced9a2..00000000
--- a/x11-libs/gtk+/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX gtk+-2.14.3-limit-gtksignal-includes.patch 513 RMD160 ad967a5fb6b9fe2d96119d478429f10032bad8a5 SHA1 5c0df3e543303dfe456479359fea2cbd0d4b723e SHA256 20e7536c29e2675d18fd3aff933621a4fcab9b5615ff96593e9f36ab4febb734
-AUX gtk+-2.21.3-macosx-aqua.patch 5151 RMD160 7ad218341fa1e9e66e171ee54e275654644e3f08 SHA1 ff87e2eb8bed90a6a94f7cf82ccf49b9d4f5a154 SHA256 4ce4f02aa41ac647d851fde7ca95c8a776afa55810ec1157a69ab2454bf8eff4
-AUX gtk+-2.21.3-multilib.patch 611 RMD160 eca8037e03582ee04ba454b2010ba6405551239d SHA1 c304db88d098e59f2776dd99392d6712b84a4972 SHA256 4c3db89f401176ea121a982974d81ca6ba3db315d2bce16c83ef7f7d7f629f3b
-AUX gtk+-2.90.4-macosx-aqua.patch 5160 RMD160 b261f1d88e1fff6359ba532360ca0529f85b72dc SHA1 6408d6b1b632844df91557d9e629dce5f162011f SHA256 6cebffdead89e458e41a365c177afd0d47cbd7ee0b462f79dbfe984845ef487a
-EBUILD gtk+-2.21.4.ebuild 4066 RMD160 f27f76955e8de5888b4c7612e28bc375064401b8 SHA1 147b36dd5a1cd9cb3fe8a35c24c27fdb0c471922 SHA256 780ea9564564b73edf0aac116def9b47fc68321188cf47453bbccaa2b42d3543
-EBUILD gtk+-2.90.5.ebuild 3576 RMD160 32b960d167b4cf9c52ad86d80bd67354057774fa SHA1 9ef99e67b887e078d95fd81d7eacffaf507d03a7 SHA256 53f02392046cc72d481903052f3588bf91a736cec287bee59a58e36ae25a18bd
-DIST gtk+-2.90.5.tar.bz2 17028893 RMD160 8b2f5bccff4e4ebe9cd8991213731a4e2e640c9e SHA1 b5c3d87642cb412ae4820b27063d0eef98bd31d1 SHA256 8c3c2b461c5a9e0c07dcc320d6362728284e8294f2cd77428d51694c15681264
-DIST gtk+-2.21.4.tar.bz2 18058932 RMD160 eec88b7a8afc5d26f36066b5463c480e8ab0efd2 SHA1 384d4691fd43a25cc575ba89d090a55e09ae1fda SHA256 7f70c73a97938a7014f4e83be01224a36dca0adcb53333dc4a7bb20f0e7855a5
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 3fe8cffd..00000000
--- 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.21.3-macosx-aqua.patch b/x11-libs/gtk+/files/gtk+-2.21.3-macosx-aqua.patch
deleted file mode 100644
index 43599a6d..00000000
--- a/x11-libs/gtk+/files/gtk+-2.21.3-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.21.3.orig/demos/gtk-demo/Makefile.am
-+++ gtk+-2.21.3/demos/gtk-demo/Makefile.am
-@@ -85,6 +85,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.21.3.orig/demos/gtk-demo/Makefile.in
-+++ gtk+-2.21.3/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)/m4/introspection.m4 \
-@@ -459,7 +460,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.21.3.orig/demos/Makefile.am
-+++ gtk+-2.21.3/demos/Makefile.am
-@@ -29,6 +29,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
- noinst_PROGRAMS += testpixbuf
- BUILT_SOURCES = test-inline-pixbufs.h
---- gtk+-2.21.3.orig/demos/Makefile.in
-+++ gtk+-2.21.3/demos/Makefile.in
-@@ -431,6 +431,7 @@ LDADDS = \
- 	$(GTK_DEP_LIBS)							\
- 	$(MATH_LIB)
- 
-+@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon
- BUILT_SOURCES = test-inline-pixbufs.h
- testpixbuf_DEPENDENCIES = $(DEPS)
- testpixbuf_drawable_DEPENDENCIES = $(DEPS)
---- gtk+-2.21.3.orig/gtk/Makefile.am
-+++ gtk+-2.21.3/gtk/Makefile.am
-@@ -905,7 +905,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)
-@@ -918,6 +918,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.21.3.orig/gtk/Makefile.in
-+++ gtk+-2.21.3/gtk/Makefile.in
-@@ -1303,7 +1303,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
-@@ -1313,6 +1313,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/$(gdktargetlib)
---- gtk+-2.21.3.orig/perf/Makefile.am
-+++ gtk+-2.21.3/perf/Makefile.am
-@@ -19,6 +19,10 @@ LDADDS =								\
- 	$(top_builddir)/gtk/$(gtktargetlib)				\
- 	$(GTK_DEP_LIBS)
- 
-+if USE_QUARTZ
-+AM_LDFLAGS = -framework AppKit -framework Carbon
-+endif
-+
- noinst_PROGRAMS	= 	\
- 	testperf
- 
---- gtk+-2.21.3.orig/perf/Makefile.in
-+++ gtk+-2.21.3/perf/Makefile.in
-@@ -368,6 +368,7 @@ LDADDS = \
- 	$(top_builddir)/gtk/$(gtktargetlib)				\
- 	$(GTK_DEP_LIBS)
- 
-+@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon
- testperf_DEPENDENCIES = $(TEST_DEPS)
- testperf_LDADD = $(LDADDS)
- testperf_SOURCES = \
---- gtk+-2.21.3.orig/tests/Makefile.am
-+++ gtk+-2.21.3/tests/Makefile.am
-@@ -20,6 +20,10 @@ LDADDS =								\
- 	$(GTK_DEP_LIBS)							\
- 	-lm
- 
-+if USE_QUARTZ
-+AM_LDFLAGS = -framework AppKit -framework Carbon
-+endif
-+
- if USE_X11
- testsocket_programs = testsocket testsocket_child
- endif
---- gtk+-2.21.3.orig/tests/Makefile.in
-+++ gtk+-2.21.3/tests/Makefile.in
-@@ -623,6 +623,7 @@ LDADDS = \
- 	$(GTK_DEP_LIBS)							\
- 	-lm
- 
-+@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.21.3-multilib.patch b/x11-libs/gtk+/files/gtk+-2.21.3-multilib.patch
deleted file mode 100644
index 3cf777df..00000000
--- a/x11-libs/gtk+/files/gtk+-2.21.3-multilib.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Same as the 2.8 version, except removed gdk-pixbuf parts
-
---- gtk+-2.21.3.orig/gtk/gtkrc.c
-+++ gtk+-2.21.3/gtk/gtkrc.c
-@@ -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+/files/gtk+-2.90.4-macosx-aqua.patch b/x11-libs/gtk+/files/gtk+-2.90.4-macosx-aqua.patch
deleted file mode 100644
index 24f7e133..00000000
--- a/x11-libs/gtk+/files/gtk+-2.90.4-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.90.4.orig/demos/gtk-demo/Makefile.am
-+++ gtk+-2.90.4/demos/gtk-demo/Makefile.am
-@@ -85,6 +85,10 @@ gtk3_demo_DEPENDENCIES = $(DEPS)
- gtk3_demo_LDADD = $(LDADDS)
- gtk3_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.90.4.orig/demos/gtk-demo/Makefile.in
-+++ gtk+-2.90.4/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 = gtk3-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)/m4/introspection.m4 \
-@@ -459,7 +460,7 @@ gtk3_demo_SOURCES = \
- 
- gtk3_demo_DEPENDENCIES = $(DEPS)
- gtk3_demo_LDADD = $(LDADDS)
--gtk3_demo_LDFLAGS = -export-dynamic
-+gtk3_demo_LDFLAGS = -export-dynamic $(am__append_1)
- IMAGEFILES = alphatest.png		\
- 	        apple-red.png		\
- 		background.jpg		\
---- gtk+-2.90.4.orig/demos/Makefile.am
-+++ gtk+-2.90.4/demos/Makefile.am
-@@ -29,6 +29,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
- noinst_PROGRAMS += testpixbuf
- BUILT_SOURCES = test-inline-pixbufs.h
---- gtk+-2.90.4.orig/demos/Makefile.in
-+++ gtk+-2.90.4/demos/Makefile.in
-@@ -431,6 +431,7 @@ LDADDS = \
- 	$(GTK_DEP_LIBS)							\
- 	$(MATH_LIB)
- 
-+@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon
- BUILT_SOURCES = test-inline-pixbufs.h
- testpixbuf_DEPENDENCIES = $(DEPS)
- testpixbuf_drawable_DEPENDENCIES = $(DEPS)
---- gtk+-2.90.4.orig/gtk/Makefile.am
-+++ gtk+-2.90.4/gtk/Makefile.am
-@@ -837,7 +837,7 @@ libgtk_directfb_3_0_la_SOURCES = $(gtk_c
- 
- libgtk_x11_3_0_la_LDFLAGS = $(libtool_opts)
- libgtk_win32_3_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
--libgtk_quartz_3_0_la_LDFLAGS = $(libtool_opts)
-+libgtk_quartz_3_0_la_LDFLAGS = $(libtool_opts) -framework AppKit -framework Carbon
- libgtk_directfb_3_0_la_LDFLAGS = $(libtool_opts)
- 
- libgtk_x11_3_0_la_LIBADD = $(libadd)
-@@ -850,6 +850,10 @@ libgtk_win32_3_0_la_DEPENDENCIES = $(gtk
- libgtk_quartz_3_0_la_DEPENDENCIES = $(deps)
- libgtk_directfb_3_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.90.4.orig/gtk/Makefile.in
-+++ gtk+-2.90.4/gtk/Makefile.in
-@@ -1560,7 +1560,7 @@ libgtk_quartz_3_0_la_SOURCES = $(gtk_c_s
- libgtk_directfb_3_0_la_SOURCES = $(gtk_c_sources)
- libgtk_x11_3_0_la_LDFLAGS = $(libtool_opts)
- libgtk_win32_3_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
--libgtk_quartz_3_0_la_LDFLAGS = $(libtool_opts)
-+libgtk_quartz_3_0_la_LDFLAGS = $(libtool_opts) -framework AppKit -framework Carbon
- libgtk_directfb_3_0_la_LDFLAGS = $(libtool_opts)
- libgtk_x11_3_0_la_LIBADD = $(libadd)
- libgtk_win32_3_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
-@@ -1570,6 +1570,7 @@ libgtk_x11_3_0_la_DEPENDENCIES = $(deps)
- libgtk_win32_3_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps)
- libgtk_quartz_3_0_la_DEPENDENCIES = $(deps)
- libgtk_directfb_3_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-3.0.la libgtk-win32-3.0.la libgtk-quartz-3.0.la libgtk-directfb-3.0.la
- DEPS = $(gtktargetlib) $(top_builddir)/gdk/$(gdktargetlib)
---- gtk+-2.90.4.orig/perf/Makefile.am
-+++ gtk+-2.90.4/perf/Makefile.am
-@@ -19,6 +19,10 @@ LDADDS =								\
- 	$(top_builddir)/gtk/$(gtktargetlib)				\
- 	$(GTK_DEP_LIBS)
- 
-+if USE_QUARTZ
-+AM_LDFLAGS = -framework AppKit -framework Carbon
-+endif
-+
- noinst_PROGRAMS	= 	\
- 	testperf
- 
---- gtk+-2.90.4.orig/perf/Makefile.in
-+++ gtk+-2.90.4/perf/Makefile.in
-@@ -368,6 +368,7 @@ LDADDS = \
- 	$(top_builddir)/gtk/$(gtktargetlib)				\
- 	$(GTK_DEP_LIBS)
- 
-+@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon
- testperf_DEPENDENCIES = $(TEST_DEPS)
- testperf_LDADD = $(LDADDS)
- testperf_SOURCES = \
---- gtk+-2.90.4.orig/tests/Makefile.am
-+++ gtk+-2.90.4/tests/Makefile.am
-@@ -21,6 +21,10 @@ LDADDS =								\
- 	$(GTK_DEP_LIBS)							\
- 	-lm
- 
-+if USE_QUARTZ
-+AM_LDFLAGS = -framework AppKit -framework Carbon
-+endif
-+
- if USE_X11
- testsocket_programs = testsocket testsocket_child
- endif
---- gtk+-2.90.4.orig/tests/Makefile.in
-+++ gtk+-2.90.4/tests/Makefile.in
-@@ -627,6 +627,7 @@ LDADDS = \
- 	$(GTK_DEP_LIBS)							\
- 	-lm
- 
-+@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+/gtk+-2.21.4.ebuild b/x11-libs/gtk+/gtk+-2.21.4.ebuild
deleted file mode 100644
index 69fb6029..00000000
--- a/x11-libs/gtk+/gtk+-2.21.4.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# 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="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="aqua cups debug doc +introspection jpeg jpeg2k tiff test vim-syntax xinerama"
-
-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.25.8
-	>=x11-libs/pango-1.28[introspection?]
-	>=dev-libs/atk-1.29.2[introspection?]
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	x11-libs/gdk-pixbuf[introspection?,jpeg?,jpeg2k?,tiff?]
-	cups? ( net-print/cups )"
-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 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
-
-set_gtk2_confdir() {
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
-}
-
-src_prepare() {
-	has_multilib_profile && epatch "${FILESDIR}/${PN}-2.21.3-multilib.patch"
-	epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
-	epatch "${FILESDIR}/${PN}-2.21.3-macosx-aqua.patch"
-	replace-flags -O3 -O2
-	strip-flags
-	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() {
-	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
-
-	use debug && myconf="${myconf} --enable-debug=yes"
-	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}
-
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
-	insinto ${GTK2_CONFDIR}
-	doins "${T}"/gtkrc
-
-	echo "GDK_USE_XFT=1" > "${T}"/50gtk2
-	doenvd "${T}"/50gtk2
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
-
-	rm "${ED}etc/gtk-2.0/gtk.immodules"
-	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"
-	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"
-	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.90.5.ebuild b/x11-libs/gtk+/gtk+-2.90.5.ebuild
deleted file mode 100644
index 4ae62f76..00000000
--- a/x11-libs/gtk+/gtk+-2.90.5.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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="~amd64 ~x86"
-IUSE="aqua cups debug doc +introspection jpeg jpeg2k tiff test vim-syntax xinerama"
-
-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.25.9
-	>=x11-libs/pango-1.28[introspection?]
-	>=dev-libs/atk-1.29.2[introspection?]
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	x11-libs/gdk-pixbuf[introspection?,jpeg?,jpeg2k?,tiff?]
-	cups? ( net-print/cups )
-	!<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 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.90.4-macosx-aqua.patch"
-	replace-flags -O3 -O2
-	strip-flags
-	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() {
-	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
-
-	use debug && myconf="${myconf} --enable-debug=yes"
-	econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
-}
-
-src_compile() {
-	use introspection && export MAKEOPTS="${MAKEOPTS} -j1"
-	gnome2_src_compile
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
-	insinto /etc/gtk-3.0
-	doins "${T}"/gtkrc
-	echo "GDK_USE_XFT=1" > "${T}"/50gtk3
-	doenvd "${T}"/50gtk3
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
-
-	find "${D}" -name "*.la" -delete
-	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."
-}