patch version bump

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

6 files changed, 184 insertions, 19 deletions

diff --git a/games-emulation/generator/ChangeLog b/games-emulation/generator/ChangeLog
index 2deb839c2752..39acc02f4956 100644
--- a/games-emulation/generator/ChangeLog
+++ b/games-emulation/generator/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-emulation/generator
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/ChangeLog,v 1.27 2014/05/15 16:36:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/ChangeLog,v 1.28 2014/07/02 03:48:43 mr_bones_ Exp $
+
+*generator-0.35_p4 (02 Jul 2014)
+
+  02 Jul 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/generator-0.35_p4-configure.patch,
+  +files/generator-0.35_p4-execstacks.patch,
+  +files/generator-0.35_p4-underlink.patch, +generator-0.35_p4.ebuild:
+  patch version bump
 
   15 May 2014; Ulrich Müller <ulm@gentoo.org> generator-0.35_p3.ebuild:
   Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to
diff --git a/games-emulation/generator/Manifest b/games-emulation/generator/Manifest
index b7639ed0720d..804fcb8c5a85 100644
--- a/games-emulation/generator/Manifest
+++ b/games-emulation/generator/Manifest
@@ -1,24 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX generator-0.35_p3-configure.patch 3630 SHA256 229f6624cf3a016124942d5f2a78b425f791e125ddf3aa9cc26473d5e1cdc465 SHA512 ab863e180d8ffc3c57c40f1e99f7230c3894da7afa028205299550b9b8db01d1dc6bac9060e1488ecd48628843acb171260bc39d71a462f518b519139dff3cc5 WHIRLPOOL 1c85baa0e12c5d75b4213776df2c222b183f56bd55b31951f81c384863ce5b3b3f95bdbe77a739d3dbbc28598fb698f218af11244f8b5668ab6bf7c3d92a2fc0
 AUX generator-0.35_p3-execstacks.patch 429 SHA256 ea7c9d4098007a314c38dc750fea6f2aabd2c1d133027a8fa1502a5902d0f545 SHA512 b13137d2944ca5651bf2e43c95ae16da16840d253b517f5a94d02fc0ee8388a6c6750aa21e1b61ecdd6bd95eb4ca8636269eeb8dab949d3ebfccf6bfb08a3653 WHIRLPOOL 13e8fc81d3103d0c289ab61e5d50cb60e830040bf0ddc374f44392cd28fcec02fc98a03080470b16e07b2e8153394bdce9152745dda282431cf6258628ce9c83
 AUX generator-0.35_p3-underlink.patch 509 SHA256 29f6596eafca13f33f7b8bae3ecd292f3fef96cd4c622e9481b7932d66c8ef44 SHA512 075bd9e588aa9b230d446ece3661ae3236deee2175b0e0d25645c717846b0261341a30f4df239fe3b7092be0db612d26f504d7df6e2969e2889654cdc4decfd3 WHIRLPOOL 7e4d2109e578a105b8c5404bcdc17b1b80437a72eddad00c187d4de68a4ab519dc22e6d32b810bec7bd5c5c1eb8747c9cd056ed537d4a046f792ad538bd4f670
+AUX generator-0.35_p4-configure.patch 3630 SHA256 229f6624cf3a016124942d5f2a78b425f791e125ddf3aa9cc26473d5e1cdc465 SHA512 ab863e180d8ffc3c57c40f1e99f7230c3894da7afa028205299550b9b8db01d1dc6bac9060e1488ecd48628843acb171260bc39d71a462f518b519139dff3cc5 WHIRLPOOL 1c85baa0e12c5d75b4213776df2c222b183f56bd55b31951f81c384863ce5b3b3f95bdbe77a739d3dbbc28598fb698f218af11244f8b5668ab6bf7c3d92a2fc0
+AUX generator-0.35_p4-execstacks.patch 429 SHA256 ea7c9d4098007a314c38dc750fea6f2aabd2c1d133027a8fa1502a5902d0f545 SHA512 b13137d2944ca5651bf2e43c95ae16da16840d253b517f5a94d02fc0ee8388a6c6750aa21e1b61ecdd6bd95eb4ca8636269eeb8dab949d3ebfccf6bfb08a3653 WHIRLPOOL 13e8fc81d3103d0c289ab61e5d50cb60e830040bf0ddc374f44392cd28fcec02fc98a03080470b16e07b2e8153394bdce9152745dda282431cf6258628ce9c83
+AUX generator-0.35_p4-underlink.patch 509 SHA256 29f6596eafca13f33f7b8bae3ecd292f3fef96cd4c622e9481b7932d66c8ef44 SHA512 075bd9e588aa9b230d446ece3661ae3236deee2175b0e0d25645c717846b0261341a30f4df239fe3b7092be0db612d26f504d7df6e2969e2889654cdc4decfd3 WHIRLPOOL 7e4d2109e578a105b8c5404bcdc17b1b80437a72eddad00c187d4de68a4ab519dc22e6d32b810bec7bd5c5c1eb8747c9cd056ed537d4a046f792ad538bd4f670
 DIST generator-0.35-cbiere-r3.tar.bz2 448830 SHA256 4d9ae1c2fea72462450ea5dd84b1fe009959e7bf66d9abe8d449572fd78a824b SHA512 cd0b56704f8678cbb09e94d5d72a17a59e8218987348d1aa37b639e370b9eb405cc813529d31e94643fa52a1f759351f8e3706754a36b17d0d358b637a978afe WHIRLPOOL e1512315697128752553e0435844ca25407cb3b3ee5fd5ef2607ea3b87520cebf187f577b3c9b77af67227a2dc61833fe0904f95e0dd4b4cf07c5f63013577be
+DIST generator-0.35-cbiere-r4.tar.bz2 435289 SHA256 54f3a94ed441cfd05d66e7730126c65287f3c1503f13987653c6db84739a79b6 SHA512 73fd36d8004135c172025b3eb3385f731e294935413d7ac905672f1a88434ca332325821c5f15d5ae83fb1385fcde9f1e7f32242f8ac175bb96bd535b5d91620 WHIRLPOOL 446345f838f6c79a31434eda2bb29ff8169036dc6fb26ee11b7adcdb4e7932c62f02fdb468c7a5125b0245b1eae6ffad34ec0d239702e5e1d975504efb7d190b
 EBUILD generator-0.35_p3.ebuild 1563 SHA256 bbd26e24d54dc4502dd76ed4e900cc56248e6fb035f1dbb54e727b05e7cac7ed SHA512 8fafbb12404ad6469135f792ca6665169dad3021bea233a711c4e501f595a13447d64012f81e8c87ee304f51ae4d6514b1aedcc1fbb25496e37665a6b52d5533 WHIRLPOOL bd14916f734d915227759751523624d829b08e6c314389dde806dc299c77952ea7442e1947f07a2e118fc6be40aeb9cc24f164e05413453dda042c9b4f7a47c0
-MISC ChangeLog 4563 SHA256 069edd60080c87168421de18128ed3ae65c18641d4fe35be7fec3942cb67198c SHA512 d9f8dd0ba7f2769d33d4d135ab963094267905bfbb7c3a950b9b6ab8505ed2f7905d41c6089b6cfa103c0c0a1115c8ff2b888e25ae3d1a267cea798343a3d408 WHIRLPOOL e669a23fdfc1167f920e3356006731ee8136fd74a62d5f607054e5ec1f548bad720a2c3f9f2c2833dcf7e9486bbd414f7927a6ace9492d24450d9170afaa49a1
+EBUILD generator-0.35_p4.ebuild 1206 SHA256 4c931cdc92a405ab8e2e0bc1f25ef0d54515078735fe957f3c801da2cb9520f7 SHA512 7c3182c15168ee3a3f923cc61991480665e71910ce25475c8b2f55c304e54931f171ada63c562fbf35cd30667640cdb6c901dc0683fd10b4eb849af428840d02 WHIRLPOOL 41c91a9514ba011c582ba4f10e5d00ca4324e1313068b2751eaecb6a7ac27306fcc8e57186b765c96a77f130c9014cc3c49bf71b924d00848006e77471f59dfd
+MISC ChangeLog 4840 SHA256 22f562e5c5d6949135e1bd062606759708b2466ce5eb11e7edf2e3c6000718b1 SHA512 5b027ed73c4b6332c588373cfec0432ad6672016589bed89fc39e82b9c7088df18ac28646c31c148037fd0a68c1b00f233c5bd4c42e91fa15ffe7d8a7880a385 WHIRLPOOL 6479f8ba88636bdd7553a38262d673f452f39933e60ec58ae9f3879cb15a18ea5b702024e955e4522567f1b9f9f5b20255e9be53fa2038e3c239857898add20d
 MISC metadata.xml 227 SHA256 b61bb0d62f0bea4e072577e5e55025be60e706ae532e9c9ad106b04815d09a7e SHA512 84e3321ec6b4e0d94f7d1c17cf564078306540d0e4ce5e654b37304578b22b4fc25dd05871428efa518fb7fdfd5bcec312969ccf9f295e31d0e58e2f2d7fc693 WHIRLPOOL 9fcd306ebfcade4235729600f8cf32c4fa4f47ba77e50f5d342655abf403d0f597b4d5f47c2a9a11e043bbbf264cc242867a8839ffbaf68ddae29b00d0fe9f05
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQGcBAEBCAAGBQJTdO0ZAAoJEJQzkH1pP7W4RU0L/iNEIyenYsqrKxZIuxgeqIxd
-EVLzS0iaNQ/13FUHrLLmJ2pCCEymvSa0o+K+mrOe/hK2lSb7k4mBTq2VNLheKRMB
-rtpsqIyPhzQIIGSGaaEr15JNq33bcpNZvnJJpaYCdDK0+F40efFr+3w5DH65rYpX
-1lNM+Z19eXRPosCcA7e1Y0gbNeGJ00KhA6p79l9ACMytU6/ebVXnwjSREWvs2L8s
-z9YPR0N19iCmpmNSlYNh2nRlmSrJF68XJRUwch27GgZGfR3jIk186sBF8g1hpXed
-xq+FgSk4MdWFIU23Dw0CYy1hdUmmYy8pOOhH11m+XI/tjP6edCcESgVUBWcQKHXk
-MtYQZYThyCnu6/URpwOfxLpLI7axhbaMd1osSev8SvZ87U371b74Srtgxon58bxj
-ymZNqglE+ExZBAHoK6F1iPOct5a/K+pHdlxrPww3TDauzS3o0bg/qeCmq6KaOMuZ
-Ovtjz5BnHnYzA0XIDKNBNon4HS/P4KvEUPbmCsxTIQ==
-=S9qk
------END PGP SIGNATURE-----
diff --git a/games-emulation/generator/files/generator-0.35_p4-configure.patch b/games-emulation/generator/files/generator-0.35_p4-configure.patch
new file mode 100644
index 000000000000..72ed087bd296
--- /dev/null
+++ b/games-emulation/generator/files/generator-0.35_p4-configure.patch
@@ -0,0 +1,94 @@
+--- configure.ac.original	2008-03-17 13:07:48.000000000 -0400
++++ configure.ac	2008-03-17 13:08:03.000000000 -0400
+@@ -28,15 +28,12 @@
+   AC_ARG_WITH(tcltk,
+               AS_HELP_STRING(--with-tcltk,Create tcltk version),
+               MY_PROG="generator-tcltk")
+-  AC_ARG_WITH(gtk,
+-              AS_HELP_STRING(--with-gtk,Create gtk version),
+-              MY_PROG="generator-gtk")
+   AC_ARG_WITH(sdl,
+               AS_HELP_STRING(--with-sdl,Create SDL version),
+               [MY_PROG="generator-sdl"; USE_SDL_AUDIO=yes])
+    if [[ "x$MY_PROG" = "x" ]]; then
+     AC_MSG_ERROR(You must select a user interface type:
+-    svgalib allegro tcltk gtk sdl)
++    svgalib allegro tcltk sdl)
+   fi
+   if [[ "x$MY_PROG" = "xgenerator-allegro" ]]; then
+     AC_DEFINE(ALLEGRO, 1, [Allegro version])
+@@ -202,50 +199,6 @@
+       CFLAGS="$CFLAGS -Wstrict-prototypes -Wunused"
+     fi
+   fi
+-  if [[ "x$DEBUG" != "xno" ]]; then
+-    AC_MSG_RESULT(Turning on debug flags)
+-    CFLAGS="$CFLAGS -g -O"
+-    optimum=no
+-  else
+-    if [[ "x$GCCVER" != "xno" ]]; then
+-      AC_MSG_RESULT(Turning on gcc optimisations)
+-      CFLAGS="$CFLAGS -O3 -fomit-frame-pointer"
+-      if [[ "x$GCCVER" = "x3" ]]; then
+-        AC_MSG_RESULT(Turning on gcc 3 optimisations)
+-        CFLAGS="$CFLAGS -fno-math-errno"
+-      fi
+-      case "$CFLAGS" in
+-        *mcpu*|*march*) AC_MSG_RESULT(Skipping target optimisations)
+-              ;;
+-        *) case "$target_cpu" in
+-             i386) AC_MSG_RESULT(Turning on i386 optimisations)
+-                   CFLAGS="$CFLAGS -march=i386 -ffast-math"
+-                   ;;
+-             i486) AC_MSG_RESULT(Turning on i486 optimisations)
+-                   CFLAGS="$CFLAGS -march=i486 -ffast-math"
+-                   ;;
+-             i586) AC_MSG_RESULT(Turning on pentium optimisations)
+-                   # cannot do malign-double as we link to other libraries and
+-                   # it would break binary compatibility
+-                   CFLAGS="$CFLAGS -march=pentium -ffast-math"
+-                   ;;
+-             i?86) AC_MSG_RESULT(Turning on i686 optimisations)
+-                   # cannot do malign-double as we link to other libraries and
+-                   # it would break binary compatibility
+-                   CFLAGS="$CFLAGS -march=i686 -ffast-math"
+-                   ;;
+-             alpha*) AC_MSG_RESULT(Adding -mieee for Alpha)
+-                   CFLAGS="$CFLAGS -mieee"
+-                   ;;
+-                *) AC_MSG_RESULT(Sorry unknown target CPU)
+-                   ;;
+-           esac
+-      esac
+-    else
+-      AC_MSG_WARN(You did not opt for gcc optimisations!)
+-      optimum=no
+-    fi
+-  fi
+   AC_CHECK_LIB(jpeg, jpeg_start_compress, 
+     [ MY_LIBS="-ljpeg $MY_LIBS"; AC_DEFINE(JPEG, 1, [JPEG features]) ])
+ 
+@@ -272,14 +225,7 @@
+ 
+   AC_PATH_XTRA
+ 
+-  if [[ "x$MY_PROG" = "xgenerator-gtk" ]]; then
+-    MY_SUBDIRS="glade gtkopts $MY_SUBDIRS"
+-    AM_PATH_GTK(1.2.10,,AC_MSG_ERROR(Generator needs gtk 1.2.10 or later))
+-    AM_PATH_SDL(1.2.6,,AC_MSG_ERROR(Generator needs sdk 1.2.6 or later))
+-
+-    MY_LIBS="$MY_LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
+-    CFLAGS="$CFLAGS $X_CFLAGS"
+-  elif [[ "x$MY_PROG" = "xgenerator-sdl" ]]; then
++  if [[ "x$MY_PROG" = "xgenerator-sdl" ]]; then
+     MY_SUBDIRS="gtkopts $MY_SUBDIRS"
+     AM_PATH_SDL(1.2.6,,AC_MSG_ERROR(Generator needs sdk 1.2.6 or later))
+ 
+@@ -305,6 +251,7 @@
+   AC_CHECK_SIZEOF(unsigned long, 4)
+   AC_CHECK_SIZEOF(unsigned long long, 8)
+   AC_CHECK_HEADERS(sys/param.h)
++  AC_CHECK_HEADERS(sys/time.h)
+   AC_CHECK_HEADERS(bzlib.h)
+   AC_CHECK_HEADERS(zlib.h)
+   AC_CHECK_HEADERS(tcl8.0.h)
diff --git a/games-emulation/generator/files/generator-0.35_p4-execstacks.patch b/games-emulation/generator/files/generator-0.35_p4-execstacks.patch
new file mode 100644
index 000000000000..f92ef6121f5a
--- /dev/null
+++ b/games-emulation/generator/files/generator-0.35_p4-execstacks.patch
@@ -0,0 +1,12 @@
+--- raze/Makefile.am.old	2006-09-03 03:17:39.000000000 +0200
++++ raze/Makefile.am	2006-09-03 03:16:36.000000000 +0200
+@@ -343,6 +343,10 @@
+ raze:	raze.o
+ raze.o:	raze.asm raze.reg
+ 	nasm -e raze.asm -o raze2.asm
++	echo "%ifidn __OUTPUT_FORMAT__,elf" >> raze2.asm
++	echo "section .note.GNU-stack noalloc noexec nowrite progbits" \
++		>> raze2.asm
++	echo "%endif" >> raze2.asm
+ 	nasm -f @ASMOUTPUT@ raze2.asm -o raze.o -praze.reg
+
diff --git a/games-emulation/generator/files/generator-0.35_p4-underlink.patch b/games-emulation/generator/files/generator-0.35_p4-underlink.patch
new file mode 100644
index 000000000000..964a6bea0883
--- /dev/null
+++ b/games-emulation/generator/files/generator-0.35_p4-underlink.patch
@@ -0,0 +1,11 @@
+--- main/Makefile.am.old	2011-06-20 21:35:25.832460030 +0200
++++ main/Makefile.am	2011-06-20 21:36:29.490503981 +0200
+@@ -7,7 +7,7 @@
+ bin_PROGRAMS = @PROGRAM@
+ EXTRA_PROGRAMS = generator-svgalib generator-tcltk generator-allegro \
+                  generator-gtk generator-sdl
+-LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ \
++LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ -lm \
+         ../sn76496/libsn76496.a
+ 
+ ## this should be generator_tcltk_DATA but it won't let me do that
diff --git a/games-emulation/generator/generator-0.35_p4.ebuild b/games-emulation/generator/generator-0.35_p4.ebuild
new file mode 100644
index 000000000000..3ae96790728e
--- /dev/null
+++ b/games-emulation/generator/generator-0.35_p4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/generator-0.35_p4.ebuild,v 1.1 2014/07/02 03:48:43 mr_bones_ Exp $
+
+EAPI=5
+inherit autotools eutils toolchain-funcs games
+
+MY_P=${PN}-${PV/_p/-cbiere-r}
+DESCRIPTION="Sega Genesis / Mega Drive emulator"
+HOMEPAGE="http://www.squish.net/generator/"
+SRC_URI="http://www.squish.net/generator/cbiere/generator/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+sdlaudio"
+
+DEPEND="virtual/jpeg
+	media-libs/libsdl[joystick,video]
+	sdlaudio? ( media-libs/libsdl[sound] )"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-configure.patch \
+		"${FILESDIR}"/${P}-underlink.patch
+
+	sed -i -e 's/@GTK_CFLAGS@//g' main/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf \
+		--with-cmz80 \
+		--with-sdl \
+		--without-tcltk \
+		--with-gcc=$(gcc-major-version) \
+		$(use_with sdlaudio sdl-audio)
+}
+
+src_compile() {
+	[[ -f Makefile ]] && emake clean
+	emake -j1
+}
+
+src_install() {
+	dogamesbin main/generator-sdl
+	dodoc AUTHORS ChangeLog NEWS README TODO docs/*
+	prepgamesdirs
+}