avoid pre-stripping files; some touchups - patch submitted by Tristan Heaven via bug #137825

Package-Manager: portage-2.1.1_pre5-r3

4 files changed, 37 insertions, 44 deletions

diff --git a/games-emulation/mupen64-jttl_sound/ChangeLog b/games-emulation/mupen64-jttl_sound/ChangeLog
index bb1c6a3bcd9c..e2c9037f40d7 100644
--- a/games-emulation/mupen64-jttl_sound/ChangeLog
+++ b/games-emulation/mupen64-jttl_sound/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/mupen64-jttl_sound
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-jttl_sound/ChangeLog,v 1.7 2005/09/26 17:48:22 wolf31o2 Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-jttl_sound/ChangeLog,v 1.8 2006/08/22 08:11:40 mr_bones_ Exp $
+
+  22 Aug 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  mupen64-jttl_sound-1.2.ebuild:
+  avoid pre-stripping files; some touchups - patch submitted by Tristan
+  Heaven via bug #137825
 
   26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   mupen64-jttl_sound-1.2.ebuild:
diff --git a/games-emulation/mupen64-jttl_sound/Manifest b/games-emulation/mupen64-jttl_sound/Manifest
index e2b3bb228b0d..6fa788707443 100644
--- a/games-emulation/mupen64-jttl_sound/Manifest
+++ b/games-emulation/mupen64-jttl_sound/Manifest
@@ -1,30 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX mupen64-jttl_sound-gentoo-sdl.patch 740 RMD160 13f1502cf9e930a1d329ba997eaabc98c70b9361 SHA1 24b109e68c0c9088df95ee3a7ec8929320f9db8b SHA256 454bf06125c3ecccba23cb78a6ad13400e412156ec8da974e5764c6ddf1f6e06 size 740
+AUX mupen64-jttl_sound-gentoo-sdl.patch 740 RMD160 13f1502cf9e930a1d329ba997eaabc98c70b9361 SHA1 24b109e68c0c9088df95ee3a7ec8929320f9db8b SHA256 454bf06125c3ecccba23cb78a6ad13400e412156ec8da974e5764c6ddf1f6e06
 MD5 d36511359fea3ac49bf4143ff0a75c73 files/mupen64-jttl_sound-gentoo-sdl.patch 740
 RMD160 13f1502cf9e930a1d329ba997eaabc98c70b9361 files/mupen64-jttl_sound-gentoo-sdl.patch 740
 SHA256 454bf06125c3ecccba23cb78a6ad13400e412156ec8da974e5764c6ddf1f6e06 files/mupen64-jttl_sound-gentoo-sdl.patch 740
-DIST jttl_sound-1.2.tar.bz2 10015 size 10015
-EBUILD mupen64-jttl_sound-1.2.ebuild 1016 RMD160 e364e3c97739887b56ac925c740f3bef8d83ad6a SHA1 0ee620b6541653f4183c1ba5489c98aa0aa43913 SHA256 db503b994ebdd05650d3695736c20f1cd5bc8d7f04734b963a95642886e11f33 size 1016
-MD5 6ada4f5becfb4c8c7c9af304c4f1ab73 mupen64-jttl_sound-1.2.ebuild 1016
-RMD160 e364e3c97739887b56ac925c740f3bef8d83ad6a mupen64-jttl_sound-1.2.ebuild 1016
-SHA256 db503b994ebdd05650d3695736c20f1cd5bc8d7f04734b963a95642886e11f33 mupen64-jttl_sound-1.2.ebuild 1016
-MISC ChangeLog 1089 RMD160 c17d05b05b9877f8670ee1c6c8a42bca56fa4ba1 SHA1 262e034586326f1668d725cca8ecb67b9fcf48d3 SHA256 e44fd93c0bbed5bce5e7d923728e9e90307eb05f29cf4792c1aed716f688349c size 1089
-MD5 a54abe14e0150d70854d8e76a110494c ChangeLog 1089
-RMD160 c17d05b05b9877f8670ee1c6c8a42bca56fa4ba1 ChangeLog 1089
-SHA256 e44fd93c0bbed5bce5e7d923728e9e90307eb05f29cf4792c1aed716f688349c ChangeLog 1089
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
+DIST jttl_sound-1.2.tar.bz2 10015 RMD160 652e34d1223025f5f5f56c618f498dea525c1fed SHA1 ce5052076ff95bd5a9413594882ebf1be57af855 SHA256 bc113e193c32729b2b0f9e9b7b0059bad0504c2aa41335d68d9b0fe1f2e5d422
+EBUILD mupen64-jttl_sound-1.2.ebuild 999 RMD160 17e86d808be4f4fb98c31274a3a6131d30bc56d9 SHA1 e00abad2549ed435d478294012aa22e587797672 SHA256 b5146b7a2c1c318f075b7630535c04be5b562e85af44501450a1ab051f3f5d0e
+MD5 7161d6183a927ee1ff4fe55b7e1e7196 mupen64-jttl_sound-1.2.ebuild 999
+RMD160 17e86d808be4f4fb98c31274a3a6131d30bc56d9 mupen64-jttl_sound-1.2.ebuild 999
+SHA256 b5146b7a2c1c318f075b7630535c04be5b562e85af44501450a1ab051f3f5d0e mupen64-jttl_sound-1.2.ebuild 999
+MISC ChangeLog 1276 RMD160 15c61ef95788731d12642c9cb61069c6872d7abd SHA1 b1bc2ac8dc0269613d32f808703ea2941395d7bc SHA256 c7beb9cc1ada15c509f49321ad158a1f93c55030975fcc028619385ab4a4805c
+MD5 7b7a71cfb9fc38de797a0ad903e9eee9 ChangeLog 1276
+RMD160 15c61ef95788731d12642c9cb61069c6872d7abd ChangeLog 1276
+SHA256 c7beb9cc1ada15c509f49321ad158a1f93c55030975fcc028619385ab4a4805c ChangeLog 1276
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 15a6f8ba72caa4ce4756527060ba4d4d files/digest-mupen64-jttl_sound-1.2 66
-RMD160 c44a0d88720574146237ea16ecb70333f76eb57f files/digest-mupen64-jttl_sound-1.2 66
-SHA256 3684a1717aeee9a532671a950b78a86bc6bc048c5ed2d1a01fe00ed433e25d6d files/digest-mupen64-jttl_sound-1.2 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEXaCl/aM9DdBw91cRAi24AJ97VlQsp6dq1rGcj6PvWJaAimroggCgi7No
-mpEv41QOkpdrGytVP5PQy7Y=
-=1m8u
------END PGP SIGNATURE-----
+MD5 c45392a9d08c115bd1dfb054f3f27bfc files/digest-mupen64-jttl_sound-1.2 244
+RMD160 ad30b5d9a6df399154b2f3ad2689eea18951e2d4 files/digest-mupen64-jttl_sound-1.2 244
+SHA256 72534e62ae7792350d95e6b2c0dc94af67d7f689373498829b1316128afe7a9a files/digest-mupen64-jttl_sound-1.2 244
diff --git a/games-emulation/mupen64-jttl_sound/files/digest-mupen64-jttl_sound-1.2 b/games-emulation/mupen64-jttl_sound/files/digest-mupen64-jttl_sound-1.2
index 53343000f96a..8f0866753b19 100644
--- a/games-emulation/mupen64-jttl_sound/files/digest-mupen64-jttl_sound-1.2
+++ b/games-emulation/mupen64-jttl_sound/files/digest-mupen64-jttl_sound-1.2
@@ -1 +1,3 @@
 MD5 7bb104cf6ca94c0e761027eb9895fcbe jttl_sound-1.2.tar.bz2 10015
+RMD160 652e34d1223025f5f5f56c618f498dea525c1fed jttl_sound-1.2.tar.bz2 10015
+SHA256 bc113e193c32729b2b0f9e9b7b0059bad0504c2aa41335d68d9b0fe1f2e5d422 jttl_sound-1.2.tar.bz2 10015
diff --git a/games-emulation/mupen64-jttl_sound/mupen64-jttl_sound-1.2.ebuild b/games-emulation/mupen64-jttl_sound/mupen64-jttl_sound-1.2.ebuild
index 8fb9d22fb9d9..f0b494652373 100644
--- a/games-emulation/mupen64-jttl_sound/mupen64-jttl_sound-1.2.ebuild
+++ b/games-emulation/mupen64-jttl_sound/mupen64-jttl_sound-1.2.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-jttl_sound/mupen64-jttl_sound-1.2.ebuild,v 1.6 2005/09/26 17:48:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-jttl_sound/mupen64-jttl_sound-1.2.ebuild,v 1.7 2006/08/22 08:11:40 mr_bones_ Exp $
 
 inherit eutils libtool games
 
-IUSE="sdl"
-
 DESCRIPTION="A sound plugin for mupen64"
 SRC_URI="http://mupen64.emulation64.com/files/0.4/jttl_sound-1.2.tar.bz2"
 HOMEPAGE="http://mupen64.emulation64.com/"
@@ -13,22 +11,23 @@ HOMEPAGE="http://mupen64.emulation64.com/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE="sdl"
 
-RDEPEND="media-libs/libsdl
+DEPEND="media-libs/libsdl
 	media-libs/sdl-sound"
 
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-S="${WORKDIR}/jttl_sound-1.2"
+S=${WORKDIR}/jttl_sound-1.2
 
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-gentoo-sdl.patch
-	sed -i -e "s:CFLAGS.*=\(.*\):CFLAGS=\1 ${CFLAGS}:" Makefile ||  \
-		die "couldn't apply cflags"
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-gentoo-sdl.patch
+	sed -i \
+		-e '/strip/d' \
+		-e "s:CFLAGS.*=\(.*\):CFLAGS=\1 ${CFLAGS}:" \
+		Makefile \
+		|| die "sed failed"
 }
 
 src_compile() {
@@ -37,13 +36,10 @@ src_compile() {
 
 src_install() {
 	local dir=${GAMES_LIBDIR}/mupen64
-	dodir ${dir}
 
-	exeinto ${dir}/plugins
+	exeinto "${dir}"/plugins
 	doexe *.so
-	cp jttl_audio.conf ${D}/${dir}/plugins
-
+	cp jttl_audio.conf "${D}/${dir}/plugins" || die "cp failed"
 	dodoc README
-
 	prepgamesdirs
 }