Introduce multilib support.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 68 insertions, 11 deletions

diff --git a/media-libs/alsa-oss/ChangeLog b/media-libs/alsa-oss/ChangeLog
index 8a4c873b8baa..bc6d4cf59a3e 100644
--- a/media-libs/alsa-oss/ChangeLog
+++ b/media-libs/alsa-oss/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/alsa-oss
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-oss/ChangeLog,v 1.128 2013/07/14 15:33:52 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-oss/ChangeLog,v 1.129 2014/05/09 14:32:19 mgorny Exp $
+
+*alsa-oss-1.0.25-r1 (09 May 2014)
+
+  09 May 2014; Michał Górny <mgorny@gentoo.org> +alsa-oss-1.0.25-r1.ebuild:
+  Introduce multilib support.
 
   14 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> -alsa-oss-1.0.17.ebuild:
   old
diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest
index 69c33be97c54..d184d031b7c8 100644
--- a/media-libs/alsa-oss/Manifest
+++ b/media-libs/alsa-oss/Manifest
@@ -3,17 +3,26 @@ Hash: SHA256
 
 AUX alsa-oss-1.0.12-hardened.patch 370 SHA256 c21bf36df32e8b480b3e2e064e52874d68d263e1f36f7a687025d1450bc2062e SHA512 126bd73800844c0b9e4c2af05b3754bbbacf9e380288cdde7fef666621fcb0b1775bead7fd932c23375efea594ec9f1d3eccf009a90a7994d18b101ba21f1ee2 WHIRLPOOL b45cc1c93437823be2e06f1d8ec810daf514bf53c21ad756aa5df1913032432157dea69dc7ea76bd10abf8a248278491085b4a1b81c59ae89f50f646a689dd0c
 DIST alsa-oss-1.0.25.tar.bz2 253409 SHA256 ed823b8e42599951d896c1709615d4cf7cb1cb3a7c55c75ccee82e24ccaf28e3 SHA512 5380e5acf588dd56384f53afedc7704bfc5e3a7b886853061c53236f86312a8f0ca9b9adf6e69019569a3eb6fd3e89acfb715bb16101f50dcf961e84269c3cd2 WHIRLPOOL 27f19ae9b43d6941fdafb8e51ef0e7cd2667a6a6a8babf58303a0468bad02a33fd2562e91e5c92941083f7a0b2b4e17d4a001c41370bf6cddd29182b17ee4ca0
+EBUILD alsa-oss-1.0.25-r1.ebuild 1134 SHA256 19cf70255be396c1aa313bfa906af80eff68f4e46aee165d44dd80d34963f832 SHA512 86907294ddc986bbf48b621a96f954983ff2914f578223ca174314d1438400b4f79e69a32b0bc65ed09cbcf5c39ba6450c71667d9db5955a64a7132f67965adc WHIRLPOOL bb29571aaf0df7ac6f219d14f8566e45f8d8f3b06e5f6d166dd036c4f85ee51b281158314040f94b9748fe20570057ebc7f6dab629eaab65c93d12ea72da994e
 EBUILD alsa-oss-1.0.25.ebuild 955 SHA256 b43465ba94050e4fcc7b871a4d1960b5268dd416d2b58990814b4438524a5d69 SHA512 ea8789b8ae1da21ee071e54db8ca822848aaaffee88e9a2e2ba2b59c7e99a6bc80433d73ca1398d568dad9b16efd2c221b92675597b5d0b620687f5aee8fc2b7 WHIRLPOOL ecf7e100561cf452f4d02b96cb939f938603e5a4c3b9ef3aa6f5d854ce1d40bdaa3d2b968c90814712697ced351830112dd550dcc4d0cce27ca3fb174b984487
-MISC ChangeLog 15854 SHA256 515780f8249923e087066ffa1afa17b1f822a91f14acfeae967e2130767d314f SHA512 17d2bf4fd677ba032e331a90829275a3518d7464cad5ba48b733fc81360dafdfe3a2215bada375aa86266490506038bf5b9cbb8c7228237049e7de57b4236a35 WHIRLPOOL 4a16c6732e42cba105c1a3b2c96716de0b3ad4b4b03ee9bf95a739cfa256046480b736740dc42533ea6c5a40716247d5319002b77e1d2373f8d10b3957a220bf
+MISC ChangeLog 15995 SHA256 b9464529156974f5a08118e32691f93419b92a75ab7ee3076dd704914194567d SHA512 fe391609c1de9daa19b0ecf57720ce32d0a63798c4d238e7f887b9971118ef4a57d44476abeb88003232eac727e561695e77049074df046378b77761ced3639a WHIRLPOOL 2cf1fe61e6eba7cca9622de5e4162664b49343a6921cee96b70188d5894b58712bc8f2e9363182c0cbb93112a7be2b3e3b54a8729c0a41668d120c19e4cb0749
 MISC metadata.xml 220 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054 SHA512 bfa2051cacad9c45a63629f41143d807230d2c6470275bcfc1e96a16dfaa885905054ab76eedbb11a6b2414fb0ca1996ba8222913a8c6fd7d8219e48adb90fac WHIRLPOOL 38c7fa4c2a63df86caebb43afa06ed95650a09dec9cd676738d8074fc699820ca66a9b8a7f00d64747ab2adf4e348efa1249aaab6f6778b045be7d2372e27b42
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR4sThAAoJEEdUh39IaPFNA/cH/3T2XEk9OGtMJaPEDIexTPEM
-zRVSBmXc/Bzv2fq8+Cn/49r3DdQj/IoYHch2M5rim1yJhgd5wSQGE3xyE0edD62c
-gipGHuxiB8j6p1vNYmh5diMbD5wn9naRD487a/kfJgATsp357lacJ7zDf6AhVSoB
-3BB9ZWH1dUJzOJegQtwvrzOUWzEBBgCHXm7N/TaU2sMa4GwBdG0wj6jMvUiAT8V9
-ykysltfhUtxj4TCY1zkNmKsVymOeBH+UrQzQdjupxJtEo6sbPqH4unNSDIEipdDz
-r2pE2d+DFSfSboRjfg1gPD/POHzOmbGA8EIOdyFrZhXTtlr2L6t/IxpWqkI+llQ=
-=BcQk
+iQJ8BAEBCABmBQJTbOb0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZObNEQAL+7RkM7WPOCYFuoOiorbCmO
+yxDCyjvTZQaeS2SQAjn0ZoSLghDm6cYtwS1YS8grj/OoavaIBE2KILusykJpxRg2
+h0LlfDwPfmrFx1Ev76gMYtAKcKCFF14JN2uI/x26XJmE6MU50uRU/cse1Ig1uk6w
+i+RCccmQf9pdmhapGZt4NlBjK5yQWj9CPy7ZpqT+e7EjiNKceH1eKY9GHnY3u8rt
+ggFOeTfxcSsSZ3D3dqgI40+vsNGLk0Sr0E26VjCVuaq5UNTm6VQJCTZSjPXOQLXH
+919qmTr+8s1b6WI8p/ZOksmNW77Uat5weZ4Qm/wzI+Os9s0ab0QlWRnYVMLPUreA
+bVmvaMDTlDv9Pwf21MNJmZPmYdFhKdZQShrX6zyknuAgz3FI9w8LW/dVedPpeZjS
+LLn8A0d1YNKsabhpbR9ueGQ6Celaqpd4c6ADH2vmrqb2Dy1yBay6p7svLd3ewf97
+8W9OCCjzJHK30JHRyRNN3Ys7+uKeMygCf1Ilif7E/72j7CgyPqbqSlPju7TYIxG0
+aR6ly2Eg5xXTNEZkJuAG7XmjyBIoDM7HT/H68ouoNwkiUeSDMbn63RpQaYJsY1oO
+GfRIikC42LXhYbbEFfiaolW9XJuCR7mHxbQsOLDuwkyHqOBfZWnV8IU9cRhn10U0
+s1CsrfdpCIWTXcOWyxrA
+=p9Bl
 -----END PGP SIGNATURE-----
diff --git a/media-libs/alsa-oss/alsa-oss-1.0.25-r1.ebuild b/media-libs/alsa-oss/alsa-oss-1.0.25-r1.ebuild
new file mode 100644
index 000000000000..57c4f068406c
--- /dev/null
+++ b/media-libs/alsa-oss/alsa-oss-1.0.25-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-oss/alsa-oss-1.0.25-r1.ebuild,v 1.1 2014/05/09 14:32:17 mgorny Exp $
+
+EAPI=5
+
+inherit autotools eutils multilib multilib-minimal
+
+MY_P="${P/_rc/rc}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Advanced Linux Sound Architecture OSS compatibility layer."
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/oss-lib/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=media-libs/alsa-lib-${PV}[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!<app-emulation/emul-linux-x86-soundlibs-20140406-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
+	)"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-1.0.12-hardened.patch" )
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static)
+}
+
+src_prepare() {
+	eautoreconf
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+	sed -i -e 's:\${exec_prefix}/\\$LIB/::' "${D}/usr/bin/aoss" || die
+}