Fix unpack failure, bug 299436

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

3 files changed, 17 insertions, 14 deletions

diff --git a/app-emulation/emul-linux-x86-soundlibs/ChangeLog b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
index e6f813e5c742..a73e711ba715 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.50 2010/01/01 21:31:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.51 2010/01/03 13:25:12 pacho Exp $
+
+  03 Jan 2010; Pacho Ramos <pacho@gentoo.org>
+  emul-linux-x86-soundlibs-20091231.ebuild:
+  Fix unpack failure when alsa disabled, thanks to Yegle for reporting it in
+  bug 299436
 
   01 Jan 2010; Pacho Ramos <pacho@gentoo.org>
   -emul-linux-x86-soundlibs-2.5-r2.ebuild,
diff --git a/app-emulation/emul-linux-x86-soundlibs/Manifest b/app-emulation/emul-linux-x86-soundlibs/Manifest
index 95629baf384d..a4ba6f1ffbe4 100644
--- a/app-emulation/emul-linux-x86-soundlibs/Manifest
+++ b/app-emulation/emul-linux-x86-soundlibs/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 DIST emul-linux-x86-soundlibs-20081109.tar.bz2 5164156 RMD160 d6590752ec026c200811e7b99234e9fd5820b609 SHA1 54d2442e3eb2bc73d2a9eacbcf1a7bd372a7e312 SHA256 6f9ad7406fbd869d6fd0d526bd8c4f0380f354a4952eebe134ddefdbb26e4ee1
 DIST emul-linux-x86-soundlibs-20091231.tar.bz2 7173720 RMD160 00548b1623503dadd3abe6d72b01307fa0f53d9d SHA1 4ebad49e243da857ae5845c2975e4971946fbbe7 SHA256 23ab831b6733e8c178f19d68009cc858f5ea1a3fb31ab2a93f01c14b36ccbd4a
 EBUILD emul-linux-x86-soundlibs-20081109.ebuild 1039 RMD160 58d5508e594e1ea92ff3239ef1e7891a308f9744 SHA1 a085461e44b21ce0f31b6ad1585aa43525f46815 SHA256 7c527eee5c054fc6677408d958d819bf8880a3f2abe32d6c1a1f8b9e814ae032
-EBUILD emul-linux-x86-soundlibs-20091231.ebuild 707 RMD160 fcebd18cac49aaa222d74c74ff900639cde77114 SHA1 b23bdbd0a5ba0d3df0cf145e6a77f00302bcee54 SHA256 86995adbfba530368016b56fd713ead6a232b913fef32ad9f436c723c07c39ba
-MISC ChangeLog 8943 RMD160 601df099eb81f3a83ada07c9bc1ce6d4571669c6 SHA1 87068e05ba39822122b7affc2cd9a88d4bbf1a1e SHA256 98cf1cd71591ecab0e799e190abfbe3ad7c021e04dea6c069aa095858a557d50
+EBUILD emul-linux-x86-soundlibs-20091231.ebuild 717 RMD160 5f18e53e0ee791c8b0d70bb11ae81f288e469e5f SHA1 1af32d7307dbd33f685552bb6e76ac1c92df4959 SHA256 78672f52ff91e623e0a92bf17b183db9488dc96cd1fcb5f77406f8bd1ab76907
+MISC ChangeLog 9124 RMD160 5777f6d11c27ab4b20dec77b80ef492ff892baab SHA1 b85e9c2bfbdadd32319bb3e8b708e7ad21ff766f SHA256 f8b86d5d0aab8ae724bd4344b9c1af3c86800382254b3e8ef9d3a7f3a19666c6
 MISC metadata.xml 159 RMD160 d52f9d709e07e1eca289e2940d4292c64fda6029 SHA1 021f81ae2e25595444e199cc4be3c122d37da802 SHA256 38c5ab0a3cf60ec0611d1112056b9ff16183715db2c60a2ac84590da0ce7fb76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEUEARECAAYFAks+acAACgkQCaWpQKGI+9QSlQCWNgtWi3OX4ypmxwZ0PIiUQpnJ
-sgCeJkC2gxR+XIe3DRra+BxgT/rw1HI=
-=1MwD
+iEYEARECAAYFAktAmsIACgkQCaWpQKGI+9TeKQCfXwraN1JGp6rgksS8J4lf+K1A
+6RgAniR9Fun/icRlQA9oFs6T2+zA1n+W
+=6snq
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20091231.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20091231.ebuild
index ca4eebe1f5aa..a341196791ac 100644
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20091231.ebuild
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20091231.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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-20091231.ebuild,v 1.1 2009/12/31 12:07:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20091231.ebuild,v 1.2 2010/01/03 13:25:12 pacho Exp $
 
 EAPI=1
 inherit emul-linux-x86
@@ -16,14 +16,12 @@ QA_DT_HASH="usr/lib32/.*"
 
 src_unpack() {
 	_ALLOWED="${S}/etc/env.d"
-
-	if use alsa; then
-		_ALLOWED="${_ALLOWED}|${S}/usr/bin/aoss"
-	fi
-
+	use alsa && _ALLOWED="${_ALLOWED}|${S}/usr/bin/aoss"
 	ALLOWED="(${_ALLOWED})"
 
 	emul-linux-x86_src_unpack
 
-	mv -f "${S}"/usr/bin/aoss{,32} || die
+	if use alsa; then
+		mv -f "${S}"/usr/bin/aoss{,32} || die
+	fi
 }