From 765a11dc4841a96dd238a601202ae81fc2bb26cc Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Wed, 16 Nov 2011 21:54:12 +0000
Subject: [PATCH] Bump to 2.24.8; fixes several bugs and updates search to
 tracker-0.12 dbus API. Makes the same Alt key handling change as in
 gtk+-3.2.2 (and so gets a blocker on old vte:0 versions to make sure that
 2.24.8 is not stabilized before vte-0.28.2-r201:0). Also, add a comment to
 3.2.2 about when the vte blocker can be lifted.

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64
---
 x11-libs/gtk+/ChangeLog          |  12 +-
 x11-libs/gtk+/Manifest           |  12 +-
 x11-libs/gtk+/gtk+-2.24.8.ebuild | 240 +++++++++++++++++++++++++++++++
 x11-libs/gtk+/gtk+-3.2.2.ebuild  |   3 +-
 4 files changed, 260 insertions(+), 7 deletions(-)
 create mode 100644 x11-libs/gtk+/gtk+-2.24.8.ebuild

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 3ac08bfd8cc8..ec31dac3124b 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.549 2011/11/15 08:44:35 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.550 2011/11/16 21:54:12 tetromino Exp $
+
+*gtk+-2.24.8 (16 Nov 2011)
+
+  16 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> +gtk+-2.24.8.ebuild,
+  gtk+-3.2.2.ebuild:
+  Bump to 2.24.8; fixes several bugs and updates search to tracker-0.12 dbus
+  API. Makes the same Alt key handling change as in gtk+-3.2.2 (and so gets a
+  blocker on old vte:0 versions to make sure that 2.24.8 is not stabilized
+  before vte-0.28.2-r201:0).
+  Also, add a comment to 3.2.2 about when the vte blocker can be lifted.
 
   15 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> gtk+-3.2.2.ebuild:
   Force vte:2.90 users to upgrade to vte-0.30.1-r1 (having a working Alt key in
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 14fbb6988f33..83137f97f6a1 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -25,6 +25,7 @@ DIST gtk+-2.24.4.tar.bz2 17607752 RMD160 56a6f731cfdc47686c71f8f6b4253484e08dd23
 DIST gtk+-2.24.5.tar.xz 13252580 RMD160 f0eb690c906166c5f0e296faac8fdb983955921b SHA1 eb1200fe42bd2d5e3dc1bdb69b524600cbc06df1 SHA256 d6b30889efbb9fab9aa598092d08887826a7b2a3069b3bd5155dede28d9866f3
 DIST gtk+-2.24.6.tar.xz 13173032 RMD160 5d78546b5f2aeb79d8fd8839911ee9a442e674e9 SHA1 da835834fe882be1893d0df41216e8141737b51b SHA256 8a026b545dc1fa0c1a69b395232ad7c8ee8fa260be5f7d9a2f2ffcd799efefca
 DIST gtk+-2.24.7.tar.xz 13224600 RMD160 37fcc2702da52ec9785a6886939b795fb3c764ae SHA1 5f5206b88498aba03fd2dc24a925c210410e6660 SHA256 1fdc7605501bd2932ef9a3c4c3c9a406e505f18667aea9e73af650da28fff994
+DIST gtk+-2.24.8.tar.xz 12811268 RMD160 55a57b32f3034d7b3d190538f929920bc6c96aff SHA1 b69a7cf512b8254d8a6cd39a45b3f09cb02af20b SHA256 8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c
 DIST gtk+-3.0.12-use-const2.patch.xz 12500 RMD160 2cebd73630f83530a76ac263d797e196032994ee SHA1 697b8d41ba24386acd1cfec1d733361901e797dd SHA256 f10b251a52a4f5d73b435315c94297dd30a4bc3c20a25bc947842bb214808cc4
 DIST gtk+-3.0.12.tar.xz 13104092 RMD160 c82d14e113ae287476f5887ca03b8b01b8d22e1b SHA1 1b87e12ef3dfe598ee757db1f5bdff6cd66e6558 SHA256 219fdea120897981840e909fac40d4d433fe061a37b12b9402e215c819ebeae9
 DIST gtk+-3.2.1.tar.xz 12664740 RMD160 38f61e8881b5dd1230aeafecc01cfa45629bc6ef SHA1 7f3feaa6e9227bfc9247d58fd34962c677750591 SHA256 f1989f183700cd5f46681cfabc2253e2f526b19b56e4b631dcee2594dddb0ef3
@@ -35,16 +36,17 @@ EBUILD gtk+-2.24.4.ebuild 7474 RMD160 6423a1cb33e4f0493c39da224d2a125c45494c8a S
 EBUILD gtk+-2.24.5-r1.ebuild 7811 RMD160 42262f81762fc564a77438335d9780fe0b339344 SHA1 5b8fbcf9eb4e839b5e92450d643cbd5a8e917572 SHA256 8d98f118d3bc9196ff08dee01308e99c21f79186e242494e5de0cea7b4fe1332
 EBUILD gtk+-2.24.6.ebuild 7676 RMD160 b36290f910c27eee2fc2ddd0a4c506c71b92a6f3 SHA1 845a413728db1fc707b641175808ea97785c02ad SHA256 a02fc317af27b02b9dea43adab64c1845ae5f3a2b7ed346875cadd9e4f5d6ba2
 EBUILD gtk+-2.24.7.ebuild 7680 RMD160 72bb82e782cf3cbc41509b8d353186fdc781e821 SHA1 a5bd93f5415443d7b3c8a9413c99140aa9d68801 SHA256 a92648d881e6b15915136bde60e473ebb6f078b3554eae8d1988e3af47a7401c
+EBUILD gtk+-2.24.8.ebuild 7871 RMD160 0a02f32b8fa40e84b8646e8458e1916b5dbdcdc5 SHA1 ba55c198feb7651d765f5bb24ef039f307de5019 SHA256 9d4d184a65b2a9dabd8ef5ba171ba15c2d4842294fd4b9dea7da0b77e35cd2d2
 EBUILD gtk+-3.0.12-r1.ebuild 6168 RMD160 0f1671e21ae1d8f5296cef76abc76e8529d5fcf3 SHA1 ce3f023df86242370b1ce92a5dfeaa008e9019ce SHA256 bfb696209c581aff44462759223770dea30cc41a2be608fd96169dc34ec9faab
 EBUILD gtk+-3.0.12.ebuild 5924 RMD160 304c8786053b789687d2179b017e2bc8b6538943 SHA1 b15b6ffc22ae2c709af8249f8283d1150e209d20 SHA256 a28b2ead97e9a6d44d2aab8db2811befd406444ca7733ca5d4eb3851301f4c9e
 EBUILD gtk+-3.2.1.ebuild 6248 RMD160 78c1cb16b8ed44fdcf8d9dc30b9d68be006cb230 SHA1 a792484cda6857875f17b163b39aba3908c5507e SHA256 c0389b5bb1f3537f096b6229f72bec022503f0ceda061a5646d1150d75b41a25
-EBUILD gtk+-3.2.2.ebuild 6346 RMD160 cf84b7e51c852f8a92b3e1b80c9a07c3db03ea6f SHA1 3f00763ba23321ad9bd571e79983f5d4995e443b SHA256 421d62f78efa3bd27e59a855c31f9023d8e660d9d80ed5441f61906e4cf8dae2
-MISC ChangeLog 82941 RMD160 51a9ad9d3edfd84e011982224528a0f787b8d0f9 SHA1 d5e95f38e01e35994a292b63cc8ebc2107cf4c77 SHA256 0cf602bbaf2d663daa481fdc061cd1c49fe590c957c339a180bfe751a940115f
+EBUILD gtk+-3.2.2.ebuild 6400 RMD160 b56f4af2dcd010df43ea2d8608d519a31ce7e1ae SHA1 1d71a0979bc6bbd936aca03dcfa1c8988679b5f5 SHA256 813f9a4f6c2bd5d497808bf3ad5f605f36e12bc85e29efa40c7561f45c37cb1f
+MISC ChangeLog 83403 RMD160 5391c7e4194b3be2541e4ac4626de15bd0237e28 SHA1 a8bb34fa2d07baa4256bb0ccf19ef5a134034290 SHA256 3e58ea6807524b0db106bfc6fbfc8e67ac24b3f2399fecedabe78b3e63bb2250
 MISC metadata.xml 798 RMD160 9c1c01af06ea6cb0d398d66eda999eba1ec6880a SHA1 13f2860e4e48abb065d70fd85b7073074624ec28 SHA256 634c27d323d01eecbcda3159df57a7cc64557e2a0087eac60e6d9e3d94acd85c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7CJngACgkQdjK8w9WeBnDIBQEAsn590SuqgjXnQURjf9H0lEPZ
-le+s6XGYfF5CfqNzl4YBAK3S+T7ErVN8Ahb71shMLivtjxM8oKh+LBV6pesUJ611
-=IQMy
+iF4EAREIAAYFAk7EMQoACgkQdjK8w9WeBnDm5AEAotSeJqCZbO7MhgemjrWC7Y/G
+wAG+1/2y3PXOfRrmwW4BAKx7yyw4PRkUcIvLb0gxbjQ9ADfV6owS8O4Vtk9iBg9r
+=s1lK
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-2.24.8.ebuild b/x11-libs/gtk+/gtk+-2.24.8.ebuild
new file mode 100644
index 000000000000..2b39a3984663
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.24.8.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.8.ebuild,v 1.1 2011/11/16 21:54:12 tetromino Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2:2.4"
+
+inherit eutils flag-o-matic gnome.org libtool python virtualx autotools
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="aqua cups debug doc examples +introspection test vim-syntax xinerama"
+
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+COMMON_DEPEND="!aqua? (
+		x11-libs/libXrender
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXt
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.3
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		>=x11-libs/cairo-1.6[X,svg]
+		x11-libs/gdk-pixbuf:2[X,introspection?]
+	)
+	aqua? (
+		>=x11-libs/cairo-1.6[aqua,svg]
+		x11-libs/gdk-pixbuf:2[introspection?]
+	)
+	xinerama? ( x11-libs/libXinerama )
+	>=dev-libs/glib-2.27.3:2
+	>=x11-libs/pango-1.20[introspection?]
+	>=dev-libs/atk-1.29.2[introspection?]
+	media-libs/fontconfig
+	x11-misc/shared-mime-info
+	cups? ( net-print/cups )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+	!<gnome-base/gail-1000"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/pkgconfig-0.9
+	!aqua? (
+		x11-proto/xextproto
+		x11-proto/xproto
+		x11-proto/inputproto
+		x11-proto/damageproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	>=dev-util/gtk-doc-am-1.11
+	doc? (
+		>=dev-util/gtk-doc-1.11
+		~app-text/docbook-xml-dtd-4.1.2 )
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )"
+# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
+# Remove blocker after >=vte-0.28.2-r201:0 is stable
+RDEPEND="${COMMON_DEPEND}
+	!<x11-libs/vte-0.28.2-r201:0"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+set_gtk2_confdir() {
+	# An arch specific config directory is used on multilib systems
+	GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+}
+
+src_prepare() {
+	# 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"
+
+	# Create symlinks to old icons until apps are ported, bug #339319
+	epatch "${FILESDIR}/${PN}-2.24.4-old-icons.patch"
+
+	# fix building with gir #372953, upstream bug #642085
+	epatch "${FILESDIR}"/${PN}-2.24.7-darwin-quartz-introspection.patch
+
+	# 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 Makefile.in
+	else
+		# Non-working test in gentoo's env
+		sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
+			-i gtk/tests/testing.c || die "sed 1 failed"
+
+		# Cannot work because glib is too clever to find real user's home
+		# gentoo bug #285687, upstream bug #639832
+		# XXX: /!\ Pay extra attention to second sed when bumping /!\
+		sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
+			|| die "failed to disable recentmanager test (1)"
+		sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
+			|| die "failed to disable recentmanager test (2)"
+		sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
+			|| die "failed to disable recentmanager test (3)"
+
+		# Skip tests known to fail
+		# https://bugzilla.gnome.org/show_bug.cgi?id=646609
+		sed -e '/g_test_add_func.*test_text_access/s:^://:' \
+			-i "${S}/gtk/tests/testing.c" || die
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=617473
+		sed -i -e 's:pltcheck.sh:$(NULL):g' \
+			gtk/Makefile.am || die
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.am Makefile.in
+	fi
+
+	# http://bugs.gentoo.org/show_bug.cgi?id=371907
+	mkdir -p "${S}/m4" || die
+	mv "${WORKDIR}/introspection.m4" "${S}/m4macros" || die
+	AT_M4DIR=m4macros eautoreconf
+	# Use elibtoolize in place of eautoreconf when it will be dropped
+	#elibtoolize
+}
+
+src_configure() {
+	local myconf="$(use_enable doc gtk-doc)
+		$(use_enable xinerama)
+		$(use_enable cups cups auto)
+		$(use_enable introspection)
+		--disable-papi"
+	if use aqua; then
+		myconf="${myconf} --with-gdktarget=quartz"
+	else
+		myconf="${myconf} --with-gdktarget=x11 --with-xinput"
+	fi
+
+	# Passing --disable-debug is not recommended for production use
+	use debug && myconf="${myconf} --enable-debug=yes"
+
+	econf ${myconf}
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	# Exporting HOME fixes tests using XDG directories spec since all defaults
+	# are based on $HOME. It is also backward compatible with functions not
+	# yet ported to this spec.
+	XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	set_gtk2_confdir
+	dodir ${GTK2_CONFDIR}
+	keepdir ${GTK2_CONFDIR}
+
+	# see bug #133241
+	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
+	insinto /etc/gtk-2.0
+	doins "${T}"/gtkrc
+
+	# Enable xft in environment as suggested by <utx@gentoo.org>
+	echo "GDK_USE_XFT=1" > "${T}"/50gtk2
+	doenvd "${T}"/50gtk2
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+	# add -framework Carbon to the .pc files
+	use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do
+		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED%/}"/usr/lib/pkgconfig/$i || die "sed failed"
+	done
+
+	python_convert_shebangs 2 "${ED}"usr/bin/gtk-builder-convert
+
+	find "${D}" -name '*.la' -exec rm -f {} +
+}
+
+pkg_postinst() {
+	set_gtk2_confdir
+
+	# gtk.immodules should be in their CHOST directories respectively.
+	gtk-query-immodules-2.0  > "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" \
+		|| ewarn "Failed to run gtk-query-immodules-2.0"
+
+	if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
+		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
+		elog "aware location. Removing deprecated file."
+		rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
+	fi
+
+	# pixbufs are now handled by x11-libs/gdk-pixbuf
+	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
+		elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+		elog "Removing deprecated file."
+		rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
+	fi
+
+	# two checks needed since we dropped multilib conditional
+	if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
+		elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+		elog "Removing deprecated file."
+		rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
+	fi
+
+	if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
+		elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
+	fi
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your gtkrc."
+	fi
+}
diff --git a/x11-libs/gtk+/gtk+-3.2.2.ebuild b/x11-libs/gtk+/gtk+-3.2.2.ebuild
index 0910701e53ff..076b77fb8cb9 100644
--- a/x11-libs/gtk+/gtk+-3.2.2.ebuild
+++ b/x11-libs/gtk+/gtk+-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.2.ebuild,v 1.2 2011/11/15 08:44:35 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.2.ebuild,v 1.3 2011/11/16 21:54:12 tetromino Exp $
 
 EAPI="4"
 
@@ -68,6 +68,7 @@ DEPEND="${COMMON_DEPEND}
 		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
+# Remove blocker after >=vte-0.30.1-r1:2.90 is stable
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gail-1000
 	!<x11-libs/vte-0.30.1-r1:2.90
-- 
2.26.2