old

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

6 files changed, 7 insertions, 274 deletions

diff --git a/games-emulation/gngeo/ChangeLog b/games-emulation/gngeo/ChangeLog
index bc0e62cb3e36..ff1659c27c78 100644
--- a/games-emulation/gngeo/ChangeLog
+++ b/games-emulation/gngeo/ChangeLog
@@ -1,6 +1,12 @@
 # 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.26 2015/02/25 15:57:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/ChangeLog,v 1.27 2015/03/20 18:44:59 mr_bones_ Exp $
+
+  20 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/gngeo-0.7-build.patch, -files/gngeo-0.7-concurrentMake.patch,
+  -files/gngeo-0.7-execstacks.patch, -files/gngeo-0.7-zlib.patch,
+  -gngeo-0.7.ebuild:
+  old
 
   25 Feb 2015; Agostino Sarubbo <ago@gentoo.org> gngeo-0.8.ebuild:
   Stable for x86, wrt bug #540612
diff --git a/games-emulation/gngeo/files/gngeo-0.7-build.patch b/games-emulation/gngeo/files/gngeo-0.7-build.patch
deleted file mode 100644
index 742524486a70..000000000000
--- a/games-emulation/gngeo/files/gngeo-0.7-build.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -17,13 +17,14 @@
- AC_SUBST(CC_FOR_BUILD)
- 
- # Humm is this a good idea?
--CFLAGS=""
-+CFLAGS="$CFLAGS -Wall -Wno-unused"
- 
-  #echo $CC
- 
- # Checks for programs.
- AC_PROG_CC
- AC_PROG_RANLIB
-+AM_PROG_AS
- 
- 
- 
-@@ -213,33 +214,14 @@
-     i?86)  AC_MSG_RESULT(Turning on x86 processor optimisations)
-            AC_DEFINE(PROCESSOR_INTEL, 1, [Define if you have an x86 processor])
-            ALIGNLONGS=0
--	   if test $CC_MAJOR -ge 3 ; then
--		CFLAGS="$CFLAGS -O3 -fstrength-reduce -frerun-loop-opt -Wall -Wno-unused -funroll-loops \
--                    -ffast-math -falign-functions=2 -falign-jumps=2 -fexpensive-optimizations \
--                    -falign-loops=2 -fschedule-insns2 -malign-double -fomit-frame-pointer -g \
--		    -fno-strict-aliasing -pipe -mtune=$target_cpu -DCPU=$target_cpu"
--	   else
--		CFLAGS="$CFLAGS -O3 -fstrength-reduce -frerun-loop-opt -Wall -Wno-unused -funroll-loops \
--                    -ffast-math -malign-functions=2 -malign-jumps=2 -fexpensive-optimizations \
--                    -malign-loops=2 -fschedule-insns2 -malign-double -fomit-frame-pointer -g \
--		    -fno-strict-aliasing -pipe -mcpu=$target_cpu -DCPU=$target_cpu"
--           fi
-            ;;
-     sparc*) AC_MSG_RESULT(Turning on sparc processor optimisations)
-            AC_DEFINE(PROCESSOR_SPARC, 1, [Define if you have a sparc processor])
- 	   ALIGNLONGS=1
--	   if test $target_cpu = sparc64 && test $CC_MAJOR -ge 3 ; then
--		CFLAGS="$CFLAGS -mcpu=v9"
--	   fi
--	   CFLAGS="$CFLAGS -O3 -Wall -Wno-unused -funroll-loops \
--                    -ffast-math -fomit-frame-pointer -g"
-            ;;
-     arm)   AC_MSG_RESULT(Turning on arm processor optimisations)
-            #AC_DEFINE(PROCESSOR_ARM, 1, [Define if you have an ARM processor])
-            ALIGNLONGS=1
--	   CFLAGS="$CFLAGS -O3 -Wall -ftracer -fstrength-reduce -Wno-unused -funroll-loops \
--                    -fomit-frame-pointer -fstrict-aliasing -ffast-math \
--	   	    "
- 	   #CFLAGS="$CFLAGS -O2 -Wall -ftracer -fstrength-reduce -Wno-unused  \
-            #         -fomit-frame-pointer -fstrict-aliasing -ffast-math \
- 	   #	    "
-@@ -248,8 +230,6 @@
-     *)     AC_MSG_WARN(Processor type not known - Use generic optimisations)
-            ALIGNLONGS=1
-            optimum=no
--	   CFLAGS="$CFLAGS -O3 -Wall -Wno-unused -funroll-loops \
--                    -ffast-math -g"
-            ;;
-   esac
-   
diff --git a/games-emulation/gngeo/files/gngeo-0.7-concurrentMake.patch b/games-emulation/gngeo/files/gngeo-0.7-concurrentMake.patch
deleted file mode 100644
index dfa9cbe46444..000000000000
--- a/games-emulation/gngeo/files/gngeo-0.7-concurrentMake.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/generator68k/Makefile.am.old	2006-10-26 21:52:24.000000000 +0200
-+++ src/generator68k/Makefile.am	2006-10-26 21:53:45.000000000 +0200
-@@ -66,7 +66,10 @@
- 
- #def68k : def68k.c
- #	gcc def68k.c tab68k.c -o def68k -I .. -I ../.. -I . `sdl-config --cflags`
--def68k.o gen68k.o: %.o : %.c
-+def68k.o: %.o : %.c
-+	$(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
diff --git a/games-emulation/gngeo/files/gngeo-0.7-execstacks.patch b/games-emulation/gngeo/files/gngeo-0.7-execstacks.patch
deleted file mode 100644
index 17c576b7d634..000000000000
--- a/games-emulation/gngeo/files/gngeo-0.7-execstacks.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- 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.7-zlib.patch b/games-emulation/gngeo/files/gngeo-0.7-zlib.patch
deleted file mode 100644
index 872b2e67601a..000000000000
--- a/games-emulation/gngeo/files/gngeo-0.7-zlib.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- src/Makefile.am.old	2012-09-04 06:43:21.415398601 +0200
-+++ src/Makefile.am	2012-09-04 06:43:37.227461006 +0200
-@@ -58,8 +58,8 @@
- 		blitter.h        font.h           memory.h          raze_interf.c   \
- 		timer.c          effect.h         frame_skip.c      messages.c      \
- 		screen.c         timer.h          emu.c             frame_skip.h    \
--		messages.h       screen.h         unzip.c           emu.h           \
--		neocrypt.c       sound.c          unzip.h           generator68k_interf.c \
-+		messages.h       screen.h         emu.h           \
-+		neocrypt.c       sound.c          generator68k_interf.c \
- 		debug.c          debug.h          neocrypt.h	    state.c         \
- 		state.h          video_template.h conf.c            conf.h          \
- 		transpack.h      transpack.c      pbar.h            pbar.c          \
---- src/fileio.c.old	2012-09-04 06:42:03.956194155 +0200
-+++ src/fileio.c	2012-09-04 06:42:32.299098500 +0200
-@@ -30,7 +30,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <zlib.h>
--#include "unzip.h"
-+#include <minizip/unzip.h>
- #include "memory.h"
- #include "video.h"
- #include "emu.h"
---- src/driver.c.old	2012-09-04 06:49:28.418057327 +0200
-+++ src/driver.c	2012-09-04 06:49:58.161055744 +0200
-@@ -29,7 +29,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <zlib.h>
--#include "unzip.h"
-+#include <minizip/unzip.h>
- #include "driver.h"
- #include "conf.h"
- #include "pbar.h"
---- configure.in.old	2012-09-04 06:55:46.998493962 +0200
-+++ configure.in	2012-09-04 06:56:23.705960317 +0200
-@@ -66,6 +66,7 @@
- fi
- 
- AC_CHECK_LIB([SDL_image], [IMG_Load])
-+AC_CHECK_LIB([minizip], [unzReadCurrentFile])
- 
- AC_CHECK_FUNCS(getopt_long , , [ AC_LIBOBJ(getopt) AC_LIBOBJ(getopt1) ])
- AC_CHECK_FUNCS(scandir)
diff --git a/games-emulation/gngeo/gngeo-0.7.ebuild b/games-emulation/gngeo/gngeo-0.7.ebuild
deleted file mode 100644
index c42c375bfaa9..000000000000
--- a/games-emulation/gngeo/gngeo-0.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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.7.ebuild,v 1.8 2015/01/17 16:28:18 tupone Exp $
-EAPI=5
-
-inherit eutils autotools games
-
-DESCRIPTION="A NeoGeo emulator"
-HOMEPAGE="http://m.peponas.free.fr/gngeo/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-DEPEND="virtual/opengl
-	media-libs/sdl-image
-	media-libs/libsdl
-	sys-libs/zlib[minizip]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-execstacks.patch \
-		"${FILESDIR}"/${P}-concurrentMake.patch \
-		"${FILESDIR}"/${P}-zlib.patch
-	mv configure.{in,ac}
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf --disable-i386asm
-}
-
-src_install() {
-	default
-	dodoc sample_gngeorc
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	elog "A licensed NeoGeo BIOS copy is required to run the emulator."
-	echo
-}