Version bump (this has various changes from upstream that affect our multilib patch and behavior of immodules stuff)

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

3 files changed, 275 insertions, 6 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 18cff011ba03..1696e3cc33f4 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.668 2013/06/23 09:05:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.669 2013/07/07 13:03:07 pacho Exp $
+
+*gtk+-2.24.20 (07 Jul 2013)
+
+  07 Jul 2013; Pacho Ramos <pacho@gentoo.org> +gtk+-2.24.20.ebuild:
+  Version bump (this has various changes from upstream that affect our multilib
+  patch and behavior of immodules stuff)
 
   23 Jun 2013; Pacho Ramos <pacho@gentoo.org> -gtk+-2.24.18.ebuild,
   gtk+-2.24.19.ebuild:
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 2bbcf31517cf..24339b855010 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -22,6 +22,7 @@ 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.19.tar.xz 13374160 SHA256 15b8bf463eba99abfa58270662914e8e9b83568ab4945b5f0ef1aa29e90becb8 SHA512 89df9bbaf971beeb3390c433a80a8c64ebc1722ba83bb1bc3aefe4013d354c5f40bda43cb7c9b0a42a904fd8de02e12e12b964334bd43c6a4748756c56b0f950 WHIRLPOOL efa766e2ffb86e367b3983ebaf5f8d245fa6d52edcb4f2d88afda75912f17f908a850c8a43ffa737121cbcb0ce6c3bb390d6104f65dac02a08e3f7939d7e12c3
+DIST gtk+-2.24.20.tar.xz 13387180 SHA256 cc66bcbf9239a7d9861175c681ba95894b55c70dc0b37aad8345c46ecfda0da3 SHA512 45ed8069b208a18a736a15bd91a744687603dc422df3cf0ca1e9128e13fb92ff1bd023f79efa32f4e30b98247d78021d76efa8e87dc7c141ba860cbce27f13d2 WHIRLPOOL ab52ec7198b4ae624428284b8f66491f242170d1cafda13e65f634f92d22fe4e5037cb72a8e8be49173de416e346165f606ab2e4326176cfc6fc9363a276130a
 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.2.tar.xz 13701516 SHA256 1ca80c9c15a1df95d74cefb8c2afe4682ba272a4b489106f04877be2a7aff297 SHA512 20958c192fe881281f6885e2d7cecc4e2700fc01ef8006304f1fb8befe8f6628cbdb06c0d801f109e5805d58f327ca9a07d5e2c7f938116c99db8080d0c2f83e WHIRLPOOL 5fef2b68c58a3337127a5afbe3457c012b8bb7b3ba222ce8fdf4c338c5d639eaf7933b190b71f003dbb8d9698e1ce96e08dc4506cbf8670692dd8f80023814e9
@@ -30,16 +31,17 @@ EBUILD gtk+-1.2.10-r12.ebuild 2406 SHA256 03e22a0e23e19cc0ad87697527ac186aeb6904
 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.19.ebuild 8160 SHA256 e167ae8cebf379afb5e91df6fa3f5dd402e4c16979c9bcbfb608c5eb9bb6325e SHA512 9f158cfc02358e1ae101d7ceb6b7f31e554f34f12f161b2b3d05d5897407070655fc38b7fc7f2230b3686b1882419ba029ce053f6721185336146004fc06cfea WHIRLPOOL 30d941dba52ec5d1e6b37ff3bc42d24039c6137acec5c53d757235b8412dbd961f7623c171ff25c54e04d8ad144f74d207a80a9d0ca6f0d4fc56f94f2f74780c
+EBUILD gtk+-2.24.20.ebuild 8529 SHA256 38f98cc131b7b4d8b4ebba87cd44984a00b077118f888ba30a907f1c86e82940 SHA512 4a2573a54c7871e91ae2d6e12f9995c861f5f412831977c14793bfc639654e3fd8750963aba70585f4aca657ac6af92fa9b31514c5a2a455da783d3c1ec04d5f WHIRLPOOL cf095ec327bf1e6e625d7333daf054a3af0ed84b45b15ea5a388ad5bff66958a309dc1edcbc1c4fec98b23d29ce5dfe4bacca1a316f8f2a5b0c6ce0f04463441
 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.2.ebuild 6557 SHA256 830bc28cdd17ba3b3039265f4199242f0d5fe852e8289bff42a099296560c09c SHA512 a39970e673901672d71c9cda497974996a1bcc81795f0a96c54200c3009d8de0cd9731d57af7a7f89585ae83c2a42dcff205ef784aed9e1947f69543d3d4479a WHIRLPOOL c7589e5c3953243b03ce2064141ff60b974df30b3cf2422040158d800c317044ca4fb2e4d6fad55476ce7c213a518c433fa246a88143c15cb21cb0b4f6c06557
-MISC ChangeLog 6190 SHA256 bc3fea27c12059fe2021a215cbdddf3b0b0bc59b55416a5480d60ab998ea8f74 SHA512 4fa846e312c4941462e1471541e7c5830151311d80a8ba105b45b0130ad14f80a1d38ce2329eeb8adcce27d8a1cd006a0592f68e08035b451821315e06bd3dcc WHIRLPOOL e1b14a62dfe1b74412498da2ba285edbf94b0e598cfa54ab17996c55d9b2051fe8b1325aff5d61fb1839016c6b0e2cdaaa48cdf5444f16ebb700e1cad3509ff0
+MISC ChangeLog 6409 SHA256 a2026d31e04f07759d76fef1484ad50c2ba00c7aeb2b0892fac12cd88d4f30ab SHA512 ee1907419f624f75931ad4357324b1b3c13eb4ad15b2bb6db705c902043a33958dfe4ef4bd67dcea80cccfb40e5bd6ee3643719b0d7bb9763e2d23bd53d64b78 WHIRLPOOL 8290e4d88718fb1801f4e279868821416451df8669cb7216dec6e9c94c37af71ad68cc52c1ebeb3790ea7d385f08905e48992b1eed679847a92da3163b9fc364
 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)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHGukMACgkQCaWpQKGI+9SFKgCdEIX+d3ekbIBEE4rIMZg02a0r
-R4oAn3Tkw9uQH8kokkASL27qdHxcDoGv
-=KE0N
+iEUEAREIAAYFAlHZZw0ACgkQCaWpQKGI+9QMWgCXd9rKtj12p3VR2hsZOWjejyOm
+6gCfQe7RuET0po4x9D10hAqOzlfbt20=
+=ETg3
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-2.24.20.ebuild b/x11-libs/gtk+/gtk+-2.24.20.ebuild
new file mode 100644
index 000000000000..1552b361bcdd
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.24.20.ebuild
@@ -0,0 +1,261 @@
+# 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.20.ebuild,v 1.1 2013/07/07 13:03:07 pacho Exp $
+
+EAPI="5"
+inherit eutils flag-o-matic gnome2-utils gnome.org multilib 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-util/gtk-doc-am-1.11
+	test? (
+		x11-themes/hicolor-icon-theme
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )
+"
+# introspection.m4 is in the tarball, so gobject-introspection-common is not needed
+
+# 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}
+	!<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"
+	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"
+		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
+}