avoid pre-stripping files - patch from Tristan Heaven via bug #137834

Package-Manager: portage-2.1.1_pre5-r1

3 files changed, 24 insertions, 29 deletions

diff --git a/games-emulation/stella/ChangeLog b/games-emulation/stella/ChangeLog
index facd14eeac18..68ea90995867 100644
--- a/games-emulation/stella/ChangeLog
+++ b/games-emulation/stella/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-emulation/stella
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/stella/ChangeLog,v 1.20 2006/04/27 19:47:29 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/stella/ChangeLog,v 1.21 2006/08/16 16:40:49 mr_bones_ Exp $
+
+  16 Aug 2006; Michael Sterrett <mr_bones_@gentoo.org> stella-2.2.ebuild:
+  avoid pre-stripping files - patch from Tristan Heaven via bug #137834
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org> files/digest-stella-1.4.2,
   files/digest-stella-2.0.1, files/digest-stella-2.1, Manifest:
diff --git a/games-emulation/stella/Manifest b/games-emulation/stella/Manifest
index a278afb018e8..e417a6600f40 100644
--- a/games-emulation/stella/Manifest
+++ b/games-emulation/stella/Manifest
@@ -1,31 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST stella-1.4.2-src.tar.gz 706631 RMD160 57128baf93ceac97712faea4401b3c4ef9d9c04a SHA256 00cf7d9efa5e6a72792c824d31f20a74a945a57a41bdb466dbbaa8b431bd21c1 size 706631
-DIST stella-2.0.1-src.tar.gz 1022969 RMD160 12d1917173a969fe9979e348bdaf06a691ff186f SHA256 3dcaf04d5bfc39d2f776be6ec76159c0c18491a35e4074ec4fb100fb9f9a5f80 size 1022969
-DIST stella-2.1-src.tar.gz 1062215 RMD160 7ddecbcc78bf0ddd3a0aedf924f00b69e2ec6013 SHA256 957ad54b28268125ef284c49d92b006e447a7dcb16e30d54ebad17df2c238c54 size 1062215
-DIST stella-2.2-src.tar.gz 1569101 RMD160 0353028d93ff43b009beb08381168d1a6763cc8f SHA256 3ed5ca029a725a9146eb9f737c6167d241ab6541aa55ecd6bd759a8d0628155a size 1569101
-EBUILD stella-1.4.2.ebuild 1141 RMD160 a13db00772e1c444f1b8b90ac4c93114f2f85a80 SHA1 e9ca626eef39f03623c9714867d4c37276418e0c SHA256 a55ea79b27e9c15af1edd9f4a36600af7ec955f9c7a91775569bc692062bb715 size 1141
+DIST stella-1.4.2-src.tar.gz 706631 RMD160 57128baf93ceac97712faea4401b3c4ef9d9c04a SHA256 00cf7d9efa5e6a72792c824d31f20a74a945a57a41bdb466dbbaa8b431bd21c1
+DIST stella-2.0.1-src.tar.gz 1022969 RMD160 12d1917173a969fe9979e348bdaf06a691ff186f SHA256 3dcaf04d5bfc39d2f776be6ec76159c0c18491a35e4074ec4fb100fb9f9a5f80
+DIST stella-2.1-src.tar.gz 1062215 RMD160 7ddecbcc78bf0ddd3a0aedf924f00b69e2ec6013 SHA256 957ad54b28268125ef284c49d92b006e447a7dcb16e30d54ebad17df2c238c54
+DIST stella-2.2-src.tar.gz 1569101 RMD160 0353028d93ff43b009beb08381168d1a6763cc8f SHA1 2c8e2e0c9e7820e3d0b6cc19887b6cf6c4e40a1d SHA256 3ed5ca029a725a9146eb9f737c6167d241ab6541aa55ecd6bd759a8d0628155a
+EBUILD stella-1.4.2.ebuild 1141 RMD160 a13db00772e1c444f1b8b90ac4c93114f2f85a80 SHA1 e9ca626eef39f03623c9714867d4c37276418e0c SHA256 a55ea79b27e9c15af1edd9f4a36600af7ec955f9c7a91775569bc692062bb715
 MD5 e863cc9ae62eb20dd3c83e07a15ef6a4 stella-1.4.2.ebuild 1141
 RMD160 a13db00772e1c444f1b8b90ac4c93114f2f85a80 stella-1.4.2.ebuild 1141
 SHA256 a55ea79b27e9c15af1edd9f4a36600af7ec955f9c7a91775569bc692062bb715 stella-1.4.2.ebuild 1141
-EBUILD stella-2.0.1.ebuild 1288 RMD160 7ec35bedab420639ef6b4fabc7d926937203f966 SHA1 578e3a2906807193ef08ff75d1053ee16962530c SHA256 cb48dfe7e94f1469fae0c4c7bbc06b2fc7039833a490b31ce5f791a345b359e8 size 1288
+EBUILD stella-2.0.1.ebuild 1288 RMD160 7ec35bedab420639ef6b4fabc7d926937203f966 SHA1 578e3a2906807193ef08ff75d1053ee16962530c SHA256 cb48dfe7e94f1469fae0c4c7bbc06b2fc7039833a490b31ce5f791a345b359e8
 MD5 d5c0468e81769bee08a77ce1594f91b3 stella-2.0.1.ebuild 1288
 RMD160 7ec35bedab420639ef6b4fabc7d926937203f966 stella-2.0.1.ebuild 1288
 SHA256 cb48dfe7e94f1469fae0c4c7bbc06b2fc7039833a490b31ce5f791a345b359e8 stella-2.0.1.ebuild 1288
-EBUILD stella-2.1.ebuild 1285 RMD160 80437272b39f994289f045fb7543e8cf45165f4a SHA1 167d6c831c42e2c82d8a01811e05fc32f76afb3b SHA256 22a976497452fdc426e6ff6247e7a8511d37d5fb4e8ab6836c0d3f27f573ec3a size 1285
+EBUILD stella-2.1.ebuild 1285 RMD160 80437272b39f994289f045fb7543e8cf45165f4a SHA1 167d6c831c42e2c82d8a01811e05fc32f76afb3b SHA256 22a976497452fdc426e6ff6247e7a8511d37d5fb4e8ab6836c0d3f27f573ec3a
 MD5 9b5a1f6d7f460e556e329b71095aa09a stella-2.1.ebuild 1285
 RMD160 80437272b39f994289f045fb7543e8cf45165f4a stella-2.1.ebuild 1285
 SHA256 22a976497452fdc426e6ff6247e7a8511d37d5fb4e8ab6836c0d3f27f573ec3a stella-2.1.ebuild 1285
-EBUILD stella-2.2.ebuild 1044 RMD160 af48215cd3d5d80f5c49da51b17edfc1530ed4bc SHA1 aa0685dfca7a51b78c47a179f48c3282d386887f SHA256 20ee9cbe6aa1d9759d8060b9a680b0b9f51ff6e7e7066746a80e383f657b58f7 size 1044
-MD5 0a5d773b1e0d702036a5ddc30213a1f0 stella-2.2.ebuild 1044
-RMD160 af48215cd3d5d80f5c49da51b17edfc1530ed4bc stella-2.2.ebuild 1044
-SHA256 20ee9cbe6aa1d9759d8060b9a680b0b9f51ff6e7e7066746a80e383f657b58f7 stella-2.2.ebuild 1044
-MISC ChangeLog 2606 RMD160 96aea68f67204711fb24493e0a615b094d92c443 SHA1 ebf7cf816bc58dc595692c2bc46dd2d4e68d6809 SHA256 34cf2e8c75de1963f4780ea0543a3ac412845ff1f56015c3013c509a65a95711 size 2606
-MD5 440870bf98f96638c8dd0766570c5d67 ChangeLog 2606
-RMD160 96aea68f67204711fb24493e0a615b094d92c443 ChangeLog 2606
-SHA256 34cf2e8c75de1963f4780ea0543a3ac412845ff1f56015c3013c509a65a95711 ChangeLog 2606
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
+EBUILD stella-2.2.ebuild 1090 RMD160 db006b2ffa27294942dfc4e80d97d3a5c07571f0 SHA1 b72ce542fba16223a494d3e795b584003dc6ff8b SHA256 41a5486b88cf20e8b56477fb7dc40a86e71bc390e9109246bb3e05665c683151
+MD5 1e8b37a61304a20561a862a0fd687432 stella-2.2.ebuild 1090
+RMD160 db006b2ffa27294942dfc4e80d97d3a5c07571f0 stella-2.2.ebuild 1090
+SHA256 41a5486b88cf20e8b56477fb7dc40a86e71bc390e9109246bb3e05665c683151 stella-2.2.ebuild 1090
+MISC ChangeLog 2755 RMD160 c2a30e883d5a32477bbe0b058e10120fa638bd21 SHA1 ef427ba8dbf7630d1efaa0c947589ef34944731d SHA256 69f4b9a407b7c95cc1ec67d1891f7242d3843320c5ab0a5f85704fe8d6bcba24
+MD5 f792b2e671b746675f35ad8ce8847727 ChangeLog 2755
+RMD160 c2a30e883d5a32477bbe0b058e10120fa638bd21 ChangeLog 2755
+SHA256 69f4b9a407b7c95cc1ec67d1891f7242d3843320c5ab0a5f85704fe8d6bcba24 ChangeLog 2755
+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
@@ -41,10 +38,3 @@ SHA256 2ebe7bfa0b0dde532c7f8c47d390981121448ec2efc6f601b2e7110d002904c3 files/di
 MD5 7907d4a7a230c7e99a854eac1241b13e files/digest-stella-2.2 247
 RMD160 df1c21f4557cf4f4da134c223596cd4a47966828 files/digest-stella-2.2 247
 SHA256 d0a90aa1b593fca1b4304cf6e7acad88d9002281ac9d60fd12abbff791912bae files/digest-stella-2.2 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEUR/XW78445TWHXcRAu3iAJwPGm+wZjwyXzT7/LyzxUb7q8DPjgCfYEwo
-Cst3SbvTecdKpvgbJAwy0Qw=
-=C7wH
------END PGP SIGNATURE-----
diff --git a/games-emulation/stella/stella-2.2.ebuild b/games-emulation/stella/stella-2.2.ebuild
index 6a638d3e8cdc..72449a8a7374 100644
--- a/games-emulation/stella/stella-2.2.ebuild
+++ b/games-emulation/stella/stella-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/stella/stella-2.2.ebuild,v 1.1 2006/04/07 23:21:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/stella/stella-2.2.ebuild,v 1.2 2006/08/16 16:40:49 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -21,6 +21,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	sed -i \
+		-e '/INSTALL/s/-s //' \
+		-e '/strip/d' \
 		-e "/icons/d" \
 		Makefile \
 		|| die "sed failed"
@@ -39,7 +41,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	doicon src/common/stella.xpm
 	make_desktop_entry stella Stella stella.xpm
 	prepgamesdirs