Add USE=pulseaudio to disable PulseAudio support on multilib variant.

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

4 files changed, 37 insertions, 22 deletions

diff --git a/app-emulation/emul-linux-x86-soundlibs/ChangeLog b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
index a3c6570728ce..58004d27113e 100644
--- a/app-emulation/emul-linux-x86-soundlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/emul-linux-x86-soundlibs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.111 2013/11/30 21:41:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.112 2013/12/01 09:30:10 mgorny Exp $
+
+  01 Dec 2013; Michał Górny <mgorny@gentoo.org>
+  emul-linux-x86-soundlibs-20131008-r2.ebuild, metadata.xml:
+  Add USE=pulseaudio to disable PulseAudio support on multilib variant.
 
   30 Nov 2013; Michał Górny <mgorny@gentoo.org>
   emul-linux-x86-soundlibs-20131008-r2.ebuild:
diff --git a/app-emulation/emul-linux-x86-soundlibs/Manifest b/app-emulation/emul-linux-x86-soundlibs/Manifest
index 339ed13cad3a..bbb847948a60 100644
--- a/app-emulation/emul-linux-x86-soundlibs/Manifest
+++ b/app-emulation/emul-linux-x86-soundlibs/Manifest
@@ -5,25 +5,25 @@ AUX remove-native 11241 SHA256 d9bc95d494be6c361394a628999a87e908f06b60f405a1028
 DIST emul-linux-x86-soundlibs-20130224.tar.xz 7068240 SHA256 51ee669fb864b8522cd9ffa4aa8148c20eb07c06623a8c0bd718d444867da92a SHA512 67bca8c875e17bb8e1b3057182d08c679992ce525e124162e02e8a2c01bb5413d7ab19736a9f803d8a3835e7c5d68e556de9d3aee7240fb6708d2f3528ae56e0 WHIRLPOOL 48b9583dd91d5b1dbb4dedc1c9f5bf2937a325adad20bb45adf7de96e5d1db6a3e62a617ef85300c917faf57313a00790007d12db3a6dc9261ef627c71f14d9a
 DIST emul-linux-x86-soundlibs-20131008.tar.xz 6700140 SHA256 4afbaea80a493556475abfba0f2ee72941d214bfab159097f1c3267190f3fbdf SHA512 da1e38004fee464d88051fa2c4496bf250a2b641b7c6570ae327260ea121a8cb9c9557065595c1c546185d890fedbae987daab6deb8d192e94623fd3926ded20 WHIRLPOOL af569f721be3e07334b1384f5d245ad010aa4090705dfb954b1e48b5845894ea9400f9ac9c8cfbe0168ec1954bfd4503711068218c970c7a7f4a6d33d54a022b
 EBUILD emul-linux-x86-soundlibs-20130224.ebuild 796 SHA256 820c1ff543ca0d4756ce6201ea6d92422fe86813cc0451dd8a417f55fa5789f9 SHA512 04c9297c4c1fe3e3058bb11fa15bc2088cbf3bb838a0fe6ca306b4918164beb5a0764f758391b846063ca0ab596aecc70388b3b9c0639a5a335cf5df9ae249c1 WHIRLPOOL f56fb097e6bfdccb54b664df82deb0bc1fd7e528dcfce7e6d9b486ff86bedfa3fa5a8a8038854f9af093490c958292e5bc6e0e5f200b9c01ad2877e11b187f3f
-EBUILD emul-linux-x86-soundlibs-20131008-r2.ebuild 2229 SHA256 0bc7ce2915f63b866edc79c445382b8c413a7bfd2ae13003d098243061aaeb78 SHA512 925feda3481e16e5d7039dfc34d94499ac616c6865956617e1cfd92b91a0170c2592c21e322a93bb8acd942445612343d57a0a925e93bcf12470177cfbc9b15e WHIRLPOOL 0610d98f1c4d5cf609c8b3146d60a1c5560a21ed7c7ea8a817e295343c904dedb4b83ba0e9d42409070d157c221a312cfe8c52696a34df17e96ed903f2d0fbed
-MISC ChangeLog 21855 SHA256 a18faa11206b669d9e6a28a53061e969d00cd23473da76845581be9d7f1a5c60 SHA512 3216dba48166b21e53f2643a238e8bf8fb9f53d135534105ede8aa51ef9a7181cc25d701a1f7c6c95bd43007cec67469c77b3eb9e165859d2e7da125da2ea40f WHIRLPOOL 064fe8db4bd015a928b993bc0f782932701bc67427e093ce1d890e7b6fc1d92bcca052f2065f753b548de21a906d9e07c127950107952df176257a5915a6a3f3
-MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
+EBUILD emul-linux-x86-soundlibs-20131008-r2.ebuild 2517 SHA256 4adf1813c750a07ecb1fe96aab0d11aabd7e375392b75a355ea9d2dc91be936b SHA512 155bb7b388b2b135a161c04216f6871e39ba55e5a5ec44cd2122e40f9026e81b5b8a8f8f05a8fd934662108ac4aa788dc9e2d3470f4423f093b49497fd7d1a08 WHIRLPOOL 9ff33c27e4807c233c4eb9abce15b83454f1b80ae185b12088ae1a9e1bfc686e225e18973b3fde46b9f3d226f96e87b986d26c553a3efb8ab533242dd57cb3ff
+MISC ChangeLog 22039 SHA256 3768d794f42447b0d8191c68be879f9c7b8cc1219697782da6ece6f5a0eeef4e SHA512 6e0f72f9532c18cae6c7a7e979e89ac6717c6fac65c7ec737e95da051f7affa6b8ab682930fe3188cbf1843f8ea2b6ccd9efb0068db856148e8c48b1103bc201 WHIRLPOOL 7b9355afbae377a448c6be8953168cb49bfd976d5be99f0e65a72e4fb102713805da25b315a36fbaf345b5a2b482efecc16b74f52b3d5b1c50db5480a650c4c8
+MISC metadata.xml 393 SHA256 1c7a2ff2a63b40d4d163c62ec9b2a8734abefa33f9aa2fd514c51e62ba284a80 SHA512 ad676da46d237f6f3562a01055e935b4b5e04b95bf8b9e20a6b02562849627eac594d50146291c7434259440473b48bde16f4c5e985ef3ed7250275bfc47a6a6 WHIRLPOOL 2023a9f3b593d6f4d92f4e3a4fcc8e5ee4271911ebb1578323acb17b7e7e17230fcf3c342751bda7f9bcc149c956d169923d9f157e789eba3ccf03df374199a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSmlukXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSmwGoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZON78QANJ9kspD+/Hm/SBmZdz66ryB
-UEobDBBsqN9IqOm5BbG9/6XPthZKwdDv/owOU/7LICg3tbzDiutH0hyqqHl75vq+
-nxSYUYkdKzXIYeNmgGGy9oWDxoe29WLW1HKFQz8FXmPhYze4CEdoaWZMdoR4qmIc
-ZlkWP2Y+1+iZQEAGrMYf0Zu5kDPbaz1OGX8n+9QEBjucbuacJ0ietxBDAzlQ1y5p
-GYkM6OXQC9BI/zW9Jhhj9nHVAOAKk7BvLrA96qr+73/V6AQWpsmrInHL6H8VMO71
-b0ytua94f18yGLlgCDOHlL8mAdwYszCbvOcNNRfjAC7JH5s8oquqa5Ldwy82LkZx
-/xJvHBgmVy912aok1qJKLoX9Y7hef/4ntkl/V5mSyhcsGEQ8iVInlU0k+vKc0GBQ
-PICwRfSl+7+cyl5LJXbqmV4Eur6G3FnOQHCQmFDlxD+o5NTEEan9/cy5EEq0p1N8
-4n4oN6wa0GJd5pGsXUIp7zXHxSfDCCA7NyzbLSoGBoskL0E8X82vTcrBHH2vnP9a
-yzHT/NCxH8OeIUuX8Bo0az27uJNP5qt/tyXFvMn7oSPVmqFXAojZ7CF3W3Ocbo1I
-tJzvjwPYCR/5t6kIlSJZq7siJS7+acx72aemd8xfq+2Khu8tERfqkWAaEpLDdhpN
-RYV+dVrmyLul312Ehpy+
-=O1na
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOQCYP/impF2oWR6933B/dGP+vcSYS
+ZLd2afTuBeYqKc3j35lDNJmCyoGpq+fBH0IuQlOl+vz9z/WY4W4+aL80dgrkRC+Y
+Y6icLjF6o4qC9cEPjTRLScz2inL14iJYbWi0c8Wy5J4WaoBqPol0KBmXTje2XHkr
+uB7HL9IXKq5NRiplrbaDCXeo+OU0elL6uuRygcfWrtt/PRoLvovwzY5jsLocv7e4
+NIGEV4FyVrHwNR9KtksQZV3ZqW0/EwBb6s49vptT2/WsxABxGIFctz3+viBDovWy
+A6x217imSxVyV8hiln+/TOjwqz7Dp+PZIjbQbMpODXfs5ko8a51rVvUM+2BmRs/O
+EWB8M15Wj3T83TPohEcP/ijV8HhgjvP0Fpwun/S1ziwgKUOu1yk0jE4y1rRCiZXH
+7JjFXx7hWdtAi6SkWnRfONabO8aI8XWhiyEO/8T3TaDi44M/vsIEFpOsr+xOnUN+
+6c6dHPCbS1UwKsuFzqQXmqzXhelGsiYK4DxScBZVXoiVJJ3TkZGLuxklytfbRU+d
+Rw3uqSfjM/M0f+yW5PeV4j9/hLqNzgtJFZaAFNyJx4V1YTJzpbcoHWrF4PZSbZvs
+X9E0XkwKCeu/XtNNOoicgkP4S0TuPrK0eVZlVczDbfVUfiy+Tax9/gjwOrfzdfb3
+n2VCjH246bw6iCz9ubYa
+=XzJB
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild
index e5f0bc7541cf..46be8b0ad84e 100644
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild,v 1.2 2013/11/30 21:41:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild,v 1.3 2013/12/01 09:30:10 mgorny Exp $
 
 EAPI=5
 inherit emul-linux-x86
 
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 MIT gsm public-domain"
 KEYWORDS="-* amd64"
-IUSE="abi_x86_32 alsa"
+IUSE="abi_x86_32 alsa +pulseaudio"
 
 RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}[abi_x86_32=]
 	~app-emulation/emul-linux-x86-medialibs-${PV}[abi_x86_32=]
@@ -38,9 +38,17 @@ RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}[abi_x86_32=]
 		>=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)]
 		>=media-sound/mpg123-1.15.4-r1[abi_x86_32(-)]
 		>=media-libs/libao-1.1.0-r1[abi_x86_32(-)]
-		>=media-sound/pulseaudio-4.0-r1[abi_x86_32(-)]
+		pulseaudio? ( >=media-sound/pulseaudio-4.0-r1[abi_x86_32(-)] )
 	)"
 
+pkg_pretend() {
+	if use abi_x86_32 && ! use pulseaudio; then
+		ewarn "You have disabled USE=pulseaudio. This is known to break pre-built"
+		ewarn "libavfilter in emul-linux-x86-medialibs. If you need that, please"
+		ewarn "turn USE=pulseaudio back on."
+	fi
+}
+
 src_prepare() {
 	_ALLOWED="${S}/etc/env.d"
 	use alsa && _ALLOWED="${_ALLOWED}|${S}/usr/bin/aoss"
diff --git a/app-emulation/emul-linux-x86-soundlibs/metadata.xml b/app-emulation/emul-linux-x86-soundlibs/metadata.xml
index 873043696036..82bd3923e49d 100644
--- a/app-emulation/emul-linux-x86-soundlibs/metadata.xml
+++ b/app-emulation/emul-linux-x86-soundlibs/metadata.xml
@@ -5,5 +5,8 @@
 		<email>multilib@gentoo.org</email>
 		<name>Gentoo multilib project</name>
 	</maintainer>
-	<use><flag name="development">Install pkgconfig files</flag></use>
+	<use>
+		<flag name="development">Install pkgconfig files</flag>
+		<flag name="pulseaudio">Pull in pulseaudio if using USE=abi_x86_32</flag>
+	</use>
 </pkgmetadata>