Bump to 3.0.9, remove old

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

5 files changed, 28 insertions, 473 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 9b9043117d02..0b896e4a1f14 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.503 2011/04/10 09:30:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.504 2011/04/16 09:10:07 nirbheek Exp $
+
+*gtk+-3.0.9 (16 Apr 2011)
+
+  16 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -gtk+-2.24.0.ebuild,
+  -gtk+-2.24.1.ebuild, -gtk+-3.0.6.ebuild, +gtk+-3.0.9.ebuild:
+  Bump to 3.0.9, remove old
 
   10 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> gtk+-2.24.3.ebuild:
   Punt useless libtool files.
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 6364effec579..a573eff2512f 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX gtk+-1.2-locale_fix.patch 419 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a SHA1 569c877ff692a7694e8aca5aceae9558844ba5dd SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb
 AUX gtk+-1.2.10-as-needed.patch 19865 RMD160 17c6b5d447b2d1c56fcc89dad676156caf0d700e SHA1 1027f38d29492c6f77205fc40992d8e625da8dbe SHA256 0864194a1e2be5f1b3df91d7dceb50bbe038fbb29f24901891c22829d55d4da7
@@ -25,25 +25,31 @@ DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 RMD160 fa41bb12e41f0c60c605dbeac03a1aa
 DIST gtk+-1.2.10.tar.gz 2868322 RMD160 9b38310d2768e947c4f6173db009243dd11db288 SHA1 a5adcb909257da01ae4d4761e1d41081d06e4d7c SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34
 DIST gtk+-2.20.1.tar.bz2 19089076 RMD160 bcd5f20f9e3f8d4e6f9bd91388de2fe9851ef361 SHA1 a80953b4e81c6a5bc2a986852f7fe60c8704cc02 SHA256 0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65
 DIST gtk+-2.22.1.tar.bz2 18306164 RMD160 f7d5cd312dc982a599e6a834c87c1bc07ff87e2d SHA1 c88d8be4aebd6e59d6ca44d57f6acd18e2be1c08 SHA256 965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07
-DIST gtk+-2.24.0.tar.bz2 18008113 RMD160 113f13271ff4dbd033eb502e27e66897974d3e82 SHA1 17c52460854b3b17410204d5eefe8d783e894add SHA256 cbed1a7b8cd1e471388a00f22557dd061334698a0c1aece11b7ed6541d115606
-DIST gtk+-2.24.1.tar.bz2 17600141 RMD160 2a416bbe02cd8ca6b50a43f33c70a85d1c1235ca SHA1 4e3bb7ad801e86133ef2ed5ed3b6728cea2d0574 SHA256 0e2f94dfeb82ffb73640e17a411b9d62851dc4b2e147d90a24f94c1bfc0491ed
 DIST gtk+-2.24.3.tar.bz2 17598600 RMD160 63173846e21f782915d5811fb75f455e231f7ad3 SHA1 a139460a34bfb5a2095645ebc634a5754bdb2920 SHA256 336ddf3dd342cc36bee80dd4f86ef036044a2deb10cda67c8eecf5315b279ef7
-DIST gtk+-3.0.6.tar.bz2 16893545 RMD160 ca35962a0c69232c3e9ea71401384d907042c00d SHA1 2359b34056687d7b73087bbf785cd7a17c592e9f SHA256 5d7df3adf68b42b1a3eb5797ccec8e762ad420dce597c89a4152c48f245d8902
 DIST gtk+-3.0.8.tar.bz2 16860271 RMD160 9e83407f50f5d560e4d6b46b5be5a2d7506439c0 SHA1 763827465edfa8ffa5b4e445b1e59a01b305cdd0 SHA256 42b2b1a400372fe0b3ef890162d1610422f7e787af0765b59f1b3352a4839308
+DIST gtk+-3.0.9.tar.bz2 16869612 RMD160 945b57ea43aa90f27e61d3d857e02c5ce4ce81c6 SHA1 b231bf1402e8868201321323941a089ad2866258 SHA256 88a9dda6f2a23155ac3d7aca6b414ca3b55e2817b46bcc87733f1a407e16678c
 EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9bd5 SHA1 93a6ec39cde941b4939c04da955475d017a6ff6f SHA256 e4874d2dd01bc266e7e0f5b691fcf4e54f6bd3a79658dcec6d5374c5910aa78b
 EBUILD gtk+-2.20.1-r1.ebuild 6422 RMD160 7ada1edda8575341f0063dc054a15cf3e7187cc5 SHA1 3ea573a5341cb97f6f90320621bce8ea3b884a04 SHA256 cfcc2091b22c026f5bf700c7e4c3e6cf2881eb0d56db25a4500ac7f1b5b179bb
 EBUILD gtk+-2.22.1-r1.ebuild 7597 RMD160 03ba03c4ff419e7898fa2d547421727162e76658 SHA1 f5c24e1cd89a41f13ecee6f143859f9f94a5f8e9 SHA256 4224d89c2380fdc57bb15d6af05f6d442cedc21ba99dfc9a3048c33b3b45001a
-EBUILD gtk+-2.24.0.ebuild 7374 RMD160 ff7e934b39e67a18b81018bef5577d8dafd7e3eb SHA1 09d212e46df50b513a635218491bfe4e31cb66ea SHA256 3dac2bdfe12906ed76ace69c66b3e9bb8366c323df39f7c1290049f7923a7a05
-EBUILD gtk+-2.24.1.ebuild 7386 RMD160 a67f21f9b592cf56a1e464c9dc3a0daf809f548c SHA1 fffd9b386895243d07e57659138f475f8a5ffdd1 SHA256 047ad1076fc65f66b334065df4f56ba5fe5ca88adfa6f961bf60c751e81b6946
 EBUILD gtk+-2.24.3.ebuild 7372 RMD160 36846cbbad6f3cfdb96da4c6efce6a9ce4c85eff SHA1 05900b28b32e48dbc887468545339bde704613a3 SHA256 e1431b6c16fd0783702f1d0b20e5431facec7aefafeba69e7816b3cc2e8a372d
-EBUILD gtk+-3.0.6.ebuild 5806 RMD160 14ce56b19fd598024e88122ba69ba8f68f6d92eb SHA1 26c3186059f1de5576b6f94bbb4dfcb6355b16b8 SHA256 eb5bd97bed62d140869e9911c81af6fd2d63e855dace48f607d73c49c8b0e379
 EBUILD gtk+-3.0.8.ebuild 5925 RMD160 075f4ea8ad6ef0df74f2e5dd0422ca4a0d27ae4e SHA1 6ac10a004676aa60768ce274924e096b6949a551 SHA256 b9b858267262d63f332223eb44f2c2641a7c1e22c714f4d0c63beb1545b6c4ab
-MISC ChangeLog 74753 RMD160 0da19cb736c072a13e2c1b7892e8334b32f76941 SHA1 348b708d67c03cf9ea205ba982dbedf362040f0b SHA256 783303a262f710494bf75fd58a261c5396ce496addbb318debb78f5f1440bfb2
+EBUILD gtk+-3.0.9.ebuild 5933 RMD160 288826b7c7c4bca5534024546ab640942bf7de81 SHA1 17feeacede8a7143f644db482ada2f1e82d7136f SHA256 055c06734af541a02237de05d574de68735650330d4c165b12c60df54ca38642
+MISC ChangeLog 74946 RMD160 023771380e364d7d650a05de5fb864ce48dc391a SHA1 3e9bcab78aa7633b0aa401be6d2ad6e70f52941b SHA256 e2f8352f76ca70c62b56f363b68b7b0a268f29ff00b35a3282a5cf1abb0ef37a
 MISC metadata.xml 549 RMD160 8d6692e4cf18e0c75421ddef09e2881624c5ce3e SHA1 ce3ed4bec69816eb61b5ca9d48c2db396085a923 SHA256 2e7f82b302d91c37ecf915de09e4b85ef093b790baacbef0325b6fe9b1bb304b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2heN0ACgkQXkR9YqOcLPGtBwD/Sp1Ru4OwSYfkJtWdENa1axfH
-lieM05GY3985H8bg7ggA/0rQEIrwa9iJQpg3eo8lJoE/nJvfC1F2BOoPqRfUPNhU
-=UWAI
+iQIcBAEBAgAGBQJNqVzzAAoJEO/kOhxWD91kmYUQAKnd5Wt4XKCAbucwd3M78PoA
+1Xu/KMz4gfOlK+ltNdURfj/bCNCHxF/KQsnqQIZbq0B+jsIwZgbm58hmI/yedOvH
+VlT+TtJVPyPukTR1ooEAzS2mk03I8n9KsRowCnJcxjI8InbJVdL0K+wepOiTmb+h
+i+DvYJUvme8XH7GVyEVf2uv3JnmaoCq1a4OfWb6ZWNQhnglcf0X04MhbjKifdX7k
+gfPE5xIKmzuOt3ZsNeiTvNDCQiHek7HrC3Hp9XqeOX7qdyg75JjGYo8C0AryG0HZ
+fZ0tvsncfn1Ce5TI/ENcHv/bAut6qHJLypYKLg6VX/Dla8i44pLvkRiL8NCuCdSp
+5iCPUzXSsHk799UjilhBuDFH2NVHdncB5NcvaskkdXepqDUk7tR9fxoWhA6CA7Xj
+x38Pwt8Q3Slg8X8K6Z1nFMMnxDMeWE61U6LTeQ4b2BYTUNMnNThaqayayi478lW9
+inP/HAz6hmwjgPCqSxZ7RYrbPg8bIuhCdE178+1GCB23RuUKVRbi4T8gQ3Rdldc8
+/Om09y8fbb2zovKoaTQiQPZIDgn/hYeC5uVxxw2ELRQqidSTDuWr6icmZNBgIPih
+FDF3qNXUoVNFEIOgGygPT4sNwW3QY870o/lgwh/QVvwlXjamKwKCL/sBz2n2iv1l
+o0S9almpfKsu8kvLaRB4
+=h9GM
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-2.24.0.ebuild b/x11-libs/gtk+/gtk+-2.24.0.ebuild
deleted file mode 100644
index 523f6d3c19c3..000000000000
--- a/x11-libs/gtk+/gtk+-2.24.0.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.0.ebuild,v 1.1 2011/02/09 17:18:19 eva Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.4"
-
-inherit eutils flag-o-matic gnome.org libtool python 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 examples +introspection 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]
-		x11-libs/gdk-pixbuf:2[X,introspection?]
-	)
-	aqua? (
-		>=x11-libs/cairo-1.6[aqua,svg]
-		x11-libs/gdk-pixbuf:2[introspection?]
-	)
-	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.27.3
-	>=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.3 )
-	!<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 )"
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-}
-
-src_prepare() {
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	epatch "${FILESDIR}/${PN}-2.21.3-multilib.patch"
-
-	# Don't break inclusion of gtkclist.h, upstream bug 536767
-	epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
-
-	# Create symlinks to old icons until apps are ported, bug #339319
-	epatch "${FILESDIR}/${PN}-2.22.1-old-icons.patch"
-
-	# Stop trying to build unmaintained docs, bug #349754
-	strip_builddir SUBDIRS tutorial docs/Makefile.am docs/Makefile.in
-	strip_builddir SUBDIRS faq docs/Makefile.am docs/Makefile.in
-
-	# -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"
-
-	# Cannot work because glib is too clever to find real user's home
-	# gentoo bug #285687, upstream bug #639832
-	# XXX: /!\ Pay extra attention to second sed when bumping /!\
-	sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
-		|| die "failed to disable recentmanager test (1)"
-	sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
-		|| die "failed to disable recentmanager test (2)"
-	sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
-		|| die "failed to disable recentmanager test (3)"
-
-	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
-
-	if ! use test; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS tests Makefile.am Makefile.in
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.am Makefile.in
-	fi
-
-	# Use elibtoolize in place of eautoreconf when it will be dropped
-	#elibtoolize
-	eautoreconf
-}
-
-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
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	econf ${myconf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	# Exporting HOME fixes tests using XDG directories spec since all defaults
-	# are based on $HOME. It is also backward compatible with functions not
-	# yet ported to this spec.
-	XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	set_gtk2_confdir
-	dodir ${GTK2_CONFDIR} || die "dodir failed"
-	keepdir ${GTK2_CONFDIR}
-
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
-	insinto /etc/gtk-2.0
-	doins "${T}"/gtkrc || die "doins gtkrc failed"
-
-	# Enable xft in environment as suggested by <utx@gentoo.org>
-	echo "GDK_USE_XFT=1" > "${T}"/50gtk2
-	doenvd "${T}"/50gtk2 || die "doenvd failed"
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
-
-	# 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
-
-	# Clean up useless la files
-	find "${ED}"/usr/$(get_libdir)/gtk-2.0/ -name "*.la" -delete
-
-	python_convert_shebangs 2 "${ED}"usr/bin/gtk-builder-convert
-}
-
-pkg_postinst() {
-	set_gtk2_confdir
-
-	# gtk.immodules should be in their CHOST directories respectively.
-	gtk-query-immodules-2.0  > "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" \
-		|| ewarn "Failed to run gtk-query-immodules-2.0"
-
-	if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
-		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
-		elog "aware location. Removing deprecated file."
-		rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
-	fi
-
-	# pixbufs are now handled by x11-libs/gdk-pixbuf
-	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
-	fi
-
-	# two checks needed since we dropped multilib conditional
-	if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}/etc/gtk-2.0/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
-
-	if ! has_version "app-text/evince"; then
-		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."
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-2.24.1.ebuild b/x11-libs/gtk+/gtk+-2.24.1.ebuild
deleted file mode 100644
index 9187f14780d0..000000000000
--- a/x11-libs/gtk+/gtk+-2.24.1.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.1.ebuild,v 1.2 2011/02/27 09:35:27 pacho Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.4"
-
-inherit eutils flag-o-matic gnome.org libtool python virtualx autotools
-
-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 examples +introspection 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]
-		x11-libs/gdk-pixbuf:2[X,introspection?]
-	)
-	aqua? (
-		>=x11-libs/cairo-1.6[aqua,svg]
-		x11-libs/gdk-pixbuf:2[introspection?]
-	)
-	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.27.3
-	>=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.3 )
-	!<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 )"
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-}
-
-src_prepare() {
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	epatch "${FILESDIR}/${PN}-2.21.3-multilib.patch"
-
-	# Don't break inclusion of gtkclist.h, upstream bug 536767
-	epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
-
-	# Create symlinks to old icons until apps are ported, bug #339319
-	epatch "${FILESDIR}/${PN}-2.22.1-old-icons.patch"
-
-	# Stop trying to build unmaintained docs, bug #349754
-	strip_builddir SUBDIRS tutorial docs/Makefile.am docs/Makefile.in
-	strip_builddir SUBDIRS faq docs/Makefile.am docs/Makefile.in
-
-	# -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"
-
-	# Cannot work because glib is too clever to find real user's home
-	# gentoo bug #285687, upstream bug #639832
-	# XXX: /!\ Pay extra attention to second sed when bumping /!\
-	sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
-		|| die "failed to disable recentmanager test (1)"
-	sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
-		|| die "failed to disable recentmanager test (2)"
-	sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
-		|| die "failed to disable recentmanager test (3)"
-
-	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
-
-	if ! use test; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS tests Makefile.am Makefile.in
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.am Makefile.in
-	fi
-
-	# Use elibtoolize in place of eautoreconf when it will be dropped
-	#elibtoolize
-	eautoreconf
-}
-
-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
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	econf ${myconf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	# Exporting HOME fixes tests using XDG directories spec since all defaults
-	# are based on $HOME. It is also backward compatible with functions not
-	# yet ported to this spec.
-	XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	set_gtk2_confdir
-	dodir ${GTK2_CONFDIR} || die "dodir failed"
-	keepdir ${GTK2_CONFDIR}
-
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
-	insinto /etc/gtk-2.0
-	doins "${T}"/gtkrc || die "doins gtkrc failed"
-
-	# Enable xft in environment as suggested by <utx@gentoo.org>
-	echo "GDK_USE_XFT=1" > "${T}"/50gtk2
-	doenvd "${T}"/50gtk2 || die "doenvd failed"
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
-
-	# 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
-
-	# Clean up useless la files
-	find "${ED}"/usr/$(get_libdir)/gtk-2.0/ -name "*.la" -delete
-
-	python_convert_shebangs 2 "${ED}"usr/bin/gtk-builder-convert
-}
-
-pkg_postinst() {
-	set_gtk2_confdir
-
-	# gtk.immodules should be in their CHOST directories respectively.
-	gtk-query-immodules-2.0  > "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" \
-		|| ewarn "Failed to run gtk-query-immodules-2.0"
-
-	if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
-		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
-		elog "aware location. Removing deprecated file."
-		rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
-	fi
-
-	# pixbufs are now handled by x11-libs/gdk-pixbuf
-	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
-	fi
-
-	# two checks needed since we dropped multilib conditional
-	if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}/etc/gtk-2.0/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
-
-	if ! has_version "app-text/evince"; then
-		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."
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.0.6.ebuild b/x11-libs/gtk+/gtk+-3.0.9.ebuild
index 49f26143b5de..a0400b888023 100644
--- a/x11-libs/gtk+/gtk+-3.0.6.ebuild
+++ b/x11-libs/gtk+/gtk+-3.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.0.6.ebuild,v 1.5 2011/03/30 07:56:06 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.0.9.ebuild,v 1.1 2011/04/16 09:10:07 nirbheek Exp $
 
 EAPI="3"
 
@@ -110,6 +110,9 @@ src_prepare() {
 		strip_builddir SRC_SUBDIRS demos Makefile.am
 		strip_builddir SRC_SUBDIRS demos Makefile.in
 	fi
+
+	# http://mail.gnome.org/archives/commits-list/2011-March/msg04372.html
+	epatch "${FILESDIR}"/${PN}-3.0.8-darwin-quartz.patch
 }
 
 src_configure() {