Add 2.10.3, and clean up older 2.10 versions

Package-Manager: portage-2.1.1_rc1-r2

5 files changed, 22 insertions, 364 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index da4303638bdc..2e05d8bf5e1c 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gtk+-1.2-locale_fix.patch 419 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a SHA1 569c877ff692a7694e8aca5aceae9558844ba5dd SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a files/gtk+-1.2-locale_fix.patch 419
@@ -37,9 +40,8 @@ SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294 files/gt
 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 RMD160 fa41bb12e41f0c60c605dbeac03a1aaa905f4333 SHA1 7350d1ed147e52ddc870a4d4b52073f7407d9f0d SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684
 DIST gtk+-1.2.10.tar.gz 2868322 RMD160 9b38310d2768e947c4f6173db009243dd11db288 SHA1 a5adcb909257da01ae4d4761e1d41081d06e4d7c SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34
 DIST gtk+-2-smoothscroll-r6.patch.bz2 3718 RMD160 0acbd1a78a1abf6147af0dfe91b96becd1f0f107 SHA1 7735c1d49e87a2bfce9537224c4c3da5c40647aa SHA256 43d20bd59448bf5d8daa90cc384830fe1f046889b83552fc417669c2fdff168e
-DIST gtk+-2.10.0.tar.bz2 14152208 RMD160 295aff724cf255f30321ea62c8cea6c1a815ea73 SHA1 9395758be636323bc2392be78426bb131c4c3b36 SHA256 9de9f4892a0b1022dc9b928e908e8638bc2b717d2c49a0baf530eaed71376bee
-DIST gtk+-2.10.1.tar.bz2 14052462 RMD160 9c27934ad23f7d0669e51dd66ece8883dbfa6e2d SHA1 1a6326a08cc80afb64c1b72ed4af0739cd35415b SHA256 db7ff62bb39cff4a80f7dd940c8da28cf6e8842b716517f995af19bdc5118320
 DIST gtk+-2.10.2.tar.bz2 14267844 RMD160 909920bf2db97bacef65f07de29fad9821faf60f SHA1 6da7bc4440dd4f8b56cee4b3d3a4b3b582784341 SHA256 d18a069e20a3e4d1a07c5fa01af24d30ffa87a48c490796eaf4bab8d51fd9396
+DIST gtk+-2.10.3.tar.bz2 14543034 RMD160 aa945237ebdbf5613faf3e762ed3bc37dcd45c5c SHA1 d9e9ca2728e560c46503a1e768cba3145510ca57 SHA256 9ce29b3df0f26883fec3d674e32db06edfb16acfd378fcd28c743879447ed662
 DIST gtk+-2.6-smoothscroll-r5.patch.bz2 3758 RMD160 b1db44f5055cef48239f69620e0bc13b1dccc139 SHA1 4ee4af7ebb1e013b14afeac94e8bd14b12badd58 SHA256 1322ed086c0b7353c5a28f23fe422ab23fd553ca8f3047b47fe5ae9a69c6c5eb
 DIST gtk+-2.6.1-lib64.patch.bz2 6047 RMD160 0ce3bf05fe59910ea019b4157dd1066367df2af6 SHA1 4a83215ef6a420db5f8080288567437941f72daf SHA256 fe171fc78e10f49ff69c2db424b816a331e21f362aef55b8624031c53ebcfc72
 DIST gtk+-2.6.10.tar.bz2 11521380 RMD160 5bb2e4de406e0e6ccf5c66ec48f6ba3e5b0911ff SHA1 9ba627683e0dc4bceb5fb900c1ee687638d95fcd SHA256 d408b606c8dd414dfbf220ccc168a0bc85a419945439796792a5357a96ff02af
@@ -57,18 +59,14 @@ EBUILD gtk+-1.2.10-r11.ebuild 2033 RMD160 24ec6feebfce673f0a81af1905963741f8e073
 MD5 2f736fc4a5ca2d7d68e746063414ea85 gtk+-1.2.10-r11.ebuild 2033
 RMD160 24ec6feebfce673f0a81af1905963741f8e073de gtk+-1.2.10-r11.ebuild 2033
 SHA256 b581707ebeb94e69954bd080234d2667b8e8c9aa90b933df8c8677d41628b697 gtk+-1.2.10-r11.ebuild 2033
-EBUILD gtk+-2.10.0.ebuild 4448 RMD160 044862f3bb11ba83bd0fe4f7c4578c2d12637c97 SHA1 22c9c83ee248063f9e6fae34cec1500967cf88fc SHA256 4a40e3631c6ffec69452d9a7213f1b3ee6617c340e29b779aa0046cf53671b33
-MD5 0f63b8097b9f55220456b7448ff7a64e gtk+-2.10.0.ebuild 4448
-RMD160 044862f3bb11ba83bd0fe4f7c4578c2d12637c97 gtk+-2.10.0.ebuild 4448
-SHA256 4a40e3631c6ffec69452d9a7213f1b3ee6617c340e29b779aa0046cf53671b33 gtk+-2.10.0.ebuild 4448
-EBUILD gtk+-2.10.1.ebuild 4446 RMD160 99c673296f49e4a2f48be5820d3b7f4d373a0f58 SHA1 0ebb492315e9a5f03278641ddad5758ffc3f618c SHA256 6a9f6e8278b1a7b352d66fc0d11b9f29ebeed86c5560e165abf2fe9b13dc4461
-MD5 7adbec109d7055b1731b43dba692d28b gtk+-2.10.1.ebuild 4446
-RMD160 99c673296f49e4a2f48be5820d3b7f4d373a0f58 gtk+-2.10.1.ebuild 4446
-SHA256 6a9f6e8278b1a7b352d66fc0d11b9f29ebeed86c5560e165abf2fe9b13dc4461 gtk+-2.10.1.ebuild 4446
 EBUILD gtk+-2.10.2.ebuild 4425 RMD160 516c84a55bba62a251567beaaf4bd01089bd9b35 SHA1 2d8917c3cd354e788e49d7def7e6b8d489866cd8 SHA256 244f2de9303ec3efd21ce69a0e405c8dbf9043bdaa4d3c7cba5b0e42087e793c
 MD5 d12b6d7659f8f1883ec6ae326fdc1973 gtk+-2.10.2.ebuild 4425
 RMD160 516c84a55bba62a251567beaaf4bd01089bd9b35 gtk+-2.10.2.ebuild 4425
 SHA256 244f2de9303ec3efd21ce69a0e405c8dbf9043bdaa4d3c7cba5b0e42087e793c gtk+-2.10.2.ebuild 4425
+EBUILD gtk+-2.10.3.ebuild 4421 RMD160 45c0736ac2dae45260cd5a52958be5e9f7650647 SHA1 0df2058c8af842110b64a59d296a22de28a1b54e SHA256 0058e15c3ec4d3a610d52e83cb57bd9525e6dc1873bafeffd31439a763fbd6e2
+MD5 3559886c97043c417833b44796c81adb gtk+-2.10.3.ebuild 4421
+RMD160 45c0736ac2dae45260cd5a52958be5e9f7650647 gtk+-2.10.3.ebuild 4421
+SHA256 0058e15c3ec4d3a610d52e83cb57bd9525e6dc1873bafeffd31439a763fbd6e2 gtk+-2.10.3.ebuild 4421
 EBUILD gtk+-2.6.10-r1.ebuild 3455 RMD160 63997fee767bbb4ddc7d978374c7d9fbe73bf6ba SHA1 4c472888cd0f1dc1b43c3e4c3167e2941ae1c39e SHA256 d58bd7ffe27a02b4c4cf71dd16dcc6c7116723b36df0d15519846b19549ade2e
 MD5 16ca62398139ea671319657720b6fc8b gtk+-2.6.10-r1.ebuild 3455
 RMD160 63997fee767bbb4ddc7d978374c7d9fbe73bf6ba gtk+-2.6.10-r1.ebuild 3455
@@ -101,10 +99,10 @@ EBUILD gtk+-2.8.8.ebuild 4113 RMD160 2a0a497cc25fecdec658b444eacb1374e7491a36 SH
 MD5 eae2dcc7f50ccdc71d375984f2104005 gtk+-2.8.8.ebuild 4113
 RMD160 2a0a497cc25fecdec658b444eacb1374e7491a36 gtk+-2.8.8.ebuild 4113
 SHA256 11c0c44d19b8efe7994af62a4bed7aec110cb69e2f3b8d0bdd72bbe7cfdfe121 gtk+-2.8.8.ebuild 4113
-MISC ChangeLog 36654 RMD160 80a4659df0db9779d54020fd656f17bfcf23b314 SHA1 3bf629ddb504b58405db3c9a0e3f3b8f3b6f9937 SHA256 c333d5dc7662761e09a1f3d03395e7d1a0d5688d01aa187e0d2743f492691f95
-MD5 66b386d644b651a2653edeb9006439fb ChangeLog 36654
-RMD160 80a4659df0db9779d54020fd656f17bfcf23b314 ChangeLog 36654
-SHA256 c333d5dc7662761e09a1f3d03395e7d1a0d5688d01aa187e0d2743f492691f95 ChangeLog 36654
+MISC ChangeLog 36845 RMD160 60452a226f5817529ac7acd8569b13451eda4736 SHA1 badc660e96aa535fdd82e01f07050efb2247d960 SHA256 dcb837d979436660beb11785f8cca7011999ad25f859ec9bd0a8f7552ad8b5a3
+MD5 c85aabb0121a32ad938e9fdb85fdbaa5 ChangeLog 36845
+RMD160 60452a226f5817529ac7acd8569b13451eda4736 ChangeLog 36845
+SHA256 dcb837d979436660beb11785f8cca7011999ad25f859ec9bd0a8f7552ad8b5a3 ChangeLog 36845
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 metadata.xml 424
@@ -115,15 +113,12 @@ SHA256 4bd7f7ef31547e6dabca532b07bc6be7e37c96d234abd2818afbb85d725aed47 files/di
 MD5 9a443de5999df036ffd6e66f5b0f83ce files/digest-gtk+-1.2.10-r11 506
 RMD160 45ddc3e7c5ca97084139787b6be318498a9965db files/digest-gtk+-1.2.10-r11 506
 SHA256 4bd7f7ef31547e6dabca532b07bc6be7e37c96d234abd2818afbb85d725aed47 files/digest-gtk+-1.2.10-r11 506
-MD5 0c0f1d0b8b3f5e7cc1004516a5abeff7 files/digest-gtk+-2.10.0 244
-RMD160 792d893b66a7ced6101878f1b64e507ef8221a27 files/digest-gtk+-2.10.0 244
-SHA256 d2bbb32837054bb5422686c763c0b1763ac2da98c672a97c607d9c4708792340 files/digest-gtk+-2.10.0 244
-MD5 3734377ef4828e8121235a814594186c files/digest-gtk+-2.10.1 244
-RMD160 7bfd4d5716231a695bf5df41602cefbce3463294 files/digest-gtk+-2.10.1 244
-SHA256 3ce2d68d583bb89fc9a00cbb4b6bb3aaadc3ee216613cde1072fcef313ab5220 files/digest-gtk+-2.10.1 244
 MD5 6d88b7411a397638ab9add1a41513b47 files/digest-gtk+-2.10.2 244
 RMD160 0f0a8f431635f7ca2f172b61c0792e6981774611 files/digest-gtk+-2.10.2 244
 SHA256 121667d832116d1892fad4660d4ce7478c4343f63b042c50b0eb0faa22fea810 files/digest-gtk+-2.10.2 244
+MD5 3fb399b0c96da29a5a67bd068bcb3c30 files/digest-gtk+-2.10.3 244
+RMD160 10aaaa0054e84942708a377671eaec8d9afd3355 files/digest-gtk+-2.10.3 244
+SHA256 c4852a3a8c58ec44f90900d255488b13bfef5a16b6aa4a2ec40ae6aca04c7956 files/digest-gtk+-2.10.3 244
 MD5 4db8c558f465f191df15e6d4b6198e6b files/digest-gtk+-2.6.10-r1 774
 RMD160 b07163c72c7096fb0f6fae53857bfce45994af49 files/digest-gtk+-2.6.10-r1 774
 SHA256 219aadd2affc04b82e80378f93bc4acbb03123573cc4e16c2f3366c20e4854cf files/digest-gtk+-2.6.10-r1 774
@@ -148,3 +143,10 @@ SHA256 87a06d8202ce31cb65090a54522b8c4cd3021dd5d5d42ff53ff22f754f9b2b97 files/di
 MD5 98f0c0090a29b1fd7fb4843cfff7c326 files/digest-gtk+-2.8.8 512
 RMD160 53f899df61e1d373f54eabae144c940850d31164 files/digest-gtk+-2.8.8 512
 SHA256 e263619d35ad46ec239b36623c4b6768ff50ae9e2cf4ad01d716e17f0608cd74 files/digest-gtk+-2.8.8 512
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFE/ZqoomPajV0RnrERAgbDAJ0eUesVPW8AFd6Un+moPuTJxMUKWwCbBPXC
+wvmpshgxw1W4blmhK9OidtE=
+=4lmM
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.10.0 b/x11-libs/gtk+/files/digest-gtk+-2.10.0
deleted file mode 100644
index 3407321209b0..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.10.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 37cdf73719e8b2af6b0d065df6236542 gtk+-2.10.0.tar.bz2 14152208
-RMD160 295aff724cf255f30321ea62c8cea6c1a815ea73 gtk+-2.10.0.tar.bz2 14152208
-SHA256 9de9f4892a0b1022dc9b928e908e8638bc2b717d2c49a0baf530eaed71376bee gtk+-2.10.0.tar.bz2 14152208
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.10.1 b/x11-libs/gtk+/files/digest-gtk+-2.10.1
deleted file mode 100644
index 501f157d47bd..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.10.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7f1d39031d50de8228211aa3230d4acd gtk+-2.10.1.tar.bz2 14052462
-RMD160 9c27934ad23f7d0669e51dd66ece8883dbfa6e2d gtk+-2.10.1.tar.bz2 14052462
-SHA256 db7ff62bb39cff4a80f7dd940c8da28cf6e8842b716517f995af19bdc5118320 gtk+-2.10.1.tar.bz2 14052462
diff --git a/x11-libs/gtk+/gtk+-2.10.0.ebuild b/x11-libs/gtk+/gtk+-2.10.0.ebuild
deleted file mode 100644
index 284847659aaa..000000000000
--- a/x11-libs/gtk+/gtk+-2.10.0.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.10.0.ebuild,v 1.5 2006/07/18 19:13:57 allanonjl Exp $
-
-inherit gnome.org flag-o-matic eutils debug autotools virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc jpeg tiff xinerama"
-
-RDEPEND="|| ( (
-			x11-libs/libXrender
-			x11-libs/libX11
-			x11-libs/libXi
-			x11-libs/libXt
-			x11-libs/libXext
-			x11-libs/libXcursor
-			x11-libs/libXrandr
-			x11-libs/libXfixes
-			xinerama? ( x11-libs/libXinerama ) )
-		virtual/x11 )
-	>=dev-libs/glib-2.12.0
-	>=x11-libs/pango-1.13.0
-	>=dev-libs/atk-1.10.1
-	>=x11-libs/cairo-1.2.0
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.2.1
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	>=dev-util/pkgconfig-0.9
-	=sys-devel/automake-1.7*
-	|| ( (
-			x11-proto/xextproto
-			x11-proto/xproto
-			x11-proto/inputproto
-			x11-proto/xineramaproto )
-		virtual/x11 )
-	doc? (
-		>=dev-util/gtk-doc-1.4
-		~app-text/docbook-xml-dtd-4.1.2 )"
-
-RESTRICT="confcache"
-
-
-pkg_setup() {
-
-	if ! built_with_use x11-libs/cairo X pdf ; then
-		einfo "Please re-emerge x11-libs/cairo with the X and pdf USE flag set"
-		die "cairo needs the X and pdf flag set"
-	fi
-
-}
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	use x86 && [ "$(get_libdir)" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	# Optionalize xinerama support
-	epatch "${FILESDIR}"/${PN}-2.8.10-xinerama.patch
-
-	# 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
-
-	# and this line is just here to make building emul-linux-x86-gtklibs a bit
-	# easier, so even this should be amd64 specific.
-	if use x86 && [ "$(get_libdir)" == "lib32" ]; then
-		epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
-	fi
-
-	use ppc64 && append-flags -mminimal-toc
-
-	# remember, eautoreconf applies elibtoolize.
-	# if you remove this, you should manually run elibtoolize
-	export WANT_AUTOMAKE=1.7
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR="."
-	eautoreconf
-
-	epunt_cxx
-
-}
-
-src_compile() {
-
-	# png always on to display icons (foser)
-	local myconf="$(use_enable doc gtk-doc) \
-		$(use_with jpeg libjpeg) \
-		$(use_with tiff libtiff) \
-		$(use_enable xinerama) \
-		--with-libpng \
-		--with-gdktarget=x11 \
-		--with-xinput"
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	econf ${myconf} || die "./configure failed to run"
-
-	emake || die "gtk+ failed to compile"
-}
-
-src_test() {
-
-	Xmake check || die
-
-}
-
-src_install() {
-
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	set_gtk2_confdir
-	dodir ${GTK2_CONFDIR}
-	keepdir ${GTK2_CONFDIR}
-
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > ${D}/${GTK2_CONFDIR}/gtkrc
-
-	# Enable xft in environment as suggested by <utx@gentoo.org>
-	dodir /etc/env.d
-	echo "GDK_USE_XFT=1" > ${D}/etc/env.d/50gtk2
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
-}
-
-pkg_postinst() {
-
-	set_gtk2_confdir
-
-	if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then
-		gtk-query-immodules-2.0  > ${ROOT}${GTK2_CONFDIR}/gtk.immodules
-		gdk-pixbuf-query-loaders > ${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders
-	else
-		ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;"
-		ewarn "to complete the installation of GTK+, please create the"
-		ewarn "directory and then manually run:"
-		ewarn "  cd ${ROOT}${GTK2_CONFDIR}"
-		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
-		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
-	fi
-
-	einfo "If you experience text corruption issues, turn off RenderAccel"
-	einfo "in your xorg.conf.  NVIDIA is working on this issue. "
-	einfo "See http://bugs.gentoo.org/113123 for more information."
-
-	if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]*
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC" /usr/lib/gtk-2.0/2.[^1]* ")"
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-2.10.1.ebuild b/x11-libs/gtk+/gtk+-2.10.1.ebuild
deleted file mode 100644
index dbdd281a3848..000000000000
--- a/x11-libs/gtk+/gtk+-2.10.1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.10.1.ebuild,v 1.2 2006/07/26 16:14:24 genstef Exp $
-
-inherit gnome.org flag-o-matic eutils debug autotools virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc jpeg tiff xinerama"
-
-RDEPEND="|| ( (
-			x11-libs/libXrender
-			x11-libs/libX11
-			x11-libs/libXi
-			x11-libs/libXt
-			x11-libs/libXext
-			x11-libs/libXcursor
-			x11-libs/libXrandr
-			x11-libs/libXfixes
-			xinerama? ( x11-libs/libXinerama ) )
-		virtual/x11 )
-	>=dev-libs/glib-2.12.1
-	>=x11-libs/pango-1.12.0
-	>=dev-libs/atk-1.10.1
-	>=x11-libs/cairo-1.2.0
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.2.1
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	>=dev-util/pkgconfig-0.9
-	=sys-devel/automake-1.7*
-	|| ( (
-			x11-proto/xextproto
-			x11-proto/xproto
-			x11-proto/inputproto
-			x11-proto/xineramaproto )
-		virtual/x11 )
-	doc? (
-		>=dev-util/gtk-doc-1.4
-		~app-text/docbook-xml-dtd-4.1.2 )"
-
-RESTRICT="confcache"
-
-
-pkg_setup() {
-
-	if ! built_with_use x11-libs/cairo X pdf ; then
-		einfo "Please re-emerge x11-libs/cairo with the X and pdf USE flag set"
-		die "cairo needs the X and pdf flag set"
-	fi
-
-}
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	use x86 && [ "$(get_libdir)" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	# Optionalize xinerama support
-	epatch "${FILESDIR}"/${PN}-2.8.10-xinerama.patch
-
-	# 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
-
-	# and this line is just here to make building emul-linux-x86-gtklibs a bit
-	# easier, so even this should be amd64 specific.
-	if use x86 && [ "$(get_libdir)" == "lib32" ]; then
-		epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
-	fi
-
-	use ppc64 && append-flags -mminimal-toc
-
-	# remember, eautoreconf applies elibtoolize.
-	# if you remove this, you should manually run elibtoolize
-	export WANT_AUTOMAKE=1.7
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR="."
-	eautoreconf
-
-	epunt_cxx
-
-}
-
-src_compile() {
-
-	# png always on to display icons (foser)
-	local myconf="$(use_enable doc gtk-doc) \
-		$(use_with jpeg libjpeg) \
-		$(use_with tiff libtiff) \
-		$(use_enable xinerama) \
-		--with-libpng \
-		--with-gdktarget=x11 \
-		--with-xinput"
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	econf ${myconf} || die "./configure failed to run"
-
-	emake || die "gtk+ failed to compile"
-}
-
-src_test() {
-
-	Xmake check || die
-
-}
-
-src_install() {
-
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	set_gtk2_confdir
-	dodir ${GTK2_CONFDIR}
-	keepdir ${GTK2_CONFDIR}
-
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > ${D}/${GTK2_CONFDIR}/gtkrc
-
-	# Enable xft in environment as suggested by <utx@gentoo.org>
-	dodir /etc/env.d
-	echo "GDK_USE_XFT=1" > ${D}/etc/env.d/50gtk2
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
-}
-
-pkg_postinst() {
-
-	set_gtk2_confdir
-
-	if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then
-		gtk-query-immodules-2.0  > ${ROOT}${GTK2_CONFDIR}/gtk.immodules
-		gdk-pixbuf-query-loaders > ${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders
-	else
-		ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;"
-		ewarn "to complete the installation of GTK+, please create the"
-		ewarn "directory and then manually run:"
-		ewarn "  cd ${ROOT}${GTK2_CONFDIR}"
-		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
-		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
-	fi
-
-	einfo "If you experience text corruption issues, turn off RenderAccel"
-	einfo "in your xorg.conf.  NVIDIA is working on this issue. "
-	einfo "See http://bugs.gentoo.org/113123 for more information."
-
-	if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]*
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC" /usr/lib/gtk-2.0/2.[^1]* ")"
-	fi
-}