Version bump, bug #184352

Package-Manager: portage-2.1.3_rc9

6 files changed, 181 insertions, 5 deletions

diff --git a/games-emulation/generator/ChangeLog b/games-emulation/generator/ChangeLog
index 497118fd2f95..8f00cbe4f2b9 100644
--- a/games-emulation/generator/ChangeLog
+++ b/games-emulation/generator/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/generator
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/ChangeLog,v 1.18 2007/04/11 20:51:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/ChangeLog,v 1.19 2007/07/25 17:01:36 nyhm Exp $
+
+*generator-0.35_p3 (25 Jul 2007)
+
+  25 Jul 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/generator-0.35_p3-configure.patch,
+  +files/generator-0.35_p3-execstacks.patch, +generator-0.35_p3.ebuild:
+  Version bump, bug #184352
 
   11 Apr 2007; Michael Sterrett <mr_bones_@gentoo.org>
   +files/generator-0.35-configure.patch,
diff --git a/games-emulation/generator/Manifest b/games-emulation/generator/Manifest
index 8144a588a9df..3cfeee6a4e77 100644
--- a/games-emulation/generator/Manifest
+++ b/games-emulation/generator/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX generator-0.35-configure.patch 2354 RMD160 a9ce7928157307313ac08dcfd17edb9c1d2e77d4 SHA1 81064296563f3c55ae5f5c0da5ce6f7f45edf69d SHA256 918c8159ed4936e12b91a642a6fd11f62d16a17d7e60d09aee04b3df77582b11
 MD5 9ea4dfb321b8fe397069ad21e40dedb1 files/generator-0.35-configure.patch 2354
 RMD160 a9ce7928157307313ac08dcfd17edb9c1d2e77d4 files/generator-0.35-configure.patch 2354
@@ -6,11 +9,20 @@ AUX generator-0.35-execstacks.patch 429 RMD160 cfea637a080c669c5901ab7eced001ca2
 MD5 22dfef9cc5ba182474f4d71a11f9a59f files/generator-0.35-execstacks.patch 429
 RMD160 cfea637a080c669c5901ab7eced001ca28fe4af9 files/generator-0.35-execstacks.patch 429
 SHA256 ea7c9d4098007a314c38dc750fea6f2aabd2c1d133027a8fa1502a5902d0f545 files/generator-0.35-execstacks.patch 429
+AUX generator-0.35_p3-configure.patch 2354 RMD160 a9ce7928157307313ac08dcfd17edb9c1d2e77d4 SHA1 81064296563f3c55ae5f5c0da5ce6f7f45edf69d SHA256 918c8159ed4936e12b91a642a6fd11f62d16a17d7e60d09aee04b3df77582b11
+MD5 9ea4dfb321b8fe397069ad21e40dedb1 files/generator-0.35_p3-configure.patch 2354
+RMD160 a9ce7928157307313ac08dcfd17edb9c1d2e77d4 files/generator-0.35_p3-configure.patch 2354
+SHA256 918c8159ed4936e12b91a642a6fd11f62d16a17d7e60d09aee04b3df77582b11 files/generator-0.35_p3-configure.patch 2354
+AUX generator-0.35_p3-execstacks.patch 429 RMD160 cfea637a080c669c5901ab7eced001ca28fe4af9 SHA1 10c7cb18bd70d3c8069c6e5642311efae3e6efa3 SHA256 ea7c9d4098007a314c38dc750fea6f2aabd2c1d133027a8fa1502a5902d0f545
+MD5 22dfef9cc5ba182474f4d71a11f9a59f files/generator-0.35_p3-execstacks.patch 429
+RMD160 cfea637a080c669c5901ab7eced001ca28fe4af9 files/generator-0.35_p3-execstacks.patch 429
+SHA256 ea7c9d4098007a314c38dc750fea6f2aabd2c1d133027a8fa1502a5902d0f545 files/generator-0.35_p3-execstacks.patch 429
 AUX netbsd-gcc-3.3.patch 1345 RMD160 94d4d22321c81248f8b12c24389e517fe448b7a6 SHA1 6bc259408bb02411c014b9d146ab33e7237ddad4 SHA256 1cbc8749da616ebe356364a7730bbb7f1832456742dff6192ea9e152fa6ba906
 MD5 9ad78ba06412ba4a6b57b93e759e1016 files/netbsd-gcc-3.3.patch 1345
 RMD160 94d4d22321c81248f8b12c24389e517fe448b7a6 files/netbsd-gcc-3.3.patch 1345
 SHA256 1cbc8749da616ebe356364a7730bbb7f1832456742dff6192ea9e152fa6ba906 files/netbsd-gcc-3.3.patch 1345
 DIST generator-0.35-cbiere-r2.tar.bz2 446101 RMD160 394145e32f3bf61ac4ed5fa21d2873978c5bd341 SHA1 bb329925298ef7a087601e61f570af8d4e615915 SHA256 10da28fc5eb77e3a7d54e6b9d08a0630d3effedd0576dd1767ff5f74f57f2a17
+DIST generator-0.35-cbiere-r3.tar.bz2 448830 RMD160 9ade032cd4813983494a80ff326da82f888885e4 SHA1 ddbadfa82b6d30ee31da71be3e42ec4623c16e13 SHA256 4d9ae1c2fea72462450ea5dd84b1fe009959e7bf66d9abe8d449572fd78a824b
 DIST generator-0.35.tar.gz 469541 RMD160 6b448018b8ed0fd9755ddb850f48892304d12e78 SHA1 a61138579efd97028d3a69c54c3c6fcd0a3d74ab SHA256 5e622e4234125eeea9bc6fa2759f8cdf42844092bdb007d4a43f55c40c4cd7f5
 EBUILD generator-0.35-r3.ebuild 1608 RMD160 f03fafeb1fc7f0a66bb7ba37ad63f80b540d6fa7 SHA1 a106641e40745ae538e8659e42c4d8429b9bf9ce SHA256 5190e05355c9c723e15e415e800390390a18435395bd3fa3ace4fcb7568ba83a
 MD5 4738b1689bfe4f28183dfc1d324962a4 generator-0.35-r3.ebuild 1608
@@ -20,10 +32,14 @@ EBUILD generator-0.35.ebuild 1719 RMD160 808b9c81f4ad92b786edac15ed306cf8cc555f9
 MD5 681b051aabf3174334050f3324ac0ce8 generator-0.35.ebuild 1719
 RMD160 808b9c81f4ad92b786edac15ed306cf8cc555f92 generator-0.35.ebuild 1719
 SHA256 09ae66d230048ebacb15c3a97b1f244d2c47ea801e53740d1b38dbed7e45d198 generator-0.35.ebuild 1719
-MISC ChangeLog 3144 RMD160 4eff9382bbecfce186f6e2add309c7f9bb9595e1 SHA1 ec5b4b81e27e530bb6e3e335a993568c4b647dda SHA256 9b6efbf87ac8eec54d4ff54dca38cb74c1c6f0afdfb0ce6d2fb249c567a87441
-MD5 7d4affc2931f9e8674dc1a9c1c115ffe ChangeLog 3144
-RMD160 4eff9382bbecfce186f6e2add309c7f9bb9595e1 ChangeLog 3144
-SHA256 9b6efbf87ac8eec54d4ff54dca38cb74c1c6f0afdfb0ce6d2fb249c567a87441 ChangeLog 3144
+EBUILD generator-0.35_p3.ebuild 1614 RMD160 67d44c9d227a5024fd6fc815a3e188e9f111cdc5 SHA1 89372553d2a53544811f6bcf4f9944bbd42a450e SHA256 5228da27f6daf046d05722a7bac95110c1c255138dcdcfe86935f1ed440952eb
+MD5 1d89069976f9f201ca22aab157d418ef generator-0.35_p3.ebuild 1614
+RMD160 67d44c9d227a5024fd6fc815a3e188e9f111cdc5 generator-0.35_p3.ebuild 1614
+SHA256 5228da27f6daf046d05722a7bac95110c1c255138dcdcfe86935f1ed440952eb generator-0.35_p3.ebuild 1614
+MISC ChangeLog 3366 RMD160 97007a961d9cc633e93c101cc7a1dbd222e43553 SHA1 afebf84ced0578cc1efb20f15575c9362107cb42 SHA256 bcdf8318686903594a4e95bd6edce81c3dc87442b8984da5a25283c3b17911fc
+MD5 cb951e2474be7985bb215aff566e7596 ChangeLog 3366
+RMD160 97007a961d9cc633e93c101cc7a1dbd222e43553 ChangeLog 3366
+SHA256 bcdf8318686903594a4e95bd6edce81c3dc87442b8984da5a25283c3b17911fc ChangeLog 3366
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -34,3 +50,13 @@ SHA256 d64cc6fa39a62a23a842102782bc39cc69e6dee76f0ca1c864070a87e425b887 files/di
 MD5 f56926056560ebc91a002761911d554a files/digest-generator-0.35-r3 277
 RMD160 192b34e99e0bcf01ae4a45dde32e8a94ca4aee63 files/digest-generator-0.35-r3 277
 SHA256 258e370f5aa5701dbde2a704bdd080c33aace03c50b0a2beeb1817be10549c15 files/digest-generator-0.35-r3 277
+MD5 b73e7a6e723157fc95a3e1e25499a532 files/digest-generator-0.35_p3 277
+RMD160 9a471160c631a759fc80aa485084dd97682eac40 files/digest-generator-0.35_p3 277
+SHA256 046ec56c1ef50c1e6bc88fd6281a3a2ecd59d01a54ab0456be5bd1c1229089a1 files/digest-generator-0.35_p3 277
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGp4H2dz7hIScOURERAs3pAKDJMI7KsoULhxsCt2tEmvDKKmPbUACeJzIs
+WL7BCH9KoUIWhWRUw4Xvk+c=
+=sv4X
+-----END PGP SIGNATURE-----
diff --git a/games-emulation/generator/files/digest-generator-0.35_p3 b/games-emulation/generator/files/digest-generator-0.35_p3
new file mode 100644
index 000000000000..c079c7f9cb33
--- /dev/null
+++ b/games-emulation/generator/files/digest-generator-0.35_p3
@@ -0,0 +1,3 @@
+MD5 5ab81706482d2c2c9932521a25dbae28 generator-0.35-cbiere-r3.tar.bz2 448830
+RMD160 9ade032cd4813983494a80ff326da82f888885e4 generator-0.35-cbiere-r3.tar.bz2 448830
+SHA256 4d9ae1c2fea72462450ea5dd84b1fe009959e7bf66d9abe8d449572fd78a824b generator-0.35-cbiere-r3.tar.bz2 448830
diff --git a/games-emulation/generator/files/generator-0.35_p3-configure.patch b/games-emulation/generator/files/generator-0.35_p3-configure.patch
new file mode 100644
index 000000000000..cc4046c7e62b
--- /dev/null
+++ b/games-emulation/generator/files/generator-0.35_p3-configure.patch
@@ -0,0 +1,61 @@
+--- configure.ac.orig	2007-04-11 16:28:09.000000000 -0400
++++ configure.ac	2007-04-11 16:29:07.000000000 -0400
+@@ -202,50 +202,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]) ])
+ 
+@@ -305,6 +261,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_p3-execstacks.patch b/games-emulation/generator/files/generator-0.35_p3-execstacks.patch
new file mode 100644
index 000000000000..f92ef6121f5a
--- /dev/null
+++ b/games-emulation/generator/files/generator-0.35_p3-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/generator-0.35_p3.ebuild b/games-emulation/generator/generator-0.35_p3.ebuild
new file mode 100644
index 000000000000..112471985877
--- /dev/null
+++ b/games-emulation/generator/generator-0.35_p3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/generator-0.35_p3.ebuild,v 1.1 2007/07/25 17:01:36 nyhm Exp $
+
+inherit autotools eutils toolchain-funcs games
+
+MY_P=${PN}-${PV/_p/-cbiere-r}
+DESCRIPTION="Sega Genesis / Mega Drive emulator"
+HOMEPAGE="http://www.ghostwhitecrab.com/generator/"
+SRC_URI="http://www.ghostwhitecrab.com/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk sdlaudio svga"
+
+RDEPEND="media-libs/jpeg
+	media-libs/libsdl
+	gtk? ( =x11-libs/gtk+-1.2* )
+	svga? ( media-libs/svgalib )"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	mkdir my-bins
+
+	epatch \
+		"${FILESDIR}"/${P}-execstacks.patch \
+		"${FILESDIR}"/${P}-configure.patch
+	eautoreconf
+}
+
+# builds SDL by default since otherwise -svga -gtk builds nothing
+src_compile() {
+	local myconf mygui myguis
+
+	use x86 \
+		&& myconf="--with-raze" \
+		|| myconf="--with-cmz80"
+
+	myguis="sdl"
+	use gtk && myguis="${myguis} gtk"
+	use svga && myguis="${myguis} svgalib"
+
+	for mygui in ${myguis}; do
+		[[ -f Makefile ]] && emake clean
+		egamesconf \
+			${myconf} \
+			--with-${mygui} \
+			--without-tcltk \
+			--with-gcc=$(gcc-major-version) \
+			$(use_with sdlaudio sdl-audio) \
+			--disable-dependency-tracking || die
+		emake -j1 || die "building ${mygui}"
+		mv main/generator-${mygui} my-bins/
+	done
+}
+
+src_install() {
+	dogamesbin my-bins/* || die "dogamesbin failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO docs/*
+	prepgamesdirs
+}