Use another way to disable pulseaudio stuff to prevent problems like bug #416751 (by Manuel Rüger (mrueg) and fix by Samuli Suominen).

Package-Manager: portage-2.1.10.63/cvs/Linux x86_64

3 files changed, 48 insertions, 5 deletions

diff --git a/app-emulation/emul-linux-x86-soundlibs/ChangeLog b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
index 89761da67284..b9948422efde 100644
--- a/app-emulation/emul-linux-x86-soundlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-soundlibs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.76 2012/05/20 13:14:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.77 2012/05/27 17:58:29 pacho Exp $
+
+*emul-linux-x86-soundlibs-20120520-r1 (27 May 2012)
+
+  27 May 2012; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-soundlibs-20120520-r1.ebuild:
+  Use another way to disable pulseaudio stuff to prevent problems like bug
+  #416751 (by Manuel Rüger (mrueg) and fix by Samuli Suominen).
 
 *emul-linux-x86-soundlibs-20120520 (20 May 2012)
 
diff --git a/app-emulation/emul-linux-x86-soundlibs/Manifest b/app-emulation/emul-linux-x86-soundlibs/Manifest
index dd717ba52703..72668da6e7d0 100644
--- a/app-emulation/emul-linux-x86-soundlibs/Manifest
+++ b/app-emulation/emul-linux-x86-soundlibs/Manifest
@@ -4,13 +4,14 @@ Hash: SHA1
 DIST emul-linux-x86-soundlibs-20120127.tar.xz 6459848 RMD160 782c4297d2b1b4a2fe0ce6a4d459c271b53c89b8 SHA1 435b7c8ff7fd5d5b8065350159dba39bdec04fe5 SHA256 bd705e6a633b0f96f667615070c7f6f0c569f699c8c4065d9b207c56436c8c9c
 DIST emul-linux-x86-soundlibs-20120520.tar.xz 7107912 RMD160 1321dfbe99f5679c31bb0c7942259e0c164a492b SHA1 6cd8f4569aef1512665d6017948db79ae56c68bc SHA256 a0b7714822a0b6506eee9cef00c4a5b810425c0a08c1ccaf4a8dafc728906285
 EBUILD emul-linux-x86-soundlibs-20120127.ebuild 966 RMD160 1656beaa32989cdef40b95b9f5512adaa98af4f7 SHA1 0a12b89a1e1111f36b7ae7922b2a0d21fbde9605 SHA256 c3667640d2a5fabff99fba088361164466c82e2a10597c148a5e7471baf529b0
+EBUILD emul-linux-x86-soundlibs-20120520-r1.ebuild 1019 RMD160 aeb8a85db65909e4b38593d1af4770bfd934ce79 SHA1 08587553aee6ac6787d660b8421f63550f64089c SHA256 fd510352e29d41a03d9031ef3f4f116ba6ec738353f20eccad2c2edff16ebf50
 EBUILD emul-linux-x86-soundlibs-20120520.ebuild 963 RMD160 96277930806fb46e0440bba9721811b7fe310bb0 SHA1 531c6281c34d2b2c7a69334919c24ab4c25bf38a SHA256 8b576fa699ad5242a95cc1389ce7754d822597ae0a4d0b9c6f7291a9cbc54d92
-MISC ChangeLog 13691 RMD160 8ae97737c3eec26295b9194781156a708ecac9f0 SHA1 1490f639e69a7ce2a564f47491374811fd637957 SHA256 ee19b0d4dd0fed932d16bb1505783c0a4ad773fbaecb2b2ecca6767145f69fc0
+MISC ChangeLog 13979 RMD160 0c64f7b047a16b17978cfd48e8be863ccec342d4 SHA1 71c1bd87c407fd42684b4ad2998ece9c6d4db8a9 SHA256 6eff0c5a239d6ef0678d887e2eef2cc556ad8163ec610f355534232cb14d8daa
 MISC metadata.xml 225 RMD160 a4128fba81c97533725f589d51de117055011d3b SHA1 873f20f8dbcaf11a00b55546daaebd1ec63a657c SHA256 0ce288a649a1cbdf01d699a90300d341736ab0fd3456fd1002e2ffa8d409f453
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+47icACgkQCaWpQKGI+9S9hgCfRccUpc3tJ5XHKcwF+a8EuPEs
-Qk4Aniu02mLzrJTh3dptHYLhg1ffXs/2
-=JT4a
+iEYEARECAAYFAk/Ca0sACgkQCaWpQKGI+9RtDQCcDcVZVLbYatYl/1VoZpvIXka2
+i+wAnj63CVU1qlhmDcSsSAv1lNT1dENS
+=cGtA
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20120520-r1.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20120520-r1.ebuild
new file mode 100644
index 000000000000..ad65df3674fb
--- /dev/null
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20120520-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 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-20120520-r1.ebuild,v 1.1 2012/05/27 17:58:29 pacho Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 as-is gsm public-domain"
+KEYWORDS="-* ~amd64"
+IUSE="alsa pulseaudio"
+
+RDEPEND="pulseaudio? ( media-sound/pulseaudio )
+	~app-emulation/emul-linux-x86-baselibs-${PV}
+	~app-emulation/emul-linux-x86-medialibs-${PV}"
+
+QA_DT_HASH="usr/lib32/.*"
+
+src_prepare() {
+	_ALLOWED="${S}/etc/env.d"
+	use alsa && _ALLOWED="${_ALLOWED}|${S}/usr/bin/aoss"
+	ALLOWED="(${_ALLOWED})"
+
+	emul-linux-x86_src_prepare
+
+	if use alsa; then
+		mv -f "${S}"/usr/bin/aoss{,32} || die
+	fi
+
+	# libs without the rest of pulseaudio cause problems, bug 302003
+	# See bug 416751 to understand this way to disable pulseaudio
+	if ! use pulseaudio; then
+		chmod a-r "${S}"/usr/lib32/libpulse{,-simple}.so.* || die
+	fi
+}