Remove old version.

Revision bump, removed ugly workaround for amd64.

(Portage version: 2.1.3_rc5)

7 files changed, 93 insertions, 722 deletions

diff --git a/games-emulation/zsnes/ChangeLog b/games-emulation/zsnes/ChangeLog
index 3aa887ec5e58..022fd814de13 100644
--- a/games-emulation/zsnes/ChangeLog
+++ b/games-emulation/zsnes/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-emulation/zsnes
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.33 2007/03/18 20:30:48 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.34 2007/06/25 21:38:06 drizzt Exp $
+
+*zsnes-1.51-r1 (25 Jun 2007)
+
+  25 Jun 2007; Timothy Redaelli <drizzt@gentoo.org>
+  -files/zsnes-1.42-memfix.patch, -files/1.42-configure.patch,
+  -files/zsnes-1.42-execStack.patch, -zsnes-1.42.ebuild,
+  +zsnes-1.51-r1.ebuild:
+  Remove old version.
+  Revision bump, removed ugly workaround for amd64.
 
   18 Mar 2007; Steve Dibb <beandog@gentoo.org> zsnes-1.51.ebuild:
   amd64 stable, bug 168804, fix documentation install
diff --git a/games-emulation/zsnes/files/1.42-configure.patch b/games-emulation/zsnes/files/1.42-configure.patch
deleted file mode 100644
index b19194dace67..000000000000
--- a/games-emulation/zsnes/files/1.42-configure.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- configure.in.orig	2005-01-23 17:17:21.000000000 -0500
-+++ configure.in	2005-01-23 17:17:38.000000000 -0500
-@@ -15,8 +15,6 @@
- dnl Mingw, because it doesnt have a standard file tree. Maybe if ming do this
- dnl else do -I/usr/include. Or some shit. You figure it out.
- 
--LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"
--
- dnl -- Same thing here.
- 
- AC_CANONICAL_SYSTEM
-@@ -84,7 +82,9 @@
- CFLAGS="$CFLAGS -I$opengl_prefix/include"
- LDFLAGS-"$LDFLAGS -L$opengl_prefix/lib"
- fi
-+if test x$x_libraries != x; then
- LDFLAGS="$LDFLAGS -L$x_libraries"
-+fi
- AC_CHECK_LIB(GL, glGetError,found_opengl="yes",,)
- if test x$found_opengl = xyes; then
-         echo checking for OpenGL... yes
-@@ -118,36 +118,10 @@
- else
- 	AC_MSG_RESULT(no)
- 	
--	CFLAGS="$CFLAGS -O3 -ffast-math -fomit-frame-pointer -fexpensive-optimizations -s"
- 	NFLAGS="$NFLAGS -O1"
- 	ZSNESEXE="zsnes"
- fi
- 
--AC_MSG_CHECKING(which processor class to optimize for)
--if test x$debug != xyes; then
--	case "$target" in
--		i486-*-*)
--			CFLAGS="$CFLAGS -march=i486"
--			AC_MSG_RESULT(486)
--			;;
--		i586-*-*)
--			CFLAGS="$CFLAGS -march=pentium"
--			AC_MSG_RESULT(586)
--			;;
--		i686-*-*)
--			CFLAGS="$CFLAGS -march=pentiumpro"
--			dnl CFLAGS="$CFLAGS -march=pentium3 -mmmx -msse -mfpmath=sse,387"
--			AC_MSG_RESULT(686)
--			;;
--		*)
--			AC_MSG_RESULT(386)
--			AC_MSG_WARN(*** This is probably not what you want use --target)
--			;;
--	esac
--else
--	AC_MSG_RESULT(no optimization because debug enabled)
--fi
--
- dnl Checks for header files.
- AC_HEADER_STDC
- AC_HEADER_MAJOR
diff --git a/games-emulation/zsnes/files/digest-zsnes-1.51-r1 b/games-emulation/zsnes/files/digest-zsnes-1.51-r1
new file mode 100644
index 000000000000..018d3f063974
--- /dev/null
+++ b/games-emulation/zsnes/files/digest-zsnes-1.51-r1
@@ -0,0 +1,3 @@
+MD5 328071775f88f7c3b9fdb94176e5e417 zsnes151src.tar.bz2 1071712
+RMD160 337407bf7e5516bcd7bf310c7b17d6d12a948750 zsnes151src.tar.bz2 1071712
+SHA256 eb013f824f5a9814a714cf0daaea3ea68a1c74fd741e5b0979fcb7964236a866 zsnes151src.tar.bz2 1071712
diff --git a/games-emulation/zsnes/files/zsnes-1.42-execStack.patch b/games-emulation/zsnes/files/zsnes-1.42-execStack.patch
deleted file mode 100644
index 9b242a9db179..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.42-execStack.patch
+++ /dev/null
@@ -1,585 +0,0 @@
---- endmem.asm.orig	2006-01-05 22:37:07.000000000 -0600
-+++ endmem.asm	2006-01-05 22:37:19.000000000 -0600
-@@ -256,3 +256,6 @@
- NEWSYM PrevPicture, resb 64*56*2
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- init.asm.orig	2006-01-05 22:30:51.000000000 -0600
-+++ init.asm	2006-01-05 22:31:12.000000000 -0600
-@@ -3623,3 +3623,6 @@
- 
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/hq2x16.asm.orig	2006-01-05 22:52:46.000000000 -0600
-+++ video/hq2x16.asm	2006-01-05 22:52:46.000000000 -0600
-@@ -2167,3 +2167,6 @@
- SECTION .text
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/hq2x32.asm.orig	2006-01-05 22:52:46.000000000 -0600
-+++ video/hq2x32.asm	2006-01-05 22:52:46.000000000 -0600
-@@ -2140,3 +2140,6 @@
- SECTION .text
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/hq3x16.asm.orig	2006-01-05 22:52:46.000000000 -0600
-+++ video/hq3x16.asm	2006-01-05 22:52:46.000000000 -0600
-@@ -2756,3 +2756,6 @@
- SECTION .text
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/hq3x32.asm.orig	2006-01-05 22:52:46.000000000 -0600
-+++ video/hq3x32.asm	2006-01-05 22:52:46.000000000 -0600
-@@ -2819,3 +2819,6 @@
- SECTION .text
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/mode716b.asm.orig	2006-01-05 22:56:33.000000000 -0600
-+++ video/mode716b.asm	2006-01-05 22:56:33.000000000 -0600
-@@ -189,3 +189,6 @@
-     Mode7ProcessB Mode7Window, domosaic16b, 2
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/mode716d.asm.orig	2006-01-05 22:56:33.000000000 -0600
-+++ video/mode716d.asm	2006-01-05 22:56:33.000000000 -0600
-@@ -234,3 +234,6 @@
-     Mode7ProcessB Mode7Window, domosaic16b, 2
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/mode716e.asm.orig	2006-01-05 22:56:33.000000000 -0600
-+++ video/mode716e.asm	2006-01-05 22:56:33.000000000 -0600
-@@ -1264,3 +1264,6 @@
-     ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/mode716t.asm.orig	2006-01-05 22:56:33.000000000 -0600
-+++ video/mode716t.asm	2006-01-05 22:56:33.000000000 -0600
-@@ -368,3 +368,6 @@
- cwinptr2 resd 1
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/newgfx16.asm.orig	2006-01-05 22:56:33.000000000 -0600
-+++ video/newgfx16.asm	2006-01-05 22:56:33.000000000 -0600
-@@ -3623,3 +3623,6 @@
- 
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/sw_draw.asm.orig	2006-01-05 22:56:33.000000000 -0600
-+++ video/sw_draw.asm	2006-01-05 22:56:33.000000000 -0600
-@@ -287,3 +287,6 @@
-         ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/makevid.asm.orig	2006-01-05 22:56:33.000000000 -0600
-+++ video/makevid.asm	2006-01-05 22:56:33.000000000 -0600
-@@ -4415,3 +4415,6 @@
- 
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/makevid16b.asm.orig	1969-12-31 18:00:00.000000000 -0600
-+++ video/makevid16b.asm	2006-01-05 22:56:33.000000000 -0600
-@@ -0,0 +1,3 @@
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/makev16t.asm.orig	2006-01-05 22:56:33.000000000 -0600
-+++ video/makev16t.asm	2006-01-05 22:56:33.000000000 -0600
-@@ -5322,3 +5322,6 @@
-     ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/mode7ext.asm.orig	2006-01-05 22:56:33.000000000 -0600
-+++ video/mode7ext.asm	2006-01-05 22:56:33.000000000 -0600
-@@ -1326,3 +1326,6 @@
-     ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/m716text.asm.orig	2006-01-05 22:56:33.000000000 -0600
-+++ video/m716text.asm	2006-01-05 22:56:33.000000000 -0600
-@@ -999,3 +999,6 @@
- 
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/2xaiw.asm.orig	1969-12-31 18:00:00.000000000 -0600
-+++ video/2xaiw.asm	2006-01-05 22:56:33.000000000 -0600
-@@ -0,0 +1,3 @@
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/mode716.asm.orig	2006-01-05 22:56:33.000000000 -0600
-+++ video/mode716.asm	2006-01-05 22:56:33.000000000 -0600
-@@ -689,3 +689,6 @@
-     ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/mode7.asm.orig	2006-01-05 22:56:33.000000000 -0600
-+++ video/mode7.asm	2006-01-05 22:56:33.000000000 -0600
-@@ -828,3 +828,6 @@
-     ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/mv16tms.asm.orig	2006-01-05 22:56:33.000000000 -0600
-+++ video/mv16tms.asm	2006-01-05 22:56:33.000000000 -0600
-@@ -1504,3 +1504,6 @@
-     ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/newgfx.asm.orig	2006-01-05 22:56:33.000000000 -0600
-+++ video/newgfx.asm	2006-01-05 22:56:33.000000000 -0600
-@@ -2354,3 +2354,6 @@
- NEWSYM sprsingle,  resd 1
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/procvid.asm.orig	2006-01-05 22:56:33.000000000 -0600
-+++ video/procvid.asm	2006-01-05 22:56:33.000000000 -0600
-@@ -3790,3 +3790,6 @@
- db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/newg162.asm.orig	2006-01-05 22:56:33.000000000 -0600
-+++ video/newg162.asm	2006-01-05 22:56:33.000000000 -0600
-@@ -1405,3 +1405,6 @@
-     drawline16bmacroom16x16 tltype4b,preparet4ba,cachesingle4bng,ngpalcon4b,test4ba,0Fh,procpixelsmsnt,procpixelstmsnt
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/newgfx2.asm.orig	2006-01-05 22:56:33.000000000 -0600
-+++ video/newgfx2.asm	2006-01-05 22:56:33.000000000 -0600
-@@ -669,3 +669,6 @@
-     jmp drawlinengom4bwin.loop
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/makev16b.asm.orig	2006-01-05 22:57:41.000000000 -0600
-+++ video/makev16b.asm	2006-01-05 22:57:41.000000000 -0600
-@@ -3090,3 +3090,6 @@
- 
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/hq4x16.asm.orig	2006-01-05 22:59:20.000000000 -0600
-+++ video/hq4x16.asm	2006-01-05 22:59:20.000000000 -0600
-@@ -4283,3 +4283,6 @@
- SECTION .text
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/hq4x32.asm.orig	2006-01-05 22:59:20.000000000 -0600
-+++ video/hq4x32.asm	2006-01-05 22:59:20.000000000 -0600
-@@ -4208,3 +4208,6 @@
- 
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- video/2xsaiw.asm.orig	2006-01-05 22:59:20.000000000 -0600
-+++ video/2xsaiw.asm	2006-01-05 22:59:20.000000000 -0600
-@@ -2085,3 +2085,6 @@
- final2b       resb 8
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- chips/sfxproc.asm.orig	2006-01-05 23:00:37.000000000 -0600
-+++ chips/sfxproc.asm	2006-01-05 23:00:37.000000000 -0600
-@@ -670,3 +670,6 @@
-     ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- chips/dsp1proc.asm.orig	2006-01-05 23:00:37.000000000 -0600
-+++ chips/dsp1proc.asm	2006-01-05 23:00:37.000000000 -0600
-@@ -885,3 +885,6 @@
- 
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- chips/dsp2proc.asm.orig	2006-01-05 23:00:37.000000000 -0600
-+++ chips/dsp2proc.asm	2006-01-05 23:00:37.000000000 -0600
-@@ -611,3 +611,6 @@
-     ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- chips/st10proc.asm.orig	2006-01-05 23:00:37.000000000 -0600
-+++ chips/st10proc.asm	2006-01-05 23:00:37.000000000 -0600
-@@ -132,3 +132,6 @@
-     xor ebx,ebx
-     ret
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- chips/fxemu2b.asm.orig	2006-01-05 23:02:24.000000000 -0600
-+++ chips/fxemu2b.asm	2006-01-05 23:02:24.000000000 -0600
-@@ -616,3 +616,6 @@
-    ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- chips/fxemu2c.asm.orig	2006-01-05 23:02:24.000000000 -0600
-+++ chips/fxemu2c.asm	2006-01-05 23:02:24.000000000 -0600
-@@ -2556,3 +2556,6 @@
-    FXReturn
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- chips/fxtable.asm.orig	2006-01-05 23:02:24.000000000 -0600
-+++ chips/fxtable.asm	2006-01-05 23:02:24.000000000 -0600
-@@ -3544,3 +3544,6 @@
-             db 'IWT R12 IWT R13 IWT R14 IWT R15 '
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- chips/sa1proc.asm.orig	2006-01-05 23:02:24.000000000 -0600
-+++ chips/sa1proc.asm	2006-01-05 23:02:24.000000000 -0600
-@@ -367,3 +367,6 @@
- 
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- chips/sa1regs.asm.orig	2006-01-05 23:02:24.000000000 -0600
-+++ chips/sa1regs.asm	2006-01-05 23:02:24.000000000 -0600
-@@ -2727,3 +2727,6 @@
-     ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- chips/fxemu2.asm.orig	2006-01-05 23:02:24.000000000 -0600
-+++ chips/fxemu2.asm	2006-01-05 23:02:24.000000000 -0600
-@@ -2692,3 +2692,6 @@
- 
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- linux/sdlintrf.asm.orig	2006-01-05 23:02:56.000000000 -0600
-+++ linux/sdlintrf.asm	2006-01-05 23:02:56.000000000 -0600
-@@ -1747,3 +1747,6 @@
-     ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- linux/copyvwin.asm.orig	2006-01-05 23:02:56.000000000 -0600
-+++ linux/copyvwin.asm	2006-01-05 23:02:56.000000000 -0600
-@@ -1565,3 +1565,6 @@
- InterPtr dd 0
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- gui/menu.asm.orig	2006-01-05 23:03:18.000000000 -0600
-+++ gui/menu.asm	2006-01-05 23:03:18.000000000 -0600
-@@ -1616,3 +1616,6 @@
- .nored
-    ret
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- gui/gui.asm.orig	2006-01-05 23:03:18.000000000 -0600
-+++ gui/gui.asm	2006-01-05 23:03:18.000000000 -0600
-@@ -5661,3 +5661,6 @@
- db 57,103,110,236,113,118,203,200,22,87,251,7,138,37,12,84,221,171,51,209
- db 242,37,89,73,151,162,139,189,131,209,221,96,107,144,175,79,199,123,98,138
- db 226,86,221,254,72,14,126,180,200,171,85,94,120,124,196,225,150,57,219,158
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- dos/sw.asm.orig	2006-01-05 23:05:45.000000000 -0600
-+++ dos/sw.asm	2006-01-05 23:05:45.000000000 -0600
-@@ -223,3 +223,6 @@
-    ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- dos/debug.asm.orig	2006-01-05 23:05:45.000000000 -0600
-+++ dos/debug.asm	2006-01-05 23:05:45.000000000 -0600
-@@ -4377,3 +4377,6 @@
- SECTION .text
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- dos/joy.asm.orig	2006-01-05 23:05:45.000000000 -0600
-+++ dos/joy.asm	2006-01-05 23:05:45.000000000 -0600
-@@ -1682,3 +1682,6 @@
- .exit
-     ret
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- dos/initvid.asm.orig	2006-01-05 23:05:45.000000000 -0600
-+++ dos/initvid.asm	2006-01-05 23:05:45.000000000 -0600
-@@ -574,3 +574,6 @@
-     ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- dos/vesa12.asm.orig	2006-01-05 23:05:45.000000000 -0600
-+++ dos/vesa12.asm	2006-01-05 23:05:45.000000000 -0600
-@@ -544,3 +544,6 @@
- .spare   times 20 resd 1
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- dos/gppro.asm.orig	2006-01-05 23:05:45.000000000 -0600
-+++ dos/gppro.asm	2006-01-05 23:05:45.000000000 -0600
-@@ -158,3 +158,6 @@
-    ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- dos/vesa2.asm.orig	2006-01-05 23:05:45.000000000 -0600
-+++ dos/vesa2.asm	2006-01-05 23:05:45.000000000 -0600
-@@ -807,3 +807,6 @@
- ;----------------------------------------------------------------------
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- dos/modemrtn.asm.orig	2006-01-05 23:05:45.000000000 -0600
-+++ dos/modemrtn.asm	2006-01-05 23:05:45.000000000 -0600
-@@ -455,3 +455,6 @@
-    ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- cpu/spc700.asm.orig	2006-01-05 23:07:54.000000000 -0600
-+++ cpu/spc700.asm	2006-01-05 23:07:54.000000000 -0600
-@@ -2787,3 +2787,6 @@
-       ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- cpu/dma.asm.orig	2006-01-05 23:07:54.000000000 -0600
-+++ cpu/dma.asm	2006-01-05 23:07:54.000000000 -0600
-@@ -1424,3 +1424,6 @@
-     ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- cpu/dsp.asm.orig	2006-01-05 23:07:54.000000000 -0600
-+++ cpu/dsp.asm	2006-01-05 23:07:54.000000000 -0600
-@@ -2865,3 +2865,6 @@
-       ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- cpu/irq.asm.orig	2006-01-05 23:07:54.000000000 -0600
-+++ cpu/irq.asm	2006-01-05 23:07:54.000000000 -0600
-@@ -555,3 +555,6 @@
- 
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- cpu/table.asm.orig	2006-01-05 23:07:54.000000000 -0600
-+++ cpu/table.asm	2006-01-05 23:07:54.000000000 -0600
-@@ -1195,3 +1195,6 @@
-     ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- cpu/executable.asm.orig	1969-12-31 18:00:00.000000000 -0600
-+++ cpu/executable.asm	2006-01-05 23:07:54.000000000 -0600
-@@ -0,0 +1,3 @@
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- cpu/tablec.asm.orig	2006-01-05 23:07:54.000000000 -0600
-+++ cpu/tablec.asm	2006-01-05 23:07:54.000000000 -0600
-@@ -719,3 +719,6 @@
-     ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- cpu/tableb.asm.orig	2006-01-05 23:07:54.000000000 -0600
-+++ cpu/tableb.asm	2006-01-05 23:07:54.000000000 -0600
-@@ -719,3 +719,6 @@
-     ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- cpu/addrni.asm.orig	2006-01-05 23:07:54.000000000 -0600
-+++ cpu/addrni.asm	2006-01-05 23:07:54.000000000 -0600
-@@ -405,3 +405,6 @@
- %endmacro
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- cpu/stable.asm.orig	2006-01-05 23:07:54.000000000 -0600
-+++ cpu/stable.asm	2006-01-05 23:07:54.000000000 -0600
-@@ -695,3 +695,6 @@
-     ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- cpu/dspproc.asm.orig	2006-01-05 23:07:54.000000000 -0600
-+++ cpu/dspproc.asm	2006-01-05 23:07:54.000000000 -0600
-@@ -5496,3 +5496,6 @@
-     ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- cpu/memory.asm.orig	2006-01-05 23:07:54.000000000 -0600
-+++ cpu/memory.asm	2006-01-05 23:07:54.000000000 -0600
-@@ -5002,3 +5002,6 @@
- .tmpbyte resb 1
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- cpu/execute.asm.orig	2006-01-05 23:08:28.000000000 -0600
-+++ cpu/execute.asm	2006-01-05 23:08:28.000000000 -0600
-@@ -4268,3 +4268,6 @@
- 
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- vcache.asm.orig	2006-01-05 23:13:00.000000000 -0600
-+++ vcache.asm	2006-01-05 23:13:00.000000000 -0600
-@@ -3918,3 +3918,6 @@
-     ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- ui.asm.orig	2006-01-05 23:13:00.000000000 -0600
-+++ ui.asm	2006-01-05 23:13:00.000000000 -0600
-@@ -1301,3 +1301,6 @@
-     ret
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
diff --git a/games-emulation/zsnes/files/zsnes-1.42-memfix.patch b/games-emulation/zsnes/files/zsnes-1.42-memfix.patch
deleted file mode 100644
index a80ae3679984..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.42-memfix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -NurdB zsnes_1_42/src/linux/zfilew.c zsnes_1_42-patched/src/linux/zfilew.c
---- zsnes_1_42/src/linux/zfilew.c	2005-01-14 08:11:19.000000000 -0500
-+++ zsnes_1_42-patched/src/linux/zfilew.c	2006-03-16 02:16:42.000000000 -0500
-@@ -476,9 +476,13 @@
-   {
-     homedir = (char *)malloc(ZCFG_DIR_LEN);
-     getcwd(homedir, ZCFG_DIR_LEN);
-+    strcpy(zcfgdir, homedir);
-+    free(homedir);
-+  }
-+  else
-+  {
-+    strcpy(zcfgdir, homedir);
-   }
--  strcpy(zcfgdir, homedir);
--  free(homedir);
-   strcat(zcfgdir, ZCFG_DIR);
-   tmp = opendir(zcfgdir);
-   if (tmp == NULL) 
diff --git a/games-emulation/zsnes/zsnes-1.42.ebuild b/games-emulation/zsnes/zsnes-1.42.ebuild
deleted file mode 100644
index f2043a8a7150..000000000000
--- a/games-emulation/zsnes/zsnes-1.42.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.42.ebuild,v 1.15 2006/11/11 00:43:53 vapier Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-inherit eutils autotools flag-o-matic multilib games
-
-DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly"
-HOMEPAGE="http://www.zsnes.com/ http://ipherswipsite.com/zsnes/"
-SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="opengl png"
-
-RDEPEND=">=media-libs/libsdl-1.2.0
-	>=sys-libs/zlib-1.1
-	amd64? ( app-emulation/emul-linux-x86-sdl )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng )"
-DEPEND="${RDEPEND}
-	>=dev-lang/nasm-0.98
-	sys-devel/automake
-	>=sys-devel/autoconf-2.58"
-
-S=${WORKDIR}/${PN}_${PV//./_}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/src
-	cp "icons/48x48x32.png" "${T}/zsnes.png"
-	epatch \
-		"${FILESDIR}"/${PV}-configure.patch \
-		"${FILESDIR}"/${P}-execStack.patch \
-		"${FILESDIR}"/${P}-memfix.patch
-	eautoreconf
-}
-
-src_compile() {
-	use amd64 && multilib_toolchain_setup x86
-	cd src
-	egamesconf \
-		$(use_enable png libpng) \
-		$(use_enable opengl) \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	dogamesbin src/zsnes || die "dogamesbin failed"
-	newman src/linux/zsnes.1 zsnes.6
-	dodoc docs/{*.txt,README.LINUX}
-	dohtml -r docs/Linux/*
-	make_desktop_entry zsnes ZSNES zsnes.png
-	doicon "${T}/zsnes.png"
-	prepgamesdirs
-}
diff --git a/games-emulation/zsnes/zsnes-1.51-r1.ebuild b/games-emulation/zsnes/zsnes-1.51-r1.ebuild
new file mode 100644
index 000000000000..d90cdcb953cb
--- /dev/null
+++ b/games-emulation/zsnes/zsnes-1.51-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r1.ebuild,v 1.1 2007/06/25 21:38:06 drizzt Exp $
+
+inherit eutils autotools flag-o-matic toolchain-funcs games
+
+DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly"
+HOMEPAGE="http://www.zsnes.com/ http://ipherswipsite.com/zsnes/"
+SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+IUSE="ao custom-cflags opengl png"
+
+RDEPEND="media-libs/libsdl
+	>=sys-libs/zlib-1.2.3-r1
+	amd64? ( >=app-emulation/emul-linux-x86-sdl-10.1 )
+	ao? ( media-libs/libao )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng )"
+DEPEND="${RDEPEND}
+	dev-lang/nasm
+	amd64? ( >=sys-apps/portage-2.1 )"
+
+S=${WORKDIR}/${PN}_${PV//./_}/src
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fixing compilation without libpng installed
+	epatch "${FILESDIR}"/${P}-libpng.patch
+
+	# Remove hardcoded CFLAGS and LDFLAGS
+	if use custom-cflags; then
+		sed -i -e '/^\s*CFLAGS=.* -fomit-frame-pointer /d' \
+			configure.in || die
+		append-flags -fomit-frame-pointer -D__RELEASE__
+	else
+		strip-flags
+	fi
+	sed -i \
+		-e 's:^\s*STRIP="-s":STRIP="":'	\
+		-e 's:^\s*CFLAGS=.* -I\/usr\/local\/include .*$:CFLAGS="${CFLAGS} -I.":'	\
+		-e '/^\s*LDFLAGS=.* -L\/usr\/local\/lib /d'		\
+		configure.in || die
+
+	eautoreconf
+}
+
+src_compile() {
+	tc-export CC
+
+	use amd64 && multilib_toolchain_setup x86
+
+	local myconf=""
+	use custom-cflags && myconf="--disable-cpucheck force_arch=no"
+
+	egamesconf \
+		$(use_enable ao libao) \
+		$(use_enable png libpng) \
+		$(use_enable opengl) \
+		--disable-debug \
+		--enable-release \
+		${myconf} \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	dogamesbin zsnes || die "dogamesbin failed"
+	newman linux/zsnes.1 zsnes.6
+	dodoc ../docs/{readme.1st,*.txt,README.LINUX}
+	dodoc ../docs/readme.txt/*
+	dohtml -r ../docs/readme.htm/*
+	make_desktop_entry zsnes ZSNES zsnes.png
+	newicon icons/48x48x32.png ${PN}.png
+	prepgamesdirs
+}