Yet another revbump to fix the pulseaudio dependency. Bug #416751. Thanks to Samuli Suominen <ssuominen@gentoo.org> for the patch

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

3 files changed, 34 insertions, 12 deletions

diff --git a/app-emulation/emul-linux-x86-soundlibs/ChangeLog b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
index b9948422efde..b393c0ee4487 100644
--- a/app-emulation/emul-linux-x86-soundlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
@@ -1,6 +1,14 @@
 # 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.77 2012/05/27 17:58:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.78 2012/06/03 09:19:40 hwoarang Exp $
+
+*emul-linux-x86-soundlibs-20120520-r2 (03 Jun 2012)
+
+  03 Jun 2012; Markos Chandras <hwoarang@gentoo.org>
+  +emul-linux-x86-soundlibs-20120520-r2.ebuild,
+  -emul-linux-x86-soundlibs-20120520-r1.ebuild:
+  Yet another revbump to fix the pulseaudio dependency. Bug #416751. Thanks to
+  Samuli Suominen <ssuominen@gentoo.org> for the patch
 
 *emul-linux-x86-soundlibs-20120520-r1 (27 May 2012)
 
diff --git a/app-emulation/emul-linux-x86-soundlibs/Manifest b/app-emulation/emul-linux-x86-soundlibs/Manifest
index 72668da6e7d0..39d5c0624af0 100644
--- a/app-emulation/emul-linux-x86-soundlibs/Manifest
+++ b/app-emulation/emul-linux-x86-soundlibs/Manifest
@@ -1,17 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 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-r2.ebuild 1224 RMD160 e1ab6a99b245b6de359373ae7bbd098ec26e5320 SHA1 310f682e2b4e91a40931c42670720b0276480cb2 SHA256 a48395547d300d4e7f9a59551f38c2870c41e3b5978e417378f0253560b70645
 EBUILD emul-linux-x86-soundlibs-20120520.ebuild 963 RMD160 96277930806fb46e0440bba9721811b7fe310bb0 SHA1 531c6281c34d2b2c7a69334919c24ab4c25bf38a SHA256 8b576fa699ad5242a95cc1389ce7754d822597ae0a4d0b9c6f7291a9cbc54d92
-MISC ChangeLog 13979 RMD160 0c64f7b047a16b17978cfd48e8be863ccec342d4 SHA1 71c1bd87c407fd42684b4ad2998ece9c6d4db8a9 SHA256 6eff0c5a239d6ef0678d887e2eef2cc556ad8163ec610f355534232cb14d8daa
+MISC ChangeLog 14319 RMD160 d0d4cc7f3bb85a232e0983e093b14e83ad3bc8e7 SHA1 021caf8d83d78812c71e5efd9ae15a6330e25c9f SHA256 3f60e675c319a2fd5bb50a975e33d972601ae322cffb8c9c4d3d6c0b7a8cec7e
+MISC emul-linux-x86-soundlibs-20120520-r2.ebuild.orig 1019 RMD160 aeb8a85db65909e4b38593d1af4770bfd934ce79 SHA1 08587553aee6ac6787d660b8421f63550f64089c SHA256 fd510352e29d41a03d9031ef3f4f116ba6ec738353f20eccad2c2edff16ebf50
+MISC emul-linux-x86-soundlibs-20120520-r2.ebuild.rej 603 RMD160 b33a8c42868151d0a327571b3b05116697f2ee5c SHA1 32e78f7ab89c1a3b31146f10e387a309db21da78 SHA256 b81bc71fa87a9fe0259c47497892570820d35bf29cc8b08ac803d981b12a2dd5
 MISC metadata.xml 225 RMD160 a4128fba81c97533725f589d51de117055011d3b SHA1 873f20f8dbcaf11a00b55546daaebd1ec63a657c SHA256 0ce288a649a1cbdf01d699a90300d341736ab0fd3456fd1002e2ffa8d409f453
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/Ca0sACgkQCaWpQKGI+9RtDQCcDcVZVLbYatYl/1VoZpvIXka2
-i+wAnj63CVU1qlhmDcSsSAv1lNT1dENS
-=cGtA
+iQIcBAEBCgAGBQJPyywxAAoJEPqDWhW0r/LC3XIQAMC2yTBne3lRYzrLinYw6CKY
+rQbuSQTGZbXkp6Hb92zmd3N45MlT4c0JT9kU+HXqKmtWEKqNhm87SJKAto3SRpla
+ER4g9e5FX8uxPJcSftxJMWLMeU/73wXNhS7xOiSYvo20yORJHDZ9U7HgF9mBWqyn
+EhqvpRhOjQJ3L2RhOBxmeu0uL0zrp2jqHjz5/zVGdf2T3A2Ao5/sYkoJ6wE9Hl5O
+2rKE00PZaWKQxa74V/Xt/kH/dKBm2p3c/vIL1mP9PDX14sT49UB8iQyKtPesn8i9
+0zeES8F2hvna3uLoj1cxalukHil9YGTY21tR4vC2wNcfdyNkgtZjTq2shhwl5yCC
+u0jGV0Wl0Fzm+Va6MDizTOGTxAlbgfcPQZCGWLkYJwv46lKGXAbS7QXCZdfWuvSr
+U3Pgwdd+w78OkBYMcEtnSeg4iYXMWh30Laaz0cT3k9GkW6VKC7PUUujSA0RXen2L
+/NS2c1rw3fe93Iha6MsDOw69nkIq8y2zNk6B+XXsgNZ4mhB/of/PNIUYmL4GCs6x
+Lj434Nh73H20TO5o+q0c7HvAb7ttm6RNxSUc4xQTJ8Xu6V9l6+iNJ4aS7dgh4zj2
+ckQ5KX3riItaVIG+UF9mypV7s1Ey1kM6bmBZAUckgIhYMPH2M/i5fwRTKU7cCn4n
+H8+15EzS3givcAHPCLlk
+=3coC
 -----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-r2.ebuild
index ad65df3674fb..263c3a4f4adb 100644
--- 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-r2.ebuild
@@ -1,10 +1,10 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20120520-r2.ebuild,v 1.1 2012/06/03 09:19:40 hwoarang Exp $
 
 EAPI="4"
 
-inherit emul-linux-x86
+inherit emul-linux-x86 toolchain-funcs
 
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 as-is gsm public-domain"
 KEYWORDS="-* ~amd64"
@@ -28,8 +28,10 @@ src_prepare() {
 	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
+		rm -f "${S}"/usr/lib32/libpulse{,-simple}.so*
+		echo 'int main() { }' > "${T}"/tmp.c
+		$(tc-getCC) -m32 -shared -Wl,-soname -Wl,libpulse.so.0 "${T}"/tmp.c -o "${S}"/usr/lib32/libpulse.so.0
+		$(tc-getCC) -m32 -shared -Wl,-soname -Wl,libpulse-simple.so.0 "${T}"/tmp.c -o "${S}"/usr/lib32/libpulse-simple.so.0
 	fi
 }