Remove smpeg.

Package-Manager: portage-2.0.51.22-r1

3 files changed, 26 insertions, 6 deletions

diff --git a/app-emulation/emul-linux-x86-compat/ChangeLog b/app-emulation/emul-linux-x86-compat/ChangeLog
index 6daa756f2e87..0dc5b5722473 100644
--- a/app-emulation/emul-linux-x86-compat/ChangeLog
+++ b/app-emulation/emul-linux-x86-compat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/emul-linux-x86-compat
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/ChangeLog,v 1.3 2005/01/01 14:10:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/ChangeLog,v 1.4 2005/05/26 12:42:43 herbs Exp $
+
+  26 May 2005; Herbie Hopkins <herbs@gentoo.org>
+  emul-linux-x86-compat-1.0.ebuild:
+  Remove libsmpeg as it collides with emul-sdl.
 
   28 Aug 2004; Travis Tilley <lv@gentoo.org> emul-linux-x86-compat-1.0.ebuild:
   stable on amd64
diff --git a/app-emulation/emul-linux-x86-compat/Manifest b/app-emulation/emul-linux-x86-compat/Manifest
index 39cb82c508fe..dd7b616f3ae7 100644
--- a/app-emulation/emul-linux-x86-compat/Manifest
+++ b/app-emulation/emul-linux-x86-compat/Manifest
@@ -1,4 +1,14 @@
-MD5 c5b8ff50dcb2e9852f33e62aae5c8dc0 ChangeLog 487
-MD5 b63087f592093bcb8d7820d21ed1bcb3 emul-linux-x86-compat-1.0.ebuild 787
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1de9e58125ef6128a8c1399baebf04e6 ChangeLog 616
 MD5 869ce605a0d7dfff1b73e2030778e34f metadata.xml 350
+MD5 ff6244bd767be7b762499ec878b384ba emul-linux-x86-compat-1.0.ebuild 924
 MD5 4c37476a27e99f8df37a1c0b0288c74e files/digest-emul-linux-x86-compat-1.0 79
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFClcTZ2G5bA0cA/ScRAiQDAKDjcLaQuoxtEO20beJ09IJ3JAjEWACfRaPr
+vr4mFvoSl/PL3+MuF3uIxok=
+=b4F6
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0.ebuild b/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0.ebuild
index ee07bbc112c2..af7023de4740 100644
--- a/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0.ebuild
+++ b/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0.ebuild,v 1.3 2005/01/01 14:10:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0.ebuild,v 1.4 2005/05/26 12:42:43 herbs Exp $
 
 DESCRIPTION="emul-linux-x86 version of lib-compat, with the addition of a 32bit libgcc_s and the libstdc++ versions provided by gcc 3.3 and 3.4 for non-multilib systems."
-SRC_URI="http://dev.gentoo.org/~lv/emul-linux-x86-compat-1.0.tar.bz2"
-HOMEPAGE=""
+SRC_URI="mirror://gentoo/emul-linux-x86-compat-${PV}.tar.bz2"
+HOMEPAGE="http://www.gentoo.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -17,6 +17,12 @@ S=${WORKDIR}
 DEPEND="virtual/libc
 	>=app-emulation/emul-linux-x86-glibc-1.0"
 
+src_unpack() {
+	unpack ${A}
+	# Remove libsmpeg to avoid collision with emul-sdl
+	rm -f ${S}/emul/linux/x86/usr/lib/libsmpeg*
+}
+
 src_install() {
 	mkdir -p ${D}
 	# everything should already be in the right place :)