Version bump, drop old.

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

4 files changed, 267 insertions, 231 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 006a103fb1a6..ea5ec5088e16 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.665 2013/06/05 00:43:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.666 2013/06/18 19:55:00 pacho Exp $
+
+*gtk+-2.24.19 (18 Jun 2013)
+
+  18 Jun 2013; Pacho Ramos <pacho@gentoo.org> +gtk+-2.24.19.ebuild,
+  -gtk+-3.8.1.ebuild:
+  Version bump, drop old.
 
   05 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 6ba77701f7b1..cf099bf7b306 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -22,36 +22,26 @@ DIST gtk+-1.2.10.tar.gz 2868322 SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e5
 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.18.tar.xz 13344536 SHA256 6c963101272ff53bb5b01d21bfb86cebba5f0a68f31c5e10523c63f07e762385 SHA512 5250ae00c8d5fcefded54c8476e45f6bcc69d1207457ed53a23cacf3986cbbbcd115c2b5b823c1f90f1e21de4eafb40c7081a7175943ce2adda593bf2759d0da WHIRLPOOL b899c19756ccd8f558ea4da43cf97ddf286c8315836bc6b7457c8a244d9d856d3c5ab62ec1972388ed4f774a1b3c0cdc8cdcba0665d293fc50e1006df1a791ea
+DIST gtk+-2.24.19.tar.xz 13374160 SHA256 15b8bf463eba99abfa58270662914e8e9b83568ab4945b5f0ef1aa29e90becb8 SHA512 89df9bbaf971beeb3390c433a80a8c64ebc1722ba83bb1bc3aefe4013d354c5f40bda43cb7c9b0a42a904fd8de02e12e12b964334bd43c6a4748756c56b0f950 WHIRLPOOL efa766e2ffb86e367b3983ebaf5f8d245fa6d52edcb4f2d88afda75912f17f908a850c8a43ffa737121cbcb0ce6c3bb390d6104f65dac02a08e3f7939d7e12c3
 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.1.tar.xz 13675144 SHA256 f43e7c7d7a0e2417225509e88f67799534c69abfbb6f615fc7a895bf15e31255 SHA512 384c629f652452113d627967eca926ab66ee22ed6ed1b7d0d3f74bc8d8940cf82f0a91209d0d4fd28acf732404d2312d38992fbc47763e3baf453d9e9692ff08 WHIRLPOOL 750e5173dc1ba4714a6a6084a620045aff1e15de7c97b65665e97faadb80d3923701408e2119fce90654019f2c40e1441ffade1bc6e8f3e17f7c388f963ca7f7
 DIST gtk+-3.8.2.tar.xz 13701516 SHA256 1ca80c9c15a1df95d74cefb8c2afe4682ba272a4b489106f04877be2a7aff297 SHA512 20958c192fe881281f6885e2d7cecc4e2700fc01ef8006304f1fb8befe8f6628cbdb06c0d801f109e5805d58f327ca9a07d5e2c7f938116c99db8080d0c2f83e WHIRLPOOL 5fef2b68c58a3337127a5afbe3457c012b8bb7b3ba222ce8fdf4c338c5d639eaf7933b190b71f003dbb8d9698e1ce96e08dc4506cbf8670692dd8f80023814e9
 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 8295 SHA256 3ee00ba54882021d12aa9be3e65ac59cb58c270e121256c8852b511e193f5a1a SHA512 a98318201eb30caca991250def12a5742aaa9b3d3b17787b37bdfe0cfdbc589930795c7b3538faceb611c1efb15f35a11c8fadddac0d2feefd2310748663a8f5 WHIRLPOOL dccdd749b4dfef75b6a29a7acd7274c48ddbed7634b5702bbc6e543db9427f985f47ce79ae23c79a6e4b5b07f35498c2822ee7ddec337307e6d451cb4910a3f5
 EBUILD gtk+-2.24.17.ebuild 8322 SHA256 ffecf60222a8ad35a7b5fa03ad362344b2cae15e9e2b06a35906f9203ae5ec07 SHA512 cdb3c7cd9742882ac43075b14323a84ff4c7518e870494e9488dbb0d919d99e0c924896d9da84c6fdd6c06488bc883449edfeb401282cb9f38d62af132c7c6e1 WHIRLPOOL a3f967355c1c0207261f0eea634cf71865cc9bf63a52b007efb55b45e10a2e5df4379c670bec34fa4f1ed79227d42525f469d84810d80d3a07acd163aeb2ce38
 EBUILD gtk+-2.24.18.ebuild 8113 SHA256 7d562607d22f6d9d61e539fe6d88e97adb7d6779fd05283b27fce75747bc326c SHA512 aea325af629447d5404dcfdac82f820b1085f08455c324e62dcb5cc168779cdc53472d74cfbd8b75e734a9fd0e93d854775ef5dd8836a605ac446538d0676b29 WHIRLPOOL 1a3aacc8fe33bf6d54343fe80e9a865596a6036128039b0f124fba25ea681277df9dfdb0374b39134e9e2da36b5d99edb1b3358a823123af341f3b2ec993649d
+EBUILD gtk+-2.24.19.ebuild 8185 SHA256 fcabb8ce02d43c94c10feed1528e4e90815885522146b9c6cc2d4a90ebe045d7 SHA512 d8cdc2bc8f02d9ac4ac4b43915d37a3571d403e65a25a7e9721fca41d9d3801419309a4c960581b148e93fc9910d51d76b6d9acf30295347a41b6e556b800f0d WHIRLPOOL f36d503b640e95fed1221e4fbd5bea97db4ea4c1975d63f06ba14ee01efab0cd436b39a073972f994f2678f53abbc93d36edb8da2bc985ef926897efaed71e81
 EBUILD gtk+-3.4.4.ebuild 7093 SHA256 8b6b52b25cd14140fcd54ad1c9e6cefd46d3194c740d8fe16890fa02f1bfac85 SHA512 9698a2de174e1d122f30d8ed185e026b3f7be2992574341127027347f0ffd62890b21a2f9829c2aabad2b5bc823147f956515f87f501fd2bee45a32ed858544c WHIRLPOOL c918ffcdf90c0d966f4881c374490281c73d5d9ed06d11e32406ddb436624c42a23e6eba9cd1ac38115deac8246c5857e74f9b482f8797c16cd1d36a6c013b52
 EBUILD gtk+-3.6.3-r2.ebuild 7140 SHA256 98849d610bd1d0f6a768d592fb1aeb5e73091bdb4171badc44d2a4cb7a1a3cc5 SHA512 cff7b64f6ac55f625712076674f482069197361cd5e1235a0724142b983f926566488aa96e26bcfd57209f5d174daf286e0e4ac6a8e2c10f5fa9fd90ae8dbba4 WHIRLPOOL bfca4104ebdacee63c5224910a82550a915fd03744f4ef14b80eb18c438d4b613048b7b3cbc19e333f8f7e1fb79e3a1835151738f2ec58fcaff8c500f2784a24
-EBUILD gtk+-3.8.1.ebuild 6741 SHA256 b8883558252297fdd206da787b1d6d13ae960f2b4db67c425959c19c2ea28ba5 SHA512 1fa386af050204a48312474252104aeac66335292a41ebbb390b13547c4ac3cf48d859ec0dc1b9e405e9ffe48bb9c45f767b01aa9af1d7db774000e31dfbfe6b WHIRLPOOL 2dc81c01ad63c9497dafa3c900574b64193d78b0fa2046f35e078d5903b8573bef31d2e991ef1f878f7f85ca891dc0ee02a78251b4bcebbf251e773bfa45ad6c
 EBUILD gtk+-3.8.2.ebuild 6557 SHA256 830bc28cdd17ba3b3039265f4199242f0d5fe852e8289bff42a099296560c09c SHA512 a39970e673901672d71c9cda497974996a1bcc81795f0a96c54200c3009d8de0cd9731d57af7a7f89585ae83c2a42dcff205ef784aed9e1947f69543d3d4479a WHIRLPOOL c7589e5c3953243b03ce2064141ff60b974df30b3cf2422040158d800c317044ca4fb2e4d6fad55476ce7c213a518c433fa246a88143c15cb21cb0b4f6c06557
-MISC ChangeLog 5730 SHA256 cbe69ba31cb10b82a5873ff61b485f0272026fb7cfc17d362546029f70359eb7 SHA512 e18839bfb6d40ec082e327320029e7acfde03406df53d09e9128a0ae18b4c3ae5b7f898e1389a3468040af634f8124dbee9168fa77a8086cad32bb3548f4ddcf WHIRLPOOL 0b6d629abbc8d053a6de392174d6da2d6b82360b2bda00bece3fe4853a8852ad8ddb882b7d38115a8ad129933ff1f2dbf1e82865a797efdb8d13ccdcf4968c42
+MISC ChangeLog 5875 SHA256 c080552d6d52633b728d95c797dadb5ba24f6ab9db019c92615f28389fe8fede SHA512 f259cd4fe32a6a07b535fa76b453d6db3824964a4c20c90b7b13412e584eb7cfc87478fa2a7fe01599627e6984613f76b07dcdad28b758c790a20c761d1cff72 WHIRLPOOL 9f2538a19df3322dd54b2263a479e9d324c6f31a02bd76fd0741257fa9182d0cecf61cd4341baf18f3211ef5e34331618f1163c9d27a4c86f0dcd1ebe813c0fd
 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.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRronRAAoJELEHsLL7fEFWbioP/isDBvt27FXaE97vm/4C6WL9
-eoUFgZRKJxHALFyx1Tw8a2cH2Vz4pkH5WZkA/7caFpj6Pdw+Jooe+5sCn6fjmaRO
-Y0A/SIRZAjsufxVT3NsMxdsLeORrHFGiYhhGE1Kc0m7LEbTa9XIGKFzR2pQTli3k
-dveU0ehLZAnTpoGnZvZDHQM4RtdE7rCxZCiWwYTLcRkAr3wAEOpRTIU+ytPR7mIG
-W7oArciyWF/qG97JbBefcFAnsCA0M3dNimv/Xsq0UghcncJ+Q53BN0/TzkxnLrfF
-njq4mT/KPaobt2TBIUAT9DVKRf0R4QnruI5AT8Pe45EVSpuazoq+koUMPn93TTY4
-Zw+CyCwDTh1cz6raKRQDOljai04MytOKl76WgSgyTpfINu8kUqEcoGMhXD6rKw5m
-Xo9p3b7Fqab6WN/NqqMxCxPupkDD6jcz/5UdYsr0W56t8NczwPQsxeO2UmRZzUnz
-KTKgd/YR17ubsUDOC2FNkqKPSBDrKxInrBBHQNeLoTou90xYb3eVMhqrD4P3t4TE
-jiI12sPcR3mrJ6Xjd17Rf8KznQfpFGOZ9jKx4I1N3n0vNApmEjjwSRFI7XW9iFUz
-bLcQg1apD6bSegxoliVzTYEU0RVleqM9Mu1tPmPYkuJa30do+S+aQJ7SfPHoBc73
-S+w++GIdZHYqyzZnkU2t
-=nlBC
+iEYEAREIAAYFAlHAuxUACgkQCaWpQKGI+9SbHQCgh40aOxzvytf2zI7QCETBDEdp
+Zc0AnA+1VyH0pusgbrUicDKqkf9Mzjae
+=h0iV
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-2.24.19.ebuild b/x11-libs/gtk+/gtk+-2.24.19.ebuild
new file mode 100644
index 000000000000..334161a3e543
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.24.19.ebuild
@@ -0,0 +1,254 @@
+# 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+-2.24.19.ebuild,v 1.1 2013/06/18 19:55:00 pacho Exp $
+
+EAPI="5"
+inherit eutils flag-o-matic gnome2-utils gnome.org virtualx autotools readme.gentoo
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+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 ~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? (
+		x11-libs/libXrender
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXt
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.3
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		>=x11-libs/cairo-1.6:=[X,svg]
+		x11-libs/gdk-pixbuf:2[X,introspection?]
+	)
+	aqua? (
+		>=x11-libs/cairo-1.6:=[aqua,svg]
+		x11-libs/gdk-pixbuf:2[introspection?]
+	)
+	xinerama? ( x11-libs/libXinerama )
+	>=dev-libs/glib-2.30:2
+	>=x11-libs/pango-1.20[introspection?]
+	>=dev-libs/atk-1.29.2[introspection?]
+	media-libs/fontconfig
+	x11-misc/shared-mime-info
+	cups? ( net-print/cups:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+	!<gnome-base/gail-1000
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	!aqua? (
+		x11-proto/xextproto
+		x11-proto/xproto
+		x11-proto/inputproto
+		x11-proto/damageproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	dev-libs/gobject-introspection-common
+	>=dev-util/gtk-doc-am-1.11
+	test? (
+		x11-themes/hicolor-icon-theme
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )
+"
+# dev-libs/gobject-introspection-common needed for introspection.m4
+
+# 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 with maintain both
+# in sync.
+RDEPEND="${COMMON_DEPEND}
+	!<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
+	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() {
+	gnome2_environment_reset
+
+	# 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
+
+		# 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 Makefile.in
+	fi
+
+	epatch_user
+
+	eautoreconf
+	# Use elibtoolize in place of eautoreconf when it will be dropped
+	#elibtoolize
+}
+
+src_configure() {
+	# Passing --disable-debug is not recommended for production use
+	econf \
+		$(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
+		$(usex aqua "" --with-xinput) \
+		$(usex debug --enable-debug=yes "") \
+		$(use_enable cups cups auto) \
+		$(use_enable introspection) \
+		$(use_enable xinerama) \
+		--disable-papi
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check
+}
+
+src_install() {
+	default
+
+	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
+
+	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
+
+	prune_libtool_files --modules
+
+	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"
+
+	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
+
+	readme.gentoo_print_elog
+}
diff --git a/x11-libs/gtk+/gtk+-3.8.1.ebuild b/x11-libs/gtk+/gtk+-3.8.1.ebuild
deleted file mode 100644
index 9709bd361cd9..000000000000
--- a/x11-libs/gtk+/gtk+-3.8.1.ebuild
+++ /dev/null
@@ -1,214 +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.1.ebuild,v 1.1 2013/04/20 12:51:40 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 ~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="
-	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-1.0.0
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2.0
-	)
-	>=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
-	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
-
-	# FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=654108
-	# epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
-
-	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 -v tests/a11y/pickers.{ui,txt} || die "rm failed"
-	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
-}
-
-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"
-
-	# 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
-}
-
-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
-}