version bump

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 184 insertions, 2 deletions

diff --git a/games-emulation/gngeo/ChangeLog b/games-emulation/gngeo/ChangeLog
index 43a7f7762e4d..4d1cdfd00271 100644
--- a/games-emulation/gngeo/ChangeLog
+++ b/games-emulation/gngeo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/gngeo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/ChangeLog,v 1.23 2015/01/17 16:28:18 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/ChangeLog,v 1.24 2015/01/24 05:58:44 mr_bones_ Exp $
+
+*gngeo-0.8 (24 Jan 2015)
+
+  24 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/gngeo-0.8-concurrentMake.patch, +files/gngeo-0.8-execstacks.patch,
+  +files/gngeo-0.8-zlib.patch, +gngeo-0.8.ebuild:
+  version bump
 
   17 Jan 2015; Tupone Alfredo <tupone@gentoo.org> gngeo-0.7.ebuild:
   EAPI 5
@@ -91,4 +98,3 @@
 
   29 Jul 2003; Michael Sterrett <msterret@gentoo.org> gngeo-0.5.9a.ebuild:
   Initial ebuild supplied by Paolo and tidied (bug 24702)
-
diff --git a/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch b/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch
new file mode 100644
index 000000000000..1afc182c0988
--- /dev/null
+++ b/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch
@@ -0,0 +1,16 @@
+--- src/generator68k/Makefile.am.orig	2015-01-23 18:37:37.998723294 -0500
++++ src/generator68k/Makefile.am	2015-01-23 18:38:39.995391133 -0500
+@@ -71,9 +71,12 @@
+ 
+ #def68k : def68k.c
+ #	gcc def68k.c tab68k.c -o def68k -I .. -I ../.. -I . `sdl-config --cflags`
+-def68k.o gen68k.o tab68k2.o : %.o : %.c
++def68k.o tab68k2.o : %.o : %.c
+ 	$(gcc_build_verbose)$(CC_FOR_BUILD) -c $< -o $@ -I .. -I ../.. -I . `sdl-config --cflags`
+ 
++gen68k.o: gen68k.c def68k-iibs.h
++	$(CC_FOR_BUILD) -c $< -o $@ -I .. -I ../.. -I . `sdl-config --cflags`
++
+ def68k : def68k.o tab68k2.o
+ 	$(gcc_build_verbose)$(CC_FOR_BUILD) def68k.o tab68k2.o -o $@ 
+ 
diff --git a/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch b/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch
new file mode 100644
index 000000000000..17c576b7d634
--- /dev/null
+++ b/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch
@@ -0,0 +1,105 @@
+--- 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/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/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/raze/Makefile.am
++++ src/raze/Makefile.am
+@@ -20,7 +20,7 @@
+ 	$(srcdir)/strip_ $< $@
+ 
+ raze2.asm: raze.asmu raze.incu raze.regu
+-	nasm -w+orphan-labels -I $(srcdir)/ -e $< -o $@
++	nasm -w+orphan-labels -f elf -I $(srcdir)/ -e $< -o $@
+ 
+ # This assembles the file, once it's been pre-processed
+ raze.o: raze2.asm
+--- 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/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");
+ }
+ 
+ /****************************************************************************
+--- 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
diff --git a/games-emulation/gngeo/files/gngeo-0.8-zlib.patch b/games-emulation/gngeo/files/gngeo-0.8-zlib.patch
new file mode 100644
index 000000000000..9aa4a6b5f479
--- /dev/null
+++ b/games-emulation/gngeo/files/gngeo-0.8-zlib.patch
@@ -0,0 +1,9 @@
+diff -ru gngeo-0.8.orig/configure.in gngeo-0.8/configure.in
+--- gngeo-0.8.orig/configure.in	2012-11-15 17:57:57.849578009 -0500
++++ gngeo-0.8/configure.in	2012-11-15 18:19:55.305923094 -0500
+@@ -95,6 +95,7 @@
+ #AC_SUBST(LIBOBJS)
+ AC_CHECK_LIB([m], [acos])
+ AC_CHECK_LIB([z], [inflate])
++AC_CHECK_LIB([minizip], [unzReadCurrentFile])
+ 
diff --git a/games-emulation/gngeo/gngeo-0.8.ebuild b/games-emulation/gngeo/gngeo-0.8.ebuild
new file mode 100644
index 000000000000..7cf408342cac
--- /dev/null
+++ b/games-emulation/gngeo/gngeo-0.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/gngeo-0.8.ebuild,v 1.1 2015/01/24 05:58:44 mr_bones_ Exp $
+
+EAPI=5
+inherit eutils autotools games
+
+DESCRIPTION="A NeoGeo emulator"
+HOMEPAGE="http://code.google.com/p/gngeo/"
+SRC_URI="http://gngeo.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="virtual/opengl
+	media-libs/libsdl[joystick,opengl,sound,video]
+	sys-libs/zlib[minizip]"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-execstacks.patch \
+		"${FILESDIR}"/${P}-zlib.patch \
+		"${FILESDIR}"/${P}-concurrentMake.patch
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf --disable-i386asm
+}
+
+src_install() {
+	DOCS=( AUTHORS FAQ NEWS README* TODO sample_gngeorc )
+	default
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	echo
+	elog "A licensed NeoGeo BIOS copy is required to run the emulator."
+	echo
+}