Always apply multilib patch, will avoid falling into bug #288549 again, and handle file move in postinst as well. Add some needed die statements. Mutualize build directory removal code. Insert gtkrc at the proper location, bug #288549. Also generate gtk.immodules file, there is no reason the directory would not exist. Another attemp at making testsuite run successfully for everyone, bug #285687. Pin gdk-pixbuf dependency to slot 2. Add gdk-pixbuf split handling in postinst.

Package-Manager: portage-2.2.0_alpha13/cvs/Linux x86_64

3 files changed, 69 insertions, 34 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 2cf35be46143..f054750c8d2a 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,15 @@
 # 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.483 2011/01/03 13:33:30 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.484 2011/01/12 16:24:39 eva Exp $
+
+  12 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org> gtk+-2.22.1-r1.ebuild:
+  Always apply multilib patch, will avoid falling into bug #288549 again, and
+  handle file move in postinst as well. Add some needed die statements.
+  Mutualize build directory removal code. Insert gtkrc at the proper location,
+  bug #288549. Also generate gtk.immodules file, there is no reason the
+  directory would not exist. Another attemp at making testsuite run
+  successfully for everyone, bug #285687. Pin gdk-pixbuf dependency to slot 2.
+  Add gdk-pixbuf split handling in postinst.
 
   03 Jan 2011; Fabian Groffen <grobian@gentoo.org> gtk+-2.22.1-r1.ebuild:
   Don't use ED with DESTDIR
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 4d26c0f33f42..fb908504d044 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gtk+-1.2-locale_fix.patch 419 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a SHA1 569c877ff692a7694e8aca5aceae9558844ba5dd SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb
 AUX gtk+-1.2.10-as-needed.patch 19865 RMD160 17c6b5d447b2d1c56fcc89dad676156caf0d700e SHA1 1027f38d29492c6f77205fc40992d8e625da8dbe SHA256 0864194a1e2be5f1b3df91d7dceb50bbe038fbb29f24901891c22829d55d4da7
 AUX gtk+-1.2.10-automake.patch 3270 RMD160 fce6e376c7581db2a15e0e7024eb28c0712f0f8e SHA1 1ba127d50f7eddc86e07a37c819b9dd233d27926 SHA256 f36beb9303dcf08b87ffc404576c001003c1068ae0ad66fe1585a7c1f0c462d2
@@ -27,7 +30,14 @@ EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9b
 EBUILD gtk+-2.18.9.ebuild 5892 RMD160 59252178f671f97124d5baaa5754328c62aa96d1 SHA1 4705696a1f4656f169afb3cc227a19a3b0c76bbe SHA256 de1aff3e032a77e0db94a78dd2dfb0f9246df2044de80b8d2302ab2113a72104
 EBUILD gtk+-2.20.1-r1.ebuild 6422 RMD160 7ada1edda8575341f0063dc054a15cf3e7187cc5 SHA1 3ea573a5341cb97f6f90320621bce8ea3b884a04 SHA256 cfcc2091b22c026f5bf700c7e4c3e6cf2881eb0d56db25a4500ac7f1b5b179bb
 EBUILD gtk+-2.22.0.ebuild 5642 RMD160 fa293f2b6f911c3e0d8f4526cd4cbb70a2bf2af5 SHA1 808aaf0a67eb61e67f0241717e9b49d78141ca47 SHA256 eaa23dcf0477bacf156dbcc07aed00e57fd12fc4e7310ef479175c682cc5ab23
-EBUILD gtk+-2.22.1-r1.ebuild 6341 RMD160 e426139bd7c6273d9df6f74d760a1ca227b22cc5 SHA1 cfabe543abd8029df15299e8728de779249cd33e SHA256 6a6a0beef47310266ea3b9ff7ba1d7988978b2637ac38b35304554dd5ae86ff9
+EBUILD gtk+-2.22.1-r1.ebuild 6971 RMD160 5b5ead1b17e50d8c7cebc31eb6b4ff39fd0e2bf8 SHA1 e31fc661edc7e0fed257c820bb717d611081b186 SHA256 9f072fd611393c39dc422ee211286eebef41f5286b1508a6ccc1a306b44146eb
 EBUILD gtk+-2.22.1.ebuild 5810 RMD160 4b6ae0fcf87c94a28506ffec4735e2094225f7f4 SHA1 fa7f4c5dcd50925c3f2ec4f5539d76db435b40f2 SHA256 f498e3dd8246fd6a66caf0be419f1f4eeb09df6d8acb218b7363395f1aeebd6c
-MISC ChangeLog 71399 RMD160 c65c63300a047bb55e2a3dae2b8d6bb1716a545b SHA1 77c23fbe47490bbac9ebddeb7ab631b44b928989 SHA256 6469df4612ff3b3a66daee8a979a254124709db21a8602c8e5a41a848d3441de
+MISC ChangeLog 71966 RMD160 d56203cbdba6f6d04ee4cbeada8b02ca3171c8e3 SHA1 7ffa38d1b2ca88a07b75296927d967aa150bcd49 SHA256 e143813f9482c5dd581ee1c96ac0819d89af3ff12a64c1f933ce4c5fef804510
 MISC metadata.xml 549 RMD160 8d6692e4cf18e0c75421ddef09e2881624c5ce3e SHA1 ce3ed4bec69816eb61b5ca9d48c2db396085a923 SHA256 2e7f82b302d91c37ecf915de09e4b85ef093b790baacbef0325b6fe9b1bb304b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0t1eAACgkQ1fmVwcYIWAZB9ACgpAvZGPhCIQpW05GCP//tu883
+bqQAn1ibpCZf+3qgzgppCjoNWgvIdZ3t
+=M1v3
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-2.22.1-r1.ebuild b/x11-libs/gtk+/gtk+-2.22.1-r1.ebuild
index fc13e5894c5a..b72b13f4e95b 100644
--- a/x11-libs/gtk+/gtk+-2.22.1-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.22.1-r1.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+-2.22.1-r1.ebuild,v 1.2 2011/01/03 13:33:30 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.22.1-r1.ebuild,v 1.3 2011/01/12 16:24:39 eva Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.4"
@@ -28,11 +28,11 @@ RDEPEND="!aqua? (
 		x11-libs/libXcomposite
 		x11-libs/libXdamage
 		>=x11-libs/cairo-1.6[X,svg]
-		x11-libs/gdk-pixbuf[X,introspection?,jpeg?,jpeg2k?,tiff?]
+		x11-libs/gdk-pixbuf:2[X,introspection?,jpeg?,jpeg2k?,tiff?]
 	)
 	aqua? (
 		>=x11-libs/cairo-1.6[aqua,svg]
-		x11-libs/gdk-pixbuf[introspection?,jpeg?,jpeg2k?,tiff?]
+		x11-libs/gdk-pixbuf:2[introspection?,jpeg?,jpeg2k?,tiff?]
 	)
 	xinerama? ( x11-libs/libXinerama )
 	>=dev-libs/glib-2.25.10
@@ -64,16 +64,24 @@ DEPEND="${RDEPEND}
 		media-fonts/font-cursor-misc )"
 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
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
+	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
-	has_multilib_profile && epatch "${FILESDIR}/${PN}-2.21.3-multilib.patch"
+	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"
@@ -85,9 +93,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.22.1-old-icons.patch"
 
 	# Stop trying to build unmaintained docs, bug #349754
-	sed -i -e '/docs\/faq\/Makefile/d' configure.in || die
-	sed -i -e '/docs\/tutorial\/Makefile/d' configure.in || die
-	sed -i -e 's/tutorial faq //' docs/Makefile.am || die
+	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
@@ -107,17 +114,16 @@ src_prepare() {
 
 	if ! use test; then
 		# don't waste time building tests
-		sed 's/^\(SRC_SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed 2 failed"
+		strip_builddir SRC_SUBDIRS tests Makefile.am Makefile.in
 	fi
 
 	if ! use examples; then
 		# don't waste time building demos
-		sed 's/^\(SRC_SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed 3 failed"
+		strip_builddir SRC_SUBDIRS demos Makefile.am Makefile.in
 	fi
 
-	elibtoolize
+	# Use elibtoolize in place of eautoreconf when it will be dropped
+	#elibtoolize
 	eautoreconf
 }
 
@@ -144,31 +150,27 @@ src_test() {
 	# 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.
-	HOME="${T}" Xemake check || die "tests failed"
+	XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "Installation failed"
 
 	set_gtk2_confdir
-	dodir ${GTK2_CONFDIR}
+	dodir ${GTK2_CONFDIR} || die "dodir failed"
 	keepdir ${GTK2_CONFDIR}
 
 	# see bug #133241
 	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
-	insinto ${GTK2_CONFDIR}
-	doins "${T}"/gtkrc
+	insinto /etc/gtk-2.0
+	doins "${T}"/gtkrc || die "doins gtkrc failed"
 
 	# Enable xft in environment as suggested by <utx@gentoo.org>
 	echo "GDK_USE_XFT=1" > "${T}"/50gtk2
-	doenvd "${T}"/50gtk2
+	doenvd "${T}"/50gtk2 || die "doenvd failed"
 
 	dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
 
-	# This has to be removed, because it's multilib specific; generated in
-	# postinst
-	rm "${ED}etc/gtk-2.0/gtk.immodules"
-
 	# 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"
@@ -180,14 +182,28 @@ src_install() {
 pkg_postinst() {
 	set_gtk2_confdir
 
-	if [ -d "${EROOT%/}${GTK2_CONFDIR}" ]; then
-		gtk-query-immodules-2.0  > "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules"
-	else
-		ewarn "The destination path ${EROOT%/}${GTK2_CONFDIR} doesn't exist;"
-		ewarn "to complete the installation of GTK+, please create the"
-		ewarn "directory and then manually run:"
-		ewarn "  cd ${EROOT%/}${GTK2_CONFDIR}"
-		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
+	# 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