Previous exec stack fix was discarded by the 2 stages asm build. Fixed.

Package-Manager: portage-2.1-r2

5 files changed, 100 insertions, 12 deletions

diff --git a/games-emulation/generator/ChangeLog b/games-emulation/generator/ChangeLog
index b1ebb039a273..68b41edd902b 100644
--- a/games-emulation/generator/ChangeLog
+++ b/games-emulation/generator/ChangeLog
@@ -1,6 +1,12 @@
 # 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.13 2006/04/20 03:45:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/ChangeLog,v 1.14 2006/09/03 01:31:19 tupone Exp $
+
+*generator-0.35-r2 (03 Sep 2006)
+
+  03 Sep 2006; <tupone@gentoo.org> files/generator-0.35-gcc.patch,
+  -generator-0.35-r1.ebuild, +generator-0.35-r2.ebuild:
+  Previous exec stack fix was discarded by the 2 stages asm build. Fixed.
 
   20 Apr 2006; Mike Frysinger <vapier@gentoo.org>
   +files/generator-0.35-gcc.patch, generator-0.35-r1.ebuild:
@@ -10,7 +16,7 @@
 
   30 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   +generator-0.35-r1.ebuild:
-  Added new ebuild for a patched generator. The oroginal ebuild was written by
+  Added new ebuild for a patched generator. The original ebuild was written by
   Machiel Groeneveld <machiel@ideus.nl> and edited by Bernard Cafarelli
   <voyageur@operamail.com>. Closing bug #76072.
 
diff --git a/games-emulation/generator/files/digest-generator-0.35 b/games-emulation/generator/files/digest-generator-0.35
index 2e4ef0fce18e..a1c26ef5a092 100644
--- a/games-emulation/generator/files/digest-generator-0.35
+++ b/games-emulation/generator/files/digest-generator-0.35
@@ -1 +1,3 @@
 MD5 86f23702f2f7b38172863d080bb94630 generator-0.35.tar.gz 469541
+RMD160 6b448018b8ed0fd9755ddb850f48892304d12e78 generator-0.35.tar.gz 469541
+SHA256 5e622e4234125eeea9bc6fa2759f8cdf42844092bdb007d4a43f55c40c4cd7f5 generator-0.35.tar.gz 469541
diff --git a/games-emulation/generator/files/digest-generator-0.35-r2 b/games-emulation/generator/files/digest-generator-0.35-r2
new file mode 100644
index 000000000000..b386cf282598
--- /dev/null
+++ b/games-emulation/generator/files/digest-generator-0.35-r2
@@ -0,0 +1,3 @@
+MD5 bce3326c165d74e8a00e50355b653e08 generator-0.35-cbiere.tar.bz2 454740
+RMD160 4bb53827645fdba237f08d9b60d01d8eccf05b10 generator-0.35-cbiere.tar.bz2 454740
+SHA256 93ded1b0b3e61b729382c1bb143b8021b195264745c483650178f16ebb681fc1 generator-0.35-cbiere.tar.bz2 454740
diff --git a/games-emulation/generator/files/generator-0.35-gcc.patch b/games-emulation/generator/files/generator-0.35-gcc.patch
index 2ff8d5b8eaf8..e4c56e6a9865 100644
--- a/games-emulation/generator/files/generator-0.35-gcc.patch
+++ b/games-emulation/generator/files/generator-0.35-gcc.patch
@@ -20,13 +20,16 @@
     4,   4,  8,  8,  8, 12, 14, 12, 16,
     4,   4,  8,  8,  8, 12, 14, 12, 16,
     8,   8, 12, 12, 12, 16, 18, 16, 20,
---- raze/raze.asm.in
-+++ raze/raze.asm.in
-@@ -4372,3 +4372,7 @@
- DB  6,19,5,19,4,19,3,19,2,19,1,19

- 

- ;- the end ------ (blimey) --------------------------------------------------;

-+
-+%ifidn ___OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
+--- 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-r2.ebuild b/games-emulation/generator/generator-0.35-r2.ebuild
new file mode 100644
index 000000000000..e24562152052
--- /dev/null
+++ b/games-emulation/generator/generator-0.35-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/generator-0.35-r2.ebuild,v 1.1 2006/09/03 01:31:19 tupone Exp $
+
+inherit eutils toolchain-funcs games
+
+DESCRIPTION="Sega Genesis / Mega Drive console emulator"
+HOMEPAGE="http://www.ghostwhitecrab.com/generator/"
+SRC_URI="http://www.ghostwhitecrab.com/generator/${P}-cbiere.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="svga gtk"
+
+S=${WORKDIR}/${P}-cbiere
+
+RDEPEND="media-libs/jpeg
+	gtk? (
+		=x11-libs/gtk+-1*
+		media-libs/libsdl
+	)
+	svga? ( media-libs/svgalib )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	x86? ( dev-lang/nasm )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	mkdir my-bins
+
+	epatch "${FILESDIR}"/${P}-gcc.patch
+
+	sed -i \
+		-e '/CFLAGS.*-O3/d' \
+		-e 's/-minline-all-stringops//g' \
+		configure || die "sed configure failed"
+
+	if [[ $(gcc-major-version) -eq 3 ]] ; then
+		sed -i \
+			-e "s/-malign-functions/-falign-functions/" \
+			-e "s/-malign-loops/-falign-loops/" \
+			-e "s/-malign-jumps/-falign-jumps/" \
+			configure || die "sed configure failed"
+	fi
+}
+
+src_compile() {
+	local myconf="--with-gcc=$(gcc-major-version)"
+	local mygui myguis
+
+	use x86 \
+		&& myconf="${myconf} --with-raze" \
+		|| myconf="${myconf} --with-cmz80"
+
+	use gtk && myguis="gtk"
+	use svga && myguis="svgalib"
+
+	for mygui in ${myguis:-gtk} ; do
+		[[ -f Makefile ]] && make -s clean
+		egamesconf \
+			${myconf} \
+			--with-${mygui} || 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
+	prepgamesdirs
+}