Revert the broken commit, USE=pulseaudio is an unsupported flag intended for non-emul-linux systems only. Fixes bug #528928.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

2 files changed, 6 insertions, 71 deletions

diff --git a/app-emulation/emul-linux-x86-soundlibs/ChangeLog b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
index 70fb869b1d16..3134c1b5b10a 100644
--- a/app-emulation/emul-linux-x86-soundlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/emul-linux-x86-soundlibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.129 2014/11/10 22:23:12 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.130 2014/11/11 23:10:58 mgorny Exp $
+
+  11 Nov 2014; Michał Górny <mgorny@gentoo.org>
+  -emul-linux-x86-soundlibs-20140508-r1.ebuild:
+  Revert the broken commit, USE=pulseaudio is an unsupported flag intended for
+  non-emul-linux systems only. Fixes bug #528928.
 
 *emul-linux-x86-soundlibs-20140508-r1 (10 Nov 2014)
 
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508-r1.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508-r1.ebuild
deleted file mode 100644
index cb3c60471070..000000000000
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 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-20140508-r1.ebuild,v 1.1 2014/11/10 22:23:12 axs Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="!abi_x86_32? ( BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 MIT gsm public-domain ) abi_x86_32? ( metapackage )"
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32 alsa +pulseaudio"
-
-RDEPEND="
-	!abi_x86_32? (
-		~app-emulation/emul-linux-x86-baselibs-${PV}[abi_x86_32=]
-		~app-emulation/emul-linux-x86-medialibs-${PV}[abi_x86_32=]
-
-		!>=sci-libs/fftw-3.3.3-r1[abi_x86_32]
-		!>=media-libs/libmikmod-3.2.0-r1[abi_x86_32] )
-	abi_x86_32? (
-		>=media-libs/libogg-1.3.1[abi_x86_32(-)]
-		>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
-		>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)]
-		>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-		>=media-libs/webrtc-audio-processing-0.1-r1[abi_x86_32(-)]
-		>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-		>=media-libs/flac-1.2.1-r5[abi_x86_32(-)]
-		>=media-libs/audiofile-0.3.6-r1[abi_x86_32(-)]
-		>=sci-libs/fftw-3.3.3-r2[abi_x86_32(-)]
-		>=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)]
-		>=media-plugins/caps-plugins-0.4.5-r2[abi_x86_32(-)]
-		>=media-plugins/swh-plugins-0.4.15-r3[abi_x86_32(-)]
-		>=media-libs/libmikmod-3.3.5[abi_x86_32(-)]
-		>=media-plugins/alsaequal-0.6-r1[abi_x86_32(-)]
-		>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)]
-		>=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)]
-		>=media-sound/musepack-tools-465-r1[abi_x86_32(-)]
-		>=media-libs/libsndfile-1.0.25-r1[abi_x86_32(-)]
-		>=media-libs/libsamplerate-0.1.8-r1[abi_x86_32(-)]
-		>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)]
-		>=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)]
-		>=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)]
-		>=media-sound/mpg123-1.18.1[abi_x86_32(-)]
-		>=media-libs/libao-1.1.0-r2[abi_x86_32(-)]
-		>=media-libs/alsa-oss-1.0.25-r1[abi_x86_32(-)]
-		>=media-plugins/alsa-plugins-1.0.27-r3[abi_x86_32(-)]
-		|| (
-			>=net-wireless/bluez-5.18-r1[abi_x86_32(-)]
-			=net-wireless/bluez-4.101-r9[abi_x86_32(-)]
-		)
-		pulseaudio? ( >=media-sound/pulseaudio-5.0[glib,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() {
-	use abi_x86_32 || emul-linux-x86_src_prepare
-}
-
-src_install() {
-	if use abi_x86_32 ; then
-		emul-linux-x86_src_install
-		use pulseaudio || rm -f "${ED}"/usr/lib32/libpulse{,-simple}.so*
-	fi
-}