Introduce multilib support.

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

3 files changed, 122 insertions, 9 deletions

diff --git a/media-plugins/alsa-plugins/ChangeLog b/media-plugins/alsa-plugins/ChangeLog
index ccc47697210c..07d4fa1d13a4 100644
--- a/media-plugins/alsa-plugins/ChangeLog
+++ b/media-plugins/alsa-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/alsa-plugins
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.192 2014/04/05 19:20:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.193 2014/05/09 14:28:44 mgorny Exp $
+
+*alsa-plugins-1.0.27-r2 (09 May 2014)
+
+  09 May 2014; Michał Górny <mgorny@gentoo.org> +alsa-plugins-1.0.27-r2.ebuild:
+  Introduce multilib support.
 
   05 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
   -alsa-plugins-1.0.26.ebuild, -alsa-plugins-1.0.27.ebuild,
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 766e6e897c52..99da1d7c52da 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -9,16 +9,25 @@ AUX alsa-plugins-1.0.27-ffmpeg.patch 1031 SHA256 bca9e739909a6e2652555641688ffbb
 AUX pulse-default.conf 196 SHA256 331ddca02bf9324f924baa7ab14460d8878f1db917e509bfc8c314938c53c26f SHA512 c64f73a46c9f50704d4b2bef09d95ce3bc2352da1437750f49974ab8e6f60d5467d5d94ab0e1490deea5f2b1f67b20aa60a10c502e7d6e049649bca4208f7c1e WHIRLPOOL 373d276717005df7531b9a517d5392d7ff6ac765d677819ffc59799cfa6fd944428008e7e6e827bc31db0ed861044576f45eea67137158bb5a543717e17b00f1
 DIST alsa-plugins-1.0.27.tar.bz2 363593 SHA256 0bbd0c37c2dd7baf16363afb2e58169ffb0f9c0a70031b3b6235594630f3ab35 SHA512 73c2010b66022429bc664bdab1c03694dfd669260dea569e32496bc6e10a11a0da2dd87db6a661ab1376f3aa59f1df8a84cb48ff1d20bb064756c655203f9993 WHIRLPOOL 4487734e0377c880a46df6f7fa53d86a7c38fa3d4bd35e06d128c0ec2b99c789ed64674b59003d8bd0abce2db53301234e467d235532ea145ddb150919cb49af
 EBUILD alsa-plugins-1.0.27-r1.ebuild 2643 SHA256 a77d77ed72c162db150b442897256b9a138143556449238964a21de33fca1239 SHA512 494d8729af45bb4a632cf643382cec26f0e63a85000052ae316014b250be37df356fa9a627f700aff5d9bfd9c187e9760a1215271c84ff3f381365673dcb085f WHIRLPOOL 66f27affcb888213d0faf37da7275df5e7e1dcf7e8beacc930182e8c8ec9eef4dacb0b24d26ed8513b08d69758205ad581fdd2ef2793372c3470e2e3a20f90c8
-MISC ChangeLog 28607 SHA256 5bf12b8a38b60b119232eff55458998b6bc05107a28ef112049319765cd782e2 SHA512 7d8acefcb8047316afbd28bc3fb2b6c70881f479647f3ca5bfa0600221a7179ace1ec72a6b7643638d5b4bd6ec5a7c4f8657d122fb2eea7d37fcc432e818fc13 WHIRLPOOL 3369ad83b6fdf15dd43c85864c3a055e37891c228ad4d1a06fe9263b876bdba8a89dffde83b37018ea0fec6f039d092e37b4edc521def58d26fa272246dd2b98
+EBUILD alsa-plugins-1.0.27-r2.ebuild 2988 SHA256 66f121ac5b55034676b72b2615482e0260a7265d8296b10125a5371ae3424eca SHA512 738a9f73da59f50b3579c61aa72a27ff3ff89a509615f4db7e82b1cc8ca768b1b94de46003b2cb916dfb41d1ee410dc24c1f40637e986958cd8c2a6c1d95d952 WHIRLPOOL 5e8b34e7215372f0914a611b8e14495e0f898c2e33d30582e2036bc82360e10889f64bfdfd7a4ca53943948b689beb8d58b8322bc156e96a5eca9eeaffb29989
+MISC ChangeLog 28756 SHA256 c2876066bc230d1234f17f9180656e5b0043a662fc572397e24bbc023df64333 SHA512 77e8d673680b4a91d2fa7a255dcbcb10b6bdfacd775bbfaf6d169239b6c1d21252515ba8c0704342a5c3c81212539697555bc1aafe7c5042d337091d8da9a07d WHIRLPOOL e2f4bb9f15850ecdd63670b92e7d7d1af719a64521ac9c77152ae3747dc36284659ee9d1263bee38fab72094f998e91ded42799e1c4937a132ca42e4ca3aef6f
 MISC metadata.xml 310 SHA256 d82c778805ce9088b30b84e54f57aab84dc02dd4c8d59c91740bf06e6d9b17fc SHA512 c05b98f8288c3fbaacbb5c9f194dbddf607e044e1cfc4f2ae2af9aeedb682a162aa4bb25ad17b6337224a5d25d367e809b23591fbeee261ccfe29c0ad14729db WHIRLPOOL e8be3c90b18296caa09d109a3c217473896a6f6ba023ab6be47a1e3909dd7fc3acaa8d7b3222f1de7b466b45fbf9295b23a072a9407915cae5fa3ee8aebdecf8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTQFYJAAoJEEdUh39IaPFNfhMH/3RfRX5CTWRD0QaxilYYvbsP
-p2FAV5Llp98tlX9o1igOsFiYxv3QPWiJXLas2QFU358mzDccAoMSettPwBElKehG
-tqKLlof5A8+kr01brBiSuH1NYwy8Z+GuedBP85fb86QbL/UIjqDVsk7J8MJ/PJCh
-h4uDPvGzwjx0tirfTbfdrt1f/QJj80+SgsvkgGrn399FJIb04b8PT6UWcpzuxErA
-/bdE/WINRYTi8eZmtiRwvul0cxXoG9bmzs8cU6Diup5/M9+YQFo+bSHcKzH54g7z
-VM3Lm/oK0+LEd5+Ze/MDCIm1OkmH6X7is2IbUE2vARyD7IGC/9e+5Q3DjU+BboE=
-=mjVG
+iQJ8BAEBCABmBQJTbOYeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO0IMP/1qlDFN0poJJneYJ+2hTeXTn
+Pmp9IeLhtNWuhSl8eqsSlhxbQdWXusEenFqtvCJ/1FW5cHcr3bqx9cp081DmrjaG
+xiymVwaC5McFv97tnKb7bA0euOJV41dJ81fBnr44agnx3/40v5g0Ywi2tf/ua/89
+1cs7eIKbqR1wWMTBwGeJvyxXlI98cSwBV0oilEBYs8nraC+pVd1CW/OUT/bF2/Vm
+skOIaqwui0ax6IUd9JtiW2US8CZncMN7tdtlH65p7sFeKdGZ44+SbZslWYnCjL83
+QG6yi5+3OqmJTC+RW1YVVdI+Y/hCEITcqAUUATwx3nAxsYohjcvKLxPs6CrNIadg
+rN8+6/1MFSLcp5s98cffrmcWTLqIi+K4Vq5CB0HmId3KU7H9SmwFSi/Fa7tgQXC0
+4sQcabXxZpfAnSKDP6EINzrT43q00PP8TUs+T+nj6h7UIy/aRrx7Fk9XYWffvlw9
+q5GWBDCiU4asfWnl9V3ny1eCd34DgWAqAbymc2H4CiL5w4pPTHs7LbBRH+CCEhpX
+kyMIBgmSDD2LI1a/PhOPaZgFewSKa0AC6Fe7k7XNSuRcTIudjer7CINjXlqB2znx
+5VxuyYdrjK5AYYZiDDvBukuPtkuAm9nE6AjlPQioOh7V5Wvyyitn8JS0V0PSdfbQ
+cLG7qwdhMWn3Egs0PTym
+=C2dK
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r2.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r2.ebuild
new file mode 100644
index 000000000000..ba439ec1aef7
--- /dev/null
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r2.ebuild,v 1.1 2014/05/09 14:28:44 mgorny Exp $
+
+EAPI=5
+inherit autotools eutils flag-o-matic multilib multilib-minimal
+
+DESCRIPTION="ALSA extra plugins"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
+IUSE="debug ffmpeg jack libsamplerate pulseaudio speex"
+
+# TODO: handle USE=ffmpeg once it is converted
+
+RDEPEND=">=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
+	ffmpeg? ( virtual/ffmpeg )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.98[${MULTILIB_USEDEP}] )
+	libsamplerate? ( media-libs/libsamplerate:=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	speex? ( media-libs/speex:=[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<app-emulation/emul-linux-x86-soundlibs-20140406-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.0.19-missing-avutil.patch \
+		"${FILESDIR}"/${PN}-1.0.23-automagic.patch \
+		"${FILESDIR}"/${P}-{ffmpeg,ffmpeg-version-check}.patch
+
+	epatch_user
+
+	# For some reasons the polyp/pulse plugin does fail with alsaplayer with a
+	# failed assert. As the code works just fine with asserts disabled, for now
+	# disable them waiting for a better solution.
+	sed -i \
+		-e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
+		pulse/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	use debug || append-cppflags -DNDEBUG
+
+	local myspeex=no
+	use speex && myspeex=lib
+
+	ECONF_SOURCE=${S} \
+	econf \
+		$(multilib_native_use_enable ffmpeg avcodec) \
+		$(use_enable jack) \
+		$(use_enable libsamplerate samplerate) \
+		$(use_enable pulseaudio) \
+		--with-speex=${myspeex}
+}
+
+src_install_all() {
+	einstalldocs
+
+	cd doc || die
+	dodoc upmix.txt vdownmix.txt README-pcm-oss
+	use jack && dodoc README-jack
+	use libsamplerate && dodoc samplerate.txt
+	use ffmpeg && dodoc lavcrate.txt a52.txt
+
+	if use pulseaudio; then
+		dodoc README-pulse
+		# install ALSA configuration files
+		# making PA to be used by alsa clients
+		insinto /usr/share/alsa
+		doins "${FILESDIR}"/pulse-default.conf
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/51-pulseaudio-probe.conf
+		# bug #410261, comment 5+
+		# seems to work fine without any path
+		sed -i \
+			-e "s:/usr/lib/alsa-lib/::" \
+			"${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
+	fi
+
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if use pulseaudio; then
+		einfo "The PulseAudio device is now set as the default device if the"
+		einfo "PulseAudio server is found to be running. Any custom"
+		einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
+		einfo "purpose should now be unnecessary."
+	fi
+}