dev-libs/gobject-introspection: avoid multilib_for_best_abi

In addition to syncing various minor upstream deltas, this avoids the
use of multilib_for_best_abi, which I want to get rid of.

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

6 files changed, 111 insertions, 257 deletions

diff --git a/dev-libs/gobject-introspection/ChangeLog b/dev-libs/gobject-introspection/ChangeLog
index 524bcb7..6aa34fb 100644
--- a/dev-libs/gobject-introspection/ChangeLog
+++ b/dev-libs/gobject-introspection/ChangeLog
@@ -1,6 +1,78 @@
 # ChangeLog for dev-libs/gobject-introspection
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.101 2013/12/10 21:30:13 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.117 2014/04/27 16:20:12 eva Exp $
+
+*gobject-introspection-1.40.0 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  +gobject-introspection-1.40.0.ebuild:
+  Version bump for Gnome 3.12.
+
+  25 Apr 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/gobject-introspection-1.34.2-better-traceback.patch,
+  -files/gobject-introspection-1.36.0-detect-clang.patch,
+  -gobject-introspection-1.32.1.ebuild, -gobject-introspection-1.34.2-r1.ebuild,
+  -gobject-introspection-1.36.0-r1.ebuild:
+  drop old
+
+  21 Apr 2014; Agostino Sarubbo <ago@gentoo.org>
+  gobject-introspection-1.38.0.ebuild:
+  Stable for arm, wrt bug #507568
+
+  19 Apr 2014; Agostino Sarubbo <ago@gentoo.org>
+  gobject-introspection-1.38.0.ebuild:
+  Stable for sparc, wrt bug #507568
+
+  18 Apr 2014; Agostino Sarubbo <ago@gentoo.org>
+  gobject-introspection-1.38.0.ebuild:
+  Stable for alpha, wrt bug #507568
+
+  17 Apr 2014; Agostino Sarubbo <ago@gentoo.org>
+  gobject-introspection-1.38.0.ebuild:
+  Stable for ia64, wrt bug #507568
+
+  16 Apr 2014; Agostino Sarubbo <ago@gentoo.org>
+  gobject-introspection-1.38.0.ebuild:
+  Stable for ppc64, wrt bug #507568
+
+  14 Apr 2014; Agostino Sarubbo <ago@gentoo.org>
+  gobject-introspection-1.38.0.ebuild:
+  Stable for ppc, wrt bug #507568
+
+  30 Mar 2014; Pacho Ramos <pacho@gentoo.org>
+  gobject-introspection-1.38.0.ebuild:
+  virtual/pkgconfig needed at runtime too (#505408 by James Le Cuirot)
+
+  28 Mar 2014; Jeroen Roovers <jer@gentoo.org>
+  gobject-introspection-1.38.0.ebuild:
+  Stable for HPPA (bug #499954).
+
+  09 Mar 2014; Pacho Ramos <pacho@gentoo.org>
+  gobject-introspection-1.38.0.ebuild:
+  x86 stable, bug 499954
+
+  09 Mar 2014; Pacho Ramos <pacho@gentoo.org>
+  gobject-introspection-1.38.0.ebuild:
+  amd64 stable, bug 499954
+
+  22 Feb 2014; Pacho Ramos <pacho@gentoo.org>
+  gobject-introspection-1.38.0.ebuild:
+  Fix wrong commit, bug 502160
+
+  22 Feb 2014; Akinori Hattori <hattya@gentoo.org>
+  gobject-introspection-1.36.0-r1.ebuild:
+  ia64 stable wrt bug #494132
+
+*gobject-introspection-1.38.0 (23 Dec 2013)
+
+  23 Dec 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  +gobject-introspection-1.38.0.ebuild:
+  Version bump for Gnome 3.10. Move configure stuff to src_configure where it
+  belongs.
+
+  22 Dec 2013; Jeroen Roovers <jer@gentoo.org>
+  gobject-introspection-1.36.0-r1.ebuild:
+  Stable for HPPA (bug #478252).
 
   10 Dec 2013; Pacho Ramos <pacho@gentoo.org>
   -gobject-introspection-1.36.0.ebuild, gobject-introspection-1.36.0-r1.ebuild:
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 529ee77..a7b1ec5 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,8 +1,4 @@
-AUX gobject-introspection-1.34.2-better-traceback.patch 1431 SHA256 921870ef1182bb6d358eaecd479f73bf22404ccd9b4d2ee27005f8aa0960a865 SHA512 48acab361c2e6a938eb88c4c2ea3cdd83dd1eb165d489b3fa54967d748a36842a4f89833a71c73ed79e4ee85e0e9aeb05fb1eac82470cc1664ba9dc0eedb8037 WHIRLPOOL af33c96fa943b6e36269963b603652bb0e6ca9702a57a384dbbef59f7b7516084bc6a2334f41d415460a7d8796c0908f9e24285cfbdde705b4430db0bb747831
-AUX gobject-introspection-1.36.0-detect-clang.patch 1084 SHA256 880db25f54711ff942c18f70ed58d466a59c7b434b1d1a876df3610286e31eb4 SHA512 61d4bb54be5567e69ddc9e9fffd8cfebb71bf7991eb9df21dcb49c10d392e385b84dd2538627c45b12b81f6bb3f6eac60c6ccbfe84132d97cf0c43eabadfe3ef WHIRLPOOL cf95d470d8a7b7d698b56db26fc451e462ad37970c0d275a48b23c9f83c5c3f899cc5bfc24a3da90f1f2bcfcca2f421a7ecf541a066ae824319011d1f16a38d2
-DIST gobject-introspection-1.36.0.tar.xz 1201108 SHA256 e3e76d9d428e7534761bf8cdf75338865a4b0872e8052bef51792744608b6383 SHA512 5c6d17851ac7d1372abdc6a9ced44d1c2313b098e6fdfbe7cba78bff66032923fccddb58913753f46e1d7fea09536bb057ea2ff7203d5f4f7540badd830eaa83 WHIRLPOOL 1f31a314a9056f2f452e59808ba143f5e387f1c7c82ddb0e3f20295592850995f602a2a82b36602b7089cddb192896d918db02190e411710d8806dbdebc77f4c
 DIST gobject-introspection-1.38.0.tar.xz 1226324 SHA256 3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73 SHA512 2eeafbb09484988c8489757232233aa9bf5cefecf7f80ed940867cf721e271644f7e94d8ae3b18717340ba3af1c208701c4766b1113af03972311517fda10e8f WHIRLPOOL 7dbab4e983095a12d6711236cd198473a326b100c67958693edf4a236cab6a922234b0e809d171fac1a2c860e29f7775f74a70589c1e1a124c137769ddd540e0
-EBUILD gobject-introspection-1.36.0-r2.ebuild 4950 SHA256 05a26b707192016a916b84cdf40bae304fb152b5e5d4bb06b8df2b2f48b4bd62 SHA512 77470223f17351ad1dac63c9a3c0a9e26b55b2414ecb8b72b435f1ae9971786dd96293f6f5aed414b8de433b4847f739ba3ef89e275d82888afc6f24c4df028b WHIRLPOOL aaa4d70fe79b5521894279fc06cc32ee1e1cd87a92450c0653a1480518359b0c152158b76eaf5c0f6ab7051180420b5ed75d7ab39d61103f6ac66f7d69f02c4f
-EBUILD gobject-introspection-1.38.0-r1.ebuild 4813 SHA256 635aa6b79d4bd0714ad54f14f8ce23c57a0acc4fc337ff74b2d7963efc4e748d SHA512 e163e1aef348e4179a3d7594475cbd0d3d0dd817e01381a13ce03042bb12da6e83f802d19cc8b70fc00ff6cc4049b6d67c147eaae960e1f4abf4a514d9d9a60d WHIRLPOOL bff0d4ab94b3a01896e1256de1191b2b5af70bbe1c46bdee6a30c75a0fbdc12f43c4542e9abcc8ddc7524de5b2686d23bdb442e160141044938c4a6e8ed20080
-MISC ChangeLog 18380 SHA256 fe5a681c806c3b29b26885c57de33583c025433bc1f088b5a1ec1b0e19962842 SHA512 1f183fbc32e40bb49f2e09f7f22f12cad1630d32678f371ea4fb1e97c5b89112977e9b50fefcf49a2bb3246d248102712a3d104391c4607b3790af80cd76e2e3 WHIRLPOOL 42f8e18b75005d7654cf812e9552891ce00d43df2396c95138e2391caeb86d1bdc4a47f32a7450f33028351a2b3df7d6e8f38c8e93bc4b24b5d6269b39f4c1ed
+EBUILD gobject-introspection-1.38.0-r1.ebuild 5082 SHA256 15bcf66b1c888f6b44d1730ee9b7b7db205c562b3fdb6a14d0c21d1037df7166 SHA512 3b7fc58b6fb3ffdb83a5f5b6264ca8b248681e49aa57f24b1e8443ad98d66fa6e1145c74de9eb3eef8daddad5ba786c5ff801d7635ee038b048c0e16c023eb35 WHIRLPOOL 5620c171a9fb0f3dbf0e4364f555146becd9a7346d5166811d412603c1914ee871a6080985a28b77ba02e77f0ff18dfc3ee809cc63b77a35bb91d6741c4ee8b4
+MISC ChangeLog 20690 SHA256 76c540459cf1dbc9ff23ddb45a97ddb6128cda6d0c28522157c205a4db732f56 SHA512 c4050d5f767ec3b6d15144d96c8bb5bbbc9125814857c366056289b6562a56fed57496cfd1e9d1e6c6d2107eb5d82bc97bbc2b6ff5c567b4a869c7c715c83ca6 WHIRLPOOL d70109c86b5c4c4a7bf12b773a197671d1c32f39a6448740ba6ad2dda5c90ccb4dafcf8f017b52f497f85271ffd43b657d5dc8b7fa0a8d248e614271759b6d7e
 MISC metadata.xml 276 SHA256 64896ff5d165a9a750f5e13dfb6ae8ab203c9c5ecf1fe95f5828dca418652cb3 SHA512 69c30c46828ec7f02fde73973d64e48042242a42f7c354fe37297df0653552eed04fac21cabbe385efa9e0d348f70e718afdf328ebdcd203a109761b4b89f99e WHIRLPOOL c527df37fc6657961892dd27b52b8597a54f11f9da01e3acbe7cad6ebaaa6d41364e49bb1635ab5c5e354a8a56e11eae49eff1f394be934cda9322204de4e282
diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-1.34.2-better-traceback.patch b/dev-libs/gobject-introspection/files/gobject-introspection-1.34.2-better-traceback.patch
deleted file mode 100644
index 296ef17..0000000
--- a/dev-libs/gobject-introspection/files/gobject-introspection-1.34.2-better-traceback.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 3e452d88e285531f78707de9a0326649d537e59f Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 29 Dec 2012 05:22:08 -0500
-Subject: [PATCH] scanner: add filename/line to the backtrace if
- parse_comment_block() raised an exception
-
-In most cases, such exceptions are caused by gtk-doc syntax errors in
-annotations, and developers want to see which annotation made g-ir-scanner
-crash.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=690850
----
- giscanner/annotationparser.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py
-index f545590..f33e956 100644
---- a/giscanner/annotationparser.py
-+++ b/giscanner/annotationparser.py
-@@ -24,6 +24,7 @@
- 
- 
- import re
-+import traceback
- 
- from . import message
- from .odict import odict
-@@ -766,7 +767,11 @@ class AnnotationParser(object):
-         comment_blocks = {}
- 
-         for comment in comments:
--            comment_block = self.parse_comment_block(comment)
-+            try:
-+                comment_block = self.parse_comment_block(comment)
-+            except:
-+                message.fatal("error when parsing comment block\n%s" % traceback.format_exc(),
-+                              message.Position(comment[1], comment[2]))
- 
-             if comment_block is not None:
-                 # Note: previous versions of this parser did not check
--- 
-1.8.0.2
-
diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-1.36.0-detect-clang.patch b/dev-libs/gobject-introspection/files/gobject-introspection-1.36.0-detect-clang.patch
deleted file mode 100644
index 8289ec0..0000000
--- a/dev-libs/gobject-introspection/files/gobject-introspection-1.36.0-detect-clang.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 863ceb7f5a5b5f6accfea23dcd47b5c74a53f68b Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Thu, 02 May 2013 01:49:01 +0000
-Subject: Do not misdetect clang as the Microsoft C compiler
-
-Just because they both start with 'cl'.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=698090
----
-diff --git a/giscanner/dumper.py b/giscanner/dumper.py
-index f5346a4..1ef1f4b 100644
---- a/giscanner/dumper.py
-+++ b/giscanner/dumper.py
-@@ -89,8 +89,9 @@ class DumpCompiler(object):
-         # Enable the --msvc-syntax pkg-config flag when
-         # the Microsoft compiler is used
-         # (This is the other way to check whether Visual C++ is used subsequently)
--        if 'cl' in self._compiler_cmd:
--            self._pkgconfig_msvc_flags = '--msvc-syntax'
-+        if 'clang' not in self._compiler_cmd:
-+            if 'cl' in self._compiler_cmd:
-+                self._pkgconfig_msvc_flags = '--msvc-syntax'
-         self._uninst_srcdir = os.environ.get(
-             'UNINSTALLED_INTROSPECTION_SRCDIR')
-         self._packages = ['gio-2.0 gmodule-2.0']
---
-cgit v0.9.2
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.36.0-r2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.36.0-r2.ebuild
deleted file mode 100644
index 9899819..0000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.36.0-r2.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils python-single-r1 toolchain-funcs gnome2-multilib
-
-DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
-HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-IUSE="cairo doctool test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	test? ( cairo )
-"
-
-RDEPEND="
-	>=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
-	doctool? ( dev-python/mako )
-	virtual/libffi:=[${MULTILIB_USEDEP}]
-	!<dev-lang/vala-0.20.0
-	${PYTHON_DEPS}
-"
-# Wants real bison, not virtual/yacc
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.15
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-# PDEPEND to avoid circular dependencies, bug #391213
-PDEPEND="cairo? ( x11-libs/cairo[glib,${MULTILIB_USEDEP}] )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Do not misdetect clang as the Microsoft C compiler (from 'master)
-	epatch "${FILESDIR}/${PN}-1.36.0-detect-clang.patch"
-
-	# To prevent crosscompiling problems, bug #414105
-	CC=$(tc-getCC)
-
-	gnome2-multilib_src_prepare
-
-	# avoid GNU-isms
-	sed -i -e 's/\(if test .* \)==/\1=/' configure || die
-
-	if ! has_version "x11-libs/cairo[glib,${MULTILIB_USEDEP}]"; then
-		# Bug #391213: enable cairo-gobject support even if it's not installed
-		# We only PDEPEND on cairo to avoid circular dependencies
-		export CAIRO_LIBS="-lcairo -lcairo-gobject"
-		export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
-	fi
-}
-
-src_configure(){
-	gnome2-multilib_src_configure \
-		--disable-static \
-		YACC=$(type -p yacc) \
-		$(use_with cairo) \
-		$(use_enable doctool)
-}
-
-###############################################################
-# DANGER WILL ROBINSON!!!  OBSCENELY INELEGANT HACK AHEAD
-#
-# this is tricky.  the scanner needs to build for the best
-# abi, only, or else all hell breaks loose (python trouble).
-# So, we very gingerly pre-build those executables, and
-# unceremoneously wedge them into the non-best-abi build-trees,
-# right where they would have gone, had we allowed the makefile
-# to generate them (if it was able to, which it isn't).
-#
-
-goi_giscanner_build_native() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake g-ir-scanner
-	# FIXME: use platform independent suffix for library here
-	[[ -x g-ir-scanner ]] || die "Dude, where's my scanner?"
-	local stuff
-	find . \( -name '*.so' -o -name '*.la' -o -name '*.o' -o -name 'g-ir-scanner' -o -name '*.lo' -o -name '*.lai' \) \
-		-print | sed "s:^:$(pwd) :" > "${T}"/its_for_scanning_things_ldo
-	popd > /dev/null || die
-}
-
-goi_giscanner_inject() {
-	multilib_is_best_abi && return 0
-	pushd "${BUILD_DIR}" > /dev/null || die
-	einfo "injecting scanner (darkly) from \"${DEFAULT_ABI}\" into \"${ABI}\""
-	[[ -f "${T}"/its_for_scanning_things_ldo ]] || die
-	local d f dn
-	cat "${T}"/its_for_scanning_things_ldo | while read d f ; do
-		[[ -d "${d}" ]] || die "bad source \"${d}\""
-		[[ -f "${d}/${f}" ]] || die "bad file \"${d}/${f}\""
-		dn=$(dirname "${f}")
-		[[ ${dn} == . ]] || mkdir -p "${dn}"
-		# hard link
-		ln -Pv ${d}/${f} ./${f} || die
-	done
-	popd > /dev/null || die
-}
-
-#
-# n.b.: I'm aware that the above was pretty damn evil.
-# By all means, let's find some better way to do it!
-# It is likely that some vastly better way exists.  In
-# the meanwhile, the above seems to work.
-# -gmt
-###############################################################
-
-src_compile() {
-	multilib_for_best_abi goi_giscanner_build_native
-	multilib_parallel_foreach_abi goi_giscanner_inject
-
-	gnome2-multilib_src_compile
-}
-
-src_test() {
-	multilib_foreach_abi run_in_build_dir abi_src_test
-}
-
-abi_src_test() {
-	# there seems to be an oot-build bug for tests/warn:
-	local mysrcdir="${S}"/tests/warn
-	local mydestdir="${BUILD_DIR}"/tests/warn
-	ebegin "OOT bug workaround for abi ${ABI}: copying *.h from \"${mysrcdir}\" into \"${mydestdir}\"..."
-	for f in "${mysrcdir}"/*.h ; do
-		[[ -f "${f}" ]] && { cp -f "${f}" "${mydestdir}" || die ; }
-	done
-	eend
-
-	emake check \
-		&& einfo "ABI \"${ABI}\" ran the test suite without incident" \
-		|| { eerror "at least one test for ABI \"${ABI}\" failed" ; die ; }
-}
-
-src_install() {
-	gnome2-multilib_src_install
-
-	dodoc AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO
-
-	# Prevent collision with gobject-introspection-common
-	rm -v "${ED}"usr/share/aclocal/introspection.m4 \
-		"${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
-	rmdir "${ED}"usr/share/aclocal || die
-
-	# prevent installation of 64-bit giscanner hacks
-	multilib_foreach_abi zap_scanner_if_not_best_abi
-}
-
-zap_scanner_if_not_best_abi() {
-	multilib_is_best_abi && return
-	einfo "zapping scanner files for abi ${ABI}"
-	rm -rf "${ED}"usr/lib32/gobject-introspection/giscanner || die "failed to zap scanner files"
-}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.38.0-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.38.0-r1.ebuild
index e508196..b551599 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.38.0-r1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.38.0-r1.ebuild
@@ -67,29 +67,28 @@ abi_src_configure() {
 ###############################################################
 # DANGER WILL ROBINSON!!!  OBSCENELY INELEGANT HACK AHEAD
 #
-# this is tricky.  the scanner needs to build for the best
+# this is tricky.  the scanner needs to build for the native
 # abi, only, or else all hell breaks loose (python trouble).
 # So, we very gingerly pre-build those executables, and
-# unceremoneously wedge them into the non-best-abi build-trees,
+# unceremoneously wedge them into the non-native-abi build-trees,
 # right where they would have gone, had we allowed the makefile
 # to generate them (if it was able to, which it isn't).
 #
 
-goi_giscanner_build_native() {
+_goi_giscanner_build_native() {
 	pushd "${BUILD_DIR}" >/dev/null || die
 	emake g-ir-scanner
-	# FIXME: use platform independent suffix for library here
 	[[ -x g-ir-scanner ]] || die "Dude, where's my scanner?"
 	local stuff
+	# FIXME: use platform independent suffix for library here
 	find . \( -name '*.so' -o -name '*.la' -o -name '*.o' -o -name 'g-ir-scanner' -o -name '*.lo' -o -name '*.lai' \) \
 		-print | sed "s:^:$(pwd) :" > "${T}"/its_for_scanning_things_ldo
 	popd > /dev/null || die
 }
 
-goi_giscanner_inject() {
-	multilib_is_best_abi && return 0
+_goi_giscanner_inject() {
 	pushd "${BUILD_DIR}" > /dev/null || die
-	einfo "injecting scanner (darkly) from \"${DEFAULT_ABI}\" into \"${ABI}\""
+	einfo "injecting scanner (darkly) from \"${DEFAULT_ABI}\" build-tree into that of \"${ABI}\""
 	[[ -f "${T}"/its_for_scanning_things_ldo ]] || die
 	local d f dn
 	cat "${T}"/its_for_scanning_things_ldo | while read d f ; do
@@ -98,7 +97,7 @@ goi_giscanner_inject() {
 		dn=$(dirname "${f}")
 		[[ ${dn} == . ]] || mkdir -p "${dn}"
 		# hard link
-		ln -Pv ${d}/${f} ./${f} || die
+		ln -P ${d}/${f} ./${f} || die
 	done
 	popd > /dev/null || die
 }
@@ -111,9 +110,33 @@ goi_giscanner_inject() {
 # -gmt
 ###############################################################
 
+_if_is_native_abi() {
+	if multilib_is_native_abi; then
+		"$@"
+	else
+		return 0
+	fi
+}
+
+_if_aint_native_abi() {
+	if multilib_is_native_abi; then
+		return 0
+	else
+		"$@"
+	fi
+}
+
+_for_native_abi_only() {
+	multilib_parallel_foreach_abi _if_is_native_abi "$@"
+}
+
+_for_nonnative_abis() {
+	multilib_parallel_foreach_abi _if_aint_native_abi "$@"
+}
+
 src_compile() {
-	multilib_for_best_abi goi_giscanner_build_native
-	multilib_parallel_foreach_abi goi_giscanner_inject
+	_for_native_abi_only _goi_giscanner_build_native
+	_for_nonnative_abis _goi_giscanner_inject
 
 	gnome2-multilib_src_compile
 }
@@ -148,11 +171,10 @@ src_install() {
 
 
 	# prevent installation of 64-bit giscanner hacks
-	multilib_foreach_abi zap_scanner_if_not_best_abi
+	_for_nonnative_abis _zap_scanner_files
 }
 
-zap_scanner_if_not_best_abi() {
-	multilib_is_best_abi && return
+_zap_scanner_files() {
 	einfo "zapping scanner files for abi ${ABI}"
 	rm -rf "${ED}"usr/lib32/gobject-introspection/giscanner || die "failed to zap scanner files"
 }