Bump to 2.24.12; themeing updates, cups-1.6 support, etc

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

3 files changed, 268 insertions, 11 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 4bd208414753..498cf2a4e4f4 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.602 2012/07/20 23:58:11 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.603 2012/09/07 01:50:21 nirbheek Exp $
+
+*gtk+-2.24.12 (07 Sep 2012)
+
+  07 Sep 2012; Nirbheek Chauhan <nirbheek@gentoo.org> +gtk+-2.24.12.ebuild:
+  Bump to 2.24.12; themeing updates, cups-1.6 support, etc
 
 *gtk+-2.24.11-r1 (20 Jul 2012)
 
@@ -2639,5 +2644,3 @@ unmasking the glib-2.0.1 packages
   10 Mar 2002; Bruce A. Locke <blocke@shivan.org> gtk+-1.2.10-r5.ebuild :
 
   NLS fixes submitted by seemant@rocketmail.com (Seemant Kulleen)
-
-
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 46ea293d2eff..b42ec6f9fd5c 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -32,6 +32,7 @@ DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 SHA256 517bdadbaa0e13285b2d72a667b3112
 DIST gtk+-1.2.10.tar.gz 2868322 SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34 SHA512 6a05062520954287b0e24a95169d18c216145ee79d1fa7f54222db32c8e39e011e3dc49886d3bc4de1cc1ebd71f5744e41891cde8d5c2759f637e71c390a235f WHIRLPOOL 906a78c2e2664b1cbd70fb9e64ce6ca1155b2a59c169eab986f5b4b90e937f380a5d35e2e28eb56913b0fbdfb53abeca5ef6823f92a3ab3906cd4e9f7c595b15
 DIST gtk+-2.24.10.tar.xz 13261132 SHA256 ea56e31bb9d6e19ed2e8911f4c7ac493cb804431caa21cdcadae625d375a0e89 SHA512 46bd22af861c04cf7d7b704356936f282da9e7edec1e637dd578170396ce6b4a837f660b46334ceb73372a076966e31afc02aaafb5d69796539ddaac1531fedf WHIRLPOOL ea2dbf04faa2718295c54bcdcb74947e87ca79246b7e966efcedc3f885c9972746f3f83fa095de018e7b19747e75a22e6dea2c89a4ff02cc80ace09e3ed07f55
 DIST gtk+-2.24.11.tar.xz 13260984 SHA256 328b4ea19a61040145e777e2ac49820968a382ac8581a380c9429897881812a9 SHA512 64b7281e63338bd094b1ee692638484f333b6837c8349c220182f651189c9f9be5a95ba7fb1a9940c74479fef35c3b5eb5bc4f9a9b185bfa36ae905110d4cb22 WHIRLPOOL ab7114019cd9dc62d9a9124701c97f67fb1a7d560cca20c724158f5994d8766ab74b84dd102ab4df759e51e1d272a643e0e00fca1f8cf7e40d82ed50de82a017
+DIST gtk+-2.24.12.tar.xz 13255456 SHA256 c5eba3b9259e4bf7554e9dc9db5d72038aa8b1bdd40fa0364b3705c226d11808 SHA512 b5abb66adc01d90c1ce62845bb264a159f4c73d0e9dce32abc80ce8fab8d72b21e22aaf0d8fa870530c019f2249fe2244d5c85e8d3d06b7541d19302bc08e641 WHIRLPOOL 7c55c5d91ecd1f6e4cde0026eeb23302f7812049d0d5ac38c79c0cf0f92b72428d59512519c8b3c4a403d1d85ed2da300c11227fd9f754a3c7a01fd9083203dc
 DIST gtk+-2.24.8.tar.xz 12811268 SHA256 8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c SHA512 616e76d7879206b8c551d2e09e8406311cbaf72093cc8d4e0c18e132f366276eb1dbabf1755fe1e8d9b70df819ffb1dac5694f166014d305bf1a0bcc39a239a4 WHIRLPOOL 66ce4b6dd1c46f9e5d2b376678fc70b8ecf5d54da0317fcd07f2266b013111388fd6d23f0904aa1e0c8adedc52b650b8c4540530e3aca87c20b3908fbabdcbc5
 DIST gtk+-3.0.12-use-const2.patch.xz 12500 SHA256 f10b251a52a4f5d73b435315c94297dd30a4bc3c20a25bc947842bb214808cc4 SHA512 bd94767188a08427c3258d287a8889436d3e180c95a38b0200c4cace4a50b29f472919b9718a1a2f96541861e34444ffcde8b80443918549a703164209aea3c7 WHIRLPOOL 5a85206ffac840c027db6e03a0515843ebcecd45796aecafc106e11ffdbc29497899705526a1b403ff939d8226b4eed56488b735f09b0746a02503c8e081752e
 DIST gtk+-3.0.12.tar.xz 13104092 SHA256 219fdea120897981840e909fac40d4d433fe061a37b12b9402e215c819ebeae9 SHA512 b58bc07216b03fbe963a5884ff57bba16c7beb68182c51268ae5de53c478df027c876f0f16ab50811f5b281b0f1c03e60f63ea0bf447b318d939207ca7360d62 WHIRLPOOL 0c0a5485d3f7b315bea11988fe682bf3c77c39d0406972475c509372fb07e2855407366c89d4757016eab5b0c2ea3d2423d0c9d3cbf8bade4b6e655b2b96b6cd
@@ -45,6 +46,7 @@ EBUILD gtk+-1.2.10-r12.ebuild 2386 SHA256 e4874d2dd01bc266e7e0f5b691fcf4e54f6bd3
 EBUILD gtk+-2.24.10-r1.ebuild 8109 SHA256 c98596978e7f0f5612547d74b6f7db6b570f624972cb410bdbb4323e093817be SHA512 f090d6399817a3a91f20c0aaae492cbf41e8b8fa434e99edd6126c612ec91f9d9b7782f345bb79cdc8e9b2222a891021252e91cb0f6bc34e4cdf41335ea5b225 WHIRLPOOL cb1c6c8b219be175ab07c880f57d84faceea18bc9c7d8a0c5ee9b17c58d6ed1c5fd575777aa7f9ddb881bc262b75f082ac76a257d339ca70774cb1273b82eca2
 EBUILD gtk+-2.24.11-r1.ebuild 8243 SHA256 c4ee7aff85728d5896852b3dbf0f4054e421532bb7357f96c6fbf251b59396f0 SHA512 f355bc6d1c551b21afeb54692de69d87f5e7c4de80dc15f9241dae9bf9b1a7b50bcc126f060bb2e0cc92377341421b86d735da69e52df9f9355dc2d005152b1c WHIRLPOOL 32d431d4ad260a86136a193713be36bd09b2736aaa5aaa1de3e69610a6f0f41984317c01b3a181da49bb17c4948ba4dc0d66beceee5468c23aa9422439b4891a
 EBUILD gtk+-2.24.11.ebuild 8124 SHA256 b3b88fac71b2185ef5723ec7a93914f4031e778e91fe3c7d60f84e6515ff5eb0 SHA512 84921d140fe5f15481b1a50de8d03bfa85b9230cfb1b6435a59df092b798e00377f6ac4205284c436f07b3fc8f188c760dc8c00ce5ffb78727c1768c52aef869 WHIRLPOOL ec3240984b01436370eb0326898a58c60bbb12569451a0694125cd5d256b21a76d97fd259b79c172927d3eb25488ca54061f93230cbf84e83cd90b2ee7b3eca8
+EBUILD gtk+-2.24.12.ebuild 8123 SHA256 4a635f5b4de1ca0ac0bf1392171b6880c4723113a50de97187bf81d26f1a8b22 SHA512 7ae79f7709ce14fa31da95be8f5d74fc5f358eaad312984318383ba1ba6934db20e91b644220e83cc7b9057ee08703d3a6e0129e664132e9dd2f343c612da616 WHIRLPOOL c49176b8d0ee3cb63793c211e3cb2fa5eda7ba9bbe07999103890be3710ac4e1280ae8c35a7bd1c8a854f7497c960114bfac14e04b9165bc9cdd563e85f4f69f
 EBUILD gtk+-2.24.8-r1.ebuild 7991 SHA256 56cdc4ab813a5b0ba2f7bff425528656c50d2b02e9ccdbe21fa1b18d92cc549f SHA512 4ff004fbbee7802140c59bbd9b005896ea07f99b925c79b5c012177f31f0a2d854792727bb993d44adee17e96bf0d1c50098d480e11278941bc075e7798605e6 WHIRLPOOL e416348e352e4cfa205c4766b658b554eae554f7786efb5ce64242d0d62586d97cc393fecfe4fe81ee009784f557edc77b4792757e551ddc362b7d64888a2d16
 EBUILD gtk+-3.0.12-r1.ebuild 6148 SHA256 57e6c1b9bae37bf29720ee20007dd6d17a33382f0939a88dec9622329bd8a0a3 SHA512 44196ee8c8c36386b3cfd6a62ee30a1eac0f479568a47946fe52c51caedc70b207d5662af4258098d329fa525655a814648e8801f8b88b19ee019a8232db9364 WHIRLPOOL 70ae34e5ed8a136e5f45585daaf555b8406b179ca4f0c0a02c9ec7723993287197610e864270515eda956331a7e67f5c7838be9f25e18d38e13a65213160cd52
 EBUILD gtk+-3.2.3.ebuild 6763 SHA256 36e19f2ef5931e3b1824e2193cbd8e039e8ad072d71485954a47357b54c07c88 SHA512 2aa4ce6b2e3e4bb421fc53f10eda04626bf29b7eca3da6dc7326f1a70917000326b02f4b582c50eb93a4c0881bfa304293cd99b9142af061a46406afa4e7073f WHIRLPOOL 65caf1299102d44659b20c62908166d45fb9e554ee6fdc52191ad6474870188ef154912714aa5407ed7ac9041133d5fd15e271d0b677ed3b754dea4319eb0b5c
@@ -52,16 +54,22 @@ EBUILD gtk+-3.2.4-r1.ebuild 7007 SHA256 da12074fcbb6bc9fb4719c9159753bcf5c4420e8
 EBUILD gtk+-3.4.3-r1.ebuild 7324 SHA256 1f06eba1cbd547ae20590d1c69b2592aca5485eddd0d21d4806acc032de0c3f6 SHA512 7efa0d772a3f39bb46e69faa2256a9d19454f334f075a03d76362accd3406529552fbe126e6c39fa19bf6f23d295de30f9f9944c7f4d588bb536a33128ee0451 WHIRLPOOL 8403076a6b9603a81ec6b5764ccf1f98e76a77847916fb7c17de0a96e090c3f89a322a0a3ba88e85450b8bc13c16ae81e75147295dd7d1bfa9104e064632d9cf
 EBUILD gtk+-3.4.3.ebuild 7266 SHA256 4a116fed27cf769aac30947359a9a79d2f934ec3e57b9d0966e3960bcf8bd764 SHA512 8808a4e54045b890ffb30e5337dec051e38193c4927f0218f82e90cb5141b77546d6eac7c7554cf82e440f42a235ff22bf3ce52234090975658b2e94b2c40f55 WHIRLPOOL ebd0ac5e8fba6c517948ece1efe56e70d52276aff8429e0750d3e1bc183cb34fd56e29d4e30ecfc080b190140e4ccbc36675f7b8c5938c5c9edf22df710bca38
 EBUILD gtk+-3.4.4.ebuild 6960 SHA256 764c15d43e011cc0d20a2f24aa08aeb27d9e43ce150906bda16c0d5c890450d3 SHA512 379b6852589f1e0b323ae61fa04a64b599352e6b583a52d044332e840e311772db6b3bac341b65d4b822206e89dafa9575228a7d6f83d64ec684a82a599684b3 WHIRLPOOL 6df2ce81191808433e683968bc152105f45f3092320e7a29de0465ff405b0f6a5c0ddccaf3b3fd0d635e2468ad344d56ae37f1d050b7b2e91e61751df4d81608
-MISC ChangeLog 93663 SHA256 e33b3fa728d4693f76ba2d6402a5a6010b570a2f431b78d9c468c6ac2d5bce9f SHA512 eaefc2583f462b622ffa52044d0e045f08d826fa16ae0383ee633f37c87078b33d0988d9dc5c2ec3dbef7fd5d6997daf93c09ee8d45292310f941ebaccd120c7 WHIRLPOOL 44ce3701bbec7322fca15a95c2e2d5b89c210fbbed645ef5458c122122b64c55d237f4bedcba89ecde0f0f28cf37e75e7813ffacc28f28a322ab094baae49b71
+MISC ChangeLog 93825 SHA256 c25487c0fd3a2b2d8246158a7d026aade01050488b7eb858e06d28683dff06d8 SHA512 7bb77249a4299ffec056861708ae54a72094d0bca6f056a4529db08c7420d793f09ab781dd980b4915241fc88bb1625592e632f6d572f0e31d1cb38f2605c996 WHIRLPOOL aebf4db92209c611db3aea57999e7a62cd435af5de0bee584683c5ea532af8779f3c33b23b8d435958b996345f179cf1e75ea08496447bccf8400d388ff41a0e
 MISC metadata.xml 870 SHA256 90835d0edfdbbc25c781b0c7bcf9b7b6db82ce5f412082ec56d250891e1853ea SHA512 42090f432fe4351844b2d818a02df8bf9aac6fdc64c7af69bf157c020619b4fc0cae0b415444efbac43c7f7a8924014ce7666022ce2281db878f58fe21769312 WHIRLPOOL 4cb3f2b92c7af24c882c536fbd9c0a2aef6ac31ca1d07715e0b2948d367c0ff94083d3a1173b6a979a2dba2e68b382c5396c5d558e1efb38d14290c0e6457fc9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQCfCZAAoJEJ0WA1zPCt1hFtIIAJjh/AzyCw1lbXvThXuiVrIU
-RFH/SrF174AZNG7+wHC994be9fCKoAY0VBvwa8tc/Hb9TayMO/zi2+Ln+pXlM7XU
-N+qE99s5eWGa2/6FGOhmRrpB5/VUZrgrKokyaZe8AUL2wYuRsiBiF8XCa77d0JXe
-lI72sp/RYVpBwHU5exRJ/6vTyArzYFOnG9u45uFYTunyUh8AybN2qG9lHOF8sYkR
-6j3P9gLgFBvJGU5X56dEJyb9MHxcP+NBTADtNbYY2glvATkvdFaDLBND1F73kCgY
-hwQcpBmyVU0bxu98ctXNTAtrrfHdiuMk28GQv+c2RxJkC1bRVnMzguzeb9t/4yM=
-=ELQc
+iQIcBAEBCAAGBQJQSVLpAAoJEO/kOhxWD91kizMP/0LHujsU9MtwORa45XUN9a0X
+Y+zzkWE0v3SLd+MSWeqSJIzd5mGiFnoj+kHLRmlnNUkKRaLGe6P4B9AYkh2whpj5
+Oe3ykXXUVbFSrqNFqcAdlDjXM1aL6eb1ltedABGL+wSoIfxB1OHM8TmJkE5PACaq
+6MqBXHx/Kvp1Q02hlayPPX8yjl5KZPMWzCDL5r1al9ab3aURdyu1ZSySzae9FLF+
+XZqSKyBIzzpyNBjUMwUnRdNyIBdjeCd4sAU066PhkGlWvLAvQwZ57dv2lbJtKrbS
+MFwAWIJ2+67TTMon32Fx9EDm2DtCY2o+17r1OZlpR/jFRr7QYnl6sVdUspp/BBBL
+Ef2mmog1Wdu0hxAT47C84FgrcXRnSS7BsoefXY3DpIk2Nv/o06Gy9jf3NuqWRYvI
+oZ8p+YeCDnC3Zb5kxNkbthDG7wvo55X5cYbxsXoKuv70wyR0LXmt5UKnqUkS0A6I
+cEPseJ+SdwpHMbrosnoblb1+Nq2z9zE+rnTS5VuSqLc6rkLGvgTgLiJHnho7rDTS
+6Lm2lNnK+6Vl/0X4yRqOygjV+BXio9ztndFzMww3JmUdebrFml7xs0qSiEuBL7Mz
+w9tvhXCVWx3vAyphTWlnTSmg+u579/t+XRDr72MW1ztUfm5TB1Ah5fqTQV/dyPwH
+QOrRqr0nWi4eneDd6+UR
+=vpPb
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-2.24.12.ebuild b/x11-libs/gtk+/gtk+-2.24.12.ebuild
new file mode 100644
index 000000000000..11484fa2e97f
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.24.12.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.12.ebuild,v 1.1 2012/09/07 01:50:21 nirbheek Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic gnome.org virtualx autotools
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-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)
+COMMON_DEPEND="!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.30:2
+	>=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="${COMMON_DEPEND}
+	virtual/pkgconfig
+	!aqua? (
+		x11-proto/xextproto
+		x11-proto/xproto
+		x11-proto/inputproto
+		x11-proto/damageproto
+	)
+	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 )"
+# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
+# Remove blocker after >=vte-0.28.2-r201:0 is stable
+RDEPEND="${COMMON_DEPEND}
+	!<x11-libs/vte-0.28.2-r201:0"
+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() {
+	# gold detected underlinking
+	# Add missing libs, patch sent upstream
+	epatch "${FILESDIR}/${PN}-2.24.10-gold.patch"
+
+	# 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"
+
+	# fix building with gir #372953, upstream bug #642085
+	epatch "${FILESDIR}"/${PN}-2.24.7-darwin-quartz-introspection.patch
+
+	# marshalers code was pre-generated with glib-2.31, upstream bug #671763
+	rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \
+		perf/marshalers.c || die
+
+	# 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
+
+	if ! use test; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+		strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in}
+	else
+		# 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)"
+
+		# Skip tests known to fail
+		# https://bugzilla.gnome.org/show_bug.cgi?id=646609
+		sed -e '/g_test_add_func.*test_text_access/s:^://:' \
+			-i "${S}/gtk/tests/testing.c" || die
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=617473
+		sed -i -e 's:pltcheck.sh:$(NULL):g' \
+			gtk/Makefile.am || die
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.am Makefile.in
+	fi
+
+	# http://bugs.gentoo.org/show_bug.cgi?id=371907
+	mkdir -p "${S}/m4" || die
+	mv "${WORKDIR}/introspection.m4" "${S}/m4macros" || die
+	AT_M4DIR=m4macros eautoreconf
+	# Use elibtoolize in place of eautoreconf when it will be dropped
+	#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
+
+	# 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
+
+	set_gtk2_confdir
+	dodir ${GTK2_CONFDIR}
+	keepdir ${GTK2_CONFDIR}
+
+	# see bug #133241
+	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
+	insinto /etc/gtk-2.0
+	doins "${T}"/gtkrc
+
+	# Enable xft in environment as suggested by <utx@gentoo.org>
+	echo "GDK_USE_XFT=1" > "${T}"/50gtk2
+	doenvd "${T}"/50gtk2
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+	# 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
+
+	# dev-util/gtk-builder-convert split off into a separate package, #402905
+	rm "${ED}"usr/bin/gtk-builder-convert
+
+	find "${D}" -name '*.la' -exec rm -f {} +
+}
+
+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
+}