Version bump, bug #184352

(Portage version: 2.1.3_rc9)

5 files changed, 151 insertions, 1 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/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
+}