x11-libs/gtk+-2.24.22: multilib-utize & fix OOT testing bug

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

3 files changed, 90 insertions, 41 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 838027f..a245772 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -7,6 +7,7 @@ AUX gtk+-1.2.10-m4.patch 220 SHA256 88f45c2f0413f29d62ca138c87b41d24a73b47456f5b
 AUX gtk+-2.14.3-limit-gtksignal-includes.patch 513 SHA256 20e7536c29e2675d18fd3aff933621a4fcab9b5615ff96593e9f36ab4febb734 SHA512 6444ad81e33ac7694335dee531c4336191391cb5956701e69152ce3a375a665912f6a94ce38bb0f64599bc56d60020a297915c79fadcd93d1e94cc42db1a40aa WHIRLPOOL 61a3b7bb8d2903ecbb3fa38c96fc95d7a010e3ad645c55ab8b172a2d0a1f5fc16ee4bd9f767990c09f08aba6792d19765e58bb2200b25201289fcd2c810f6466
 AUX gtk+-2.21.3-multilib.patch 611 SHA256 4c3db89f401176ea121a982974d81ca6ba3db315d2bce16c83ef7f7d7f629f3b SHA512 291e784c482ede1930d85f57b2ecacd6c8b8522d79f0c69f27ef29818c812b951587e16bd5d4236b8ca77a7ad773fa8f0b84c615e9bdbdb2d465134fcd6448ce WHIRLPOOL d67b05a8fb3d3dd38a4980ae1868ba31017b98d5e9a802f3499810d1f90d850dfbddf76ae3d5f6b7b3454db4d0b67156b251e75232fe2b2a07606e29ea6555ca
 AUX gtk+-2.24.20-darwin-quartz-pasteboard.patch 435 SHA256 3eaf1b2f534309344f046c1155b29d821c96287360705f13d88e182e720777b1 SHA512 123526aadb43c98490f361b964d709d78b9e10beebb845b71474a4db8eb7bfe1b102a9736b50f4c6e20bb4fa7ad8dafa52e4237f30dcae9094d2575446148126 WHIRLPOOL cf9bde6aac5e34dae5e5788d0a098e2c1230c585cb614a71d784ca587c6f0bc5f874d42d684af2e9d2314df8a2aee23e2a66d8fb36f625f04925374a7ba5bd64
+AUX gtk+-2.24.22-out-of-tree-test.patch 958 SHA256 8e6889dffdb54a0f88c0d9a8f0494cdfb385a87b3dd11ce0d474e3b2f8940537 SHA512 4b8a022788531854ad41768194a5e9efb647427769a695a57d317f7b390991bbb536c83f90e510e6222877fce55e4c4a6a068534808fe2f0fbbc9aa13a93192c WHIRLPOOL 5e3a366ed28e000225d864958a62ad55c9f565cf7b23f8cd84e908bfe09cac1b1f5c6dc0eec419629b78ea7bb42469db3591cb232901ad16086380cd18b7c6a9
 AUX gtk+-2.24.7-darwin-quartz-introspection.patch 1239 SHA256 c718aae4511d9de28ea7b300a7f3d5e1099889a320847c8e642a2e6010838069 SHA512 c618aa19791f258d95cc31efe00b7515992b150933c591b9bbc87c0972646f9982126c0a2f279e287bcbb2768b57d117c59d806b1e60641f070818f78957955e WHIRLPOOL 173e0a8404bfcd29adf0b55155eef80d927ca536f89806591bc87c90b6eed4e64f9e2cb9ad5ce15f6f8f63381a378abc4cfb8c9b802166763111a052681c9bc4
 AUX gtk+-3.3.18-fallback-theme.patch 2841 SHA256 a552218132b903835a480881803e29be678a311d3a653b8111eba1fd0ea04922 SHA512 2be5cd482625292780e88c6be5ec3e2932a1b3187ac57f2a0bbb37ebdeb9b34e56481a4ca74fc7af088389fb68dbb748e8e2cffc984052695fa6032bff0556cb WHIRLPOOL 8ae2ea9175a6ad5e0cfa6f8e018bd9ddb580548f496a81360ca302cc9d4d7cf70f5cb86f52967ee770e71f530b238d7b070b8aa61ffd040990ef0cb7b1811804
 AUX gtk+-3.3.20-wayland-xkbcommon-headers.patch 1347 SHA256 9876be3bf2ef19413248e5de51e285aa1545b3d94751e840692b811c7b4bd9a9 SHA512 8397530f85a0b8e611ab30fd4ea6a3421c7862a8aeb05ba1eaea951a2e82738bc4482e8c04be620cc03690e413190cce63f0efe0cd39aecb62e70e754e8d240c WHIRLPOOL 0a1f78b076166af3727740fb736471304124dfcf1544a0452ebd6551cd0fe00a02d09ce2c44863c6df51d1b5030cfa849e89226662cc4f633ac820c4d5d2ef78
@@ -21,7 +22,7 @@ AUX settings.ini 96 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7
 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+-3.8.7.tar.xz 13847376 SHA256 9cb4400922fcd7b71bf899036dd3d09cdcc61af8e5a0f302121c1686c7d67c89 SHA512 cbcf205188baafdeff3e58bd54a4b4f3a55e4d98938cb56f973825eebdb7a5eeb3337aee97dcff85e059520d2cfd830b01b02b36252f225291045973df5e1207 WHIRLPOOL fff4ba16809a2262e939a44c3b6d182108b47ad1d2f0a6d99d5a4e9018b0a51c8c043c171291b22048aa67970d2cbeb0859cd35546e3b50933aca657d9ed4d29
-EBUILD gtk+-2.24.22-r1.ebuild 7797 SHA256 8dfc8846a353181aaac58a8e5a14059125a4992fa026257bbcc5476b3d4612d7 SHA512 105b96ea235056ae8f3acbc6db50ff196f6f8f157e943f934af194aa812bb5fc6a993a335b9d8ce89731bbae58b445fb20b90503eb3d278cc61e4c719bf820a3 WHIRLPOOL e000ddd42168bda4816373575c6a98a2b56abfab3ec5043d88cc32bceadaeb52d7a8cdfd590dd49f09224c94fa13ae8cb25a36cab334dc14fc3756160a92779c
+EBUILD gtk+-2.24.22-r1.ebuild 8765 SHA256 1f7234a7b83cec90203a516f9e02025fc9dca5fb82f03c458c96b296a0b65fd0 SHA512 0de3955091af841ee8052fc02e1faaaa006eb020d9dce237b2e31b646c547dda2f387a98f3ddbde0d75ab01a9fa13582462a361d3537cb22bb1afd9ea020fc91 WHIRLPOOL ba6847dcabcc73f30e6b0a8c53dfdbbf9d2681dd4cec1684017612098bd2f0ecbe50d544aa8d04b52af886c14ad233fbff5fcbf94c278749a0b1658ac72a495d
 EBUILD gtk+-3.10.6-r1.ebuild 6550 SHA256 1923e1b97f9355b1e93771e8ad68ecbd72eca31b08411f1e776a9054026841a0 SHA512 71b9d93faba76e66839604e301c65e0856e7e94d0800867674f99b90a8765660dd89caf6ce5dab3f39ef5a8005260d5960463d75fd0b66e6418dec16db59eaff WHIRLPOOL fc81c68e3dbd6bfd01bab69530a329079f65c07b0b47b901b960444881d134f3b43ed02cfd4451a2ce712c8e98e6176980b7b148f95ed66001759c3b52c125db
 EBUILD gtk+-3.8.7-r1.ebuild 7018 SHA256 1d1b262be2378c172187b2668c9d2a760d7f9444323f97579ed659db86ff6923 SHA512 e4405f8dd24a5b854ecec885c1a8d5041a67dab2c0af2417e5d6a11d93e802fa05e552a32c1353641d8cfc8cba0d7f18bfc8c96dd2c4355ca1f6058ab71628a7 WHIRLPOOL 6ceaacd812735f49d0e8d4c22854b93e0adbc7b65a66a9b9e655fb223e973d9517e50ade51fa5a765e7e7e5ca34ac4740de571bda5484b2b5c6e39c606bb4272
 MISC ChangeLog 9932 SHA256 54a7a3fa0371b0fc1f8e9f0be2d1191c88277411e1db4d7b34993f98935d5fcb SHA512 4e850b2f0972dfced29c6dc9a7073395f3743c63b51d3a854d22850959e3f0663291b336ccc9ff4787edcf5791affb3be5bd0cc668482f822a95a65c4eaa3197 WHIRLPOOL b271a6c437af187100344842e899e382246335477f19abc5ceaab630efe25a200440e700a3e7422b3d278084937611ae30e5d9c2199282edaced133e3b8ce1f0
diff --git a/x11-libs/gtk+/files/gtk+-2.24.22-out-of-tree-test.patch b/x11-libs/gtk+/files/gtk+-2.24.22-out-of-tree-test.patch
new file mode 100644
index 0000000..f6f2a21
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.22-out-of-tree-test.patch
@@ -0,0 +1,26 @@
+diff -urpN gtk+-2.24.22.orig/gtk/aliasfilescheck.sh gtk+-2.24.22/gtk/aliasfilescheck.sh
+--- gtk+-2.24.22.orig/gtk/aliasfilescheck.sh	2013-10-04 15:02:29.000000000 -0700
++++ gtk+-2.24.22/gtk/aliasfilescheck.sh	2014-01-22 14:10:19.473153253 -0800
+@@ -5,6 +5,22 @@ if test "x$gtk_all_c_sources" = x; then
+ 	exit 1
+ fi
+ 
++new_sources=""
++
++for f in ${gtk_all_c_sources} ; do
++	# some in-tree, some generated in build dir...
++	if test -f "${srcdir-.}/${f}" ; then
++		new_sources="${new_sources}${new_sources+ }${srcdir-.}/${f}"
++	elif test -f "$(pwd)/${f}" ; then
++		new_sources="${new_sources}${new_sources+ }$(pwd)/${f}"
++	else
++		echo "Couldnt find requested source file \"${f}\"."
++		exit 1
++	fi
++done
++
++gtk_all_c_sources=${new_sources}
++
+ grep 'IN_FILE' ${srcdir-.}/gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files
+ { cd ${srcdir-.}; grep '^ *# *define __' $gtk_all_c_sources; } | sed 's/.*define //;s/ *$//' | sort > actual-files
+ 
diff --git a/x11-libs/gtk+/gtk+-2.24.22-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.22-r1.ebuild
index 9a0b87c..14e717a 100644
--- a/x11-libs/gtk+/gtk+-2.24.22-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.22-r1.ebuild
@@ -3,54 +3,54 @@
 # $Header: $
 
 EAPI="5"
-inherit eutils flag-o-matic gnome2-utils gnome.org multilib virtualx autotools readme.gentoo
+inherit eutils flag-o-matic gnome.org multilib virtualx autotools readme.gentoo gnome2-multilib
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-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"
+KEYWORDS="~amd64"
 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/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?]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		>=x11-libs/cairo-1.6:=[X,svg,${MULTILIB_USEDEP}]
+		x11-libs/gdk-pixbuf:2[X,introspection?,${MULTILIB_USEDEP}]
 	)
 	aqua? (
-		>=x11-libs/cairo-1.6:=[aqua,svg]
-		x11-libs/gdk-pixbuf:2[introspection?]
+		>=x11-libs/cairo-1.6:=[aqua,svg,${MULTILIB_USEDEP}]
+		x11-libs/gdk-pixbuf:2[introspection?,${MULTILIB_USEDEP}]
 	)
-	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.34:2
-	>=x11-libs/pango-1.20[introspection?]
-	>=dev-libs/atk-1.29.2[introspection?]
-	media-libs/fontconfig
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	>=dev-libs/glib-2.34:2[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.20[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/atk-1.29.2[introspection?,${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
 	x11-misc/shared-mime-info
-	cups? ( net-print/cups:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3[${MULTILIB_USEDEP}] )
 	!<gnome-base/gail-1000
 "
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	!aqua? (
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/damageproto
+		x11-proto/xextproto[${MULTILIB_USEDEP}]
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		x11-proto/inputproto[${MULTILIB_USEDEP}]
+		x11-proto/damageproto[${MULTILIB_USEDEP}]
 	)
-	xinerama? ( x11-proto/xineramaproto )
+	xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
 	>=dev-util/gtk-doc-am-1.11
 	test? (
 		x11-themes/hicolor-icon-theme
@@ -73,6 +73,10 @@ edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following:
 [Filechooser Settings]
 StartupMode=cwd"
 
+MULTILIB_WRAPPED_EXECUTABLES=(
+	/usr/bin/gtk-query-immodules-2.0
+)
+
 strip_builddir() {
 	local rule=$1
 	shift
@@ -97,6 +101,10 @@ src_prepare() {
 	rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \
 		perf/marshalers.c || die
 
+	# but the test suite relies on the above being in-tree, so find the
+	# generated ones
+	epatch "${FILESDIR}"/${PN}-2.24.22-out-of-tree-test.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
@@ -114,7 +122,7 @@ src_prepare() {
 	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"
+			-i "${S}"/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
@@ -129,19 +137,19 @@ src_prepare() {
 		# 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
+			-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
+		if ! has_version "x11-libs/gtk+:2[${MULTILIB_USEDEP}]"; 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"
+				-i "${S}"/gtk/tests/testing.c || die "sed 2 failed"
 		fi
 	fi
 
@@ -159,7 +167,7 @@ src_prepare() {
 
 src_configure() {
 	# Passing --disable-debug is not recommended for production use
-	econf \
+	gnome2-multilib_src_configure \
 		$(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
 		$(usex aqua "" --with-xinput) \
 		$(usex debug --enable-debug=yes "") \
@@ -169,14 +177,29 @@ src_configure() {
 		--disable-papi
 }
 
-src_test() {
+ehook gnome2-multilib-per-abi-pre_src_test my_abi_pre_test
+my_abi_pre_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 	Xemake check
+	return 1
 }
 
-src_install() {
+ehook gnome2-multilib-per-abi-pre_src_install my_abi_pre_install
+my_abi_pre_install() {
 	default
+	return 1
+}
+
+ehook gnome2-multilib-per-abi-post_src_install my_abi_post_install
+my_abi_post_install() {
+	# 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/$(get_libdir)/pkgconfig/$i || die "sed failed"
+	done
+}
 
+ehook gnome2-multilib-global-post_src_install my_global_post_install
+my_global_post_install() {
 	# see bug #133241
 	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
 	insinto /usr/share/gtk-2.0
@@ -184,11 +207,6 @@ src_install() {
 
 	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
 
@@ -197,10 +215,14 @@ src_install() {
 	readme.gentoo_create_doc
 }
 
+update-immod-cache() {
+	gtk-query-immodules-2.0-${ABI} --update-cache || die "Update immodules cache failed"
+}
+
 pkg_postinst() {
 	set_gtk2_confdir
 
-	gtk-query-immodules-2.0 --update-cache || die "Update immodules cache failed"
+	multilib_foreach_abi update-immod-cache
 
 	if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
 		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"