version bump

(Portage version: 2.1_pre7-r4)

5 files changed, 177 insertions, 1 deletions

diff --git a/games-emulation/gngeo/ChangeLog b/games-emulation/gngeo/ChangeLog
index de08731bcbce..b8f6bd80c1e1 100644
--- a/games-emulation/gngeo/ChangeLog
+++ b/games-emulation/gngeo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-emulation/gngeo
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/ChangeLog,v 1.11 2006/03/06 19:58:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/ChangeLog,v 1.12 2006/04/07 17:12:50 mr_bones_ Exp $
+
+*gngeo-0.6.11 (07 Apr 2006)
+
+  07 Apr 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/gngeo-0.6.11-execstacks.patch, +gngeo-0.6.11.ebuild:
+  version bump
 
   06 Mar 2006; Michael Sterrett <mr_bones_@gentoo.org>
   +files/gngeo-0.6.10-execstacks.patch, gngeo-0.6.10.ebuild:
diff --git a/games-emulation/gngeo/Manifest b/games-emulation/gngeo/Manifest
index e3cb32b8d551..cfbedd2e3bde 100644
--- a/games-emulation/gngeo/Manifest
+++ b/games-emulation/gngeo/Manifest
@@ -4,6 +4,9 @@ SHA256 001e8afc6248bc7aad07207f400c01cdfc8e4138199412ca556ec29e732ed5ea ChangeLo
 MD5 1c9b633849c5cffeec54088d4c3c4f07 files/digest-gngeo-0.6.10 241
 RMD160 cef89d9516bf128fb6bea400f63dcc5202d067e7 files/digest-gngeo-0.6.10 241
 SHA256 8150e8f68e3616915691943c9f71a90230004c80643353bfe20ae033cee8b240 files/digest-gngeo-0.6.10 241
+MD5 c1883a2f6eca7f426147edb91222e11d files/digest-gngeo-0.6.11 241
+RMD160 0ae12f336c8e59a8d0b0fb4f38d948707933759a files/digest-gngeo-0.6.11 241
+SHA256 b9104eab7258d745325a4739293ce735714b9afbefe11e0ce9f36a6d5c16f731 files/digest-gngeo-0.6.11 241
 MD5 957a350372b187d6f94429101689a223 files/digest-gngeo-0.6.3 63
 RMD160 cf9df8055e8429ef73555cdeacacbb30c8b0d874 files/digest-gngeo-0.6.3 63
 SHA256 ef71ff827bac5cb94f62b2f5f9984d5b11e538c0499e2249079c98d8a2619f9e files/digest-gngeo-0.6.3 63
@@ -16,6 +19,9 @@ SHA256 4a10fd9ae0a62bf9a449877c24adb204e6a1cae9dbd33ee28a511985f4fca616 files/gn
 MD5 95753249d404e882559a8476378c6c08 gngeo-0.6.10.ebuild 920
 RMD160 a489baa20499cb67f96d8d3ea2630f0537f6b7df gngeo-0.6.10.ebuild 920
 SHA256 2f2eefeb04b6ef14f5e99ed77d42eb6eb3f9f2133d21cf260684b6cfb2df3ead gngeo-0.6.10.ebuild 920
+MD5 95753249d404e882559a8476378c6c08 gngeo-0.6.11.ebuild 920
+RMD160 a489baa20499cb67f96d8d3ea2630f0537f6b7df gngeo-0.6.11.ebuild 920
+SHA256 2f2eefeb04b6ef14f5e99ed77d42eb6eb3f9f2133d21cf260684b6cfb2df3ead gngeo-0.6.11.ebuild 920
 MD5 05b6293881ff3f58f3f84889f16521c2 gngeo-0.6.3.ebuild 1042
 RMD160 107175e483ec420cc068f079c0b67cecf16b9b68 gngeo-0.6.3.ebuild 1042
 SHA256 2567faf4d22dd889c6c96086ffd81d5f862c7e52ca498cf277e9d3904e6840d8 gngeo-0.6.3.ebuild 1042
diff --git a/games-emulation/gngeo/files/digest-gngeo-0.6.11 b/games-emulation/gngeo/files/digest-gngeo-0.6.11
new file mode 100644
index 000000000000..f3d5efb8410c
--- /dev/null
+++ b/games-emulation/gngeo/files/digest-gngeo-0.6.11
@@ -0,0 +1,3 @@
+MD5 fee91301dab874b0a28d361ba68d6cd1 gngeo-0.6.11.tar.gz 1014372
+RMD160 08b296af04c0ad59b02b7c2a010ea0c7c1ba3011 gngeo-0.6.11.tar.gz 1014372
+SHA256 6ec67cdec7775caf81b81eb9c1c0a6209a2e1cf2cc4dfa670d4aaef40f24c45a gngeo-0.6.11.tar.gz 1014372
diff --git a/games-emulation/gngeo/files/gngeo-0.6.11-execstacks.patch b/games-emulation/gngeo/files/gngeo-0.6.11-execstacks.patch
new file mode 100644
index 000000000000..39b8af99df69
--- /dev/null
+++ b/games-emulation/gngeo/files/gngeo-0.6.11-execstacks.patch
@@ -0,0 +1,121 @@
+--- src/memcpy.S
++++ src/memcpy.S
+@@ -495,4 +495,8 @@
+ 
+ Lmemcpy_bsrcul1l4:
+ add r1, r1, #1
+-b Lmemcpy_bl4
+\ No newline at end of file
++b Lmemcpy_bl4
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+--- src/video_arm.S
++++ src/video_arm.S
+@@ -441,4 +441,8 @@
+ 	ldmia sp!,{r4-r12}	
+ 	mov pc,lr 		;@ return
+ 	
+-*/
+\ No newline at end of file
++*/
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+--- ./src/effect/hq3x16.asm
++++ ./src/effect/hq3x16.asm
+@@ -2520,3 +2520,7 @@
+     dd ..@cross8, ..@flag0,  ..@flag0,  ..@flag0,

+     dd ..@flag0,  ..@flag0,  ..@flag0,  ..@flag0

+ 

++
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+--- ./src/effect/2xsaimmx.asm
++++ ./src/effect/2xsaimmx.asm
+@@ -2107,3 +2107,7 @@
+ final1b       resb 8
+ final2a       resb 8
+ final2b       resb 8
++
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+--- ./src/effect/effect_i386.asm
++++ ./src/effect/effect_i386.asm
+@@ -88,3 +88,7 @@
+ 	emms
+ 	
+ 	endproc
++
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+--- ./src/effect/hq2x16.asm
++++ ./src/effect/hq2x16.asm
+@@ -1935,3 +1935,7 @@
+     dd ..@cross8, ..@flag0,  ..@flag0,  ..@flag0,

+     dd ..@flag0,  ..@flag0,  ..@flag0,  ..@flag0

+ 

++
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+--- ./src/video_i386.asm
++++ ./src/video_i386.asm
+@@ -86,3 +86,7 @@
+ 	
+ 	popa
+ 	endproc
++
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+
+ *Note: there are three underscores here on purpose ... otherwise the strip_
+        script will produce _OUTPUT_FORMAT__ instead of __OUTPUT_FORMAT__
+--- ./src/raze/raze.asm
++++ ./src/raze/raze.asm
+@@ -4259,3 +4259,6 @@
+ 
+ ;- the end ------------------------------------------------------------------;
+ 
++%ifidn ___OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+--- ./src/screen_i386.asm
++++ ./src/screen_i386.asm
+@@ -96,3 +96,6 @@
+ 	endproc
+ 
+ 
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+--- src/raze/Makefile.in
++++ src/raze/Makefile.in
+@@ -238,7 +238,7 @@
+ 	./strip_ raze.reg raze.regu
+ 
+ raze2.asm: raze.asmu raze.incu raze.regu
+-	nasm -w+orphan-labels -e $< -o $@
++	nasm -w+orphan-labels -f elf -e $< -o $@
+ 
+ # This assembles the file, once it's been pre-processed
+ raze.o: raze2.asm
+--- src/star/star.c
++++ src/star/star.c
+@@ -2431,6 +2431,10 @@
+ */
+ static void suffixes(void) {
+ 	emit("end\n");
++
++	emit("%%ifidn ___OUTPUT_FORMAT__,elf\n");
++	emit("section .note.GNU-stack noalloc noexec nowrite progbits\n");
++	emit("%%endif\n");
+ }
+ 
+ /****************************************************************************
diff --git a/games-emulation/gngeo/gngeo-0.6.11.ebuild b/games-emulation/gngeo/gngeo-0.6.11.ebuild
new file mode 100644
index 000000000000..c3ccd304ee7b
--- /dev/null
+++ b/games-emulation/gngeo/gngeo-0.6.11.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/gngeo-0.6.11.ebuild,v 1.1 2006/04/07 17:12:50 mr_bones_ Exp $
+
+inherit eutils games
+
+DESCRIPTION="A NeoGeo emulator"
+HOMEPAGE="http://m.peponas.free.fr/gngeo/"
+SRC_URI="http://m.peponas.free.fr/gngeo/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="ppc x86"
+IUSE=""
+
+RDEPEND="virtual/opengl
+	sys-libs/zlib
+	media-libs/sdl-image
+	>=media-libs/libsdl-1.2"
+DEPEND="${RDEPEND}
+	x86? ( >=dev-lang/nasm-0.98 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-execstacks.patch"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS NEWS README sample_gngeorc
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	echo
+	einfo "A licensed NeoGeo BIOS copy is required to run the emulator."
+	echo
+}