Version bump, drop old

Package-Manager: portage-2.2.19/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 341 insertions, 34 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index f79b29d6f22e..03d904e59fa8 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.776 2015/04/25 18:40:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.777 2015/05/17 10:13:32 pacho Exp $
+
+*gtk+-3.14.13 (17 May 2015)
+*gtk+-2.24.28 (17 May 2015)
+
+  17 May 2015; Pacho Ramos <pacho@gentoo.org> +gtk+-2.24.28.ebuild,
+  +gtk+-3.14.13.ebuild, -gtk+-3.14.10.ebuild, gtk+-2.24.25-r1.ebuild,
+  gtk+-3.12.2-r2.ebuild:
+  Version bump, drop old
 
   25 Apr 2015; Alexandre Rostovtsev <tetromino@gentoo.org> gtk+-2.24.27.ebuild,
   gtk+-2.24.27-r1.ebuild, gtk+-3.14.9.ebuild, gtk+-3.14.10.ebuild:
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index f6129e311e90..da34604e068e 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -18,37 +18,27 @@ 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.25.tar.xz 13327832 SHA256 38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3 SHA512 e102eabbd86e9e697402b4d915172dd3838374b7b8a16b95369ed602228857a013fdba7b6b8d742f925ff8d340b63a90b56c1ddbd4405d8dc454144c705ac08d WHIRLPOOL b4bcf058bcc582627be35bb8ba45a933c3814f007599df59172e537fc99003f51edac7011cf36783caad4e191c622f6fa044a6ff6e0ae3f4de7635c3815807a3
 DIST gtk+-2.24.27.tar.xz 13349252 SHA256 20cb10cae43999732a9af2e9aac4d1adebf2a9c2e1ba147050976abca5cd24f4 SHA512 ffe981a41137302713a411039238604e92d41146e25ea0643857ec40388ddfe69cbb15bdc1aa8300b87ddbb4d6fbcf0054cdb7ba39634fbe4bfd1802f5bc8ac6 WHIRLPOOL 02259afb7a410fe941b9cc20e8031d61d5dd90f2ac532e3b8525b203997cfa57999286cd59e76ef152a68de35f08e8712dc4b9cd107633f2ba2433eba633197c
+DIST gtk+-2.24.28.tar.xz 13354884 SHA256 b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656 SHA512 86d563645ca70c1e14afd4b38d925f496e596cbf6181f2e95310f58c2f4152aaecc559e3c513e6d405fcf48d8d413d59a9d72782216529c1280bd8e1947d7760 WHIRLPOOL b4943bb7792f962e0fc50a118f0dbce58a79678e1a98632717a2f3bda4ddd99b62ce9aed3b14f1c0912a4b53eb975991527843985f625c5a9e052db4889acfb0
 DIST gtk+-3.12.2.tar.xz 15015024 SHA256 61d74eea74231b1ea4b53084a9d6fc9917ab0e1d71b69d92cbf60a4b4fb385d0 SHA512 4a8d2f52328587d73e30f363bdbbd91322dae0198f5581a2da3ebbe96ef0a0635193d2537e8fc127dc0950a24df42862233edd3a873dcbd166dc675bae849c9e WHIRLPOOL 26328632d78f986d25e40d8773ff3cc90a0b3a5bafb4f21224504bd1c8c78995df556e8337d7b374f047bfff2bd0b9e0082ec163591f7a0a035260b8a2db2932
-DIST gtk+-3.14.10.tar.xz 15783300 SHA256 c3a8d0a014b0025b3c4dd21faf7f9c273b684479ae60d089f06170761ac0c289 SHA512 0354443166fef60ea36416060e1e2b6cb5b755ebbf3b32746369162bb5e6ca5deb913d3ba334b1feb35fee95ae1513e36161826953443e6ae3130698c7c5d399 WHIRLPOOL 41b8701e0c1f4303ee53a0f5d8dd1b2f2a2ae60c0b3d24f5b9836f792d1abff8043905db220be0c2ad1f4d87d4c6df2ef243431459cbd805448054b8352d1eaa
+DIST gtk+-3.14.13.tar.xz 15784112 SHA256 b1efcb1ef299f9b205e6f4512428315fd03484e5790f65bd3ac164e84ade90b0 SHA512 e4fcca57fe58821832ee0b542d86033a1028c19e2248929e25a8c16ef05603a93815556591bcc025995bfab1238ad4060fcdf4920ec2df22ab3175b404f3a207 WHIRLPOOL 36a77983701da6041f0762013638303d323a42487a6f6508e92dfa0571f8f13b8598a8187e9665e6eeb62e41b7c2533a1fe9d2b68f097e85599d373969d52da0
 DIST gtk+-3.14.9.tar.xz 15716588 SHA256 3be9560e6e99388d7706a168e3353ecd63fc30ec4f7f8bea23889e71ab7b6c64 SHA512 3b64142d65ec4b4e0ed709c2fac629d80b95dac03481a3d6f8e3cc6c351ac779fe172a1edee552df7b3c40287f10c97fa0e99212e5f0e6b4751e3d8efd0896e5 WHIRLPOOL bc45b3722913ebb90bff944ec724909d01e3e976d49f8bd273500de2af9de7dcedc85e24fca36226816993a10cb87f4477f4498cc67946449855b37a0790a2fa
 EBUILD gtk+-1.2.10-r12.ebuild 2406 SHA256 03e22a0e23e19cc0ad87697527ac186aeb6904b7e007bb0c023196f80765b716 SHA512 fb4a7905b5d6390a9d12bd5b0dd8e1b19744a5620279da1ae8c6962c80db44b9707dc6cd4d3a80cb091b5f4cfeacfeee7f5ebe46d1ecd2a3f720d8ccb73d8be4 WHIRLPOOL f3414b479f126236bef1670a51b46a2c37553f1c37edc912ed121f807926fa2dc87bcc8af1fa079cd12eeb8bc3084a4348948565356621c6a1ec267f40da1235
-EBUILD gtk+-2.24.25-r1.ebuild 9937 SHA256 f03dbe887c0170df7d3856275e10d7f5c109bbc82f68290143edf8e415e2490a SHA512 442efec4c7b807768a409dffb7ef3aaf05590435dd6b7d4ca0406b90a171057835e9c2b74773cdd5120585291b07b69ed9747b2078270ac0e6fe7c9c262ded1e WHIRLPOOL 813af7c32312a2df328b8c4616c04db72565deeea41889396be2156338dafa5a62b47ca8c84bbde4eea9313d464553eed4ca84b300611341f816856a32c0ce37
+EBUILD gtk+-2.24.25-r1.ebuild 9693 SHA256 ba1ca0c4e2b70fd49ab6fc2140e7cc79b589b176b7c0f0dc683198b44832e1e9 SHA512 df42f84e46571d91074fd8bcbfe9724e2fe49ac7c6db680cd4908eaa6cad84258b82d4b4857f89eab7b11884ce4a092a9434f9c4735d31893968cd964a3f87d1 WHIRLPOOL dc871b5c72bdd08fe0b01c23314ca6633f92fc203abbe850cadf1f5aec6df272ea1c34f68be95c2f50d22702c476668009d92cbc5eaca0dc2851b86141af51b4
 EBUILD gtk+-2.24.25.ebuild 9303 SHA256 06de60abc98acf5ffbf2f5a738330bcfba09816b4c1d0bfb0de2bcd854301af0 SHA512 1568f20620ebac879bed686c16450f6e0fb62864a83705ae06e55bb5e3e1e50ef92d055c57054532dac3f7492c716ea5fc188cd2ab4ae98cffa5095b84ef1984 WHIRLPOOL 975530592ccc3b92bf04403097a2ad623be9f5ffee902a15c79b08847a71f43702b54ccbcf1b33b93cafbbb239449594beb2ed198a57a1d733e53dd2f2eff743
 EBUILD gtk+-2.24.27-r1.ebuild 9940 SHA256 4976c08fc8ba5db7dd51dbabeb140b0ea98c8463a2fd23a6c6d4db6536c4ae41 SHA512 c277f8cd5ee9fde97b1050bfde68bac7834b96c6706017d9dd5787dace9a1804b0cf0c9094a48f0e29563a0975085c8b6ed10ee5b333e16b68bcfb40c04fd711 WHIRLPOOL 7735ab0a5686402d9c7f3d28247d483601a95c6ab454211c9769309dcad5b500fa090085107cc021b58e64d9f9b0715eb5f5cf29a2fcd1b5f7edf8b973d3a5a8
 EBUILD gtk+-2.24.27.ebuild 9684 SHA256 cd603d18c0d157a819a21020f69c12b205b58127189efe67680700e7f89bbe7b SHA512 9ff9692cf9e9909204981b133b847c93ca6554f5701edb0f57f6d27b1e9437b200f006bf5792189c25851bc0ea7be4f67efbee0a305301c1e8bd280aba575705 WHIRLPOOL f6f81049d1bad24f2aaf52d31cf593ba204a2cc7648b231d5f26fbfdd5ea501d2ae7ccebc47fd886a61be2841673c1defef0e29ee9d5c4731232ca760e6b53e3
-EBUILD gtk+-3.12.2-r2.ebuild 8223 SHA256 ecee6c83c1418c0d69d7f2a21c8219cb9675509d23cfd378455af80b4cb127aa SHA512 5057611b2b8b767bf4ff36a9583e6a1635b470742b6cc429a1876a77af903dae9d1903174062bd01c568b7df9bea4f67f0e2571387fbbd1d409765b5c56653a1 WHIRLPOOL ed6f48b1908ce088dbd4ffe36709772361d80c73de5b247a8996c40ca6fe87eae19a5b61c23a632b91fcbeb53bb4ff8cce4bb841145519737cfa324fceb36626
+EBUILD gtk+-2.24.28.ebuild 10023 SHA256 86d820bd5129631dfc7685123fa7a0c70f99250b238f20752088d994682fdba1 SHA512 1c02ce643b2a9e84a2bb002bda4681379227977deee936d5653090885eee2def7fc030067c5b009f744b54fe1ee30f38294061141cbb50ebb9a0fe2a9521217f WHIRLPOOL 1988891650b23e5d8ddb7ab73f74ed0bd490704908e4335ad1aaea654316ac750bfe79a9352cf4339edbd9da492b6157317101d9ff737cf460b081d2b1987603
+EBUILD gtk+-3.12.2-r2.ebuild 7995 SHA256 1b164be7bf3fd0850445da8a625f689da4d6a98a94b4aeff0395f834149f86ce SHA512 a4824f38f866f90aab9debd40011ea1b41b0a842f4e681a7d0af00b17999d2df3774fb7973c91f5984040b17d65f3e188ef5f5ef68b7cd9147aa02ab616cd3bc WHIRLPOOL da4ddcb7e92c032b1aa64d6e141a40b857779c5c9af62c5ae2d7f992b7ae70592469ea921493a17536ce5239dcfb9beb72439200cb054467ff6303566a7eb77a
 EBUILD gtk+-3.12.2.ebuild 6597 SHA256 be97832d070fab365a441ef5b124b803417f8ca1fa1fefd22f17772af6632e7e SHA512 d78b8d1696f16607feb4b2695ae48756cf69ea7704b73a1dda99e6f7aec119e8483c2f4197dba17188131ba9ea9a7fc18d1c97190ff3dd3a1981c3093810cd05 WHIRLPOOL e6435dd7ee84c81b9e5f1fa6b9989b6c0bd62aad8f8e35419a6dce57e174507cf60968441681057dfdcd0924f50de8409881f341253fc0d1421faedfe5a67467
-EBUILD gtk+-3.14.10.ebuild 7379 SHA256 c5fdf8db4d919634774368706d68421a55a64315c5485d84b737684268a678dc SHA512 578c09e54da6c1b5323cb50e50836c1c5666ae8842ecafa9b9115e05dce4404b94280bca8e4fa3e4e4e328f4091d40541dd2c50d4ba9560e542013df4e4f3e57 WHIRLPOOL 6c730f7a86d1783028aaeb34472316d099e0891bb88255995728c278fad56a38173ded08fd7f973a56e180c9d9ab98443f0bfc41fc1d6ddd3315edd169466ce0
+EBUILD gtk+-3.14.13.ebuild 7415 SHA256 12c538eb795fbe8f33280f11eade9a98928b54b22c0836fa6b7bba728c4cada1 SHA512 1245b54233cc732b2d8cb90ac82754dfe6404c87574de8c781a24e81ebc8229c8a38657d4462e346a48e3b589b9469957fa661424c46aab71cab35ec4eae82dc WHIRLPOOL a1f836cc0fe208a05827dc9c5202877dea0fa0de7918b923bd97df37483901246c93ff807bcf4eea9bd98dbb5e072830d22813c0fab924435ef72be4f0411499
 EBUILD gtk+-3.14.9.ebuild 7371 SHA256 d0b777b0e3b37938f3056d97d67a156de7f9dafc27ccbb2c9fba6b8b3408d1db SHA512 8a841427ba4bda25bd8252c53652fd8f72502eb8239ca3cdb2df49aeedb8337438528b04947ee32f4f01c056be0f97f0ec2dbec66e93b7c76c99d3c59c47a7fb WHIRLPOOL 2ac0f02ac2bbb8eef5ed9fdd06aac2e96bf73dd9b888d08142094e1ed55ece97d7bc3cbb7a86057b76e9491ed6f62b848b6a756ea6a8780ab054e3dba178d10a
-MISC ChangeLog 22337 SHA256 dc381db3e92ea83a260bd775ef3a29882d3b03d1fffb0a800117bd0101547c16 SHA512 dfe71979238debb592d1275ad462838f3794358f664500c6f76d1cb04b2e0105c3f05d98fc8b94918cc49425223b8bbf873626ad51c6fffd504d7ae97350be41 WHIRLPOOL b4682de6f6fd73ba4067ee23d847b4475a201de56ca49156636fe0a92e96f50541359de147dd1333c6c9c34f1332689b748ad13e5d9971dd30187ef82c961a9b
+MISC ChangeLog 22579 SHA256 b0eef063d0a946480ea2716487de4c1c6ea77f4f759dcdc9ab41d6b6fe43d505 SHA512 b62f1811875920b164024ecd166faa9fd1bf89a54ec595eba0610de8efa224c5c60fb3031910b1625c18906bde8bd2b11e28e1b975a71029792525ce6f606a1a WHIRLPOOL b73540ec94860d03c7417a83fc03aca7c190361e42b8c7ea59aef8c29c194a213d5c7985c7d6b9ae12d212007738aa38b57fe3cc5dfb105172b7205e87864b24
 MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec
 MISC metadata.xml 763 SHA256 03a0b8d26ef0461bedaf694959d0025f192a70b368b2e19f8fe438f5941011ca SHA512 c3126323546eb09681b3a72cb67dd0d0fbbb792fd8df5eee821705f68ae5ffcc708d2e368bc26c97dd602d051d424af2dfd89f2e384d56c50219b3f6a47dd792 WHIRLPOOL 1ea3a03d5b2946841ce1b4945a3a3dd095ce1f6be91afc9f869d2e8d88534ae1ce197dc5904452f099f9054f0dc69d2bc9c37269438ebdbcaadf25eb04c4a365
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVO9+3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
-OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNZQIQAMA0fxRE6ap9fJ3kv2dNsr/n
-m5Bavn/izthTMBmeJq6lMoO5amE2xiwU0hZeiYdhtBEmPoiDG/cWnZOLefohQBZd
-A6LIFyaH67R820ZHhLQu4z/H98QxXZz9DrYGQIAfAz1EyALNxzhXYAqJBqnykzN1
-4MdZhPTZ+BqaHRCvpD7lxVoGuUqcthzNnbza0vpHbAh4Mm/Eu2JL84kM+A0FgoaZ
-jL5mxaXKOtPNfvuNHin95SJPkQrC9AJw1dfd0YGWfhZSxficSPRTPnzyZwM42Fym
-fvE4+1jXhcId6WU/Q6EVybdkld6JZFOg6T/f6M3q75b6DfxWUeTzQgFoPpcpTvqr
-iWizY2Mr9T72lgKBhKV9HjLBwqzaGvRaXkDKimVv144pps/yXk6uZSe3z5sIdRN6
-sN991kynKk79J4j6WMOoG6cO4nOYLAhlJIFzRUYcNUp48rQ0AygUrwqPHqyl4KP+
-qubBMRQWizdHlXkyUPfNj3NR3cZN/vKiNsh5DxBYQih1i/FbNr7dYaEllIF3W3Sr
-lCx1gtfjAzAYNOi+kDVdidoCjwuTpFbN+UfrI+4IrQ3s4Ssdp+XYaT9Tz/ofO+nK
-0qSq04rGy1InQmoldJbY4E9hGGFKPkrmyRpJDlgfJt2tarYHEQxrpqsb7H6u2dj5
-35Mq0xXT2VRQiKpXPxkJ
-=zA5x
+iEYEAREIAAYFAlVYac0ACgkQCaWpQKGI+9TqFQCfX6a5+05WVQNjH7IfeeJUCyDb
+bm8An3MKU0qIGQzLt9BIZgzft/FofzwX
+=y3oc
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-2.24.25-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.25-r1.ebuild
index 6b379ea2f0ab..3d06e2a80fb1 100644
--- a/x11-libs/gtk+/gtk+-2.24.25-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.25-r1.ebuild,v 1.4 2015/03/03 11:10:54 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.25-r1.ebuild,v 1.5 2015/05/17 10:13:32 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( !aqua )
 "
 
-KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS=" arm"
 
 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
 COMMON_DEPEND="
diff --git a/x11-libs/gtk+/gtk+-2.24.28.ebuild b/x11-libs/gtk+/gtk+-2.24.28.ebuild
new file mode 100644
index 000000000000..32bfbbe82e1c
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.24.28.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.28.ebuild,v 1.1 2015/05/17 10:13:32 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils flag-o-matic gnome2 multilib virtualx readme.gentoo multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="aqua cups examples +introspection test vim-syntax xinerama"
+REQUIRED_USE="
+	xinerama? ( !aqua )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+COMMON_DEPEND="
+	>=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+
+	cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	!aqua? (
+		>=x11-libs/cairo-1.12.14-r4:=[X]
+		>=x11-libs/gdk-pixbuf-2.30.7:2[X]
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
+		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/gobject-introspection-common
+	>=dev-util/gtk-doc-am-1.20
+	sys-devel/gettext
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	!aqua? (
+		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+		>=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
+		>=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
+		xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
+	)
+	test? (
+		x11-themes/hicolor-icon-theme
+		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
+# Add blocker against old gtk-builder-convert to be sure we maintain both
+# in sync.
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gail-1000
+	!<dev-util/gtk-builder-convert-${PV}
+	!<x11-libs/vte-0.28.2-r201:0
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20140508
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg[${MULTILIB_USEDEP}]
+	vim-syntax? ( app-vim/gtk-syntax )
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default,
+edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following:
+[Filechooser Settings]
+StartupMode=cwd"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-2.0
+)
+
+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() {
+	# Fix tests running when building out of sources, bug #510596, upstream bug #730319
+	epatch "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch
+
+	# marshalers code was pre-generated with glib-2.31, upstream bug #662109
+	rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \
+		perf/marshalers.c || die
+
+	# Stop trying to build unmaintained docs, bug #349754, upstream bug #623150
+	strip_builddir SUBDIRS tutorial docs/Makefile.{am,in}
+	strip_builddir SUBDIRS faq docs/Makefile.{am,in}
+
+	# -O3 and company cause random crashes in applications, bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	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)"
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=617473
+		sed -i -e 's:pltcheck.sh:$(NULL):g' \
+			gtk/Makefile.am || die
+
+		# UI tests require immodules already installed; bug #413185
+		if ! has_version 'x11-libs/gtk+:2'; then
+			ewarn "Disabling UI tests because this is the first install of"
+			ewarn "gtk+:2 on this machine. Please re-run the tests after $P"
+			ewarn "has been installed."
+			sed '/g_test_add_func.*ui-tests/ d' \
+				-i gtk/tests/testing.c || die "sed 2 failed"
+		fi
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+	fi
+
+	epatch_user
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	[[ ${ABI} == ppc64 ]] && append-flags -mminimal-toc
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
+		$(usex aqua "" --with-xinput) \
+		$(use_enable cups cups auto) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable xinerama) \
+		--disable-papi \
+		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in gdk gtk libgail-util; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+
+	# add -framework Carbon to the .pc files, bug #????
+	# FIXME: Is this still needed? Any reference to try to upstream it?
+#	if use aqua ; then
+#		for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do
+#			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
+#				-i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+#		done
+#	fi
+}
+
+multilib_src_install_all() {
+	# see bug #133241
+	# Also set more default variables in sync with gtk3 and other distributions
+	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
+	echo 'gtk-theme-name = "Adwaita"' >> "${T}/gtkrc"
+	echo 'gtk-icon-theme-name = "gnome"' >> "${T}/gtkrc"
+	echo 'gtk-cursor-theme-name = "Adwaita"' >> "${T}/gtkrc"
+
+	insinto /usr/share/gtk-2.0
+	doins "${T}"/gtkrc
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+	# dev-util/gtk-builder-convert split off into a separate package, #402905
+	rm "${ED}"usr/bin/gtk-builder-convert || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make immodules.cache belongs to gtk+ alone
+		local cache="usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+	multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_query_immodules_gtk2 \
+			|| die "Update immodules cache failed (for ${ABI})"
+	}
+	multilib_parallel_foreach_abi multilib_pkg_postinst
+
+	set_gtk2_confdir
+
+	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
+
+	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then
+		elog "File /etc/gtk-2.0/gtk.immodules has been moved to"
+		elog "${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
+		elog "Removing deprecated file."
+		rm -f ${EROOT%/}${GTK2_CONFDIR}/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
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+	fi
+}
diff --git a/x11-libs/gtk+/gtk+-3.12.2-r2.ebuild b/x11-libs/gtk+/gtk+-3.12.2-r2.ebuild
index 92f543983243..fd7b4b0e5ddf 100644
--- a/x11-libs/gtk+/gtk+-3.12.2-r2.ebuild
+++ b/x11-libs/gtk+/gtk+-3.12.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.12.2-r2.ebuild,v 1.3 2015/02/08 21:07:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.12.2-r2.ebuild,v 1.4 2015/05/17 10:13:32 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -24,7 +24,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS=" arm"
 
 # 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)
diff --git a/x11-libs/gtk+/gtk+-3.14.10.ebuild b/x11-libs/gtk+/gtk+-3.14.13.ebuild
index 2e8a37ee37c5..0cb72ee44309 100644
--- a/x11-libs/gtk+/gtk+-3.14.10.ebuild
+++ b/x11-libs/gtk+/gtk+-3.14.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.14.10.ebuild,v 1.2 2015/04/25 18:40:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.14.13.ebuild,v 1.1 2015/05/17 10:13:32 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -94,7 +94,8 @@ RDEPEND="${COMMON_DEPEND}
 	)
 "
 # librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="gnome-base/librsvg[${MULTILIB_USEDEP}]
+PDEPEND="
+	gnome-base/librsvg[${MULTILIB_USEDEP}]
 	vim-syntax? ( app-vim/gtk-syntax )
 "
 
@@ -185,12 +186,13 @@ multilib_src_install() {
 	gnome2_src_install
 
 	# add -framework Carbon to the .pc files, bug #????
-	if use aqua ; then
-		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
-			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
-				-i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
-		done
-	fi
+	# FIXME: Is this still needed?
+#	if use aqua ; then
+#		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+#			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
+#				-i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+#		done
+#	fi
 }
 
 multilib_src_install_all() {