Fix stuck keyboard grab in pidgin and gajim (bug #427148, thanks to Christian Trefzer, Rafał Mużyło, shinydoofy).

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

4 files changed, 318 insertions, 9 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 65f2bea27c75..4bd208414753 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,13 @@
 # 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.601 2012/07/16 06:38:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.602 2012/07/20 23:58:11 tetromino Exp $
+
+*gtk+-2.24.11-r1 (20 Jul 2012)
+
+  20 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gtk+-2.24.11-r1.ebuild, +files/gtk+-2.24.11-stuck-grab.patch:
+  Fix stuck keyboard grab in pidgin and gajim (bug #427148, thanks to Christian
+  Trefzer, Rafał Mużyło, shinydoofy).
 
 *gtk+-3.4.4 (16 Jul 2012)
 *gtk+-2.24.11 (16 Jul 2012)
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 1a42236e9c6d..46ea293d2eff 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -9,6 +9,7 @@ AUX gtk+-1.2.10-m4.patch 220 SHA256 88f45c2f0413f29d62ca138c87b41d24a73b47456f5b
 AUX gtk+-2.14.3-limit-gtksignal-includes.patch 513 SHA256 20e7536c29e2675d18fd3aff933621a4fcab9b5615ff96593e9f36ab4febb734 SHA512 6444ad81e33ac7694335dee531c4336191391cb5956701e69152ce3a375a665912f6a94ce38bb0f64599bc56d60020a297915c79fadcd93d1e94cc42db1a40aa WHIRLPOOL 61a3b7bb8d2903ecbb3fa38c96fc95d7a010e3ad645c55ab8b172a2d0a1f5fc16ee4bd9f767990c09f08aba6792d19765e58bb2200b25201289fcd2c810f6466
 AUX gtk+-2.21.3-multilib.patch 611 SHA256 4c3db89f401176ea121a982974d81ca6ba3db315d2bce16c83ef7f7d7f629f3b SHA512 291e784c482ede1930d85f57b2ecacd6c8b8522d79f0c69f27ef29818c812b951587e16bd5d4236b8ca77a7ad773fa8f0b84c615e9bdbdb2d465134fcd6448ce WHIRLPOOL d67b05a8fb3d3dd38a4980ae1868ba31017b98d5e9a802f3499810d1f90d850dfbddf76ae3d5f6b7b3454db4d0b67156b251e75232fe2b2a07606e29ea6555ca
 AUX gtk+-2.24.10-gold.patch 797 SHA256 e5964362087f276a1d1087239e0b33395a7a8132021bacd7061f80819e0eedac SHA512 0ccd0e07d139f2440cc67951fb1d2a4102dea9b70ab4872c737a9ab6bd2d46ac7fd1ece42aa4c0e25bbd01af129a15ea2816c0b2b6fe8dd94b625fc40827050f WHIRLPOOL 01e01cc0ab6f35cb026ca91ae6f61d74c4c4a9b9e926e2676a66673ebec9aa25e1ba22cfdd3884d15f682ddd6fb657699fa64167f49190a9d18c69247b0df78a
+AUX gtk+-2.24.11-stuck-grab.patch 1806 SHA256 ed78a7e3e6f6d7f84960982051c8a627366ebba2d299dc40f15c3ef70039864f SHA512 a75cd9e4c59bca3f9ddc5a8ea37e06864b1fe995303163aa02b2bed5c64c558a9603d29d67f77dc130b7332aeccd6e3d7139e6acce38cb6d1a2fb2221e21e337 WHIRLPOOL 2ac8198dffd2c9800c6b6fa11a247252516a01e464a11bfb11141e3e7bcd5185777519962471fe841a9209969408b6d5c8a45f8cd3522f4cd8f15db0dd744b89
 AUX gtk+-2.24.4-old-icons.patch 17368 SHA256 4cb55c322e45ea151217db40c6761e6eaaea89551ff1a4134107c92774a7b635 SHA512 2469462b6a444931d1a9db52a7ea82ec95f4b99e85009c86ddafc569beb8da819ca3cf18eacbae9a7fa6df5b98e65bc5036df9d3bfd1961eee62eba14175e5e7 WHIRLPOOL 9681ef7aba92674931e4da817f4b69d7aef0db7687b8065e9f44ee0e2f1cb37b8ef9c6df66aed42b7e7354191d098b9ef07beadfe7e10c64df51d996a0e7b72d
 AUX gtk+-2.24.5-background-repaint.patch 1884 SHA256 3573af25e8db2fb490b264f80cb9e617ee1a36e767e36e7bb1d830c0b715db93 SHA512 ba00e7e75954677eeb2e8beca94f505ef7d64d23b15aa0d75646381f56f2f506a4ade9208c539ede06cef857f1e4bdde94d0d2342fdf481df73b8fbce3930744 WHIRLPOOL f4bd6fc377eb37086aa93f861526c5239914e386dba2ea153184c872a56df88dfe59115aa7947a274eff9aedaef13e0a8a536098239bd8b188f47675069fb5dc
 AUX gtk+-2.24.5-darwin-quartz-introspection.patch 1127 SHA256 a0f91bf77bd2827c10c31c0f2d7de106254d3b053e5a2bf734e35bd814db3493 SHA512 a618b43ebdf9f89fc10cafcae00f807b9ee5b46694d95ac1580d07857ddfb3f47e31e9b1789d37ad5c1eb11ffcd937380268c942869b93d1c9dc458abcdf65fd WHIRLPOOL 78daf00f66171e6b09977d03f501d0552ef3afbd115ad9f153edfa62359773dce2ae548ad92b6e86e28851d0794663cfdec7babdc3f63b05ca5d77b92d697e0d
@@ -42,6 +43,7 @@ DIST gtk+-3.4.4.tar.xz 12854476 SHA256 f154e460075034da4c0ce89c320025dcd459da2a1
 DIST introspection.m4.bz2 1181 SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae SHA512 4af08dc9a7b495949b61861d7e1a1184650dc33ab1b595544d8bef14d397a3759d97361650ab0e4812390f5fb5e812818937a2d5121246c651edd7d39a076a11 WHIRLPOOL 6b9de2bee5898a9645c07c68586df5e96205d52fb6a6c77c971e8c0742f8436fce76de2b553d0533fbbe4976363180b49ae201c1a1303dfa05585db32ebc61fc
 EBUILD gtk+-1.2.10-r12.ebuild 2386 SHA256 e4874d2dd01bc266e7e0f5b691fcf4e54f6bd3a79658dcec6d5374c5910aa78b SHA512 9a52f8c71eac25d1e85228aa9a4d912aa4794f13ef2430b86be1b37017e67a7b62b9ae69dc8df489d26d65c6149f664c8f0b273a9d3cf1c50aad05eda76a2ecc WHIRLPOOL 72d41c606fefe6671d086f739e2a4aa25e542d660fd1563d5075c97c54460f671f647da9f871aef0af0c039f7e8b279cad58a26fc1e482691020f82747de174b
 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.8-r1.ebuild 7991 SHA256 56cdc4ab813a5b0ba2f7bff425528656c50d2b02e9ccdbe21fa1b18d92cc549f SHA512 4ff004fbbee7802140c59bbd9b005896ea07f99b925c79b5c012177f31f0a2d854792727bb993d44adee17e96bf0d1c50098d480e11278941bc075e7798605e6 WHIRLPOOL e416348e352e4cfa205c4766b658b554eae554f7786efb5ce64242d0d62586d97cc393fecfe4fe81ee009784f557edc77b4792757e551ddc362b7d64888a2d16
 EBUILD gtk+-3.0.12-r1.ebuild 6148 SHA256 57e6c1b9bae37bf29720ee20007dd6d17a33382f0939a88dec9622329bd8a0a3 SHA512 44196ee8c8c36386b3cfd6a62ee30a1eac0f479568a47946fe52c51caedc70b207d5662af4258098d329fa525655a814648e8801f8b88b19ee019a8232db9364 WHIRLPOOL 70ae34e5ed8a136e5f45585daaf555b8406b179ca4f0c0a02c9ec7723993287197610e864270515eda956331a7e67f5c7838be9f25e18d38e13a65213160cd52
@@ -50,16 +52,16 @@ 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 93385 SHA256 f9682880a39285247e27db7b3bf8ba599e31eba522fc9f4d5d378af1f28319ec SHA512 0e95067eb0771e84c847b1c1be8558159353b05ad20da3a4185f5448151adce41dfd819e98cb88d4b36afa493bc6298a065ceb980b2c25034a8dd7790b7d76dd WHIRLPOOL 399cef09ac481fe9fb716a3a98be5273239a14c1c31288fd69687704227fa1a3c7197efe1963bc8a81a88732e4dc4e482f23161ea80c64119917749144ef6374
+MISC ChangeLog 93663 SHA256 e33b3fa728d4693f76ba2d6402a5a6010b570a2f431b78d9c468c6ac2d5bce9f SHA512 eaefc2583f462b622ffa52044d0e045f08d826fa16ae0383ee633f37c87078b33d0988d9dc5c2ec3dbef7fd5d6997daf93c09ee8d45292310f941ebaccd120c7 WHIRLPOOL 44ce3701bbec7322fca15a95c2e2d5b89c210fbbed645ef5458c122122b64c55d237f4bedcba89ecde0f0f28cf37e75e7813ffacc28f28a322ab094baae49b71
 MISC metadata.xml 870 SHA256 90835d0edfdbbc25c781b0c7bcf9b7b6db82ce5f412082ec56d250891e1853ea SHA512 42090f432fe4351844b2d818a02df8bf9aac6fdc64c7af69bf157c020619b4fc0cae0b415444efbac43c7f7a8924014ce7666022ce2281db878f58fe21769312 WHIRLPOOL 4cb3f2b92c7af24c882c536fbd9c0a2aef6ac31ca1d07715e0b2948d367c0ff94083d3a1173b6a979a2dba2e68b382c5396c5d558e1efb38d14290c0e6457fc9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQA7cHAAoJEJ0WA1zPCt1hTeUH/1s+XxoVDBopAV0QDB4TREMp
-3zTf9oaV9sgm2GolF6YU7Nj9MgYvrxCSmBNvxIclMUbnQiOixNgkT07vwY3jI5VH
-q+cjwn1px2FhxWuC7imx2sGxgr4AgqrBnwSeotHRjImMPXl2q1C+EPolEf3QqVGP
-6iiNkZAVZJGA8YdSGPn7cKsiG0NyQHVntAUNlhszbcBbUAQvegLd+gAY6j74+f+G
-eEVjrKLQBTjZrUEFogG3UGZsJ6nHKCzgnW7FuEgb5A7geK1ID5+1JLV1Awt5NWwe
-Gl1d7iAl0pvUKBlNEKP9wZTIROcidWLJFV/hIjJFYVb1pwQHEN/tojwXr005oJw=
-=HzQb
+iQEcBAEBCAAGBQJQCfCZAAoJEJ0WA1zPCt1hFtIIAJjh/AzyCw1lbXvThXuiVrIU
+RFH/SrF174AZNG7+wHC994be9fCKoAY0VBvwa8tc/Hb9TayMO/zi2+Ln+pXlM7XU
+N+qE99s5eWGa2/6FGOhmRrpB5/VUZrgrKokyaZe8AUL2wYuRsiBiF8XCa77d0JXe
+lI72sp/RYVpBwHU5exRJ/6vTyArzYFOnG9u45uFYTunyUh8AybN2qG9lHOF8sYkR
+6j3P9gLgFBvJGU5X56dEJyb9MHxcP+NBTADtNbYY2glvATkvdFaDLBND1F73kCgY
+hwQcpBmyVU0bxu98ctXNTAtrrfHdiuMk28GQv+c2RxJkC1bRVnMzguzeb9t/4yM=
+=ELQc
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/gtk+-2.24.11-stuck-grab.patch b/x11-libs/gtk+/files/gtk+-2.24.11-stuck-grab.patch
new file mode 100644
index 000000000000..21c1b851a914
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.11-stuck-grab.patch
@@ -0,0 +1,51 @@
+From f3afba6202a442d1c3381b2c0fe314814b73168b Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Wed, 16 May 2012 17:18:51 -0400
+Subject: [PATCH] Fix a case of 'stuck grab'
+
+This was showing up when using a combo box in list mode. After popping
+up the list, the keyboard grab appeared stuck. What was stuck here is
+only the client-side grab, since we forgot to clean up our grabs
+when receiving an UnmapNotify.
+
+This bug was introduced in 3f6592f60fd15fb353fc84600caefba3054dc892.
+
+[ Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 2.24 ]
+
+https://bugzilla.gnome.org/show_bug.cgi?id=680346
+---
+ gdk/x11/gdkevents-x11.c |   17 ++++++++---------
+ 1 files changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
+index 7cc1000..b96e9f5 100644
+--- a/gdk/x11/gdkevents-x11.c
++++ b/gdk/x11/gdkevents-x11.c
+@@ -1799,16 +1799,15 @@ gdk_event_translate (GdkDisplay *display,
+            * means we hid the window ourselves, so we will have already flipped
+            * the iconified bit off.
+            */
+-          if (window)
+-            {
+-              if (GDK_WINDOW_IS_MAPPED (window))
+-                gdk_synthesize_window_state (window,
+-                                             0,
+-                                             GDK_WINDOW_STATE_ICONIFIED);
+-
+-              _gdk_xgrab_check_unmap (window, xevent->xany.serial);
+-            }
++          if (window && GDK_WINDOW_IS_MAPPED (window))
++            gdk_synthesize_window_state (window,
++                                         0,
++                                         GDK_WINDOW_STATE_ICONIFIED);
+         }
++
++      if (window)
++        _gdk_xgrab_check_unmap (window, xevent->xany.serial);
++
+       break;
+       
+     case MapNotify:
+-- 
+1.7.8.6
+
diff --git a/x11-libs/gtk+/gtk+-2.24.11-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.11-r1.ebuild
new file mode 100644
index 000000000000..ba12c35f13c9
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.24.11-r1.ebuild
@@ -0,0 +1,249 @@
+# 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.11-r1.ebuild,v 1.1 2012/07/20 23:58:11 tetromino 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"
+
+	# Prevent stuck grab in pidgin, bug #427148, upstream 680346
+	epatch "${FILESDIR}/${PN}-2.24.11-stuck-grab.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
+}