Version bump; 2.24.14 supports setting the default file chooser mode in ~/.config/gtk-2.0/gtkfilechooser.ini. Add epatch_user (bug #443554, thanks to Michael Orlitzky). Drop old.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

14 files changed, 53 insertions, 1006 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index e28ce0b12fa1..b7a81e1aec19 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,19 @@
 # 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.623 2012/11/26 13:28:11 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.624 2012/12/06 06:13:35 tetromino Exp $
+
+*gtk+-2.24.14 (06 Dec 2012)
+
+  06 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gtk+-2.24.10-r1.ebuild, gtk+-2.24.12.ebuild, -gtk+-2.24.13.ebuild,
+  gtk+-2.24.13-r1.ebuild, +gtk+-2.24.14.ebuild,
+  -files/gtk+-3.0.8-darwin-quartz.patch,
+  -files/gtk+-3.0.11-darwin-quartz-introspection.patch, -gtk+-3.0.12-r1.ebuild,
+  -files/gtk+-3.0.12-use-const.patch, gtk+-3.2.4-r1.ebuild, gtk+-3.4.4.ebuild,
+  -gtk+-3.6.1.ebuild, gtk+-3.6.2.ebuild:
+  Version bump; 2.24.14 supports setting the default file chooser mode in
+  ~/.config/gtk-2.0/gtkfilechooser.ini. Add epatch_user (bug #443554, thanks to
+  Michael Orlitzky). Drop old.
 
   26 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
   Update to global useflag.
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index e28b0939b7c1..312b04c205b7 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -12,9 +12,6 @@ AUX gtk+-2.24.10-gold.patch 797 SHA256 e5964362087f276a1d1087239e0b33395a7a81320
 AUX gtk+-2.24.13-gold.patch 953 SHA256 72b6ff99c8d3a653c95a2079a4479ef53f7366bd13959bbbd3f13b0185f3e00a SHA512 47a03489aacf67c29795a33d89728327610a03a3e95a973f5ae743be862e084c825c0de05ea357eae10b049b93dd905ff12da885dee8a9e0e7148bd4b827f24e WHIRLPOOL e2ce4f84e8f3a61d05dabe2e278271405783c89c0e8033b8628d13b64f3c6b491b6051bac2142eba3cbb2dac7096551b041adf2d11ec307a544d356052ce4a3f
 AUX gtk+-2.24.13-gtk3-bookmarks.patch 5805 SHA256 3a5826efbf2abbeed1e581d7320f1d3b37ecbf8b6118702b6b82747645c72222 SHA512 655f7eae01d68049bfe89754dff9596df3e4f4bd952bbeb745bd668a606d9eff76236a46ee7ee68ad926ab9ea2c55813fb953160a3adcaf0b3139f5d3a6a1e9c WHIRLPOOL 05455ecd61a09092282388003b5d32e16cfc4d5fb589724fac821ac6ed05add80f412edf9506c46c2df30fc237bc5d524e5e4a75688ceddbaf158dd6e1de3b81
 AUX gtk+-2.24.7-darwin-quartz-introspection.patch 1239 SHA256 c718aae4511d9de28ea7b300a7f3d5e1099889a320847c8e642a2e6010838069 SHA512 c618aa19791f258d95cc31efe00b7515992b150933c591b9bbc87c0972646f9982126c0a2f279e287bcbb2768b57d117c59d806b1e60641f070818f78957955e WHIRLPOOL 173e0a8404bfcd29adf0b55155eef80d927ca536f89806591bc87c90b6eed4e64f9e2cb9ad5ce15f6f8f63381a378abc4cfb8c9b802166763111a052681c9bc4
-AUX gtk+-3.0.11-darwin-quartz-introspection.patch 2515 SHA256 49f8e2f1635c3eb8d7a4b2d1039150fc573f6a931ad2b3736176691ad2df8faf SHA512 0f6083de2c58c5077a74fb0a63826cc051d7c21cf190f0bbb6f041bc39b223d03a67f6452be6b1576d3c552205183730dbcec9e88f58d652f5bc088191da4c34 WHIRLPOOL 4ffe179808eefbe84e4f1a1920caa314e7fabbeefc03e2fc2448f28c282071cf88e6c0890dca3b3e72d39d56e25adf96984c40a6d2ffbc373f1ccc7dc6b990a7
-AUX gtk+-3.0.12-use-const.patch 8069 SHA256 4fbaf845da7aa757280711fc5e9a4b684b4f0f58ac78dc881336ca2cd0064749 SHA512 0c3dbad7009f8ae29b8cae362e2a2dd88d57bffd3450fecf6fa0adda11c036711b746c9cfd828b34cf50c3dfb8fb868de8b5b595d353746d6e7883b3742aff12 WHIRLPOOL 45b0dceb840aab1c3ff691a565524b54849ec7bc3b2e337b09c2764a1469aad3a196a1ae5c4f09cf2b79b8cd9e5810af5aaf3bb3658d4a80c97b6dcc119e909a
-AUX gtk+-3.0.8-darwin-quartz.patch 579 SHA256 2d30683f849be9be698424514341e814833c102c4f41d12cd02536cba62846fc SHA512 e7d3c2b3632bd7b972edd287cb59dc43abde149b1904085bffd11f6245aeb7f609c2b6297d421046669df9d4bdba6fe3d0b6e5203ff67a3b1fbd6bd1bd24db1f WHIRLPOOL bfe5143a86bc24c0d71196dfc4842b0e2d49b46b3af45e64bf42c4890faeb643f920a1fdd940c75561b15cb3d9e72cbdff59381f1ccef1c23a7fc358c092f9ba
 AUX gtk+-3.2.1-failing-tests.patch 1287 SHA256 07368c5a7b577b9493c3be423c51feadcfe48503203785e2e944309996a30850 SHA512 8e946133fa40fce121d2e360e80b54d86bd623991b8485088edfa75045cfa6cc8ca6be925f98dded4d6ada3a91d3b1873085bd56dd65f2a49cdb63ed3ef17ab6 WHIRLPOOL 152ad0dae80ebe77bcc0d1813efbee30d8cbd0f55fb66438dbe97759b5699d0e1b82a5b40b02741c654fea51fea8921129522451f57a3b910f82416dfc2de64a
 AUX gtk+-3.2.1-selector.errors 55 SHA256 dfec659411fb82ac9464b07e1675bf428a114f0348836dc1f4a9f98b9a1b5707 SHA512 59d8c70e82dc47b1c2886bc342534ea1ad0e9e4c45a54bc7175e32c1045fe3aec679f8086c82976033facb1501af6f276e8c97d508662f4d2d90409fa4331e20 WHIRLPOOL 55e508107ae5968eb2343468e517f0cfbc3929270fb9b71a233ab5b262dcc3bb1a53b1d68b6f2066d2c7ac5aea8b0b8682de155ecb7a3e69e9ade7dd91bb2553
 AUX gtk+-3.2.4-fallback-theme.patch 2880 SHA256 d021df0cc77b7033b57b62e0a3585c2fe7ae6d50273f0819b5de3acfdb73336c SHA512 59e656746d532ba08e0cf0d1308ef94b04c7fff4b0215bfcee1bd11304f876be7d40570a44145b95767e1bb94fabaa94ccd92442cbcbb9a173bb4d2dc0634311 WHIRLPOOL 094511ba6a42e7e2a6b4702351640e50f5b1182a4b51ebd435fdbd4bce06f45427a03974cb43ab12793286f3cfdf67951ddf0a2d741e09c7e0160e93d9dd1bab
@@ -25,42 +22,30 @@ AUX gtkrc 627 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb7
 AUX settings.ini 96 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7f2667658163 SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418 WHIRLPOOL 64a2c11ef1a6eda0bca40555a182023229202bcf15d527e6da8c52703be2fca26629b78ed677522eb626de7b7f456a7c37ab7fc3fe41907f1a46d770edb1fd67
 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684 SHA512 aaef9275ff6330a9fe1cbe1e40def181329d79cd33eb2b2ff5ae9cba5fa57e706716233ac7515f621d913f81343eb8244c6669e6411f7d50ca69187bf8d4fd86 WHIRLPOOL 2aacaa61e3291ff3c96a724e02a1fd250fa1574a69c730fa8635c28926c4134b780e9695e3aec3a6fd27b6e25848fcaee4075e17cd47bed2851bdcf311f19020
 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.12.tar.xz 13255456 SHA256 c5eba3b9259e4bf7554e9dc9db5d72038aa8b1bdd40fa0364b3705c226d11808 SHA512 b5abb66adc01d90c1ce62845bb264a159f4c73d0e9dce32abc80ce8fab8d72b21e22aaf0d8fa870530c019f2249fe2244d5c85e8d3d06b7541d19302bc08e641 WHIRLPOOL 7c55c5d91ecd1f6e4cde0026eeb23302f7812049d0d5ac38c79c0cf0f92b72428d59512519c8b3c4a403d1d85ed2da300c11227fd9f754a3c7a01fd9083203dc
 DIST gtk+-2.24.13.tar.xz 13278972 SHA256 35e1a01e46b02970b02ee9f299390d0aa57c1215ad2667bcd584b72f4ea6513d SHA512 95cdb709b128b5fb35def329b51b14b8c8721db644831f540ed57211945147379027f7866c1463d750a05f447648fc66eb1e6e81c69fda2f90225b8e3401b717 WHIRLPOOL b5dbe77b8eb9fa2ef9a280ac83c7db5dfe4609aa254e72a1d526eda2e157dfbd2097b6ea3d083340a75cb07d2f7b3ab7bba988682be34726154fe34e109bceb9
-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
+DIST gtk+-2.24.14.tar.xz 13258752 SHA256 8bd1b8b511a3004e8972badf467ce829e6855cdff15540b9344dc934c68008ac SHA512 f262ddd728ca2d93889bb1b113866932edf7d61ab3248ca11f2c83dbb181fcc0eaab900e6ed4933e4b597cac1ed1bf622711a617e0867ec10730c934d21dc911 WHIRLPOOL ec1b37c4439e80b6693e52c5c910c28533b478c3c994f5d8f3b8b5be2ac792dae7bec36ed92dc39ce35183d48d8bfdec347c32f55f8cc3b521e90554c8c679c8
 DIST gtk+-3.2.4.tar.xz 12261004 SHA256 f981bf514858c00d7084bd6f6c34b3c60b8aebdb959e7aca6faa59ed67c136bd SHA512 89eb2157262a448cf32a5c11cc8ab5a6b916c04119d16fb6f33a44e616e0236427921a0ee221df175c21f395a73958f02516f5aa6167ca2cc3f5b4550e8d3e3a WHIRLPOOL f9c67a34d5a3bf59ebd623fe16e81a471a4af90f698a50848d163ff1d6a6c0989a3d061951793a286bec00a6008db09bea70d513bcd47aab78f7387af62dbf37
 DIST gtk+-3.4.4.tar.xz 12854476 SHA256 f154e460075034da4c0ce89c320025dcd459da2a1fdf32d92a09522eaca242c7 SHA512 1a16f54a511f85a22f74a8ea82d218efa14ea5a58fc94fca805b0e321bdcea48a5f0a018a6d996c954ee80a51a2a16b68bdb2e3f3ab57c2362f3241c6cfa9a56 WHIRLPOOL eb1d117544aafec4936920a668b684959e89383b5b014512b82be0e99b7e48e3bdf81ceff4202b64179df4aa77453390d85a433d6e913cce8740a6b31701b15a
-DIST gtk+-3.6.1.tar.xz 13282048 SHA256 fe6c89ae40145b077d7291105e81d4f876be01bf21ddfb9cba449f6be49d7996 SHA512 9b6927c48550ac08860b20901880e944dc151b73b6bb10dbeff04eb17308fb15d064ec880c744f99e3139a41535c2dca31c92be06e4a69a00e267875991cedb1 WHIRLPOOL a0742ec56debb2661ee2723ebdd961e4eb1f4aed190d5258a969bb3346163345157bc34b027f3a0edc789e506fdee75aad653f7af9b33dc5fc57697546bbb870
 DIST gtk+-3.6.2.tar.xz 13288392 SHA256 aaccf2e1576338acf37816290578e8f19888935f381665b3847076be25fe513c SHA512 3b67c75e1de29679f2d3ffb095d7999a89967c77673b9daa574f63c8553fab9075627c892f92a4e5caf618c8736a5b476994eb13cedd4b29dadcab19b1a5d5aa WHIRLPOOL 24113134e6e73d62e2e1694fc4f9f0f6a8d2d0a976efed9c5638e0d7aa62431f37b0ca96c5cea90f1915a0161a155ed4fdcd8e39347a0cc6d1ca768f710f4c1f
 DIST introspection.m4.bz2 1181 SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae SHA512 4af08dc9a7b495949b61861d7e1a1184650dc33ab1b595544d8bef14d397a3759d97361650ab0e4812390f5fb5e812818937a2d5121246c651edd7d39a076a11 WHIRLPOOL 6b9de2bee5898a9645c07c68586df5e96205d52fb6a6c77c971e8c0742f8436fce76de2b553d0533fbbe4976363180b49ae201c1a1303dfa05585db32ebc61fc
 EBUILD gtk+-1.2.10-r12.ebuild 2393 SHA256 1375c5850b23a82e3724f3ad23be8058dcf1c164e146aab6d8b60dd55f3c694d SHA512 4fffd0ed56f05583f5d12fafb47bfd90c84cd81d568d0f425620b3b867fa33e746bfdff528cc798c524781689ed55017b823a31b168b53447950e8abaca14d62 WHIRLPOOL 03b4508a09c1f18ce53bea5aac93658f3205e6fd727acc93903a7af23dc970defcc6e819eaccc2d4cb7793b7bdd0d13fdbbf535ec7d7ddf5178202e2e4571850
-EBUILD gtk+-2.24.10-r1.ebuild 8010 SHA256 4f12e76b0524f05fd8415e9c98759112a7ecf31c592dff2920cb83b4d83e132e SHA512 0397b8911aab9806e928886b8b1f012c84714795f9854b0e8273aa7369e0d878701846eb1fea87e70ed536a7c4da89deb28ebfc7f7b5ba2885882f0fbaf1a3db WHIRLPOOL dc80e5e34d425cb68e814dda44095d663ab0a1bfa88be89c7535f325772f25921070f5c5cea92fd79c14090ab7d4938495d2f85a9f1cf1c817c9a60ce375ccad
-EBUILD gtk+-2.24.12.ebuild 8381 SHA256 424540ff6cfcad4eb50f81f68acfd8207d13e0a1841759f15183efdd929ae586 SHA512 f21f4a9ab677d7c54f9c8eefe9554811820f8bf357641f0f4bd01540e2300f0a7f18ede23d2f56cf8a624878f7853e8839fd6c49855457f71ab635715c24b80f WHIRLPOOL 4ccb5570a4f695faa03ec41f8be1e36c1beacc67804d22ac0cfe0db46de07e9884803967bf52b005e2a5428942e2348cdd03a18b4f6dddccd78bcadc52935f1c
-EBUILD gtk+-2.24.13-r1.ebuild 8360 SHA256 3fbe5e59079eda7683e423bd1c1110f6ea8f6455591259dcbbcb08fb49e94cbc SHA512 d6fd065e9c1ce2993c4c1fdfeb8cb6d72b2103c4cd1a5ca949c834853624596a727f3e581117f4f63c44ca72e3357ca03f4f25a9b7bfabdcea0fb89bb580b2a7 WHIRLPOOL ea7397ff5a8ae53a2386d3a988437c7032af74a8050abb5bf25a8fbfcb16158ac1a3793a632075faefa2f8d38aa8df2dc62ee0757a71121f48a7b9c69b484fb6
-EBUILD gtk+-2.24.13.ebuild 8372 SHA256 550c527001c0313b725a3c5613ca1df8d96674cd6684caf48b028420f8d43db8 SHA512 fd715e3997bcd30ccf83052c15d101f3a43e23b51a5efb82fbe9de37779ec1a3db14aac5750787ad9069cbadb928f9aa34a0ee35039f1d753779cf16b1aa0c44 WHIRLPOOL d24d496622291e02050cf8ded92ee1b087a29d6adb9c74254d7766bed48309ddeaa14ce17cb9d50b1425cc07f5be32bdd3f4b1a2bfa2c17f9bd0aa8a6399aeb0
-EBUILD gtk+-3.0.12-r1.ebuild 6052 SHA256 80cda3de286f6f2b9e52f6c186a269895e4ea1ae77ba655bd4b785f4049b5d7d SHA512 a7a65917ad15179bf8ba5102ef3105633696d550a86562a3e0595449b7e52bba6428129952ab6b05be5f7742dd9556e4b10094e30475e9cd746fd525c4069fa3 WHIRLPOOL e78e7fe9c95fa2e14a963ea1386762466f9a23f7d2b8a84e969456d82c488afb316daf96770d492c6f1f5dd9338ea31048b99b123d41d580b34f28b008c68b9f
-EBUILD gtk+-3.2.4-r1.ebuild 6908 SHA256 b2737bbe64493d2111df0d96686e58055bf5bca9d73e512ad5eb899fc8b2594f SHA512 83dcf74fc3d401d0bd60d4f7a81d4ca3699e442be0d6a06b9dd0d975744c87ea3745f791903341d3fd4809400b3a75f5ba188fe880be490c5513841b9911f715 WHIRLPOOL e32c4c01c7b66fb4d310ddcd1a790207c8efdf1cd0d128a3cf3eba626d64b5ec119bf20f858101290030ef5096c3a477692e840a633b1de16e8316c6b6d86dd1
-EBUILD gtk+-3.4.4.ebuild 7080 SHA256 2ef62ef79aeb58a10ac7efcbc25d46e54287a0601b80cfad3911f1d2a3fe4934 SHA512 3053b7b703b771c93d0d31fdcb88104436285dece2192db68969f29136c906719824bf75a86566b85f3ae7f311945a87fde20b4609ed5d0fd482f1002f7eb024 WHIRLPOOL 9616f4cb7a487ba33054520fee456e48530b5a240e1f6ef6f5aea2facd59b862ab1bdb46f26f005e1819a9d96879fd09b3615f259de128665af62a25544fb789
-EBUILD gtk+-3.6.1.ebuild 6941 SHA256 8cfca8897c2b68607556a1a4e6f8d6343e56ef785dadcc42cb1842bbb49b5c89 SHA512 7dd7bbf8cd2feacddfa92cff9e53310b2ef652a231d5d7a5786e8da6be4b35b75fd8f919aa484ea54f904e56c7899600c737529cf1c049fbd74a92d2a849ec40 WHIRLPOOL 18b3617dcafb07f31cc0908067c51760a3eb0b1f56db0664017334c9ca8beaef08bb78baf2310ab3cf48a35a515ad7fb6655d07cee1a393529027e6be19cbbc5
-EBUILD gtk+-3.6.2.ebuild 6941 SHA256 63b5f65385b64697661932235c6d92ef825ae816145709f5634dd1421ebc2ff2 SHA512 4d382f78eb0bf5f8dab429cbc4fa761c7a1c2d6eaca6913564a6cf629fe39e38e74c7f245153c46e5a63befb43fd998e6731ca2322df65a22aac3525edff1cf6 WHIRLPOOL 360a863f33307268cba1d0beed87dd22de1ef925a80e9c6301c475b3942d1f8b393a552c2fbc6db361e9123b1ed138a3c8d4cf0841ce31bcdf06888a91c8bc50
-MISC ChangeLog 97829 SHA256 47f5b54df42a0fc059fd85754ae54741757e1cabab9a517a93ad4fac3ba0800c SHA512 eeedeaecd06216da7f34b8f6a91b8d408d633cb221769de256da73ca436a1c5544070bde0118b2f80b81e0e135869a5c7937d9c93811bbcba3c219597b353a4e WHIRLPOOL 4a8d66807d76254c63dcf3daa501ca9358158cb0756b3ad867c834d12488414391736ad3dc3d52cf6bbe854be2f39b6cc8dfdf7feaf5f2a730772dc5a9179712
+EBUILD gtk+-2.24.12.ebuild 8395 SHA256 bb0df7d6771c06c2195df54a48d1b006b32a5d21aa493a4b8bad9d16c220eed6 SHA512 5ba4f233729d17ea3f4b0d6cef446f6e5d2bb939daec1b81d3d3055ff79c2b54402a59a8c6c7e28d5e316b0e51b4426f0d860c1996848dcea6b7c44043dacf57 WHIRLPOOL 177555bdcea980e48a2d037fbaa4ec607093271ab63908c12c4afb57f1ae684b3206bd0e913ed78981a59df6379ee2470fb08bdb4be3c5a269c6d9dbdcd31735
+EBUILD gtk+-2.24.13-r1.ebuild 8374 SHA256 3c78cb94cbf962896449a7c564a1ee54fbd22c789f906a89e4e63e31d89f5a92 SHA512 fa4d1adf469c68eb28ab3ddaafb44b40ea31dcbdc12914f5a63907f63e91275e5ee4b91bd859dcec7eadf050a2017f086f11ee6bb136ede64571cd2dc22b3bf7 WHIRLPOOL 5a11e4065089884a9a818432e306cf79607285bfe70aab5da8646c2ec9947194ae38eb2571a61d00e39a4e67a3d7004e0c1014293fb1810cc1e804db21250fbd
+EBUILD gtk+-2.24.14.ebuild 8453 SHA256 fd900269ab5fc0f82d4eb295f4c6568227388adf1d6c1c47bec023b839abdfc8 SHA512 6523eadf090c09fb2634301b565a71c346e30cc956797c5ba3ef793beac06c478836ec960d0b42d883427a71f585bf726a105b86d4c36b3c8e7078157e595643 WHIRLPOOL 4311d898c046df7ea4bdb1d8999dc4ef6d4f1550db4d3b6ca308cf40fa1cd683d85be9433735c108c2783c3c33178fd06d5595cb3701f499aac53ae7d41e7e78
+EBUILD gtk+-3.2.4-r1.ebuild 6922 SHA256 a5a138e1243cc1a25f6d6a29f9a1f3fcffabc939b4c12cb4c6fbfd46f1059299 SHA512 0a67fb5b8114ad8fedcc54dbc0d0ab9db1ec7252d7cc4f6bd092f770fa8c85de9bd743738d1da2824c18382e065dab95e27f1acd8b1347203777ee6a22ef65af WHIRLPOOL ffabadedaea7bbc5807ec2304c45d758156f9c40e3319a1c88eea4600221f3cbe35e27b1d4a1d05f0985117b715152c46da8bbb9b7f20cfef6c3fba726bf6178
+EBUILD gtk+-3.4.4.ebuild 7094 SHA256 928b0f6acf86fba5109d8e8f4d5bc1b365d19ec8092b2b7103f5c8ff005cda27 SHA512 2df2bf8b4c9d1535a2c4ca3a27f2324de4eff6ec79f712ff4cef72849fdb0b0fc6a7cb8a5084483881d97e55032c177e3c59f92f60444d0701c53b76224b1ac5 WHIRLPOOL 745c204b2459e94a6fa225a4d19a99581ff3f71713a3559cdd9a6871f8fff80c6c7e5c673059a2377145b16dda5ffb1371ad0c9bb0bf0eb806000a3e49d1f6bb
+EBUILD gtk+-3.6.2.ebuild 6955 SHA256 c80891639e27f1614d86be05acf533620ca16963f5a51f3f7285e2b5728945f8 SHA512 a9eabbacbb1298c992bad36ea28e26ed53f85bae830a3eea7c941619dc26e61d28a4ca520c6398a3c5e538cee46fb3e4ff00aa8919d25e0383438c8865c86a38 WHIRLPOOL 27d101f6c4502f0c89cf7adeaf739a4bf304c3faa76e05281174d2c2ff967e80bdb1b1e6adcc55e4f2df4a0fdf0f7dc797ad7f652ec179385d7b80163d48f0d9
+MISC ChangeLog 98462 SHA256 a926527afcf0bee347a90f2cce1db56d72548b1995b8ff054665b8b1693942a0 SHA512 4097b93278b76f4b59c6985b3e951ba97a45c5e44069b3264d9b4d616695ea812396793e9c86616a04c7d81d7f93d260c1b74ffe2406b18756c16e86b5e6d9f2 WHIRLPOOL b8341c04ac0a1bac3d99a2a55dac51bfaf04b401e0f29c4450d8bbc9001b90b4af6c51e7de461d271517f5179f47514e814b470f27364179f730c93edfe268e8
 MISC metadata.xml 927 SHA256 9752fc68dfd0f6b5f432e014e38bfc4e19fd1179c969d5a3fe92ac626b699199 SHA512 d7f776dab10659c02a50583c617cacd4b72117726c9c31af81310b8a71a721be140d57ebda752ebcbff74722783878012889912d150577d4e44a148826b25d71 WHIRLPOOL 98a2c04f6566db01d83bc319710241a0cac8c0d56e99c6d961ba6e1c21d8207095c8415d56f9b790d04b8dc2b712af4e3f4f9b98f22fe38ad091c0a63dda5013
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQs25UAAoJEOSiRoyO7jvofQIP/2yiU77JKgVvPUj9BC/c5twO
-cL7QD1WQsv0gkUIYPyqSdVWkr6sPvm0oXo8xLWNYxbx6tOJXF+tIeU51iFmwJOhA
-mTZ7tyiLpHhEZrqhWUnspJHJonM8vRtnqNCYG0FWrwBbX8rOOG0NW8sA7hhou0lO
-FDQ9zX1LXIVfti7YVro99E6aVg/45DN+ZMwBghL7NK3/4Ygsa0jqV7lzoKMc3DcN
-fk9Q63Y79YTAjw+8/hFHGYtrnx6T30Z7+/Dxy1rqT7hOzinFmltpmxlsigUkx49T
-KspMt07PmBb9ILHbrU15IPLelQ2PY3kxSxJtUwPgblQ8yhrmI4C5R7CiIElGREcV
-zKBCsR1oLcvpC0u90FRek9pBinmDk0nBV3iAE+o4rG5bN/SihukcW00UC8nD6soe
-lOyiZ+m1MrW/+JcgDJHSYOCKJaOkeVbGDF2Jv1JFshGMhKnJ6RMmziW6hNyaS4Sx
-az0Rxqmn3khPaIIZGt6OOM6WKlL8Rejml+yAYij9+/OWmPmLIoTlq9VJRfGfSrJS
-Io13/YQDWvAaQ9PfMVYbfJWB1HvlGRDOohVoyDkUjPu5rU+CaCUM3cEG6OlsW8fk
-tRevaC++4MEb0E6IUNmqiZutc75WWslboHdYrPQoGvSfP3pvsG+OjmfUJmQXkiWE
-UFFlXkhsVRmzZw98U9mf
-=JLjN
+iQEcBAEBCAAGBQJQwDeRAAoJEJ0WA1zPCt1hZp4H/2YgmS4h+afLHJRJL4LBRH6L
+eGQRhJTqfzGh618FuqAQL9A9OjZp3lbC72zAPPqCjnOwYSDLkrfvGBT5upSeqVZS
+63tTJeqv2+daIiwjKEHRc1VrfvnuPNjHsPis8tNBD6RFettAXpK59/lMh+UOmMqr
+uwtbg2TW9NorxeoJe0ACGatWoBQP1yvqcuSu/hoFlfCz9RYzoJb9uy5IczxyoZhU
+ZU8PHvCkM1HnC/lEq97O0DlU8c9Fi3MkzWQXkByOJfc3djO1+xQGCL2hI6vO7OZ1
+bXniPcqPF2lRhFUxzfVW/R+kDCKdlY/Q5l+dW58yWuVN2rWtBc/W9BtpeZtIbtk=
+=3eB2
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/gtk+-3.0.11-darwin-quartz-introspection.patch b/x11-libs/gtk+/files/gtk+-3.0.11-darwin-quartz-introspection.patch
deleted file mode 100644
index ae2f0e9c1dbe..000000000000
--- a/x11-libs/gtk+/files/gtk+-3.0.11-darwin-quartz-introspection.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-forward port of the patch from:
-
-https://bugs.gentoo.org/attachment.cgi?id=278091&action=diff&context=patch&collapsed=&headers=1&format=raw
-https://bugs.gentoo.org/show_bug.cgi?id=372953
-
---- gtk/Makefile.am
-+++ gtk/Makefile.am
-@@ -32,7 +32,7 @@
- endif
- endif
- 
--INCLUDES =						\
-+INCLUDES_COMMON =						\
- 	-DG_LOG_DOMAIN=\"Gtk\"				\
- 	-DGTK_LIBDIR=\"$(libdir)\"			\
- 	-DGTK_DATADIR=\"$(datadir)\"			\
-@@ -53,10 +53,17 @@
- 	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED		\
- 	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
- 	$(GTK_DEBUG_FLAGS)				\
--	$(GTK_DEP_CFLAGS)				\
-+	$(GTK_DEP_CFLAGS)
-+
-+INCLUDES = 								\
-+	$(INCLUDES_COMMON)					\
- 	$(gtk_clipboard_dnd_c_sources_CFLAGS)		\
- 	$(INCLUDED_IMMODULE_DEFINE)
- 
-+INCLUDES_GIR =							\
-+	$(INCLUDES_COMMON)					\
-+	$(INCLUDED_IMMODULE_DEFINE)
-+
- if PLATFORM_WIN32
- no_undefined = -no-undefined
- endif
-@@ -997,7 +1004,7 @@
- Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h"
- Gtk_3_0_gir_INCLUDES = Atk-1.0
- Gtk_3_0_gir_CFLAGS = \
--		$(INCLUDES) \
-+		$(INCLUDES_GIR) \
- 		-UGDK_DISABLE_DEPRECATED \
- 		-UGTK_DISABLE_DEPRECATED \
- 		-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
---- gtk/Makefile.in
-+++ gtk/Makefile.in
-@@ -708,7 +708,7 @@
- @HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_TRUE@GTK_PRINT_BACKENDS = file,papi
- @HAVE_CUPS_TRUE@@HAVE_PAPI_CUPS_FALSE@GTK_PRINT_BACKENDS = file,cups
- @HAVE_PAPI_CUPS_TRUE@GTK_PRINT_BACKENDS = file,papi,cups
--INCLUDES = \
-+COMMON_INCLUDES = \
- 	-DG_LOG_DOMAIN=\"Gtk\"				\
- 	-DGTK_LIBDIR=\"$(libdir)\"			\
- 	-DGTK_DATADIR=\"$(datadir)\"			\
-@@ -729,10 +729,17 @@
- 	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED		\
- 	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
- 	$(GTK_DEBUG_FLAGS)				\
--	$(GTK_DEP_CFLAGS)				\
-+	$(GTK_DEP_CFLAGS)
-+
-+INCLUDES =								\
-+	$(COMMON_INCLUDES)					\
- 	$(gtk_clipboard_dnd_c_sources_CFLAGS)		\
- 	$(INCLUDED_IMMODULE_DEFINE)
- 
-+INCLUDES_GIR =							\
-+	$(COMMON_INCLUDES)					\
-+	$(INCLUDED_IMMODULE_DEFINE)
-+
- @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
- @OS_WIN32_TRUE@gtk_def = gtk.def
- @OS_WIN32_TRUE@gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def
-@@ -1407,7 +1414,7 @@
- @HAVE_INTROSPECTION_TRUE@	--c-include="gtk/gtkx.h"
- @HAVE_INTROSPECTION_TRUE@Gtk_3_0_gir_INCLUDES = Atk-1.0
- @HAVE_INTROSPECTION_TRUE@Gtk_3_0_gir_CFLAGS = \
--@HAVE_INTROSPECTION_TRUE@		$(INCLUDES) \
-+@HAVE_INTROSPECTION_TRUE@		$(INCLUDES_GIR) \
- @HAVE_INTROSPECTION_TRUE@		-UGDK_DISABLE_DEPRECATED \
- @HAVE_INTROSPECTION_TRUE@		-UGTK_DISABLE_DEPRECATED \
- @HAVE_INTROSPECTION_TRUE@		-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
diff --git a/x11-libs/gtk+/files/gtk+-3.0.12-use-const.patch b/x11-libs/gtk+/files/gtk+-3.0.12-use-const.patch
deleted file mode 100644
index 3cb51f8f8c71..000000000000
--- a/x11-libs/gtk+/files/gtk+-3.0.12-use-const.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-From 6c3d5c45bcd78b54c3641d6748f9e0e80c1fba46 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
-Date: Mon, 6 Jun 2011 19:05:18 +0100
-Subject: [PATCH 1/2] gdk: Use const instead G_CONST_RETURN
-
-[Alexandre Rostovtsev <tetromino@gmail.com>: backport to 3.0.12]
----
- gdk/gdk.c                    |    4 ++--
- gdk/gdkdevice.h              |    2 +-
- gdk/gdkdisplay.c             |    2 +-
- gdk/gdkdisplay.h             |    2 +-
- gdk/gdkdisplayprivate.h      |    2 +-
- gdk/gdkmain.h                |    4 ++--
- gdk/win32/gdkdisplay-win32.c |    2 +-
- gdk/x11/gdkdisplay-x11.c     |    4 ++--
- gdk/x11/gdkproperty-x11.c    |    4 ++--
- gdk/x11/gdkx11display.h      |    2 +-
- gdk/x11/gdkx11property.h     |    4 ++--
- 11 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/gdk/gdk.c b/gdk/gdk.c
-index 43d45f5..241683a 100644
---- a/gdk/gdk.c
-+++ b/gdk/gdk.c
-@@ -306,7 +306,7 @@ gdk_parse_args (int    *argc,
-  *
-  * Since: 2.2
-  */
--G_CONST_RETURN gchar *
-+const gchar *
- gdk_get_display_arg_name (void)
- {
-   if (!_gdk_display_arg_name)
-@@ -1039,7 +1039,7 @@ gdk_threads_add_timeout_seconds (guint       interval,
-  *
-  * Returns: the program class.
-  */
--G_CONST_RETURN char *
-+const char *
- gdk_get_program_class (void)
- {
-   return gdk_progclass;
-diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h
-index a6ceac0..9109d65 100644
---- a/gdk/gdkdevice.h
-+++ b/gdk/gdkdevice.h
-@@ -156,7 +156,7 @@ struct _GdkTimeCoord
- 
- GType                 gdk_device_get_type       (void) G_GNUC_CONST;
- 
--G_CONST_RETURN gchar *gdk_device_get_name       (GdkDevice *device);
-+const gchar *         gdk_device_get_name       (GdkDevice *device);
- gboolean              gdk_device_get_has_cursor (GdkDevice *device);
- 
- /* Functions to configure a device */
-diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
-index 1b8c7e7..f4095c2 100644
---- a/gdk/gdkdisplay.c
-+++ b/gdk/gdkdisplay.c
-@@ -1336,7 +1336,7 @@ gdk_display_get_device_manager (GdkDisplay *display)
-  *
-  * Since: 2.2
-  */
--G_CONST_RETURN gchar *
-+const gchar *
- gdk_display_get_name (GdkDisplay *display)
- {
-   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
-index 65daad1..3c4179e 100644
---- a/gdk/gdkdisplay.h
-+++ b/gdk/gdkdisplay.h
-@@ -44,7 +44,7 @@ G_BEGIN_DECLS
- GType       gdk_display_get_type (void) G_GNUC_CONST;
- GdkDisplay *gdk_display_open                (const gchar *display_name);
- 
--G_CONST_RETURN gchar * gdk_display_get_name (GdkDisplay *display);
-+const gchar * gdk_display_get_name         (GdkDisplay *display);
- 
- gint        gdk_display_get_n_screens      (GdkDisplay  *display);
- GdkScreen * gdk_display_get_screen         (GdkDisplay  *display,
-diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
-index 1126d96..2d48943 100644
---- a/gdk/gdkdisplayprivate.h
-+++ b/gdk/gdkdisplayprivate.h
-@@ -120,7 +120,7 @@ struct _GdkDisplayClass
- 
-   GType window_type;          /* type for native windows for this display, set in class_init */
- 
--  G_CONST_RETURN gchar *     (*get_name)           (GdkDisplay *display);
-+  const gchar *              (*get_name)           (GdkDisplay *display);
-   gint                       (*get_n_screens)      (GdkDisplay *display);
-   GdkScreen *                (*get_screen)         (GdkDisplay *display,
-                                                     gint        screen_num);
-diff --git a/gdk/gdkmain.h b/gdk/gdkmain.h
-index bcbe4d0..411b58f 100644
---- a/gdk/gdkmain.h
-+++ b/gdk/gdkmain.h
-@@ -50,7 +50,7 @@ gboolean              gdk_init_check                      (gint           *argc,
- void                  gdk_add_option_entries_libgtk_only  (GOptionGroup   *group);
- void                  gdk_pre_parse_libgtk_only           (void);
- 
--G_CONST_RETURN gchar *gdk_get_program_class               (void);
-+const gchar *         gdk_get_program_class               (void);
- void                  gdk_set_program_class               (const gchar    *program_class);
- 
- void                  gdk_notify_startup_complete         (void);
-@@ -64,7 +64,7 @@ G_GNUC_WARN_UNUSED_RESULT gint gdk_error_trap_pop         (void);
- void                           gdk_error_trap_pop_ignored (void);
- 
- 
--G_CONST_RETURN gchar *gdk_get_display_arg_name (void);
-+const gchar *         gdk_get_display_arg_name (void);
- 
- /**
-  * gdk_get_display:
-diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
-index 1faa4cf..8e7c988 100644
---- a/gdk/win32/gdkdisplay-win32.c
-+++ b/gdk/win32/gdkdisplay-win32.c
-@@ -236,7 +236,7 @@ struct _GdkWin32DisplayClass
- 
- G_DEFINE_TYPE (GdkWin32Display, gdk_win32_display, GDK_TYPE_DISPLAY)
- 
--static G_CONST_RETURN gchar *
-+static const gchar *
- gdk_win32_display_get_name (GdkDisplay *display)
- {
-   HDESK hdesk = GetThreadDesktop (GetCurrentThreadId ());
-diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
-index 2911a3a..983ac72 100644
---- a/gdk/x11/gdkdisplay-x11.c
-+++ b/gdk/x11/gdkdisplay-x11.c
-@@ -1502,7 +1502,7 @@ gdk_internal_connection_watch (Display  *display,
- }
- #endif /* HAVE_X11R6 */
- 
--static G_CONST_RETURN gchar *
-+static const gchar *
- gdk_x11_display_get_name (GdkDisplay *display)
- {
-   return (gchar *) DisplayString (GDK_X11_DISPLAY (display)->xdisplay);
-@@ -2185,7 +2185,7 @@ gdk_x11_display_supports_input_shapes (GdkDisplay *display)
-  *
-  * Since: 2.12
-  */
--G_CONST_RETURN gchar *
-+const gchar *
- gdk_x11_display_get_startup_notification_id (GdkDisplay *display)
- {
-   return GDK_X11_DISPLAY (display)->startup_notification_id;
-diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
-index 0cf753c..678b196 100644
---- a/gdk/x11/gdkproperty-x11.c
-+++ b/gdk/x11/gdkproperty-x11.c
-@@ -503,7 +503,7 @@ gdk_x11_get_xatom_by_name (const gchar *atom_name)
-  *
-  * Since: 2.2
-  **/
--G_CONST_RETURN gchar *
-+const gchar *
- gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
- 				    Atom        xatom)
- {
-@@ -525,7 +525,7 @@ gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
-  * Return value: name of the X atom; this string is owned by GTK+,
-  *   so it shouldn't be modifed or freed. 
-  **/
--G_CONST_RETURN gchar *
-+const gchar *
- gdk_x11_get_xatom_name (Atom xatom)
- {
-   return get_atom_name (gdk_x11_xatom_to_atom (xatom));
-diff --git a/gdk/x11/gdkx11display.h b/gdk/x11/gdkx11display.h
-index b544ac4..8781edb 100644
---- a/gdk/x11/gdkx11display.h
-+++ b/gdk/x11/gdkx11display.h
-@@ -60,7 +60,7 @@ Display *gdk_x11_display_get_xdisplay     (GdkDisplay  *display);
- 
- guint32       gdk_x11_display_get_user_time (GdkDisplay *display);
- 
--G_CONST_RETURN gchar *gdk_x11_display_get_startup_notification_id (GdkDisplay *display);
-+const gchar * gdk_x11_display_get_startup_notification_id         (GdkDisplay *display);
- void          gdk_x11_display_set_startup_notification_id         (GdkDisplay  *display,
-                                                                    const gchar *startup_id);
- 
-diff --git a/gdk/x11/gdkx11property.h b/gdk/x11/gdkx11property.h
-index 64fb978..9227063 100644
---- a/gdk/x11/gdkx11property.h
-+++ b/gdk/x11/gdkx11property.h
-@@ -45,13 +45,13 @@ GdkAtom               gdk_x11_xatom_to_atom_for_display (GdkDisplay  *display,
-                                                          Atom         xatom);
- Atom                  gdk_x11_get_xatom_by_name_for_display (GdkDisplay  *display,
-                                                              const gchar *atom_name);
--G_CONST_RETURN gchar *gdk_x11_get_xatom_name_for_display (GdkDisplay  *display,
-+const gchar *         gdk_x11_get_xatom_name_for_display (GdkDisplay  *display,
-                                                           Atom         xatom);
- #ifndef GDK_MULTIHEAD_SAFE
- Atom                  gdk_x11_atom_to_xatom     (GdkAtom      atom);
- GdkAtom               gdk_x11_xatom_to_atom     (Atom         xatom);
- Atom                  gdk_x11_get_xatom_by_name (const gchar *atom_name);
--G_CONST_RETURN gchar *gdk_x11_get_xatom_name    (Atom         xatom);
-+const gchar *         gdk_x11_get_xatom_name    (Atom         xatom);
- #endif
- 
- G_END_DECLS
--- 
-1.7.6
-
diff --git a/x11-libs/gtk+/files/gtk+-3.0.8-darwin-quartz.patch b/x11-libs/gtk+/files/gtk+-3.0.8-darwin-quartz.patch
deleted file mode 100644
index 5bb87bd75c8c..000000000000
--- a/x11-libs/gtk+/files/gtk+-3.0.8-darwin-quartz.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit a55b59fef35af3fa86d6b6279f92ca2e3a124252
-Author: Kristian Rietveld <kris gtk org>
-Date:   Thu Mar 10 21:20:37 2011 +0100
-
-    Include gdkquartz.h so GDK_IS_QUARTZ_SCREEN is actually defined
-
- gtk/gtksettings.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
----
-diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
-index d870b44..3a83440 100644
---- a/gtk/gtksettings.c
-+++ b/gtk/gtksettings.c
-@@ -39,6 +39,10 @@
- #include <pango/pangofc-fontmap.h>
- #endif
- 
-+#ifdef GDK_WINDOWING_QUARTZ
-+#include "quartz/gdkquartz.h"
-+#endif
-+
- 
- /**
-  * SECTION:gtksettings
-
diff --git a/x11-libs/gtk+/gtk+-2.24.10-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.10-r1.ebuild
deleted file mode 100644
index 1aa575de53ca..000000000000
--- a/x11-libs/gtk+/gtk+-2.24.10-r1.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# 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.10-r1.ebuild,v 1.15 2012/10/10 07:44:20 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 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.27.3: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
-	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}/${P}-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 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
-}
diff --git a/x11-libs/gtk+/gtk+-2.24.12.ebuild b/x11-libs/gtk+/gtk+-2.24.12.ebuild
index 037c75d53d48..179b122454eb 100644
--- a/x11-libs/gtk+/gtk+-2.24.12.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.12.ebuild
@@ -1,6 +1,6 @@
 # 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.12 2012/11/05 01:10:44 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.12.ebuild,v 1.13 2012/12/06 06:13:35 tetromino Exp $
 
 EAPI="4"
 
@@ -148,6 +148,8 @@ src_prepare() {
 		strip_builddir SRC_SUBDIRS demos Makefile.am Makefile.in
 	fi
 
+	epatch_user
+
 	# http://bugs.gentoo.org/show_bug.cgi?id=371907
 	mkdir -p "${S}/m4" || die
 	mv "${WORKDIR}/introspection.m4" "${S}/m4macros" || die
diff --git a/x11-libs/gtk+/gtk+-2.24.13-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.13-r1.ebuild
index caf4a47e4db5..223ca8ecd238 100644
--- a/x11-libs/gtk+/gtk+-2.24.13-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.13-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.13-r1.ebuild,v 1.1 2012/11/05 01:10:44 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.13-r1.ebuild,v 1.2 2012/12/06 06:13:35 tetromino Exp $
 
 EAPI="4"
 
@@ -150,6 +150,8 @@ src_prepare() {
 		strip_builddir SRC_SUBDIRS demos Makefile.am Makefile.in
 	fi
 
+	epatch_user
+
 	# http://bugs.gentoo.org/show_bug.cgi?id=371907
 	mkdir -p "${S}/m4" || die
 	mv "${WORKDIR}/introspection.m4" "${S}/m4macros" || die
diff --git a/x11-libs/gtk+/gtk+-2.24.13.ebuild b/x11-libs/gtk+/gtk+-2.24.14.ebuild
index a48e5a3e8028..89fa840fa523 100644
--- a/x11-libs/gtk+/gtk+-2.24.13.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.14.ebuild
@@ -1,6 +1,6 @@
 # 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.13.ebuild,v 1.4 2012/11/05 01:10:44 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.14.ebuild,v 1.1 2012/12/06 06:13:35 tetromino Exp $
 
 EAPI="4"
 
@@ -147,6 +147,8 @@ src_prepare() {
 		strip_builddir SRC_SUBDIRS demos Makefile.am Makefile.in
 	fi
 
+	epatch_user
+
 	# http://bugs.gentoo.org/show_bug.cgi?id=371907
 	mkdir -p "${S}/m4" || die
 	mv "${WORKDIR}/introspection.m4" "${S}/m4macros" || die
@@ -181,7 +183,7 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	set_gtk2_confdir
 	dodir ${GTK2_CONFDIR}
@@ -192,10 +194,6 @@ src_install() {
 	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
@@ -247,4 +245,9 @@ pkg_postinst() {
 		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
 		elog "add it to your gtkrc."
 	fi
+
+	elog "To make the gtk2 file chooser use 'current directory' mode by default,"
+	elog "edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following:"
+	elog "[Filechooser Settings]"
+	elog "StartupMode=cwd"
 }
diff --git a/x11-libs/gtk+/gtk+-3.0.12-r1.ebuild b/x11-libs/gtk+/gtk+-3.0.12-r1.ebuild
deleted file mode 100644
index 4e4fe97a0fad..000000000000
--- a/x11-libs/gtk+/gtk+-3.0.12-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# 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+-3.0.12-r1.ebuild,v 1.12 2012/10/10 07:44:20 tetromino Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic gnome.org gnome2-utils multilib virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${PN}-3.0.12-use-const2.patch.xz"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-# NOTE: This gtk+ has multi-gdk-backend support, see:
-#  * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
-#  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
-# I tried this and got it all compiling, but the end result is unusable as it
-# horribly mixes up the backends -- grobian
-IUSE="aqua cups debug examples +introspection test vim-syntax xinerama"
-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"
-
-# FIXME: introspection data is built against system installation of gtk+:3
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-# Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert
-# >=x11-libs/gtk+-2.24:2 is needed for bug 359555
-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.10.0[X,glib,svg]
-		>=x11-libs/gdk-pixbuf-2.22.0:2[X,introspection?]
-	)
-	aqua? (
-		>=x11-libs/cairo-1.10.0[aqua,glib,svg]
-		>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
-	)
-	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.28.0
-	>=x11-libs/pango-1.24.0[introspection?]
-	>=dev-libs/atk-1.30[introspection?]
-	>=x11-libs/gtk+-2.24:2
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	cups? ( net-print/cups )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.1 )"
-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
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gail-1000"
-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."
-}
-
-src_prepare() {
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	# Use const instead G_CONST_RETURN, upstream bug #658854
-	epatch "${FILESDIR}/${PN}-3.0.12-use-const.patch"
-	epatch "${WORKDIR}/${PN}-3.0.12-use-const2.patch"
-
-	# 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"
-	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
-		-i gtk/tests/recentmanager.c || die "sed 2 failed"
-
-	if ! use test; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS tests Makefile.am
-		strip_builddir SRC_SUBDIRS tests Makefile.in
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		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
-
-	# fix building with gir #372953
-	epatch "${FILESDIR}"/${PN}-3.0.11-darwin-quartz-introspection.patch
-
-	# Solaris is strict, and needs c99
-	# http://mail.gnome.org/archives/gtk-devel-list/2011-April/msg00127.html
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e '/_XOPEN_SOURCE 500/d' gtk/gtksearchenginesimple.c || die
-	fi
-}
-
-src_configure() {
-	# FIXME: PackageKit support
-	# png always on to display icons (foser)
-	local myconf="$(use_enable xinerama)
-		$(use_enable cups cups auto)
-		$(use_enable introspection)
-		--disable-packagekit
-		--disable-papi
-		--enable-gtk2-dependency"
-
-	# XXX: Maybe with multi-backend we should enable x11 all the time?
-	if use aqua; then
-		myconf="${myconf} --enable-quartz-backend --disable-xinput"
-	else
-		myconf="${myconf} --enable-x11-backend --enable-xinput"
-	fi
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	# need libdir here to avoid a double slash in a path that libtool doesn't
-	# grok so well during install (// between $EPREFIX and usr ...)
-	econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${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
-
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
-	# Remove unneeded *.la files
-	find "${D}" -name "*.la" -delete
-
-	# add -framework Carbon to the .pc files
-	use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
-		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
-	done
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-
-	local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0"
-	gtk-query-immodules-3.0  > "${GTK3_MODDIR}/immodules.cache" \
-		|| ewarn "Failed to run gtk-query-immodules-3.0"
-
-	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 settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/x11-libs/gtk+/gtk+-3.2.4-r1.ebuild b/x11-libs/gtk+/gtk+-3.2.4-r1.ebuild
index 2225c3aa7f50..0d44edb3cc8a 100644
--- a/x11-libs/gtk+/gtk+-3.2.4-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # 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+-3.2.4-r1.ebuild,v 1.12 2012/10/10 07:44:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.4-r1.ebuild,v 1.13 2012/12/06 06:13:35 tetromino Exp $
 
 EAPI="4"
 
@@ -124,6 +124,8 @@ src_prepare() {
 		strip_builddir SRC_SUBDIRS demos Makefile.am
 		strip_builddir SRC_SUBDIRS demos Makefile.in
 	fi
+
+	epatch_user
 }
 
 src_configure() {
diff --git a/x11-libs/gtk+/gtk+-3.4.4.ebuild b/x11-libs/gtk+/gtk+-3.4.4.ebuild
index 976f5c50c7a5..93a95f69e79b 100644
--- a/x11-libs/gtk+/gtk+-3.4.4.ebuild
+++ b/x11-libs/gtk+/gtk+-3.4.4.ebuild
@@ -1,6 +1,6 @@
 # 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+-3.4.4.ebuild,v 1.12 2012/11/06 02:09:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.4.4.ebuild,v 1.13 2012/12/06 06:13:35 tetromino Exp $
 
 EAPI="4"
 
@@ -131,6 +131,8 @@ src_prepare() {
 		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
 	fi
 
+	epatch_user
+
 	eautoreconf # for 3.4.4-isnan.patch
 }
 
diff --git a/x11-libs/gtk+/gtk+-3.6.1.ebuild b/x11-libs/gtk+/gtk+-3.6.1.ebuild
deleted file mode 100644
index 656c45fab311..000000000000
--- a/x11-libs/gtk+/gtk+-3.6.1.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# 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+-3.6.1.ebuild,v 1.2 2012/11/12 00:32:35 tetromino Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic gnome.org gnome2-utils multilib virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-# NOTE: This gtk+ has multi-gdk-backend support, see:
-#  * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
-#  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
-# I tried this and got it all compiling, but the end result is unusable as it
-# horribly mixes up the backends -- grobian
-IUSE="aqua colord cups debug egl examples +introspection packagekit test vim-syntax wayland X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )"
-
-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# FIXME: introspection data is built against system installation of gtk+:3
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-# Use gtk+:2 for gtk-update-icon-cache
-COMMON_DEPEND="X? (
-		>=app-accessibility/at-spi2-atk-2.5.3
-		x11-libs/libXrender
-		x11-libs/libX11
-		>=x11-libs/libXi-1.3
-		x11-libs/libXt
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.3
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		xinerama? ( x11-libs/libXinerama )
-	)
-	wayland? (
-		>=dev-libs/wayland-0.95
-		media-libs/mesa[egl?,wayland]
-		x11-libs/libxkbcommon
-		egl? ( x11-libs/cairo[opengl] )
-	)
-	>=dev-libs/glib-2.33.1
-	>=x11-libs/pango-1.30[introspection?]
-	>=dev-libs/atk-2.5.3[introspection?]
-	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.26:2[introspection?,X?]
-	>=x11-libs/gtk+-2.24:2
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	colord? ( >=x11-misc/colord-0.1.9 )
-	cups? ( >=net-print/cups-1.2 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32 )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	virtual/pkgconfig
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/damageproto
-		xinerama? ( x11-proto/xineramaproto )
-	)
-	>=dev-util/gtk-doc-am-1.11
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
-# >=xorg-server-1.11.4 needed for
-#  http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.31.0:2.90
-	packagekit? ( app-admin/packagekit-base )
-	X? ( !<x11-base/xorg-server-1.11.4 )"
-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."
-}
-
-src_prepare() {
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=654108
-	epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
-
-	# 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"
-	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
-		-i gtk/tests/recentmanager.c || die "sed 2 failed"
-
-	# FIXME: multiple reftests fail when run from portage (but succeed when
-	# run from a manual compile in a temp directory)
-	sed -e 's:\(SUBDIRS.*\)reftests:\1:' \
-		-i tests/Makefile.* || die "sed 3 failed"
-
-	# Test results depend on the list of mounted filesystems!
-	rm -v tests/a11y/pickers.{ui,txt} || die "rm failed"
-
-	if ! use test; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS tests Makefile.am
-		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.am
-		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
-	fi
-
-	[[ ${PV} = 9999 ]] && gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf="$(use_enable aqua quartz-backend)
-		$(use_enable colord)
-		$(use_enable cups cups auto)
-		$(use_enable introspection)
-		$(use_enable packagekit)
-		$(use_enable wayland wayland-backend)
-		$(use_enable X x11-backend)
-		$(use_enable X xcomposite)
-		$(use_enable X xdamage)
-		$(use_enable X xfixes)
-		$(use_enable X xkb)
-		$(use_enable X xrandr)
-		$(use_enable xinerama)
-		--disable-papi
-		--enable-man
-		--enable-gtk2-dependency"
-
-	use wayland && myconf="${myconf} $(use_enable egl wayland-cairo-gl)"
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	# need libdir here to avoid a double slash in a path that libtool doesn't
-	# grok so well during install (// between $EPREFIX and usr ...)
-	econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
-}
-
-src_test() {
-	# Tests require a new gnome-themes-standard, but adding it to DEPEND
-	# would result in circular dependencies.
-	# https://bugzilla.gnome.org/show_bug.cgi?id=669562
-	if ! has_version '>=x11-themes/gnome-themes-standard-3.6[gtk]'; then
-		ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk]"
-		ewarn "is not installed. Please re-run tests after installing the"
-		ewarn "required version of gnome-themes-standard."
-		return 0
-	fi
-	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
-
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
-	# Remove unneeded *.la files
-	prune_libtool_files --all
-
-	# add -framework Carbon to the .pc files
-	use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
-		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
-	done
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-
-	local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0"
-	gtk-query-immodules-3.0  > "${GTK3_MODDIR}/immodules.cache" \
-		|| ewarn "Failed to run gtk-query-immodules-3.0"
-
-	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 settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/x11-libs/gtk+/gtk+-3.6.2.ebuild b/x11-libs/gtk+/gtk+-3.6.2.ebuild
index a1281534e4f6..522c0d0e3a7d 100644
--- a/x11-libs/gtk+/gtk+-3.6.2.ebuild
+++ b/x11-libs/gtk+/gtk+-3.6.2.ebuild
@@ -1,6 +1,6 @@
 # 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+-3.6.2.ebuild,v 1.1 2012/11/12 00:32:35 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.6.2.ebuild,v 1.2 2012/12/06 06:13:35 tetromino Exp $
 
 EAPI="4"
 
@@ -127,6 +127,8 @@ src_prepare() {
 		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
 	fi
 
+	epatch_user
+
 	[[ ${PV} = 9999 ]] && gnome2_src_prepare
 }