Convert to multilib, wrt bug #463750.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

3 files changed, 113 insertions, 9 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 27d2b76d6405..e89a6ed14ee7 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/alsa-lib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.355 2013/05/03 13:36:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.356 2013/05/03 14:38:28 mgorny Exp $
+
+*alsa-lib-1.0.27-r3 (03 May 2013)
+
+  03 May 2013; Michał Górny <mgorny@gentoo.org> +alsa-lib-1.0.27-r3.ebuild:
+  Convert to multilib, wrt bug #463750.
 
 *alsa-lib-1.0.27-r2 (03 May 2013)
 
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 8ebb2501fd1d..25b253d0ad43 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -12,16 +12,25 @@ DIST alsa-lib-1.0.27.tar.bz2 898132 SHA256 947caa14cf53c614d0a206fe9f5964de6ee96
 EBUILD alsa-lib-1.0.26-r1.ebuild 1611 SHA256 21beff4d4e3d1a3a641901dcb806a8b4740a99706d4d7f6f43938892c86b2620 SHA512 f0a0084ca9dba8199ae7f3cc38694226a618b170bb8b2d61d226cfbccffae8fc1585aab7ae16bbf7459bf665c2cf62dcefe746a4119df998cf3d80cf2460b716 WHIRLPOOL ce18af81d4586c04489a992db8555289d3b181807e5b8e247441fb7f23138b5f9436fbbd036010cc57789989b6909010760d011dc2d3e41913b5673531f16d79
 EBUILD alsa-lib-1.0.27-r1.ebuild 1759 SHA256 e9af06c622cde78876aa5a45b71534370ab0cb3e92cfdda03282b6addb0f9c03 SHA512 c790fc228a51f4886ccc6db51122901c9b124fcab25846df32e58214942a30afe3829bdba8434b3e1adf74aa57f67863e68e33e0f5738a40b7538e912c4a2823 WHIRLPOOL f7597f67e0427106c9d5e4a49a6dcff885568b19db931a6d95f9b37ac5aad05f9bb76150b1d9b734df48bb619f91b9d3f0aa4d53b6351247aa172f89b08171b0
 EBUILD alsa-lib-1.0.27-r2.ebuild 1877 SHA256 a116e62a4ca8c1cad2b694fffad4e5a11da4098b90ec5e8c49e02329403aeba8 SHA512 faba485d93a420e0056daaa2b5ad09afb4c3090b972e7163e1f89fdde69344379d553ff4bdc22655a5b9dd96bd3670c8311f5bfa1df07a01403c7c2ae98ebd2c WHIRLPOOL ada327901d2b16fbeedec643fbd9184f81a900941dd8c18588fdaae3937a15a7eec4ba28cfc60c5b2a30cc5fc20c73b4bf504510efa29d9ae141876149b61a6d
-MISC ChangeLog 52662 SHA256 8f292f97fe646071420e5709875207cf30bb1b38755b0d6db4c57de0997c8f08 SHA512 02768f000dd50ec3fe78807d435537797c7eeaa605b1799fe2eef14d5a13eff3baec4ca06d032d537ea64a7e711e2b85992816185dab90026fb2006c18024aa1 WHIRLPOOL ee28ee17ddf175e4fc64b623bfb28bb4cdaf62bc03ba1df69511146d45ea6f9b6e6c74ef84bccd581abc8d3b634857fc4edd91fb97cb65bc6ce45c9230a343f3
+EBUILD alsa-lib-1.0.27-r3.ebuild 2233 SHA256 a67b1e12d4a69687f98b34836d108a10247e9eaa2c942ff6a8a7b483ab27323f SHA512 d3772acf4b99f591102c9e4214f1931ce2d3072f39ddbcd039db9b91bbecd23d9b383d1d4256fc35700ca5f5b8a1814bc23ad9b62f40a2743776051e042b3b54 WHIRLPOOL b83e117c6c34f05d00c273a3b28611ea521c5c0a267632a41bcccbf2cf4bb3eb13c85a6a8a10cb4a080ff135d650eabdfcb91187f0603b2ddf3d1f69777a0d1f
+MISC ChangeLog 52813 SHA256 3b0a01c6aaaaf50c3514ed5e64d9213b523bfa57c8c33a3aaebffaaefe447a70 SHA512 d9c9103aa1698613a20a3888749dd280eb7948da721269a9b45dc952dfdea25d8576d903b8a4b20013d14c170984c7884bee7565f9d22c73802149a17a998883 WHIRLPOOL 16a8cff05f5849ee11f8dd18776cc048258b0332ba93768747b8eb947667084e65f53f5340d6582542f753d34f6b3af659133507da451f9643e9ec485a7eca4d
 MISC metadata.xml 349 SHA256 68b0f168985d3b03a0997eb9f9338662d1584dc7fe7ea35ae8f7564e5e20c2e3 SHA512 477956b85f7ddddac6b0bb67a52803a569f3ee6011ab917a3d2a60975a11c0a9ef5acedebbcb75bdbd04063e2c6e7aabf10a0c2444dd10492eda4cb8f817f688 WHIRLPOOL c42f98c4da4bd5c20d32bfa6a3d9d68b71aaccbc905cad9a7552366be99c1e1f010279d458b620e97e2c1044cef0af066cf79fc5a1fcecf8fb31c91a3e1e95ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEbBAEBCAAGBQJRg71yAAoJEEdUh39IaPFNvAkH92wm42mTOWDA7AHRiDTBGzrA
-J15HWmVXIbVAno3grAihNmlUrylnXBg/R4sQU5AhvvNqyhbY7IY2QEWgxfXCyHlX
-OUfTBCvtQgWei71ezKMv++EIg6EBcVeDs0qpkyp8p/Ym0n4bmnF7eRBSdHfr+hf0
-Exu/V6ZwyX9dB5RBh2FdtpRvASpTmmNbayca2pOa9BILk3jV+wrNbADmdBbrK0Iv
-Vg8T7Fia/yM4duNlQL47eB9lkV0UY18MF4T/1HYpEh42EGWUniWW7OrUyOIuQcXg
-L2Gj8oF9ozBvQJcBJ2w9YNtWA50BeL2av49vYGShsxGAvJWW7vwFSNZ5pbkVGg==
-=rkwB
+iQJ8BAEBCABmBQJRg8vrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDWNAQAJXf8WTTqktu8Unz6/qxJlii
+LZCDjsUQa2TybxK8lw8PbN4Y/OMpUFH/2Ndb2H06+hKGMdyWGdNBK5xyS9cPfQTN
+6p9vDSnchK0znqXdJNiTan7O67q38yuqwYkfTx4Vtreb6dFgAqZqlBk00KN0Pznv
+tA9V+c4c1WrgLcSUIcxCuAtdiLchnHLTESghInDJ1NF2EAzfVclL5FSEBXT/lBkv
+t1FYrwmNmlyeR3uHw61FhIST1+6TQsfWIHoHbDjFhjEgBOigt8B6apWvATRFJ1/n
+VQ/zUOEj233oJMBXHTIfm8Z3lmEb3Reks3pY1k7OYD3wsJlsPUV9jwOC0mADnDsx
+Nan0gI0QhI2PXVUJAebikVEtVSoRkgNbKJ7OJuw1JVS1aw9x1BcXzwEVBCr1vJl/
+PXBlPoOtMHduU6OnEefSfyLHfhYml9BmAYgmMcpMoe5D+iBVFzmo2z+oC5iadSeC
+I0B935jgfvFBIXcjjl6+w5xzcJWBYhAXYRl4Ey2hgZe0fPTc1uTDrxZo5WPnsVJN
+gewn3Yjt6Afh0MZW34+iMZPcMh6tkx3RUlcBsONf/lCiZ10QJ5U80Xtlzxey6hbB
+Hm1MFbaYBnpXpDMLzBUFhnoS6sJg20pxQisfKZ2MuoI+as5kqw7nU2SoucZzhAv3
+/XaqDWGzyb9/sk9Ie22p
+=jDSj
 -----END PGP SIGNATURE-----
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.27-r3.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.27-r3.ebuild
new file mode 100644
index 000000000000..c0e9f743a8de
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.0.27-r3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27-r3.ebuild,v 1.1 2013/05/03 14:38:28 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils multilib multilib-minimal python-single-r1
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc debug alisp python"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )"
+DEPEND="${RDEPEND}
+	>=media-sound/alsa-headers-1.0.25-r1
+	doc? ( >=app-doc/doxygen-1.2.6 )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# dlclose, pcm, kernel, inline, inline-2 are all from upstream
+	epatch \
+		"${FILESDIR}"/1.0.25-extraneous-cflags.diff \
+		"${FILESDIR}"/${P}-{dlclose,pcm,kernel}.patch \
+		"${FILESDIR}"/${P}-inline{,-2}.patch
+
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die #466980
+
+	epatch_user
+
+	eautoreconf
+	# if eautoreconf'd with recent autoconf, then epunt_cxx is
+	# unncessary wrt #460974
+#	epunt_cxx
+}
+
+multilib_src_configure() {
+	local myconf
+	# enable Python only on final ABI
+	if [[ ${ABI} == ${DEFAULT_ABI} ]]; then
+		myconf="$(use_enable python)"
+	else
+		myconf="--disable-python"
+	fi
+	use elibc_uclibc && myconf+=" --without-versioned"
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-shared \
+		--disable-resmgr \
+		--enable-rawmidi \
+		--enable-seq \
+		--enable-aload \
+		$(use_with debug) \
+		$(use_enable alisp) \
+		${myconf}
+}
+
+multilib_src_compile() {
+	emake
+
+	if [[ ${ABI} == ${DEFAULT_ABI} ]] && use doc; then
+		emake doc
+		fgrep -Zrl "${S}" doc/doxygen/html | \
+			xargs -0 sed -i -e "s:${S}::"
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	if [[ ${ABI} == ${DEFAULT_ABI} ]] && use doc; then
+		dohtml -r doc/doxygen/html/.
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	find "${ED}"/usr/$(get_libdir)/alsa-lib -name '*.a' -exec rm -f {} +
+	dodoc ChangeLog TODO
+}