Cleanup ebuild and fix exec stacks #130539.

(Portage version: 2.1_pre9)

3 files changed, 54 insertions, 21 deletions

diff --git a/games-emulation/generator/ChangeLog b/games-emulation/generator/ChangeLog
index 3a3cd617c528..b1ebb039a273 100644
--- a/games-emulation/generator/ChangeLog
+++ b/games-emulation/generator/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/generator
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/ChangeLog,v 1.12 2006/03/30 23:01:11 wolf31o2 Exp $
+# 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 $
+
+  20 Apr 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/generator-0.35-gcc.patch, generator-0.35-r1.ebuild:
+  Cleanup ebuild and fix exec stacks #130539.
 
 *generator-0.35-r1 (30 Mar 2006)
 
diff --git a/games-emulation/generator/files/generator-0.35-gcc.patch b/games-emulation/generator/files/generator-0.35-gcc.patch
new file mode 100644
index 000000000000..2ff8d5b8eaf8
--- /dev/null
+++ b/games-emulation/generator/files/generator-0.35-gcc.patch
@@ -0,0 +1,32 @@
+--- cmz80/z80stb.h
++++ cmz80/z80stb.h
+@@ -128,8 +128,6 @@
+ /* inline */ BYTE Srl(BYTE b);
+ /* inline */ BYTE Sla(BYTE b);
+ /* inline */ BYTE Sra(BYTE b);
+-/* inline */ BYTE Inc(BYTE b);
+-/* inline */ BYTE Dec(BYTE b);
+ 
+ /* inline */ WORD Add_2(WORD wArg1, WORD wArg2);
+ /* inline */ WORD Adc_2(WORD wArg1, WORD wArg2);
+--- cpu68k/def68k.c
++++ cpu68k/def68k.c
+@@ -1318,7 +1318,7 @@
+   } /* block */
+ }
+ 
+-int clocks_movetable[] = {
++static int clocks_movetable[] = {
+    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
diff --git a/games-emulation/generator/generator-0.35-r1.ebuild b/games-emulation/generator/generator-0.35-r1.ebuild
index af4dc415471d..8b0f5d5c11b9 100644
--- a/games-emulation/generator/generator-0.35-r1.ebuild
+++ b/games-emulation/generator/generator-0.35-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2006/03/30 23:01:11 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/generator-0.35-r1.ebuild,v 1.2 2006/04/20 03:45:38 vapier Exp $
 
 inherit eutils toolchain-funcs games
 
@@ -15,34 +15,34 @@ IUSE="svga gtk"
 
 S=${WORKDIR}/${P}-cbiere
 
-RDEPEND="virtual/libc
+RDEPEND="media-libs/jpeg
 	gtk? (
 		=x11-libs/gtk+-1*
 		media-libs/libsdl
 	)
-	svga? ( media-libs/svgalib )
-	media-libs/jpeg"
+	svga? ( media-libs/svgalib )"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
 	x86? ( dev-lang/nasm )"
 
 src_unpack() {
 	unpack ${A}
-
-	cd ${S}
+	cd "${S}"
 	mkdir my-bins
-	if use ppc ; then
-		sed -i \
-			-e 's/-minline-all-stringops//g' configure \
-				|| die "sed configure failed"
-	fi
 
-	if [ $(gcc-major-version) -eq 3 ] ; then
+	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"
+			-e "s/-malign-jumps/-falign-jumps/" \
+			configure || die "sed configure failed"
 	fi
 }
 
@@ -56,12 +56,9 @@ src_compile() {
 
 	use gtk && myguis="gtk"
 	use svga && myguis="svgalib"
-	[ -n "${myguis}" ] || myguis="gtk"
 
-	for mygui in ${myguis}; do
-		if [ -f Makefile ] ; then
-			make clean
-		fi
+	for mygui in ${myguis:-gtk} ; do
+		[[ -f Makefile ]] && make -s clean
 		egamesconf \
 			${myconf} \
 			--with-${mygui} || die