fix cirular rdep, fix kde file collision (bug 200261), fix rpath setting that causes revdep-rebuild to complain

Package-Manager: portage-2.1.4_rc3

4 files changed, 68 insertions, 10 deletions

diff --git a/app-emulation/emul-linux-x86-soundlibs/ChangeLog b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
index 55728f75095b..e96dfc650bf2 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.33 2007/11/24 23:25:44 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.34 2007/11/25 23:02:43 kingtaco Exp $
+
+*emul-linux-x86-soundlibs-20071125 (25 Nov 2007)
+
+  25 Nov 2007; Mike Doty <kingtaco@gentoo.org>
+  +emul-linux-x86-soundlibs-20071125.ebuild:
+  fix cirular rdep, fix kde file collision (bug 200261), fix rpath setting
+  that causes revdep-rebuild to complain
 
 *emul-linux-x86-soundlibs-20071114-r2 (24 Nov 2007)
 
diff --git a/app-emulation/emul-linux-x86-soundlibs/Manifest b/app-emulation/emul-linux-x86-soundlibs/Manifest
index a29592fba818..198f5c97ad6b 100644
--- a/app-emulation/emul-linux-x86-soundlibs/Manifest
+++ b/app-emulation/emul-linux-x86-soundlibs/Manifest
@@ -7,6 +7,7 @@ DIST arts-3.5.5.tbz2 1258953 RMD160 af2df07cb6608d348061b4bc5e7545fd1e4bfa9a SHA
 DIST audiofile-0.2.6-r2.tbz2 183393 RMD160 37b2de371023d4ab7199984f1928a5dd78d7ccff SHA1 1b875db6038be8cdd95a8f7026872ae633fbb8b3 SHA256 934f8a0621c1888fa3c7f7e897bd6f1ad09e20777cf75a659971508fe3920e47
 DIST emul-linux-x86-soundlibs-2.5.tar.bz2 865179 RMD160 72ce56bede26765b7963994cd2e746648c72c107 SHA1 f6a7862f835eb6d25d67c76047022ff414950565 SHA256 caa0d8ac3ca6af57b25cf8f525fafe29bcb074b975692959282c5efcf0770540
 DIST emul-linux-x86-soundlibs-20071114.tar.bz2 4142520 RMD160 adba37f3daab20eaa21a885ddce09cce8aa89524 SHA1 d2d1f2a6cc53bf643dba4f639486c10d8b44914d SHA256 d7d6b7575fd6c97e5e1833594804ae569e84bed7335dc9e22a15be82d84afa07
+DIST emul-linux-x86-soundlibs-20071125.tar.bz2 4109761 RMD160 abf56771b4f1c163771e952556136dd5c7bdc7e0 SHA1 b20da4149e5037de453bf1e300ec6f822ca377f6 SHA256 49f8071a42d80fb8876ff24f6b6d81d8679f5a371c1c5797b17371a2d6c48a10
 DIST esound-0.2.36-r2.tbz2 143868 RMD160 c35df277b54206b1146d129cd2d7db4a73c38a60 SHA1 e6cdad2d8b542c58b1f18033792071f0be8bdc90 SHA256 a8660552d1d040638b7a38caafd3a625d96eb803873162149ed44532873a2b15
 DIST jack-audio-connection-kit-0.101.1-r1.tbz2 158550 RMD160 d68b3fce11afa6ef95569502e969c5178a709e57 SHA1 6146d429fdd77b5f500da901267a88b56d8db111 SHA256 545de013c984d89c1b2229ecaffdca92e1f66eff928a8b335fa3213f57b950f4
 DIST libmikmod-3.1.11-r2.tbz2 281036 RMD160 cda7fe6b40037d62e6313873883c3c13b5b7a263 SHA1 c48f8ed9aca5ac7291098672008d2669ca4f29e1 SHA256 f9fd7e53eed7a7c892918e95394583fb2dd4451cf5da87f23b55a145288647db
@@ -33,10 +34,14 @@ EBUILD emul-linux-x86-soundlibs-20071114.ebuild 910 RMD160 01e5b392444c5f595c33a
 MD5 01b4f8443cda078b24466c513359a6d1 emul-linux-x86-soundlibs-20071114.ebuild 910
 RMD160 01e5b392444c5f595c33a7dea1209b11dd17a002 emul-linux-x86-soundlibs-20071114.ebuild 910
 SHA256 550b32418bfc73e3025ad729a7209d6183ca86a4f1f7e07a3ab553acf474c3b1 emul-linux-x86-soundlibs-20071114.ebuild 910
-MISC ChangeLog 5680 RMD160 4c364d4f556a3a4a6edc902c9a7c89907e991564 SHA1 7b1112e637d0d970b10ecf6f6503ab0d4c100f5e SHA256 8a66c92679f4aafcfe5b9ca67f8c95b2aefb7cf5ebfb9f6f59e357e5272f7a8a
-MD5 a4ffae34095ccbbf23656c2bb57163d4 ChangeLog 5680
-RMD160 4c364d4f556a3a4a6edc902c9a7c89907e991564 ChangeLog 5680
-SHA256 8a66c92679f4aafcfe5b9ca67f8c95b2aefb7cf5ebfb9f6f59e357e5272f7a8a ChangeLog 5680
+EBUILD emul-linux-x86-soundlibs-20071125.ebuild 995 RMD160 06d87b0fe6bff3b1f9be596a910e79ef666f094f SHA1 e4875622af5c5c58353e1cb5b5e436e61a6bf8de SHA256 8d5db9439ec11e6dc7a6fe1254a512601bbd1b7105f127945ecab8f2a197997e
+MD5 dc533344f01c411707300dff31e6f719 emul-linux-x86-soundlibs-20071125.ebuild 995
+RMD160 06d87b0fe6bff3b1f9be596a910e79ef666f094f emul-linux-x86-soundlibs-20071125.ebuild 995
+SHA256 8d5db9439ec11e6dc7a6fe1254a512601bbd1b7105f127945ecab8f2a197997e emul-linux-x86-soundlibs-20071125.ebuild 995
+MISC ChangeLog 5939 RMD160 dfe0a1f2a72a9b3f23bcb730d101307d998685f1 SHA1 1d89d5168a59d6661cfc6fed39d625121c77cfb5 SHA256 4cd315ebbfdc34135c03e86b4a6be3556a698ecc02bd4fcf23566767464ae6a5
+MD5 6bc4412386aab72d4f04c2804c286eb1 ChangeLog 5939
+RMD160 dfe0a1f2a72a9b3f23bcb730d101307d998685f1 ChangeLog 5939
+SHA256 4cd315ebbfdc34135c03e86b4a6be3556a698ecc02bd4fcf23566767464ae6a5 ChangeLog 5939
 MISC metadata.xml 226 RMD160 8b5e8dfb5cb187694ac54de32e888f915617761d SHA1 1cf50e178ffc19ba9c83c1440bb7affa225058a0 SHA256 ec696441bfd66c7ba1bd8f257fb8b28eebd35325a99a861becdcce4ab22fcb78
 MD5 e862ce865a1f6d796ddca407af1230b0 metadata.xml 226
 RMD160 8b5e8dfb5cb187694ac54de32e888f915617761d metadata.xml 226
@@ -56,12 +61,15 @@ SHA256 e548a7f6778cbff7e18e69d821ef3cb024bcb90c5cfa7bd164a6ede318497f70 files/di
 MD5 f88d4d89c486cb53103f99e710dd314f files/digest-emul-linux-x86-soundlibs-20071114-r2 307
 RMD160 90262c244713fca7c6248f493cf0a1cdef6f11af files/digest-emul-linux-x86-soundlibs-20071114-r2 307
 SHA256 e548a7f6778cbff7e18e69d821ef3cb024bcb90c5cfa7bd164a6ede318497f70 files/digest-emul-linux-x86-soundlibs-20071114-r2 307
+MD5 1693794994701ba2c48f51691b5036f0 files/digest-emul-linux-x86-soundlibs-20071125 307
+RMD160 dc31c13f398b624355618b924d56f3e6558aea4a files/digest-emul-linux-x86-soundlibs-20071125 307
+SHA256 6ce12972515123c4f66502c0cac3034e37b219b2ddbefaf5954fbc48f4ca31ea files/digest-emul-linux-x86-soundlibs-20071125 307
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iQCVAwUBR0iy/YBrouQZ9K4FAQIFFQP/Wyb+ltl4HHdKSeDzaYCVSvFxIfvNEZa8
-6BI68CS6JJs4BozBr5fnNphaPTmnts6ifcZeI3bgcxPcQRGMfwzBKycsVuIV3xY0
-/Dq+/fhXPgE+dQKduqPV/bl/cL6TNgcmVneUloAmwHihDMhTeMkdJnsCsucSgUmb
-shhCD6n50Ec=
-=5mRp
+iQCVAwUBR0n/GYBrouQZ9K4FAQLdfgP+MIh8XhLgxWNJvn2nduHKogQRRmBIKaqF
+2al2mupCmvSN5yTEtKbnDbzGPmpkEvi0H5IwnkuxLNiCxFOwsCiZ0PHGpkDxbPHW
+OHL+CicDjssYUdQFzYHoC/smwrBT5zO2hho9Vn/Hb999PjH5shdWIl1wDXJCssnr
+VG3ptk6Bros=
+=LB7q
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20071125.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20071125.ebuild
new file mode 100644
index 000000000000..dc7666511715
--- /dev/null
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20071125.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2007 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-20071125.ebuild,v 1.1 2007/11/25 23:02:43 kingtaco Exp $
+
+inherit emul-linux-x86
+
+LICENSE="as-is BSD GPL-2 LGPL-2 LGPL-2.1"
+KEYWORDS="-* ~amd64"
+IUSE="arts esd alsa"
+
+RDEPEND=">=app-emulation/emul-linux-x86-baselibs-20071114
+		>=app-emulation/emul-linux-x86-medialibs-20071114
+		>=app-emulation/emul-linux-x86-xlibs-20071114"
+
+src_unpack() {
+	_ALLOWED="${S}/etc/env.d"
+
+	if use alsa; then
+		_ALLOWED="${_ALLOWED}|${S}/usr/bin/aoss"
+	fi
+
+	if use esd; then
+		_ALLOWED="${_ALLOWED}|${S}/usr/bin/esddsp"
+	fi
+
+	if use arts; then
+		_ALLOWED="${_ALLOWED}|${S}/usr/kde/.*/bin/artsdsp"
+	fi
+	ALLOWED="(${_ALLOWED})"
+
+	emul-linux-x86_src_unpack
+
+	mv -f ${S}/usr/bin/aoss{,32}
+	mv -f ${S}/usr/kde/3.5/bin/artsdsp{,32}
+	mv -f ${S}/usr/bin/esddsp{,32}
+
+	if ! use arts; then
+		rm -rf ${S}/usr/kde/
+	fi
+}
diff --git a/app-emulation/emul-linux-x86-soundlibs/files/digest-emul-linux-x86-soundlibs-20071125 b/app-emulation/emul-linux-x86-soundlibs/files/digest-emul-linux-x86-soundlibs-20071125
new file mode 100644
index 000000000000..7977acffc0ef
--- /dev/null
+++ b/app-emulation/emul-linux-x86-soundlibs/files/digest-emul-linux-x86-soundlibs-20071125
@@ -0,0 +1,3 @@
+MD5 42e1b3134960c681f781f164a6db44b2 emul-linux-x86-soundlibs-20071125.tar.bz2 4109761
+RMD160 abf56771b4f1c163771e952556136dd5c7bdc7e0 emul-linux-x86-soundlibs-20071125.tar.bz2 4109761
+SHA256 49f8071a42d80fb8876ff24f6b6d81d8679f5a371c1c5797b17371a2d6c48a10 emul-linux-x86-soundlibs-20071125.tar.bz2 4109761