Fix for cross-compile support of multilib-portage, bug#407687

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

3 files changed, 30 insertions, 12 deletions

diff --git a/dev-libs/libaio/ChangeLog b/dev-libs/libaio/ChangeLog
index d433b1a0c1a7..615758d17c3a 100644
--- a/dev-libs/libaio/ChangeLog
+++ b/dev-libs/libaio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libaio
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.62 2012/03/09 16:12:46 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.63 2012/03/12 07:57:39 haubi Exp $
+
+  12 Mar 2012; Michael Haubenwallner <haubi@gentoo.org>
+  libaio-0.3.109-r3.ebuild:
+  Fix for cross-compile support of multilib-portage, bug#407687
 
 *libaio-0.3.109-r3 (09 Mar 2012)
 
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index 0f51a017585a..97496eab04d0 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -16,13 +16,13 @@ DIST libaio-0.3.109.tar.bz2 43579 RMD160 fed1f4ddb9cb9d66c40f5909a6d7c2400dcebda
 EBUILD libaio-0.3.107.ebuild 1511 RMD160 54bffb7552c3d806075acbbebc0481816b232cd7 SHA1 27ce5a8c02185860744cc3e7cd35af85c87fac57 SHA256 6b2df4e5454e04f71a630cb24c948031a01914a13eefa4ae6b476d3251a6efdb
 EBUILD libaio-0.3.109-r1.ebuild 1596 RMD160 f524720377ead44e1bfcf6481fc83bcb88de05fd SHA1 da6a03dc53e74815cd1c7f963d08f9fbfc762cc9 SHA256 dc8b6582152eee085c575cb7d4a8c69a680be9cf1c59c0ebef70bc94273af027
 EBUILD libaio-0.3.109-r2.ebuild 1784 RMD160 5698afa9d0d19d19afd9d7a2efb06d2912561097 SHA1 f4269428324c60a3f45093bbcca2c5d7541abbee SHA256 0fd9d7e7f5bcc91a693c761952b512c9d8811d41c2afa2c1c18dd0528a6e1958
-EBUILD libaio-0.3.109-r3.ebuild 2933 RMD160 90010243d115d0c99badd895483743292146f176 SHA1 c832884607aa39f4d2cee6feaefbfe1602e7a92e SHA256 d782f971c853c207be96c605600f61a3cf38dc6b21a69b7d27cc3e4e14ba148a
-MISC ChangeLog 8644 RMD160 bb027f8bcfed159c17d3d0da9db3853cc234b113 SHA1 c0c564ec2e01de0dec2ccf3c047d78d5a2894176 SHA256 0524dfa1443646e160afff113b5a269c3191b074d7d486146fa0e5cafbefac50
+EBUILD libaio-0.3.109-r3.ebuild 3199 RMD160 29847b9fa29f5b109dfbac943682719114c1dd11 SHA1 f46d446589166dfc58d420fa23c4966294243fa1 SHA256 365562e2979486ca9981717a8ff48ce4e2745cd880ee336a526477cdc83c2d66
+MISC ChangeLog 8793 RMD160 fb273087368ecd77aa09bee5c72ec6896d3181a7 SHA1 53b656386a01e90fa5c41533500cf40e19e03fe4 SHA256 aead79a8e3b41eff67234ec0dee4af6077746bfdcfd8cfa3ebb5bbfca3b45afb
 MISC metadata.xml 414 RMD160 729568392408a479b1c7dd127c8c158afdfffb77 SHA1 212f6c187d77b0a44db05f5eee1bcc802592bad7 SHA256 06f23f3cae96ee5bdfa7925483540566826c2756d62431921c27f70928bd8d19
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9aLAYACgkQLc0TWKYwzLgTrACeO5VDnT6zJNcaey+Q3FPNoCRK
-t/YAoK53DVJsHqf4zq5LlktApWIi0Z1g
-=+rsf
+iEYEARECAAYFAk9drHsACgkQLc0TWKYwzLiJLwCfVKXvc8xiQW9vZYLnWBiexCOv
+Vm4An3zg4QPhuzwVng0pP/ZTuYZY3UDC
+=yoEV
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libaio/libaio-0.3.109-r3.ebuild b/dev-libs/libaio/libaio-0.3.109-r3.ebuild
index f6a2db7b2724..7a1fea019779 100644
--- a/dev-libs/libaio/libaio-0.3.109-r3.ebuild
+++ b/dev-libs/libaio/libaio-0.3.109-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.109-r3.ebuild,v 1.1 2012/03/09 16:12:46 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.109-r3.ebuild,v 1.2 2012/03/12 07:57:39 haubi Exp $
 
 EAPI="3"
 
@@ -17,17 +17,24 @@ IUSE="static-libs"
 
 EMULTILIB_PKG="true"
 
+aio_get_install_abis() {
+	use multilib && get_install_abis || echo ${ABI:-default}
+}
+
 src_unpack() {
-	for ABI in $(get_install_abis)
+	local OABI=${ABI}
+	for ABI in $(aio_get_install_abis)
 	do
 		mkdir -p "${WORKDIR}"/${ABI} || die
 		cd "${WORKDIR}"/${ABI} || die
 		unpack ${A}
 	done
+	ABI=${OABI}
 }
 
 src_prepare() {
-	for ABI in $(get_install_abis)
+	local OABI=${ABI}
+	for ABI in $(aio_get_install_abis)
 	do
 		einfo "Preparing ${ABI} ABI ..."
 		cd "${WORKDIR}"/${ABI}/${P} || die
@@ -44,6 +51,7 @@ src_prepare() {
 			-e '/:=.*strip.*shell.*git/s:=.*:=:' \
 			src/Makefile Makefile || die
 	done
+	ABI=${OABI}
 }
 
 emake_libaio() {
@@ -56,16 +64,19 @@ emake_libaio() {
 }
 
 src_compile() {
-	for ABI in $(get_install_abis)
+	local OABI=${ABI}
+	for ABI in $(aio_get_install_abis)
 	do
 		einfo "Compiling ${ABI} ABI ..."
 		cd "${WORKDIR}"/${ABI}/${P} || die
 		emake_libaio || die
 	done
+	ABI=${OABI}
 }
 
 src_test() {
-	for ABI in $(get_install_abis)
+	local OABI=${ABI}
+	for ABI in $(aio_get_install_abis)
 	do
 		einfo "Testing ${ABI} ABI ..."
 		cd "${WORKDIR}"/${ABI}/${P}/harness || die
@@ -73,10 +84,12 @@ src_test() {
 		# 'make check' breaks with sandbox, 'make partcheck' works
 		emake_libaio partcheck prefix="${S}/src" libdir="${S}/src" || die
 	done
+	ABI=${OABI}
 }
 
 src_install() {
-	for ABI in $(get_install_abis)
+	local OABI=${ABI}
+	for ABI in $(aio_get_install_abis)
 	do
 		einfo "Installing ${ABI} ABI ..."
 		cd "${WORKDIR}"/${ABI}/${P} || die
@@ -96,6 +109,7 @@ src_install() {
 		# move crap to / for multipath-tools #325355
 		gen_usr_ldscript -a aio
 	done
+	ABI=${OABI}
 
 	if ! use static-libs ; then
 		rm "${ED}"usr/lib*/*.a || die