Version bump, drop old

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

5 files changed, 58 insertions, 504 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index c703cdaa4061..63ae1fae7bcb 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.699 2014/03/28 02:13:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.700 2014/03/29 19:48:14 pacho Exp $
+
+*gtk+-2.24.23 (29 Mar 2014)
+
+  29 Mar 2014; Pacho Ramos <pacho@gentoo.org> +gtk+-2.24.23.ebuild,
+  -gtk+-2.24.16.ebuild, -gtk+-3.10.6.ebuild, -gtk+-3.8.7.ebuild:
+  Version bump, drop old
 
   28 Mar 2014; Jeroen Roovers <jer@gentoo.org> gtk+-3.10.7.ebuild:
   Stable for HPPA (bug #499954).
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 7f8d4bab4a6c..f2c3676f9fb5 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -24,31 +24,27 @@ 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.16.tar.xz 13435020 SHA256 93cd69cc2cecf9a3aa31a50caf4a24752a6928a48c527ae967b109df6f9302d3 SHA512 0b3b7be3eea1372b9fe1a9a4ddaaabaf92ed1437d3c3c281f936b847cd9cb5a1e97f4b8496009faec00c182719a16767b9061efffbd03c0770b35c099f43cccf WHIRLPOOL 17057f2b4d5b8f071014adb7e0114fef1406590216e09bf745e205baa1bcd4104559a452b422870472ce3f5b5700dda894ecc2e7914e2fa7ae4d4f86235cf63a
 DIST gtk+-2.24.17.tar.xz 13288028 SHA256 e947b2b460156d98e8e38930b82458e1d613a71eb26e927f966f7081a640f415 SHA512 7a83555b4b6eb534bbdb77eae85164e182d68f786a72dcdbf41e221a25af0981263cc6637427cdf8984f82064927fb38d370d3f8621b7b056b3b5dbd92bcaf79 WHIRLPOOL c4693da71887d5eaaf17bcc60a0e65c60a745eeed5d02534019cae3f9c1baaaae919fdbfa2076999f795aaa2c7be8d1403f2a45a3fc9993eff5a456b0ac0311d
 DIST gtk+-2.24.22.tar.xz 13376344 SHA256 b114b6e9fb389bf3aa8a6d09576538f58dce740779653084046852fb4140ae7f SHA512 be17f877eda8dd80c063dfaa0d1db2efbcdf699550bb740718b809d132a4e75cc074a53d9a03529f079a3d51527fb0841092d702f6d2afb92333b2c7ebb45993 WHIRLPOOL e4a588b588d29aebb79ce47dc161d1bcfeb7d12e6f500bcd4e03bea7d2d9fe399cbde471c40b668775463f11b72f600e5ebf36d65b59d4ea3574e14848f7260d
-DIST gtk+-3.10.6.tar.xz 14387620 SHA256 3c24c57fc5cb7a5ea39d3a3ff7b12be63d7f21a52fd6f20f7b983e19b7b0268a SHA512 2619d2e08dbdde41528ad132f120c91b7536d01a6932a9dc9ac5c5b2ba7e68bcebbd91374189160519da20794957b5dcd05502f92c2acecb01bfc99444f0617b WHIRLPOOL 03d8673f570972fbb16e69fcd4cc9d445148fc7adbe59597384f3f7e9ff317f6c10bc800719dfff0181edf2dd24a5561eafaf1d85babd446f21b957155061d56
+DIST gtk+-2.24.23.tar.xz 13316276 SHA256 a0a406e27e9b5e7d6b2c4334212706ed5cdcd41e713e66c9ae950655dd61517c SHA512 e6db7d61d753f5d8ce0f41e99b461decda364d04314ff58838d2f98f29aab22313c0b5898f2cf56ddd3a18e0544f47ad796e673390d464ee2160b2542c5f558b WHIRLPOOL 65d5e277ee416bef424fa5ec424363f3f573007fa778ffef0322b75ac6835680c1ea30dc30dc03c1a8ff7b4b732df523509e573141364fcdf8cf367f8dd459b6
 DIST gtk+-3.10.7.tar.xz 14363820 SHA256 b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427 SHA512 cb138b468b8ea159b2fe7888500f08665cf54a66a042bf507539f4d8791e4dde074a98a87f6c6a36094d3996eb300f4a70b4fc9604709f9af6f7ebfb73efe3b7 WHIRLPOOL 5db9a67e620339c042530115b974f177102af003fdeab0d58eb1075f30daf4674aeb97756f3aa397e5471a5b94a251f36c782f6631315408d80c4c1b53bf4c13
 DIST gtk+-3.4.4.tar.xz 12854476 SHA256 f154e460075034da4c0ce89c320025dcd459da2a1fdf32d92a09522eaca242c7 SHA512 1a16f54a511f85a22f74a8ea82d218efa14ea5a58fc94fca805b0e321bdcea48a5f0a018a6d996c954ee80a51a2a16b68bdb2e3f3ab57c2362f3241c6cfa9a56 WHIRLPOOL eb1d117544aafec4936920a668b684959e89383b5b014512b82be0e99b7e48e3bdf81ceff4202b64179df4aa77453390d85a433d6e913cce8740a6b31701b15a
 DIST gtk+-3.6.3.tar.xz 13274804 SHA256 da376bc0623650b1560c844d94dc3bc259edb7cac14ebab1ba3325b566213801 SHA512 40534e2404b63c25a402a84f551e07e190d70f5fabd14ae01373dcea409a9e8ee1a71578e3e3c23fe6358abec87675499e7a4ded67f06d0a46b51407c9bf0d05 WHIRLPOOL 26696a105c29214289ab9816482e36d7ec77f5b903574b1ff3e340ae9e8ae8da73ad26bae9060f9293be32743eef5f4c1280d9bfd27656da0e758e41a17b4d98
-DIST gtk+-3.8.7.tar.xz 13847376 SHA256 9cb4400922fcd7b71bf899036dd3d09cdcc61af8e5a0f302121c1686c7d67c89 SHA512 cbcf205188baafdeff3e58bd54a4b4f3a55e4d98938cb56f973825eebdb7a5eeb3337aee97dcff85e059520d2cfd830b01b02b36252f225291045973df5e1207 WHIRLPOOL fff4ba16809a2262e939a44c3b6d182108b47ad1d2f0a6d99d5a4e9018b0a51c8c043c171291b22048aa67970d2cbeb0859cd35546e3b50933aca657d9ed4d29
 DIST introspection.m4.bz2 1181 SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae SHA512 4af08dc9a7b495949b61861d7e1a1184650dc33ab1b595544d8bef14d397a3759d97361650ab0e4812390f5fb5e812818937a2d5121246c651edd7d39a076a11 WHIRLPOOL 6b9de2bee5898a9645c07c68586df5e96205d52fb6a6c77c971e8c0742f8436fce76de2b553d0533fbbe4976363180b49ae201c1a1303dfa05585db32ebc61fc
 EBUILD gtk+-1.2.10-r12.ebuild 2406 SHA256 03e22a0e23e19cc0ad87697527ac186aeb6904b7e007bb0c023196f80765b716 SHA512 fb4a7905b5d6390a9d12bd5b0dd8e1b19744a5620279da1ae8c6962c80db44b9707dc6cd4d3a80cb091b5f4cfeacfeee7f5ebe46d1ecd2a3f720d8ccb73d8be4 WHIRLPOOL f3414b479f126236bef1670a51b46a2c37553f1c37edc912ed121f807926fa2dc87bcc8af1fa079cd12eeb8bc3084a4348948565356621c6a1ec267f40da1235
-EBUILD gtk+-2.24.16.ebuild 8049 SHA256 4349490584f7da6a16198d7766c0e9b397a29703697acccb2c35735c6e46abd6 SHA512 04a6149dd66455355cd50a41c2c876480075992036dac543b1d778880204951d973df644cbf0ea3fdad369e4c7f8e1c2ea13456b76c69eba9dec6f0518970bee WHIRLPOOL 269a870419068b2649a028252198c18066b67a40d920e2ce81142eadbdbe86489e36a14f027d5c298371d5cbec7bd282c48c9776e6d2b10708ba5037d21e2aee
 EBUILD gtk+-2.24.17.ebuild 8305 SHA256 619b0e80c99e19d9fa0beda14d35b79512537008943268adfc566b5a2641245f SHA512 53aef81203c586ab8839f67de12ff0d27498a35d526d30e6f09d24f6fa9179cc52d3d7da45c663facd184deba54c27b502f8d7f1341875022694eb82c83ed53e WHIRLPOOL 8a4e9e5882354e9fa63dab7250d669f808b91799051521ab181ad6e117cd979bcc79efa0b900523baf11c3476fd923936cfe77a46b3a7cf381d38920abe13c22
 EBUILD gtk+-2.24.22.ebuild 7891 SHA256 490adbc88adfe180e98a6c2407418a14b68be1279ef0d1c1a10917f3d97e8091 SHA512 2cea8d2bf622cac8a69a814e4ba4134ea8687bd3e375513c15087e450a5cbc108f2043b09385abab4a74b44cff18bd91a190cc584fb23df8b1ce923093111245 WHIRLPOOL 9474c552c88d3e13c32097221ae94254e06b06104f101bcd0e6f47a13bc3d8e18ef0accb51a4112cb9890a54c3b19ca98f8fabaadfb08405507074cf8df0da78
-EBUILD gtk+-3.10.6.ebuild 6643 SHA256 a800f6b3dec0827cfbf494aa44c126af31351e42606a32bb06127a8b7a4cb30b SHA512 3eacb75367e7bfce9d9978f71700190110ea9c8afbfb1ff67a81d16aeadfa784f6c439314be715ce37f9033a6f80bbbb1591799bd432d22c70b9a41208edf3ad WHIRLPOOL 5828c316da57cfb1484c28ffc6a13735c8f2cb1eea05137d8f54dd1ccc754f1901090b60d8237fb63826b27707969bd6988f156fa70bdc7d1cbc3c67b2c2a1a9
+EBUILD gtk+-2.24.23.ebuild 7810 SHA256 d2d5f4f83965ab5aa0e4d9117ce86dff6333451b7f508842bbdaffc9dc543168 SHA512 3279d3a7ae4d1be0706cc3b21b4c3cead3870439777a775dd7ba8c43a8b6046b052a0d68437da01dc4e011ede9be9263935f5474949233872ab3ad8ffd6c8dc6 WHIRLPOOL 97aecd42c82eaad8885fb95f649ef2b18f462acb43cc3407296f9e9c8dbfa8ede492ea1c2f1d75598e3a8c23fee0004c27116b09024204d4faeec4707581828e
 EBUILD gtk+-3.10.7.ebuild 6548 SHA256 6060cadf98da8c47f00613635053d4a9c3808ee1587e36f0dd67db6f1083396e SHA512 7a69f8f79e91409e36b1682f3cbd1dc5a0fb7f9c13a1105c873101ecaf9bbd1a26067265916f6929d7fc2d28dc02c6e54d6d5f768b38f11e4e85e4e3a93a658a WHIRLPOOL 4acc3d397dae1ce9c89a43fae2768c2cfade85c8efc37680d5699024f8b8b13352892612abad84ecfbb691f764f5e92850c4c3d0c5f2b07511805fdcf6926669
 EBUILD gtk+-3.4.4.ebuild 7076 SHA256 aa0defe046743a54ec62a77bd6f778179741df78faf35a154b01461ec0739b7c SHA512 adf621a389b83a55299aefb964fb49baff2f76f700c9ddb3d4dd96defa04b1d6b3dfb928e5b9d80aa1c86ea84fab77573ef508d73927f9a44ef1b814b4af03b4 WHIRLPOOL 989fc4c62b80d70e6e26c643d8366dfd5bce856fa12fcb7947e9c553dea6ad493a3d3f5d33fb0ca528dfcc6186bb2db6a48002f0a88a677459f25ef46f147975
 EBUILD gtk+-3.6.3-r3.ebuild 7364 SHA256 912daae1ce9cca1d0abd631bdeac90c6c0d705a5f46b1e5f40dcfae7243c1681 SHA512 5c6e8438c52b9a4259f47fa64e152f0fba69e5a35d9148b5d18ae321667e87ee9686206c493d880a2d12231c1a54fea2843646e74076cb0e5aeb37765c900fce WHIRLPOOL fd7d76f17d1d734cf7da6b056d264791d29d0834ea90a842641c96208520403dd26a0619334c22158919cb5453746a1ec4e34580411754286337344dd0043888
-EBUILD gtk+-3.8.7.ebuild 7108 SHA256 bfab31d7204f2ab0bf8949be435b2a6e1652c9027d91bfb7518ce3fa33926807 SHA512 38ab920f1f338f491ae888a279f89d5c3ebf304503e63fbed2118be1b55599d32afdc2015dedcb3ef9bbb1ad07d8553677e731383851e9e2566e46d747942b8a WHIRLPOOL ee2de855c653790626b8f5f96966969259c1e0fbead8cf8df35370de9a8f9eb90bd3e7cb8be09aa2feabfaf49fb680a35ccd8ca7d506c63af32fdc62ecc427b7
-MISC ChangeLog 10638 SHA256 6282c9d1bff7b19b576d10d50480237b9a135e0ee36f8bf55995c9c77cebb735 SHA512 cb6d2e6daf36a042724c8287d77c9a4533fa108d457ffe614a078555acd7f08e98ed45efa6a75e4cfc3e39e8f8a8518c85aaa7826a86c36e600039755dc40b59 WHIRLPOOL dc16d413401f045cd7103b50c00bff6430fefd9238ba29f0159b199ef673ec08a50d3372d16fc2e2fd9c59e1886b63183cd3667775e1f34df567800c8bbb2af7
+MISC ChangeLog 10828 SHA256 19a84b0bd438518a29635172226473fe90d12957dc9cb66d8ad109396d150ec8 SHA512 e05b67b4eef12b09306d44ab4749de8ed066eec7ef4e10c97efd3676bcec480ef7cbee87a35da3a165c36a7e10e226febeef3888511d4acb65d98e029de2a3f3 WHIRLPOOL 21f0716a54a63f785b67452760c4d3123c9fdc69c17175a59043be721cf8f46ab7f0cb543e53bf0c8c45a39a58ab90dfeaf2a93a4329df1e3d404283bea51c32
 MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec
 MISC metadata.xml 902 SHA256 f4bad589c3732f53e882bde561c44c6b1beb6fe0bea42f2149e1f3fd07929ffc SHA512 aec419c5cd0cb202c00ede6a7bd822fbe562654d95dab37f5fcd4ac47dfa19d20573a0dbe718fb582b0eaf2cc1636302825df5363075d09b3fb7f2eba7129897 WHIRLPOOL 89cb8aadfb3ae4c90d48997f8dbafd7d17da02a3ded145ce5b5ff17302353c181f9729d1e161e6cef163dfaf947624fb4526bb08e7d13675ef47aee59f4458e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlM02s0ACgkQVWmRsqeSphMvwQCfWLaSxtWeuKRPbe22NRzk676K
-tjcAn0tJ6MZEUaRtJ/dHUyi1E49BpAJ7
-=DA2Y
+iEYEAREIAAYFAlM3I38ACgkQCaWpQKGI+9T5SQCfdWnB3W8agCFIMiNkPn6cNuQb
+4pwAnAzxAFezZbj4Qf7RImwaMMKp3cJb
+=oZ+M
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-2.24.16.ebuild b/x11-libs/gtk+/gtk+-2.24.23.ebuild
index 79b824b7f526..e74e617cc71b 100644
--- a/x11-libs/gtk+/gtk+-2.24.16.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.23.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.16.ebuild,v 1.14 2013/09/08 17:42:12 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.23.ebuild,v 1.1 2014/03/29 19:48:14 pacho Exp $
 
 EAPI="5"
+GCONF_DEBUG="no"
 
-inherit eutils flag-o-matic gnome.org virtualx autotools
+inherit eutils flag-o-matic gnome2 multilib virtualx autotools readme.gentoo
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="s390"
+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 ~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? (
+COMMON_DEPEND="
+	!aqua? (
 		x11-libs/libXrender
 		x11-libs/libX11
 		x11-libs/libXi
@@ -34,14 +35,15 @@ COMMON_DEPEND="!aqua? (
 		x11-libs/gdk-pixbuf:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.30:2
+	>=dev-libs/glib-2.34: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"
+	!<gnome-base/gail-1000
+"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	!aqua? (
@@ -53,14 +55,26 @@ DEPEND="${COMMON_DEPEND}
 	xinerama? ( x11-proto/xineramaproto )
 	>=dev-util/gtk-doc-am-1.11
 	test? (
+		x11-themes/hicolor-icon-theme
 		media-fonts/font-misc-misc
-		media-fonts/font-cursor-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
+# Add blocker against old gtk-builder-convert to be sure we maintain both
+# in sync.
 RDEPEND="${COMMON_DEPEND}
-	!<x11-libs/vte-0.28.2-r201:0"
+	!<dev-util/gtk-builder-convert-${PV}
+	!<x11-libs/vte-0.28.2-r201:0
+"
 PDEPEND="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"
+
 strip_builddir() {
 	local rule=$1
 	shift
@@ -76,15 +90,8 @@ set_gtk2_confdir() {
 }
 
 src_prepare() {
-	# 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
+	# Fix building due to moved definition, upstream bug #704766
+	epatch "${FILESDIR}"/${PN}-2.24.20-darwin-quartz-pasteboard.patch
 
 	# marshalers code was pre-generated with glib-2.31, upstream bug #671763
 	rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \
@@ -145,17 +152,14 @@ src_prepare() {
 
 	epatch_user
 
-	# 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
+	eautoreconf
+
+	gnome2_src_prepare
 }
 
 src_configure() {
 	# Passing --disable-debug is not recommended for production use
-	econf \
+	gnome2_src_configure \
 		$(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
 		$(usex aqua "" --with-xinput) \
 		$(usex debug --enable-debug=yes "") \
@@ -167,22 +171,15 @@ src_configure() {
 
 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"
+	Xemake check
 }
 
 src_install() {
-	default
-
-	set_gtk2_confdir
-	dodir ${GTK2_CONFDIR}
-	keepdir ${GTK2_CONFDIR}
+	gnome2_src_install
 
 	# see bug #133241
 	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
-	insinto /etc/gtk-2.0
+	insinto /usr/share/gtk-2.0
 	doins "${T}"/gtkrc
 
 	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
@@ -193,17 +190,15 @@ src_install() {
 	done
 
 	# dev-util/gtk-builder-convert split off into a separate package, #402905
-	rm "${ED}"usr/bin/gtk-builder-convert
+	rm "${ED}"usr/bin/gtk-builder-convert || die
 
-	find "${D}" -name '*.la' -exec rm -f {} +
+	readme.gentoo_create_doc
 }
 
 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"
+	gtk-query-immodules-2.0 --update-cache || die "Update immodules cache failed"
 
 	if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
 		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
@@ -211,6 +206,13 @@ pkg_postinst() {
 		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"
@@ -237,8 +239,5 @@ pkg_postinst() {
 		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"
+	readme.gentoo_print_elog
 }
diff --git a/x11-libs/gtk+/gtk+-3.10.6.ebuild b/x11-libs/gtk+/gtk+-3.10.6.ebuild
deleted file mode 100644
index c571f32067df..000000000000
--- a/x11-libs/gtk+/gtk+-3.10.6.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.10.6.ebuild,v 1.2 2014/01/20 21:23:54 pacho Exp $
-
-EAPI="5"
-
-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 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 ~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"
-
-# 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="
-	>=dev-libs/atk-2.7.5[introspection?]
-	>=dev-libs/glib-2.37.5:2
-	media-libs/fontconfig
-	>=x11-libs/cairo-1.12[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
-	>=x11-libs/gtk+-2.24:2
-	>=x11-libs/pango-1.32.4[introspection?]
-	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 )
-	wayland? (
-		>=dev-libs/wayland-1.2
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3
-		x11-libs/libXrender
-		x11-libs/libX11
-		>=x11-libs/libXi-1.3
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.3
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		xinerama? ( x11-libs/libXinerama )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.11
-	virtual/pkgconfig
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/damageproto
-		xinerama? ( x11-proto/xineramaproto )
-	)
-	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() {
-	gnome2_environment_reset
-
-	# Build fails with USE="wayland introspection"
-	# Fixed upstream with commit 8dd899dae (and will be in 3.10.7 tarball)
-	rm "${S}"/gdk/wayland/gtk-shell-client-protocol.h || die
-	rm "${S}"/gdk/wayland/gtk-shell-protocol.c || die
-
-	# -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 testsuite Makefile.am
-		strip_builddir SRC_SUBDIRS testsuite Makefile.in
-		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
-}
-
-src_configure() {
-	# Passing --disable-debug is not recommended for production use
-	# 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 \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable colord) \
-		$(use_enable cups cups auto) \
-		$(usex debug --enable-debug=yes "") \
-		$(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-gtk-doc \
-		--disable-papi \
-		--enable-man \
-		--enable-gtk2-dependency \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-}
-
-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
-
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
-	prune_libtool_files --modules
-
-	# add -framework Carbon to the .pc files
-	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
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-
-	# Make sure loaders.cache belongs to gdk-pixbuf alone
-	local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"/${cache} || die
-	fi
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	gnome2_query_immodules_gtk3
-
-	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
-
-	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
-		rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.8.7.ebuild b/x11-libs/gtk+/gtk+-3.8.7.ebuild
deleted file mode 100644
index 83dbcd7aadbb..000000000000
--- a/x11-libs/gtk+/gtk+-3.8.7.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.8.7.ebuild,v 1.6 2013/12/22 15:41:37 jer Exp $
-
-EAPI="5"
-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 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 ~arm-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
-# at-spi2-atk dependency needed due https://mail.gnome.org/archives/desktop-devel-list/2012-June/msg00035.html
-COMMON_DEPEND="
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3
-		x11-libs/libXrender
-		x11-libs/libX11
-		>=x11-libs/libXi-1.3
-		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-1.0
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2
-	)
-	>=dev-libs/glib-2.35.3:2
-	>=x11-libs/pango-1.32.4[introspection?]
-	>=dev-libs/atk-2.7.5[introspection?]
-	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.27.1: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
-	dev-util/gdbus-codegen
-	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() {
-	gnome2_environment_reset
-
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	# FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=654108
-	# epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
-
-	# This files shouldn't be in tarball, upstream bug #709974
-	# This needs dev-util/gdbus-codegen in DEPEND
-	rm -f gtk/gtkdbusgenerated.{h,c} || die
-
-	if use test; then
-		# 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 -f tests/a11y/pickers.{ui,txt} || die "rm failed"
-
-		# Skip failing tests, upstream bug #698448
-		epatch "${FILESDIR}/${PN}-3.8.6-skip-filechooser-test.patch"
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=710467
-		rm -f tests/a11y/buttons.{ui,txt} || die
-	else
-		# 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
-
-	epatch_user
-}
-
-src_configure() {
-	# Passing --disable-debug is not recommended for production use
-	# 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 \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable colord) \
-		$(use_enable cups cups auto) \
-		$(usex debug --enable-debug=yes "") \
-		$(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-gtk-doc \
-		--disable-papi \
-		--enable-man \
-		--enable-gtk2-dependency \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-}
-
-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
-	Xemake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
-	prune_libtool_files --modules
-
-	# 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
-}