From bd9c7ddc5ded5ed386d6bb37992bf2b48f063b87 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Wed, 25 Feb 2009 17:10:09 +0000 Subject: Fix bug #257963 and #260247 Package-Manager: portage-2.2_rc23/cvs/Linux x86_64 --- games-emulation/zsnes/ChangeLog | 6 +++++- games-emulation/zsnes/Manifest | 15 +++++++++++++-- games-emulation/zsnes/files/zsnes-1.51-makefile.dep.patch | 11 +++++++++++ games-emulation/zsnes/zsnes-1.51-r2.ebuild | 6 +++++- 4 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 games-emulation/zsnes/files/zsnes-1.51-makefile.dep.patch (limited to 'games-emulation/zsnes') diff --git a/games-emulation/zsnes/ChangeLog b/games-emulation/zsnes/ChangeLog index bbc23d1c1c1d..134544ba3a46 100644 --- a/games-emulation/zsnes/ChangeLog +++ b/games-emulation/zsnes/ChangeLog @@ -1,6 +1,10 @@ # 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.39 2009/02/02 16:41:45 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.40 2009/02/25 17:10:09 drizzt Exp $ + + 25 Feb 2009; Timothy Redaelli + +files/zsnes-1.51-makefile.dep.patch, zsnes-1.51-r2.ebuild: + Fix bug #257963 and #260247 02 Feb 2009; +files/zsnes-1.51-depbuild.patch, zsnes-1.51-r2.ebuild: diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest index 03631c6bfa3c..50874ec30785 100644 --- a/games-emulation/zsnes/Manifest +++ b/games-emulation/zsnes/Manifest @@ -1,10 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + 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 2142 RMD160 4ae877b9fe1261af60cbc3e509b0298e9a0853f5 SHA1 505bbacba9185c7618259d08415d87062faec7b8 SHA256 ff7fc9053470d9bb14ef5013471f2d6fdf2967047197cafb2d66a71e43ae1efe -MISC ChangeLog 8475 RMD160 b257bbf768a0c4a3b64c76d68cecfb4ad8bae222 SHA1 eec3e5246644f9b16363844ffae06a1a2c90ca2a SHA256 ec3a0c9e1b0924e442b449b9e80991ae7350671544bb4edca12ee04a0811317c +EBUILD zsnes-1.51-r2.ebuild 2248 RMD160 f0739cd77a89d27ffd52fbd6e35d0b8b62a91f30 SHA1 2596c71c5c7b69d4f197fb238f6f50aec87cdedc SHA256 8c6b27f6db10fe34cfb82a0a87077be5ffc3f495d19554f96e380f33dc6615ba +MISC ChangeLog 8620 RMD160 d7221730c91c501b37bafa7a64172d04350a4953 SHA1 94081673f77435b9517162890360055dd601e660 SHA256 f6e3ad1337b18752e42ad97811dd0a35e9978b5b07c6801baa9b51f50aee9504 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 +-----END PGP SIGNATURE----- diff --git a/games-emulation/zsnes/files/zsnes-1.51-makefile.dep.patch b/games-emulation/zsnes/files/zsnes-1.51-makefile.dep.patch new file mode 100644 index 000000000000..e5c92847614f --- /dev/null +++ b/games-emulation/zsnes/files/zsnes-1.51-makefile.dep.patch @@ -0,0 +1,11 @@ +--- 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 55bdddbded41..768f6823afe7 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.2 2009/02/02 16:41:45 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r2.ebuild,v 1.3 2009/02/25 17:10:09 drizzt Exp $ inherit eutils autotools flag-o-matic toolchain-funcs multilib games @@ -38,6 +38,8 @@ src_unpack() { epatch "${FILESDIR}"/${P}-libao-thread.patch # Fix bug #170108 epatch "${FILESDIR}"/${P}-depbuild.patch + # Fix bug #260247 + epatch "${FILESDIR}"/${P}-makefile.dep.patch # Remove hardcoded CFLAGS and LDFLAGS sed -i \ @@ -54,6 +56,8 @@ src_compile() { use amd64 && multilib_toolchain_setup x86 use custom-cflags || strip-flags + append-flags -U_FORTIFY_SOURCE #257963 + egamesconf \ $(use_enable ao libao) \ $(use_enable png libpng) \ -- cgit v1.2.3-65-gdbad