Revision bump to include the newer version of the patch as well as to remove the executable stacks. Closing bug #129616.

(Portage version: 2.1.2_pre1-r4)

4 files changed, 93 insertions, 1 deletions

diff --git a/games-emulation/generator/ChangeLog b/games-emulation/generator/ChangeLog
index 68b41edd902b..2f48d30eb141 100644
--- a/games-emulation/generator/ChangeLog
+++ b/games-emulation/generator/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/generator
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/ChangeLog,v 1.14 2006/09/03 01:31:19 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/ChangeLog,v 1.15 2006/10/04 22:37:17 wolf31o2 Exp $
+
+*generator-0.35-r3 (04 Oct 2006)
+
+  04 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/generator-0.35-execstacks.patch, +generator-0.35-r3.ebuild:
+  Revision bump to include the newer version of the patch as well as to remove
+  the executable stacks. Closing bug #129616.
 
 *generator-0.35-r2 (03 Sep 2006)
 
diff --git a/games-emulation/generator/files/digest-generator-0.35-r3 b/games-emulation/generator/files/digest-generator-0.35-r3
new file mode 100644
index 000000000000..9ae7fa309c39
--- /dev/null
+++ b/games-emulation/generator/files/digest-generator-0.35-r3
@@ -0,0 +1,3 @@
+MD5 2076c20e0ad1b20d9ac15cab8cb12ad5 generator-0.35-cbiere-r2.tar.bz2 446101
+RMD160 394145e32f3bf61ac4ed5fa21d2873978c5bd341 generator-0.35-cbiere-r2.tar.bz2 446101
+SHA256 10da28fc5eb77e3a7d54e6b9d08a0630d3effedd0576dd1767ff5f74f57f2a17 generator-0.35-cbiere-r2.tar.bz2 446101
diff --git a/games-emulation/generator/files/generator-0.35-execstacks.patch b/games-emulation/generator/files/generator-0.35-execstacks.patch
new file mode 100644
index 000000000000..efe4c21483e2
--- /dev/null
+++ b/games-emulation/generator/files/generator-0.35-execstacks.patch
@@ -0,0 +1,13 @@
+--- raze/Makefile.in.old	2006-09-03 03:17:39.000000000 +0200
++++ raze/Makefile.in	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
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/games-emulation/generator/generator-0.35-r3.ebuild b/games-emulation/generator/generator-0.35-r3.ebuild
new file mode 100644
index 000000000000..79e5250432dd
--- /dev/null
+++ b/games-emulation/generator/generator-0.35-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header $
+
+inherit eutils toolchain-funcs flag-o-matic games
+
+DESCRIPTION="Sega Genesis / Mega Drive emulator"
+HOMEPAGE="http://www.ghostwhitecrab.com/generator/"
+SRC_URI="http://www.ghostwhitecrab.com/generator/${P}-cbiere-r2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="svga gtk sdlaudio"
+
+S="${WORKDIR}/${P}-cbiere-r2"
+
+RDEPEND="media-libs/jpeg
+	media-libs/libsdl
+	gtk? ( =x11-libs/gtk+-1.2* )
+	svga? ( media-libs/svgalib )"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	mkdir my-bins
+
+	epatch "${FILESDIR}"/${P}-execstacks.patch
+
+	sed -i \
+		-e '/CFLAGS.*-O3/d' \
+		configure || die "sed configure failed"
+}
+
+# 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"
+
+	# these are removed from configure by the sed above
+	use x86 && append-flags -ffast-math -fomit-frame-pointer
+
+	for mygui in ${myguis}; do
+		[[ -f Makefile ]] && make -s clean
+		egamesconf \
+			${myconf} \
+			--with-${mygui} \
+			--with-gcc=$(gcc-major-version) \
+			$(use_with sdlaudio sdl-audio) \
+			--disable-dependency-tracking || die "econf failed"
+		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
+}