version bump

Package-Manager: portage-2.2.14/cvs/Linux x86_64

6 files changed, 190 insertions, 13 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/Manifest b/games-emulation/gngeo/Manifest
index a6a1915fc36f..20a7512898c9 100644
--- a/games-emulation/gngeo/Manifest
+++ b/games-emulation/gngeo/Manifest
@@ -1,18 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gngeo-0.7-build.patch 2408 SHA256 2ffb334228be14b42139f47a938acf672c6968f1882ec5e557f0d2a624c0b32e SHA512 969edb9536aab71135157731dffcf69846d1dd4f814a01baf7d2d051e5d06437f62e3b558be182d8f9685ac3e0b18fc5f14fe301081f55c72d12230320f347a3 WHIRLPOOL 75856b142fefaa41ac5064eeacb7f753883494578a2a1bef8ee0c54e12e8a1909e157a191b4fad6d5d711926c0332876b964133c83a6427d79c889a8d1db3045
 AUX gngeo-0.7-concurrentMake.patch 512 SHA256 dc16caf67c38ac7a94ebeff1f994216352682d36f82f15f80d962a374902551a SHA512 82e302bb06cfb6b724acc3e51bc9659be1bcbb9052c7acab722b7cc0683732a8ef6515c98220611b5f8d2cf6276f9286e27779a684832192d039d3c4f19016f9 WHIRLPOOL 1199feebefa30fdfe356f387e1b2de0ee3e2dc54eb48a62e4dc78f90e89b91029a24904bec8abc097b73da2488131e38cbca4201fec79ac13291b3981e55d90d
 AUX gngeo-0.7-execstacks.patch 2465 SHA256 5ddb3327424b6ec92f274e5e0fe38dc90efa1906afd350ab056ba33982dcbf11 SHA512 0717568d9c967a4f314856ba490eb15efb2fe336cb7cf8eae8e918ba3e550d5704f5bca0a4a7163fae7c02257447eb783da80650f7496dd9cf81358287bd92ad WHIRLPOOL cf89268815bdce0efa43d765de3c2ffc5e6520666ddda90d9dcac2467cf0b3cf0c62cdc1ecc3143d21ad7707f30bf73b6813fdb3fe55deac1fb191a35997d0a4
 AUX gngeo-0.7-zlib.patch 1752 SHA256 4225bd7a7c2f1e2294c2a72be2fea9d2ee1c54e1a9b00257b5b9f50fbe40fc62 SHA512 46cead5260801809084765709edb50a19e86fa09dc78080399d2c5343a9d95811457da9cc171e2e15c2bf1e5e6b8b41cee4ffa7f044e39ab8d47c4a535993950 WHIRLPOOL c0921c9948015ae83b6ea2edcba4fceaba74712731b80340dc236f0f0730db5b1d94b206bffae77942d47e1dc64f379d9220fe87e91385e44d65b55bef5a2ccf
+AUX gngeo-0.8-concurrentMake.patch 631 SHA256 8757156a59b4f4583d1063ee6891b49d4d87c35336fcba56d32985e324300713 SHA512 050de6034a799e7dad41ebb2a65fb9a7ad3dd39da96151dac376a2c58862c1eeed19bb8f9b3479ffc2b2248131370d3065a73a37ce0390e5839607a6f8df6c1c WHIRLPOOL 592d82c9b8c54b465cf83307075ce68e452452fb1154deb6367fceb78243d143e153ee76cf9282de26e1887592175b223a9225d470bb36042406f2b30e299775
+AUX gngeo-0.8-execstacks.patch 2465 SHA256 5ddb3327424b6ec92f274e5e0fe38dc90efa1906afd350ab056ba33982dcbf11 SHA512 0717568d9c967a4f314856ba490eb15efb2fe336cb7cf8eae8e918ba3e550d5704f5bca0a4a7163fae7c02257447eb783da80650f7496dd9cf81358287bd92ad WHIRLPOOL cf89268815bdce0efa43d765de3c2ffc5e6520666ddda90d9dcac2467cf0b3cf0c62cdc1ecc3143d21ad7707f30bf73b6813fdb3fe55deac1fb191a35997d0a4
+AUX gngeo-0.8-zlib.patch 335 SHA256 3d6f6a34ca17c8c30988257b0727d2f215913b20128f1dde80e1c4deafa7eb81 SHA512 6f09ebb89173bc172dc035247727d5e046fb36b3b05789d4b8e98648a229a260f3749fa3e2e35065a418e339d8d80830411ca3614171ef7aadeba0147a4f6a70 WHIRLPOOL f15eec2c4b5a912a091c1763e6e6bc7b5c33bb2758c14c69e281c1356856cd5c7c5db02a11395dbf3eb1edca866c5fad886188c4b429e9203e98a99a701256f9
 DIST gngeo-0.7.tar.gz 853892 SHA256 4c1c56aacede9aceb0d8b2900d7b3edccd2ac6efe7f81a0d3723e998177ab5dc SHA512 3948236c7c2813b482ee81e74809113d1d10cacd72bc3ecf5f8b2bcfaa62d0470dd5f18032beb7c6a6fbf9646be71467fb16d23ccde1c4ef7d5e2fc680e70620 WHIRLPOOL 435bef1b7782c84289f93f693bed5bb133bbc0d29aa1b08113da3f95e04a4f9000222e91f491a2917d073bde8f8fec582182eb2f84c8415927528caa62d543c2
+DIST gngeo-0.8.tar.gz 1043579 SHA256 4955a36a978accbc13cc9d58be3dbbed8864f27c34446b2fea879ee27fd7c4b6 SHA512 4301e0f48afd8686cdc45bd8c3e7b724f4ab7a2482567c7fe99ee8960f652dbcefb00fcdd7071d85b02636a9ae9795d03169ffc79e8ae6f4c5515a5a53c090c7 WHIRLPOOL 46a9faa2ab1ef8fde03a4fa5f1569b4960b75003b09582eed718068eac125d2f3696207a474b8a14f854dad9753e14fd92f78b9778b8658e80f8f4e2b046d5d8
 EBUILD gngeo-0.7.ebuild 1002 SHA256 3b2c3606b6407d0031024b8b8eeacfa99cfaff6e8c1f9460ee1bb32ca9b64c5b SHA512 c33277da69933cbc7197255ddd6e952e9ca9c7bccd04486df6178aeb94ef504c7879f4c90aff2f83549aec8d4770578e74c39e24717524dc3aa8e4b8a9634dc1 WHIRLPOOL 289de97265a90d1613cf3e37b09d231e05258eb7390fedbc8790499241958d0327b6022aa8733e1a2b59ec08a7ef40555273a79289db908eee684aeb73209f20
-MISC ChangeLog 3100 SHA256 6c73f2a647f93ae04e8c7392ee3e40861077e6de95ca7d97fcf00622cf39a8d3 SHA512 4dc8c9f600402703bc9ea407bbd51da22b2bf6b810a81b156db50a6e74eb113c99d001b70e431542413ba99ba01a4edce648ce117b63ca1b90b014214e5b2337 WHIRLPOOL a1a4f5cb4e81d87a7806dc187cba7f8818e3910088e7146de322165e0ce55f8f23f5300b2dc05bc8a379de1ed48dc87a5c533a89fab4236b385fe3af48176aef
+EBUILD gngeo-0.8.ebuild 1036 SHA256 1a7176f9768836676577e111782edd94acf092b86f980c45c672149f6bc054cc SHA512 24d2bd65dcb982cf4b3853964b85da88e926212877f5e9db12ed90da5feea755a39524121ca004f8a0fba9cf4153485fdb5f3e9d7d196053069eed0fbebc822e WHIRLPOOL 57dad9536ea2c8d60f422d7228cfe680240d72829b1bc3dafa43eabfad47f2d53c5bc9922026d5c923ce4a221eb7722ab6146c976f256a1849d7606a23637a20
+MISC ChangeLog 3325 SHA256 21803b31a982443d95effea124e81e6978c214c69151db22dc04f1f3eb816310 SHA512 bab74bdbc079fbddac3cd392d5c8e1218fc7f62746a9f1bf3e456757c2e9084a49dc67e24a8f4f48054ee94f33668c36c5eb2001b855d4d10c7dd1899f9a752e WHIRLPOOL e4f4638efd8243367449ece6a6d06d70b0f8654231b66005f43803ab43a375cf11be7ce906de8922abac60ecc851d97c0ba264c3055c4ddf94e8f88594b8c3b2
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlS6jagACgkQIY77eQFFFC1jIgCg3il3mJGYrzQP86KQ3rBM11f8
-mp0An1DOJ98ZM8HIWtzfMPkTvggpH8Yt
-=GQfM
------END PGP SIGNATURE-----
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
+}