fix multilib and bump EAPI

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

3 files changed, 144 insertions, 16 deletions

diff --git a/dev-libs/libaio/ChangeLog b/dev-libs/libaio/ChangeLog
index b76b25a9ba52..c97d01973608 100644
--- a/dev-libs/libaio/ChangeLog
+++ b/dev-libs/libaio/ChangeLog
@@ -1,6 +1,11 @@
 # 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.71 2012/12/29 20:33:56 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.72 2013/03/07 16:45:24 hasufell Exp $
+
+*libaio-0.3.109-r4 (07 Mar 2013)
+
+  07 Mar 2013; Julian Ospald <hasufell@gentoo.org> +libaio-0.3.109-r4.ebuild:
+  fix multilib and bump EAPI
 
   29 Dec 2012; Mike Frysinger <vapier@gentoo.org> libaio-0.3.109-r3.ebuild:
   Mark stable for the rest of the arches.
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index 76bdb6abe5fb..6704fc4c3475 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -16,22 +16,17 @@ DIST libaio-0.3.109.tar.bz2 43579 SHA256 b5cefce0a3cb49f8dca4d00e9480c0d9b45b758
 EBUILD libaio-0.3.107.ebuild 1511 SHA256 6b2df4e5454e04f71a630cb24c948031a01914a13eefa4ae6b476d3251a6efdb SHA512 06ab8acd466a07325013d16066142d6d33d861e0ddae9191dbc62efedc184d27de190b10ebf86ed4a84a5a12326028f09da5dca7f623a32feccd752160eb7092 WHIRLPOOL 462e680477e9c2c132e3c638035245aa185717e926be1bce0f87c508a097e1aff381d967928b403040f6a5be055281432c1b3c966f5ba9ad3621ef94d76a135b
 EBUILD libaio-0.3.109-r2.ebuild 1781 SHA256 07cde00786155ff24514e4f40c3d2fcc2886da3f0464c513666f348d0a30592c SHA512 1e660031ca30367e997c2743209a0142ff5a3b5d17b4bc634877da7fc8cf0942da4be9dc5980fb2527ab11be9a4ef847f21f2103c5e53fefc7157f48d5249eb2 WHIRLPOOL f810ad4ba4d0c7b6e9ea3e7a6420f83bb9c4377fe4aeb5e03656adae06de1016cf3a5c364448f410670c7b22f4758b8cebc20944dc32d8f552697a758a72a198
 EBUILD libaio-0.3.109-r3.ebuild 3398 SHA256 463b48a53a67933e6b6f3b8ab402fe81247138f3434e1263877a70d2f1052c03 SHA512 8c12b4b2377908bc2cfbbbe974e409d1fc71d02e6353d40014e19749333a567060afe85b06a49011185ba7416f382d35b766c683ae03539397576268d2ff11aa WHIRLPOOL fa5c0ba2783401075dab1223892f25bf9ee8f45464210ca3995d72f203b3afee67999fac606933775baf1b0e2f3e542ec3e9c3302fe790873ecb73158a425ae6
-MISC ChangeLog 9893 SHA256 692a3615f6f5405e152c16a4358cabd7cc9db06ff86a486691979d195d96d868 SHA512 d73d76a8ffb26c62a10b58d64d686673fb46338b89c3ad6dad6a7d59ee7f72c556cba8913678ba2a7a0f9caa101da2b23e98164104a9c831a73f5a1b46829b00 WHIRLPOOL 8e20fb79cf784e37a2744a4fd0dce43d81c7505d8e6a0691167ec90ed5bdf5f6cf3d543b8fcf0baf43d31df67921008f11000dfdaf7b731313f131568eec32bf
+EBUILD libaio-0.3.109-r4.ebuild 3437 SHA256 4909bddb372744725aa0b360d9e70f4084a0488e87113c768188a71c0bcff932 SHA512 c056d545013fcb3145b3fd8ec35a3e48964d5d22d2a745a15dbf9f520270f0cf4b282ea164e45b8a6cb5b9055d323b1c64c8a668a0a3f85f9408987062b83e3f WHIRLPOOL ee0e02994fbe973c9cceb80fb097ba07cd2dfb69ec4d87a3e38e30657b73446c427d674d7292fcf67b9bfdd118103447b266af56c5ef23cd50fc235efb88fea9
+MISC ChangeLog 10037 SHA256 ff1848642218203e46a66b9f1c63ae6c3c6cf06cb834b5d21ac007cb13b114b3 SHA512 d2ca90570327fbd53a1439eed12094f127285c99a6f678301c9624d65edd1706a3382fdcea60c1c180492a3bac7cb12455faf95fb0b8f901c9d9c99e9cccf193 WHIRLPOOL cd53c51ccd6ed752972331239dc913e7d2a023632c330a9ff4b849b6be5cea2d8eaceda5adccefee96bfcdef0a1d34fe90474fc7248bb1c2182a03d9f6b6e9b2
 MISC metadata.xml 414 SHA256 06f23f3cae96ee5bdfa7925483540566826c2756d62431921c27f70928bd8d19 SHA512 d281e499efd182aff555ac7747569651a262f7265de7eecf40d5392bee7f0b8b7952e3ce887fe8ed495500fb058d2f26511fddf4d9819ce86e7a288b4144af7f WHIRLPOOL e052e6fe8319ea296f9d6c452bbf80c629750bbbfb400fdf34e06613e305203829cb4dcd99599f59bd78273f24ea69ceb9d717097015643ba0e2694a9cde5e2b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ31P+AAoJELEHsLL7fEFW8R0P/03t7zGfJByq5IyMbJipl5Aj
-OiqA21DbiMATs3oTfZxmy3iocxP638+/Ck0txppj7q09Z6aDYWAPHEXItssz1GBR
-9nyorM4c8OJix4ch0WPuFmUKfjjkb83K8QjhXSB5W3NYJBLST3SH/1wkpQTVuAOU
-TyUUIGels6Lf9yPFlGvDA368Tdx596TV/6VQkbVYerLK38IcC4gxoZ/zcBPmEp0Y
-63WVgzLGGdYCAKKKQ7K0IN7GnsD0VZAsp6Z7T56VDMd98N8NPaQ//h7/64zqSTzl
-SMAddoKeV9M2p4lo1MKGn+uwd3u4xdeGWhBvtCjxwgGK2G2oJaz+4rE8P0IRWAwb
-EXxD0A2eh3vkZLBm2k5vznwg5abvTaIcFZ384YH2h42Ws1qokudAw8S83wDPDPsM
-3YdpZ5gsBghkyU9ee8T5M2lZ7mJ3KWvvdQ250tUKxzxxYQ7QXysntsVKy/PGqDfl
-Af1gV560arKrXCKtUKgnioBXPp1UMP/jbiHWjqEs/XiaTB8aCP1tPz6+W3XX27Gq
-xgCIwikbY4lqtv6Tbg6g0JGwkrqYFKOsgjiYe2F6QJJ9OsebIQOpoyFdDfe4j1jD
-6iD6eFpc9cWW548SUW1IXRUnFoZiHzSEPqGZR0vPaMLKu4in3IKEZFQl2mYPfIJz
-mrsNE4X3WRT1FdZS4351
-=LYbl
+iQEcBAEBCAAGBQJROMQlAAoJEFpvPKfnPDWz5+sH/RBBRYfVjVU3YvFb87tKZ+vC
+mow3HYL2v288Os8CSLYNmfm25vVF15HYitm+u7FdEoGe6Ngq75IBDnknj8mQ+Ucv
+ejFJS3V0CdsAsZBJPvoo3b7bZF8qtrBSMdUkdqXSK1m97nxn0h57Cq2vBKX+KOMR
+DrdLhlW88GcqXcF0FX60PrBuBmQOIaKOGdVqyZPARNiDH7oVv/t3XYvoeloloNDH
+t5Rqp7luZaSKx4pCHPzYuz9kkpzgNxzfZncGleWp13nhnho+IphfrajIMpL4zb07
+q/iaWQ5uIJOc1/EpGu2SfC20YBbcfoO1srO4r3T9puWYsPsyI4ns3I8CjW1xOXI=
+=M6cb
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libaio/libaio-0.3.109-r4.ebuild b/dev-libs/libaio/libaio-0.3.109-r4.ebuild
new file mode 100644
index 000000000000..254f9eb0817b
--- /dev/null
+++ b/dev-libs/libaio/libaio-0.3.109-r4.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2013 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-r4.ebuild,v 1.1 2013/03/07 16:45:24 hasufell Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
+HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/andrea/libaio/ http://lse.sourceforge.net/io/aio.html"
+SRC_URI="mirror://kernel/linux/libs/aio/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="multilib static-libs test"
+
+EMULTILIB_PKG="true"
+
+S=${WORKDIR}
+
+aio_get_install_abis() {
+	use multilib && get_install_abis || echo ${ABI:-default}
+}
+
+src_unpack() {
+	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() {
+	local OABI=${ABI}
+	for ABI in $(aio_get_install_abis)
+	do
+		einfo "Preparing ${ABI} ABI ..."
+		cd "${WORKDIR}"/${ABI}/${P} || die
+
+		# remove stuff provided by man-pages now
+		rm man/{lio_listio,aio_{cancel,error,fsync,init,read,return,suspend,write}}.* || die
+
+		epatch "${FILESDIR}"/${PN}-0.3.109-unify-bits-endian.patch \
+			"${FILESDIR}"/${PN}-0.3.109-generic-arch.patch \
+			"${FILESDIR}"/${PN}-0.3.106-build.patch \
+			"${FILESDIR}"/${PN}-0.3.107-ar-ranlib.patch \
+			"${FILESDIR}"/${PN}-0.3.109-install.patch \
+			"${FILESDIR}"/${PN}-0.3.109-x32.patch \
+			"${FILESDIR}"/${PN}-0.3.109-testcase-8.patch
+
+		declare -a extra_sed
+		if ! use static-libs; then
+			extra_sed[${#extra_sed[@]}]='-e'
+			extra_sed[${#extra_sed[@]}]='/\tinstall .*\/libaio.a/d'
+			# Tests require the static library to be built.
+			if ! use test; then
+				extra_sed[${#extra_sed[@]}]='-e'
+				extra_sed[${#extra_sed[@]}]='/^all_targets +=/s/ libaio.a//'
+			fi
+		fi
+		sed -i \
+			-e "/^libdir=/s:lib$:$(get_libdir):" \
+			-e "/^prefix=/s:/usr:${EPREFIX}/usr:" \
+			-e '/:=.*strip.*shell.*git/s:=.*:=:' \
+			"${extra_sed[@]}" \
+			src/Makefile Makefile || die
+
+		sed -i -e "s:-Werror::g" harness/Makefile || die
+	done
+	ABI=${OABI}
+}
+
+emake_libaio() {
+	# The Makefiles need these environments, but multilib_toolchain_setup()
+	# does not export anything when there is only one default abi available.
+	CC="$(tc-getCC) $(get_abi_CFLAGS)" \
+	AR=$(tc-getAR) \
+	RANLIB=$(tc-getRANLIB) \
+	emake "$@"
+}
+
+src_compile() {
+	local OABI=${ABI}
+	for ABI in $(aio_get_install_abis)
+	do
+		einfo "Compiling ${ABI} ABI ..."
+		cd "${WORKDIR}"/${ABI}/${P} || die
+		emake_libaio
+	done
+	ABI=${OABI}
+}
+
+src_test() {
+	local OABI=${ABI}
+	for ABI in $(aio_get_install_abis)
+	do
+		einfo "Testing ${ABI} ABI ..."
+		cd "${WORKDIR}"/${ABI}/${P}/harness || die
+		mkdir testdir || die
+		# 'make check' breaks with sandbox, 'make partcheck' works
+		emake_libaio partcheck prefix="${S}/src" libdir="${S}/src"
+	done
+	ABI=${OABI}
+}
+
+src_install() {
+	local OABI=${ABI}
+	for ABI in $(aio_get_install_abis)
+	do
+		einfo "Installing ${ABI} ABI ..."
+		cd "${WORKDIR}"/${ABI}/${P} || die
+
+		# Don't use ED for emake, src_prepare already inserts EPREFIX in the correct
+		# place
+		emake_libaio install DESTDIR="${D}"
+
+		doman man/*
+		dodoc ChangeLog TODO
+
+		# move crap to / for multipath-tools #325355
+		CFLAGS="${CFLAGS} $(get_abi_CFLAGS)" gen_usr_ldscript -a aio
+	done
+	ABI=${OABI}
+}