x11-libs/gtk+:3 complete multilib-utization

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

3 files changed, 52 insertions, 263 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index a245772..e90e7cc 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -20,11 +20,9 @@ AUX gtk+-3.8.6-skip-filechooser-test.patch 795 SHA256 1b900fc9501024170f2bfc48e3
 AUX gtkrc 627 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4 WHIRLPOOL fdb1c72ce448e867dd8d591455103fb7790919e1d7e77d6c5aa46e9a3fbc590ad6a189c50d2bc958896471a31b975940960307dc80a2d88416b77fca581b4dfb
 AUX settings.ini 96 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7f2667658163 SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418 WHIRLPOOL 64a2c11ef1a6eda0bca40555a182023229202bcf15d527e6da8c52703be2fca26629b78ed677522eb626de7b7f456a7c37ab7fc3fe41907f1a46d770edb1fd67
 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 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
+EBUILD gtk+-3.8.7-r1.ebuild 7775 SHA256 5687278b40919179e1e4a03b75928c96dab9ba5e52ed8160df3bfce0124dcd21 SHA512 d26c4d37f46d2289cbf679381bd7fbc3b007ed3ba4f6d8cae506d858ef277f8cb633e83a5b516a371c97088000fad141b90176335fc5e153a56e865921aa4afd WHIRLPOOL 7a70ec4a14ae2039d611202fb2880c9425d6694e65fb01343e78658c671b7ebbb8e073f722281851fd77121007cdc06c7d46addad248c3ee2c8f372b30488f39
 MISC ChangeLog 9932 SHA256 54a7a3fa0371b0fc1f8e9f0be2d1191c88277411e1db4d7b34993f98935d5fcb SHA512 4e850b2f0972dfced29c6dc9a7073395f3743c63b51d3a854d22850959e3f0663291b336ccc9ff4787edcf5791affb3be5bd0cc668482f822a95a65c4eaa3197 WHIRLPOOL b271a6c437af187100344842e899e382246335477f19abc5ceaab630efe25a200440e700a3e7422b3d278084937611ae30e5d9c2199282edaced133e3b8ce1f0
 MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec
 MISC metadata.xml 902 SHA256 f4bad589c3732f53e882bde561c44c6b1beb6fe0bea42f2149e1f3fd07929ffc SHA512 aec419c5cd0cb202c00ede6a7bd822fbe562654d95dab37f5fcd4ac47dfa19d20573a0dbe718fb582b0eaf2cc1636302825df5363075d09b3fb7f2eba7129897 WHIRLPOOL 89cb8aadfb3ae4c90d48997f8dbafd7d17da02a3ded145ce5b5ff17302353c181f9729d1e161e6cef163dfaf947624fb4526bb08e7d13675ef47aee59f4458e9
diff --git a/x11-libs/gtk+/gtk+-3.10.6-r1.ebuild b/x11-libs/gtk+/gtk+-3.10.6-r1.ebuild
deleted file mode 100644
index 4bd5024..0000000
--- a/x11-libs/gtk+/gtk+-3.10.6-r1.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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 ~s390 ~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="
-	>=dev-libs/atk-2.7.5[introspection?]
-	>=dev-libs/glib-2.37.5:2
-	media-libs/fontconfig
-	>=x11-libs/cairo-1.12[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
-	>=x11-libs/gtk+-2.24:2
-	>=x11-libs/pango-1.32.4[introspection?]
-	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 )
-	wayland? (
-		>=dev-libs/wayland-1.2
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3
-		x11-libs/libXrender
-		x11-libs/libX11
-		>=x11-libs/libXi-1.3
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.3
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		xinerama? ( x11-libs/libXinerama )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.11
-	virtual/pkgconfig
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/damageproto
-		xinerama? ( x11-proto/xineramaproto )
-	)
-	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() {
-	gnome2_environment_reset
-
-	# Build fails with USE="wayland introspection"
-	# Fixed upstream with commit 8dd899dae (and will be in 3.10.7 tarball)
-	rm "${S}"/gdk/wayland/gtk-shell-client-protocol.h || die
-	rm "${S}"/gdk/wayland/gtk-shell-protocol.c || die
-
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS testsuite Makefile.am
-		strip_builddir SRC_SUBDIRS testsuite Makefile.in
-		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() {
-	# Passing --disable-debug is not recommended for production use
-	# 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 \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable colord) \
-		$(use_enable cups cups auto) \
-		$(usex debug --enable-debug=yes "") \
-		$(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-gtk-doc \
-		--disable-papi \
-		--enable-man \
-		--enable-gtk2-dependency \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-}
-
-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
-
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" 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
-	if use aqua ; then
-		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
-			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
-				-i "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
-		done
-	fi
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-
-	# Make sure loaders.cache belongs to gdk-pixbuf alone
-	local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"/${cache} || die
-	fi
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	gnome2_query_immodules_gtk3
-
-	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
-
-	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
-		rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.8.7-r1.ebuild b/x11-libs/gtk+/gtk+-3.8.7-r1.ebuild
index 261b374..9dadc57 100644
--- a/x11-libs/gtk+/gtk+-3.8.7-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.8.7-r1.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI="5"
-inherit eutils flag-o-matic gnome.org gnome2-utils multilib virtualx
+inherit eutils flag-o-matic gnome.org gnome2-multilib virtualx
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~amd64"
 
 # 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)
@@ -28,47 +28,47 @@ KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-f
 # at-spi2-atk dependency needed due https://mail.gnome.org/archives/desktop-devel-list/2012-June/msg00035.html
 COMMON_DEPEND="
 	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3
-		x11-libs/libXrender
-		x11-libs/libX11
-		>=x11-libs/libXi-1.3
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.3
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		xinerama? ( x11-libs/libXinerama )
+		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.3[${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}]
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
 	)
 	wayland? (
-		>=dev-libs/wayland-1.0
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2
+		>=dev-libs/wayland-1.0[${MULTILIB_USEDEP}]
+		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
 	)
-	>=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
+	>=dev-libs/glib-2.35.3:2[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.32.4[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/atk-2.7.5[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-2.24:2[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
 	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 )
+	colord? ( >=x11-misc/colord-0.1.9[${MULTILIB_USEDEP}] )
+	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.32[${MULTILIB_USEDEP}] )
 "
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xsl-stylesheets
 	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
+	dev-libs/libxslt[${MULTILIB_USEDEP}]
 	dev-util/gdbus-codegen
 	virtual/pkgconfig
 	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/damageproto
-		xinerama? ( x11-proto/xineramaproto )
+		x11-proto/xextproto[${MULTILIB_USEDEP}]
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		x11-proto/inputproto[${MULTILIB_USEDEP}]
+		x11-proto/damageproto[${MULTILIB_USEDEP}]
+		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
 	)
 	>=dev-util/gtk-doc-am-1.11
 	test? (
@@ -87,6 +87,10 @@ RDEPEND="${COMMON_DEPEND}
 "
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
 
+MULTILIB_WRAPPED_EXECUTABLES=(
+       /usr/bin/gtk-query-immodules-3.0
+)
+
 strip_builddir() {
 	local rule=$1
 	shift
@@ -149,7 +153,7 @@ src_configure() {
 	# Passing --disable-debug is not recommended for production use
 	# 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 \
+	gnome2-multilib_src_configure \
 		$(use_enable aqua quartz-backend) \
 		$(use_enable colord) \
 		$(use_enable cups cups auto) \
@@ -169,10 +173,11 @@ src_configure() {
 		--enable-man \
 		--enable-gtk2-dependency \
 		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--libdir="${EPREFIX}"/usr/@GET_LIBDIR@
 }
 
-src_test() {
+ehook gnome2-multilib-per-abi-pre_src_test my_abi_pre_test
+my_abi_pre_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
@@ -180,23 +185,26 @@ src_test() {
 		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
+		return 1
 	fi
 
 	unset DBUS_SESSION_BUS_ADDRESS
 	Xemake check
+	return 1
 }
 
-src_install() {
-	emake DESTDIR="${D}" install
-
+ehook gnome2-multilib-global-post_src_install my_global_post_install
+my_global_post_install() {
 	insinto /etc/gtk-3.0
 	doins "${FILESDIR}"/settings.ini
 
 	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
 
 	prune_libtool_files --modules
+}
 
+ehook gnome2-multilib-per-abi-post_src_install my_per_abi_post_install
+my_per_abi_post_install() {
 	# 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"
@@ -210,6 +218,10 @@ pkg_preinst() {
 pkg_postinst() {
 	gnome2_schemas_update
 
+	multilib_foreach_abi abi_pkg_postinst
+}
+
+abi_pkg_postinst() {
 	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"