Bump gtk 2.10 series to 2.10.4. Remove older in that series.

Package-Manager: portage-2.1.2_pre1-r4

5 files changed, 15 insertions, 353 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index ecca970bdf35..885f022850ee 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -40,8 +40,7 @@ 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.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.10.4.tar.bz2 14611916 RMD160 dcaf1d4b1439f47d7b5de9c71150cf71e5ac25c0 SHA1 80dc1cfa86c3db8bfc9d60d64f4868091f6140bb SHA256 39b0dd1a9a326447d708837d88ea50ca2f9914bacb6b434ba8b6713e229f7553
 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
@@ -53,14 +52,10 @@ 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.2.ebuild 4530 RMD160 7b91ec1c5d486a03cb8b0691bb6199e8f3b1c08a SHA1 be1872602ed8c256bbe85f85cb70b05735104138 SHA256 0225627b4e24b6ecd09bcfc2faedf2008e473766e2f83a0d7a75afec696fedbb
-MD5 e8c076450242fe91e145d0b191b910d5 gtk+-2.10.2.ebuild 4530
-RMD160 7b91ec1c5d486a03cb8b0691bb6199e8f3b1c08a gtk+-2.10.2.ebuild 4530
-SHA256 0225627b4e24b6ecd09bcfc2faedf2008e473766e2f83a0d7a75afec696fedbb gtk+-2.10.2.ebuild 4530
-EBUILD gtk+-2.10.3.ebuild 4452 RMD160 d0b2488563370b8e392215f7ec2e0383b42cadd5 SHA1 8807cf565f2c8f500bf585863637ebaa83c0f100 SHA256 3917afef0679281c82cc90e30551fc147817506f89483d10b3b68ddc5e63563d
-MD5 4ab74ffe1d85e46ca466daff80f6ca9f gtk+-2.10.3.ebuild 4452
-RMD160 d0b2488563370b8e392215f7ec2e0383b42cadd5 gtk+-2.10.3.ebuild 4452
-SHA256 3917afef0679281c82cc90e30551fc147817506f89483d10b3b68ddc5e63563d gtk+-2.10.3.ebuild 4452
+EBUILD gtk+-2.10.4.ebuild 4449 RMD160 ba41a7fc753ae392d467ced484d6fbee92ad65c3 SHA1 7e8c2deb0aa6b196cb3b0bddb73c40435606d652 SHA256 334416afadbccf2d13054d20c36c486d7ef9c42ae9e8a7e681e65ca103b582e1
+MD5 805d428538cda4ba9d517211656610d9 gtk+-2.10.4.ebuild 4449
+RMD160 ba41a7fc753ae392d467ced484d6fbee92ad65c3 gtk+-2.10.4.ebuild 4449
+SHA256 334416afadbccf2d13054d20c36c486d7ef9c42ae9e8a7e681e65ca103b582e1 gtk+-2.10.4.ebuild 4449
 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
@@ -81,10 +76,10 @@ EBUILD gtk+-2.8.8.ebuild 4109 RMD160 396d41d934218c3b9bda5179aba2e9fd428a91c5 SH
 MD5 289a17f5d4f54f223c4f338adaeb8e31 gtk+-2.8.8.ebuild 4109
 RMD160 396d41d934218c3b9bda5179aba2e9fd428a91c5 gtk+-2.8.8.ebuild 4109
 SHA256 902cf9ca730823912e322e8ddd8357f2f5609ad14f118cf7c24e5bde966dd3bc gtk+-2.8.8.ebuild 4109
-MISC ChangeLog 37887 RMD160 ced2186006b5a909a9d77ecaa4b232fd3b24a695 SHA1 158f0db90c7cc41510bfed94c395a1c8b9f76ad4 SHA256 16409142bd14be902e063ce3cc1ce49a073eb4a874bc008c57dc9f303cb72ad1
-MD5 d61cffe395da07d28422ea04d36efb23 ChangeLog 37887
-RMD160 ced2186006b5a909a9d77ecaa4b232fd3b24a695 ChangeLog 37887
-SHA256 16409142bd14be902e063ce3cc1ce49a073eb4a874bc008c57dc9f303cb72ad1 ChangeLog 37887
+MISC ChangeLog 38075 RMD160 ed364e837082c9e8f50cbbe4cf94e39a97a26982 SHA1 c25eb226e7a906ee2d902e186a0be618b6adf7b5 SHA256 ad0780c592a897155a859d437cdd94ba0b05170031e53c98a53004201165ae3c
+MD5 c6c039583c380f814bceb477d67180df ChangeLog 38075
+RMD160 ed364e837082c9e8f50cbbe4cf94e39a97a26982 ChangeLog 38075
+SHA256 ad0780c592a897155a859d437cdd94ba0b05170031e53c98a53004201165ae3c ChangeLog 38075
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 metadata.xml 424
@@ -92,12 +87,9 @@ SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d metadata
 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 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 97cfb3d43bffa617ed419fffd04bfdab files/digest-gtk+-2.10.4 244
+RMD160 1f04beedf01286895eb442c55be6f00937281eb9 files/digest-gtk+-2.10.4 244
+SHA256 19b134b66c7db04d4c689b2fcf169eca3a3a14dad39d785d9d1749dcc952f3df files/digest-gtk+-2.10.4 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
@@ -116,7 +108,7 @@ SHA256 e263619d35ad46ec239b36623c4b6768ff50ae9e2cf4ad01d716e17f0608cd74 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFGLDumOfEJZHYOKcRAqW0AKDkr3NTAFyLRl0caFxW/wA9gKGDyACgyIQv
-kjihsclTxT7rlAmb5PE1Xks=
-=CT/b
+iD8DBQFFG/g3keYb6olFHJcRApSNAKC+AlvsWG7oMqdrsSNVO6bQHrjdsACghFZc
+BN/4ZKnr8Soe6+GBCYTzTzE=
+=s2Nl
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.10.2 b/x11-libs/gtk+/files/digest-gtk+-2.10.2
deleted file mode 100644
index f377910aa976..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.10.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9039804dfd115e40a70a6ba096f418a2 gtk+-2.10.2.tar.bz2 14267844
-RMD160 909920bf2db97bacef65f07de29fad9821faf60f gtk+-2.10.2.tar.bz2 14267844
-SHA256 d18a069e20a3e4d1a07c5fa01af24d30ffa87a48c490796eaf4bab8d51fd9396 gtk+-2.10.2.tar.bz2 14267844
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.10.3 b/x11-libs/gtk+/files/digest-gtk+-2.10.3
deleted file mode 100644
index cb9e7c4ac24e..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.10.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c662ca204e204edfd8b8b917b9a852aa gtk+-2.10.3.tar.bz2 14543034
-RMD160 aa945237ebdbf5613faf3e762ed3bc37dcd45c5c gtk+-2.10.3.tar.bz2 14543034
-SHA256 9ce29b3df0f26883fec3d674e32db06edfb16acfd378fcd28c743879447ed662 gtk+-2.10.3.tar.bz2 14543034
diff --git a/x11-libs/gtk+/gtk+-2.10.2.ebuild b/x11-libs/gtk+/gtk+-2.10.2.ebuild
deleted file mode 100644
index e6f42508f4ee..000000000000
--- a/x11-libs/gtk+/gtk+-2.10.2.ebuild
+++ /dev/null
@@ -1,164 +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.2.ebuild,v 1.3 2006/09/23 15:40:54 corsair 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
-
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	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"
-
-	emake || die "compile failed"
-}
-
-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.3.ebuild b/x11-libs/gtk+/gtk+-2.10.3.ebuild
deleted file mode 100644
index 626e5374b603..000000000000
--- a/x11-libs/gtk+/gtk+-2.10.3.ebuild
+++ /dev/null
@@ -1,160 +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.3.ebuild,v 1.4 2006/09/23 15:40:54 corsair 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 )
-	>=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
-	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
-
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	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"
-
-	emake || die "compile failed"
-}
-
-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
-}