Ops

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

5 files changed, 34 insertions, 20 deletions

diff --git a/games-emulation/zsnes/ChangeLog b/games-emulation/zsnes/ChangeLog
index 134544ba3a46..4f6a5f02947e 100644
--- a/games-emulation/zsnes/ChangeLog
+++ b/games-emulation/zsnes/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/zsnes
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.40 2009/02/25 17:10:09 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.41 2009/02/25 17:16:56 drizzt Exp $
+
+  25 Feb 2009; Timothy Redaelli <drizzt@gentoo.org>
+  +files/zsnes-1.51-CC-quotes.patch, -files/zsnes-1.51-makefile.dep.patch,
+  zsnes-1.51-r2.ebuild:
+  Ops
 
   25 Feb 2009; Timothy Redaelli <drizzt@gentoo.org>
   +files/zsnes-1.51-makefile.dep.patch, zsnes-1.51-r2.ebuild:
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index 50874ec30785..902e57087b60 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -1,21 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX zsnes-1.51-CC-quotes.patch 812 RMD160 e0ed454da3a4ceb034089d8ca8b4ad5ea634a91e SHA1 73b2b1a5536e9bd7e3d0a24f86c2ce36103cfe66 SHA256 88082857f72d10e629a0b725d7ca3b558e9e0e733e1da49494c52cafadbb48a9
 AUX zsnes-1.51-archopt-july-23-update.patch 12740 RMD160 e8004f97f795c13d51fa16c5bf386dfc8b12058f SHA1 4e59c16f0e5c57cfa6e5df2b50026598e77eab5a SHA256 4fc49ccafe46dafb1db57226e6989f6a5c97e826595df881d90bad1694a9906e
 AUX zsnes-1.51-depbuild.patch 631 RMD160 bd17f4dc521fb186a62e91350c9dcdc97c1c3256 SHA1 20568092a34c60f94038d3cc5b107e36269b4df2 SHA256 ab22b2fd1dfda5f377cafa0df19269259305aeab15d3c3ae6bf511b222dc6359
 AUX zsnes-1.51-gcc43.patch 913 RMD160 95ab52f570dd1e5c7d0852dac17d56ada4939079 SHA1 9bbececf44cc48a4d6b48ebff66ba657ef409168 SHA256 9eb0aff2be2b303295b0d0a76240facd13dca170b97fe3ee827a6c26d89d53de
 AUX zsnes-1.51-libao-thread.patch 663 RMD160 10b0ce28577e39187f98d8f392462585148d34eb SHA1 67a34c9a5f8c6abb2881007d47ba10647ca4503a SHA256 71be0bbb8b683edc7c7780b68a43e54be7a8c341bf9b2a01e5cceb53834b1a73
 AUX zsnes-1.51-libpng.patch 974 RMD160 36bdb059c6641376bee6ea5040a7045420c02870 SHA1 a4f7960de8eece5ac1c51cc8b58f6fb8964bca40 SHA256 9e5ba014ba847f7e10075dfd51b0ca42b86aa2dcc47952d569c304f3e8e15470
-AUX zsnes-1.51-makefile.dep.patch 453 RMD160 d6d40e62ba8a3ef1ff43e26ae98934ac150a167c SHA1 4aca145038df2b69d04bb8be12f1d022cc09cb36 SHA256 b73335a55d3a0e64f65a355236a3c245b740dc7c15fe13eb684be8804d1d1f2d
 DIST zsnes151src.tar.bz2 1071712 RMD160 337407bf7e5516bcd7bf310c7b17d6d12a948750 SHA1 03df35490870c9950d7010747d0546c8525c0362 SHA256 eb013f824f5a9814a714cf0daaea3ea68a1c74fd741e5b0979fcb7964236a866
 EBUILD zsnes-1.51-r1.ebuild 2012 RMD160 82f87fffa9bc3ebd12a931591545f4329d9fbe43 SHA1 05ae78603bc7665d691f37e8f9b80e113cac34b8 SHA256 2f37cc30db21effbcfebbaf6df16874cc1cceff814bd8627a7e3143e3c1fac6e
-EBUILD zsnes-1.51-r2.ebuild 2248 RMD160 f0739cd77a89d27ffd52fbd6e35d0b8b62a91f30 SHA1 2596c71c5c7b69d4f197fb238f6f50aec87cdedc SHA256 8c6b27f6db10fe34cfb82a0a87077be5ffc3f495d19554f96e380f33dc6615ba
-MISC ChangeLog 8620 RMD160 d7221730c91c501b37bafa7a64172d04350a4953 SHA1 94081673f77435b9517162890360055dd601e660 SHA256 f6e3ad1337b18752e42ad97811dd0a35e9978b5b07c6801baa9b51f50aee9504
+EBUILD zsnes-1.51-r2.ebuild 2245 RMD160 68b07521608f9cb61438b9770ffae7bb7c509f66 SHA1 f28c7e16bd13a69f99cc7ab793b2feb76129d56f SHA256 793872df4964e4d30f23553667ea13e1d0442293081608a9aea0e7f77c3f4ee8
+MISC ChangeLog 8778 RMD160 ea5cbefb6dff63d88c345e88b08967a1eff7ea6a SHA1 e593d3280521b08756047958bee94c5f43aa6dc9 SHA256 f60bf1dd80d0f2e4ced704212383cdb166b152e4bdf1c1e4f5c19f3cd21d1bac
 MISC metadata.xml 480 RMD160 86136547af2c3cfc61f8b8bbc5b1d4877a8a5396 SHA1 5bf2431d4deabdf80e813fb8410a362f8429520a SHA256 a649667db5f179b2b7c914d0e13ba3e11fb5b43fd1bbd7bc4e2a2f6a07b42692
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmle3wACgkQl4DfQEcjpw2mxACeLNJDN+tGnbhzrT1CIUKTTdEZ
-ucQAoKHEQhxFUAvuAAaKHJenDUrmj/xh
-=45D0
+iEYEARECAAYFAkmlfQ8ACgkQl4DfQEcjpw2ecwCeKOoqno/9wz0IRq7SooKpib1G
+2I0AnjVdSrkZw/C7Dfio5cRPwFssfiGT
+=mhxw
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/zsnes/files/zsnes-1.51-CC-quotes.patch b/games-emulation/zsnes/files/zsnes-1.51-CC-quotes.patch
new file mode 100644
index 000000000000..5a3b588b091d
--- /dev/null
+++ b/games-emulation/zsnes/files/zsnes-1.51-CC-quotes.patch
@@ -0,0 +1,20 @@
+--- src/Makefile.in.orig	2009-02-25 18:13:40.000000000 +0100
++++ src/Makefile.in	2009-02-25 18:13:16.000000000 +0100
+@@ -95,7 +95,7 @@
+ %.o: %.cpp
+ 	@CXX@ @CXXFLAGS@ -o $@ -c $<
+ %.o %.h: %.psr $(PSR)
+-	./$(PSR) @PSRFLAGS@ -gcc @CC@ -compile -flags "@CFLAGS@ -O1" -cheader $*.h -fname $* $*.o $<
++	./$(PSR) @PSRFLAGS@ -gcc "@CC@" -compile -flags "@CFLAGS@ -O1" -cheader $*.h -fname $* $*.o $<
+ 
+ default: main
+ all: main tools--- zsnes_1_51/src/Makefile.in.orig	2009-02-25 18:02:07.000000000 +0100
+@@ -133,7 +133,7 @@
+ 
+ include makefile.dep
+ makefile.dep: $(TOOL_D)/depbuild Makefile
+-	$(TOOL_D)/depbuild @CC@ "@CFLAGS@" @NASMPATH@ "@NFLAGS@" $(Z_OBJS) > makefile.dep
++	$(TOOL_D)/depbuild "@CC@" "@CFLAGS@" @NASMPATH@ "@NFLAGS@" $(Z_OBJS) > makefile.dep
+ 
+ Makefile: Makefile.in config.status
+ 	./config.status
diff --git a/games-emulation/zsnes/files/zsnes-1.51-makefile.dep.patch b/games-emulation/zsnes/files/zsnes-1.51-makefile.dep.patch
deleted file mode 100644
index e5c92847614f..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.51-makefile.dep.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- zsnes_1_51/src/Makefile.in.orig	2009-02-25 18:02:07.000000000 +0100
-+++ zsnes_1_51/src/Makefile.in	2009-02-25 18:02:19.000000000 +0100
-@@ -133,7 +133,7 @@
- 
- include makefile.dep
- makefile.dep: $(TOOL_D)/depbuild Makefile
--	$(TOOL_D)/depbuild @CC@ "@CFLAGS@" @NASMPATH@ "@NFLAGS@" $(Z_OBJS) > makefile.dep
-+	$(TOOL_D)/depbuild "@CC@" "@CFLAGS@" @NASMPATH@ "@NFLAGS@" $(Z_OBJS) > makefile.dep
- 
- Makefile: Makefile.in config.status
- 	./config.status
diff --git a/games-emulation/zsnes/zsnes-1.51-r2.ebuild b/games-emulation/zsnes/zsnes-1.51-r2.ebuild
index 768f6823afe7..660a8b5f7da3 100644
--- a/games-emulation/zsnes/zsnes-1.51-r2.ebuild
+++ b/games-emulation/zsnes/zsnes-1.51-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r2.ebuild,v 1.3 2009/02/25 17:10:09 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r2.ebuild,v 1.4 2009/02/25 17:16:56 drizzt Exp $
 
 inherit eutils autotools flag-o-matic toolchain-funcs multilib games
 
@@ -39,7 +39,7 @@ src_unpack() {
 	# Fix bug #170108
 	epatch "${FILESDIR}"/${P}-depbuild.patch
 	# Fix bug #260247
-	epatch "${FILESDIR}"/${P}-makefile.dep.patch
+	epatch "${FILESDIR}"/${P}-CC-quotes.patch
 
 	# Remove hardcoded CFLAGS and LDFLAGS
 	sed -i \