avoid pre-stripping binaries; tidy - patch from Tristan Heaven via bug #137830

Package-Manager: portage-2.1.1_pre3-r4

3 files changed, 24 insertions, 31 deletions

diff --git a/games-emulation/pcsx/ChangeLog b/games-emulation/pcsx/ChangeLog
index 81cc1360d62d..b7cddf991937 100644
--- a/games-emulation/pcsx/ChangeLog
+++ b/games-emulation/pcsx/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-emulation/pcsx
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx/ChangeLog,v 1.8 2006/05/02 20:09:09 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx/ChangeLog,v 1.9 2006/07/25 04:19:19 mr_bones_ Exp $
+
+  25 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org> pcsx-1.5-r1.ebuild:
+  avoid pre-stripping binaries; tidy - patch from Tristan Heaven via bug #137830
 
   02 May 2006; <Tupone@gentoo.org> +files/pcsx-1.5-gcc41.patch,
   pcsx-1.5-r1.ebuild:
diff --git a/games-emulation/pcsx/Manifest b/games-emulation/pcsx/Manifest
index 722b4b34fe11..3c936db03287 100644
--- a/games-emulation/pcsx/Manifest
+++ b/games-emulation/pcsx/Manifest
@@ -1,38 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 1.5-gentoo.patch 365 RMD160 5d6c20591c1017c7ab17227c797a98ec71ce3d21 SHA1 cc97ee21b287f43ec27d099f6211b34ad57038ac SHA256 150ad420d192e8073ad2441d3f80aa8f3601a17388f9fd805871f6e81c8c75c0 size 365
+AUX 1.5-gentoo.patch 365 RMD160 5d6c20591c1017c7ab17227c797a98ec71ce3d21 SHA1 cc97ee21b287f43ec27d099f6211b34ad57038ac SHA256 150ad420d192e8073ad2441d3f80aa8f3601a17388f9fd805871f6e81c8c75c0
 MD5 2f9732780627a19f6cf58f4f46ae93a4 files/1.5-gentoo.patch 365
 RMD160 5d6c20591c1017c7ab17227c797a98ec71ce3d21 files/1.5-gentoo.patch 365
 SHA256 150ad420d192e8073ad2441d3f80aa8f3601a17388f9fd805871f6e81c8c75c0 files/1.5-gentoo.patch 365
-AUX pcsx 1314 RMD160 8d7aafee605d29379085a7235a4c9c0476471540 SHA1 04fb005298002ed120a7dbcfaffcca953fed84a3 SHA256 2ffdaa6301ecd867cc2a40f080c212c667ba28a7a159baac953c39a695a7842f size 1314
+AUX pcsx 1314 RMD160 8d7aafee605d29379085a7235a4c9c0476471540 SHA1 04fb005298002ed120a7dbcfaffcca953fed84a3 SHA256 2ffdaa6301ecd867cc2a40f080c212c667ba28a7a159baac953c39a695a7842f
 MD5 fdf3d6afdc389182742ce8e378b17916 files/pcsx 1314
 RMD160 8d7aafee605d29379085a7235a4c9c0476471540 files/pcsx 1314
 SHA256 2ffdaa6301ecd867cc2a40f080c212c667ba28a7a159baac953c39a695a7842f files/pcsx 1314
-AUX pcsx-1.5-gcc41.patch 655 RMD160 93add45c6ffc9de17f0ddfed9d6f8916449ae64f SHA1 ea6547c2b8c099a663a6989af395928b5486de9c SHA256 6ea18e4d66272760f51ec685b2c16ba4b756837123f774fe4c8f434be0635d52 size 655
+AUX pcsx-1.5-gcc41.patch 655 RMD160 93add45c6ffc9de17f0ddfed9d6f8916449ae64f SHA1 ea6547c2b8c099a663a6989af395928b5486de9c SHA256 6ea18e4d66272760f51ec685b2c16ba4b756837123f774fe4c8f434be0635d52
 MD5 8223e33b5af7e6c6be3755e3f70c08d3 files/pcsx-1.5-gcc41.patch 655
 RMD160 93add45c6ffc9de17f0ddfed9d6f8916449ae64f files/pcsx-1.5-gcc41.patch 655
 SHA256 6ea18e4d66272760f51ec685b2c16ba4b756837123f774fe4c8f434be0635d52 files/pcsx-1.5-gcc41.patch 655
-DIST PcsxSrc-1.5.tgz 441651 RMD160 83e6425cb027c72b5b452b61f6b5a83992c5e065 SHA256 49656115a7ade50245e54314052d2a7be814f40c50f609427fe5320eba4435a9 size 441651
-EBUILD pcsx-1.5-r1.ebuild 1646 RMD160 80f47cf6cbd93338bb9240473f11941d9ecea016 SHA1 c9d7589ca6daf1d2d0066db87c8b64af44d56a87 SHA256 b4101846bf85f83c75458b1258a666455ad5163d0c83d47dda99126c1fe5d1d9 size 1646
-MD5 5028b3c11cb063b4d46924ca43316d8e pcsx-1.5-r1.ebuild 1646
-RMD160 80f47cf6cbd93338bb9240473f11941d9ecea016 pcsx-1.5-r1.ebuild 1646
-SHA256 b4101846bf85f83c75458b1258a666455ad5163d0c83d47dda99126c1fe5d1d9 pcsx-1.5-r1.ebuild 1646
-MISC ChangeLog 2229 RMD160 177ef2752194eb8b2b7a1db5ceadca9d708d2325 SHA1 a0b2a52775ff9ba82ce8a40784c52cb4f912bb48 SHA256 cbc39692d58e6006295dc463bec6e6e76ad6eef63d648ee6d44700b01f478104 size 2229
-MD5 95a8de1aafa2529b5981499b328242e4 ChangeLog 2229
-RMD160 177ef2752194eb8b2b7a1db5ceadca9d708d2325 ChangeLog 2229
-SHA256 cbc39692d58e6006295dc463bec6e6e76ad6eef63d648ee6d44700b01f478104 ChangeLog 2229
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
+DIST PcsxSrc-1.5.tgz 441651 RMD160 83e6425cb027c72b5b452b61f6b5a83992c5e065 SHA1 ce7200a3ee79e04685c6fe666b1bb7e49f8a4a17 SHA256 49656115a7ade50245e54314052d2a7be814f40c50f609427fe5320eba4435a9
+EBUILD pcsx-1.5-r1.ebuild 1672 RMD160 b99e5182c54c4bd13d095c4a145fe5752a6b9253 SHA1 22963825519103a9a1dc22618906f72202fc0d69 SHA256 7ee070317a890a613322bb9854edabdf71d07348a5f98dfc5768a7cff2051d48
+MD5 c8f68cf45af7a9c049b64da26822d985 pcsx-1.5-r1.ebuild 1672
+RMD160 b99e5182c54c4bd13d095c4a145fe5752a6b9253 pcsx-1.5-r1.ebuild 1672
+SHA256 7ee070317a890a613322bb9854edabdf71d07348a5f98dfc5768a7cff2051d48 pcsx-1.5-r1.ebuild 1672
+MISC ChangeLog 2389 RMD160 479bb2d2f0ab59d747535a8eae8c1ac493865350 SHA1 562a66560f40869ee19752a2493ab741407ed490 SHA256 dfe3bf4cfa3dd038704c86ced69bd5e5306547d57e8fdc72d4d8093e428a1712
+MD5 323e2f83b5c3ece8f96552379338f293 ChangeLog 2389
+RMD160 479bb2d2f0ab59d747535a8eae8c1ac493865350 ChangeLog 2389
+SHA256 dfe3bf4cfa3dd038704c86ced69bd5e5306547d57e8fdc72d4d8093e428a1712 ChangeLog 2389
+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 f24d038538f42e14f4d60cd7d4430351 files/digest-pcsx-1.5-r1 226
 RMD160 ff33efdb959a1871d267d5d673c73deeb6a15a8a files/digest-pcsx-1.5-r1 226
 SHA256 ae47836ce270ecbfb147562d16141c3499cf1c9a59fc5f4c1db0ad8ceceec8ae files/digest-pcsx-1.5-r1 226
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEV7xw2CTtIKiFlQIRAuJmAJ9Np6qRmzfTByyIwsOgMVSQ5fKcpgCguFz/
-ux8VFZxfOBxKft9SuTglJlA=
-=/sBm
------END PGP SIGNATURE-----
diff --git a/games-emulation/pcsx/pcsx-1.5-r1.ebuild b/games-emulation/pcsx/pcsx-1.5-r1.ebuild
index 1f9dafff2890..b81dcabf2928 100644
--- a/games-emulation/pcsx/pcsx-1.5-r1.ebuild
+++ b/games-emulation/pcsx/pcsx-1.5-r1.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/pcsx/pcsx-1.5-r1.ebuild,v 1.8 2006/05/02 20:09:08 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx/pcsx-1.5-r1.ebuild,v 1.9 2006/07/25 04:19:19 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -16,7 +16,7 @@ IUSE="opengl"
 
 DEPEND="sys-libs/zlib
 	app-arch/unzip
-	x11-libs/gtk+
+	>=x11-libs/gtk+-2
 	gnome-base/libglade"
 RDEPEND="games-emulation/psemu-cdr
 	games-emulation/psemu-cdriso
@@ -30,11 +30,11 @@ RDEPEND="games-emulation/psemu-cdr
 
 src_unpack() {
 	unpack PcsxSrc-${PV}.tgz
-	cd ${S}
+	cd "${S}"
 
 	edos2unix `find -regex '.*\.[ch]'`
 
-	epatch ${FILESDIR}/${PV}-gentoo.patch \
+	epatch "${FILESDIR}"/${PV}-gentoo.patch \
 		"${FILESDIR}/${P}"-gcc41.patch
 	sed -i \
 		-e "s:Plugin/:${GAMES_LIBDIR}/psemu/plugins/:" \
@@ -55,13 +55,13 @@ src_unpack() {
 src_compile() {
 	cd Linux
 	econf || die "econf failed"
-	emake OPTIMIZE="${CFLAGS}" || die "emake failed"
+	emake OPTIMIZE="${CFLAGS}" STRIP=true || die "emake failed"
 }
 
 src_install() {
 	newgamesbin Linux/pcsx pcsx.bin
-	dogamesbin ${FILESDIR}/pcsx
-	insinto ${GAMES_DATADIR}/${PN}
+	dogamesbin "${FILESDIR}"/pcsx
+	insinto "${GAMES_DATADIR}"/${PN}
 	doins Linux/.pixmaps/*
 	dodoc Docs/*
 	prepgamesdirs