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

Package-Manager: portage-2.1.2_pre1-r4

5 files changed, 112 insertions, 8 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/Manifest b/games-emulation/generator/Manifest
index c16820faaf2e..9f5b210dfee7 100644
--- a/games-emulation/generator/Manifest
+++ b/games-emulation/generator/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX generator-0.35-execstacks.patch 563 RMD160 046b18fd6bbea01ccad03fadbb445f02ff3833a5 SHA1 751f1a4d4849d66248e7222828506821fcad2d7e SHA256 0a73e832c5718d5d548d123756c3d6a803c6d62b32ab13290809e6b6e420712c
+MD5 cfbede23add691a37dbdfad5a6015d09 files/generator-0.35-execstacks.patch 563
+RMD160 046b18fd6bbea01ccad03fadbb445f02ff3833a5 files/generator-0.35-execstacks.patch 563
+SHA256 0a73e832c5718d5d548d123756c3d6a803c6d62b32ab13290809e6b6e420712c files/generator-0.35-execstacks.patch 563
 AUX generator-0.35-gcc.patch 1150 RMD160 642993e8402233b75c3c18a1e0b17f8e7f1cb505 SHA1 3f42ce47754c5af68f0ad91db92cb91891684886 SHA256 18422a088e48d869ef8739a6725d48669a6035286e880e524c2d53e14da03b08
 MD5 a595c37807cc4c11cbdc8930dffacc34 files/generator-0.35-gcc.patch 1150
 RMD160 642993e8402233b75c3c18a1e0b17f8e7f1cb505 files/generator-0.35-gcc.patch 1150
@@ -9,20 +13,25 @@ AUX netbsd-gcc-3.3.patch 1345 RMD160 94d4d22321c81248f8b12c24389e517fe448b7a6 SH
 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.tar.bz2 454740 RMD160 4bb53827645fdba237f08d9b60d01d8eccf05b10 SHA1 a0df1313e18f32a12420b6bbeef28f4e4a037129 SHA256 93ded1b0b3e61b729382c1bb143b8021b195264745c483650178f16ebb681fc1
 DIST generator-0.35.tar.gz 469541 RMD160 6b448018b8ed0fd9755ddb850f48892304d12e78 SHA1 a61138579efd97028d3a69c54c3c6fcd0a3d74ab SHA256 5e622e4234125eeea9bc6fa2759f8cdf42844092bdb007d4a43f55c40c4cd7f5
 EBUILD generator-0.35-r2.ebuild 1725 RMD160 b533914e3b631a553a480e354636a442da556fc4 SHA1 5abd5361444e30c0c2938bfdb701df53141a504c SHA256 dcb50fcfe7c85485724ba791db053108d7b268202b86ecde80abaf166e22e1d2
 MD5 9bbddf5d84fe15be0cdcaa5e875fccbd generator-0.35-r2.ebuild 1725
 RMD160 b533914e3b631a553a480e354636a442da556fc4 generator-0.35-r2.ebuild 1725
 SHA256 dcb50fcfe7c85485724ba791db053108d7b268202b86ecde80abaf166e22e1d2 generator-0.35-r2.ebuild 1725
+EBUILD generator-0.35-r3.ebuild 1625 RMD160 82d084ea540d05ab7de63f4b9726a771e941aa6d SHA1 51384ba5ed018595b345716141a476d33f32b4ef SHA256 f027f829592f6c36eb45dbd433b78aa087e826fd1217d09c185802d5a33d2f61
+MD5 a49172a9884b9ef24c605be128dc0cb9 generator-0.35-r3.ebuild 1625
+RMD160 82d084ea540d05ab7de63f4b9726a771e941aa6d generator-0.35-r3.ebuild 1625
+SHA256 f027f829592f6c36eb45dbd433b78aa087e826fd1217d09c185802d5a33d2f61 generator-0.35-r3.ebuild 1625
 EBUILD generator-0.35.ebuild 1738 RMD160 6f63e998f4f3ed36622f62f00cfe97bcc1371364 SHA1 8de0685a236340e435b59ea0e4e2488b5771bb05 SHA256 c0485e30c4d4855958264c7f992770446980c286a2f5ba2d974c5235481a16fb
 MD5 e251624da52aa57d6072a6660005376f generator-0.35.ebuild 1738
 RMD160 6f63e998f4f3ed36622f62f00cfe97bcc1371364 generator-0.35.ebuild 1738
 SHA256 c0485e30c4d4855958264c7f992770446980c286a2f5ba2d974c5235481a16fb generator-0.35.ebuild 1738
-MISC ChangeLog 2384 RMD160 c53c967f143b739b900993c9cc8a790f2bc6b6e7 SHA1 a9f3f14964aa491c6d7446ed9b000334aeedebb6 SHA256 0a2b4bd9d0bdc6f94c12b96d11d09db07442bfcf626fccbdbaab1dd8f3b3ddac
-MD5 ead12655097785e875c23423b8fb559b ChangeLog 2384
-RMD160 c53c967f143b739b900993c9cc8a790f2bc6b6e7 ChangeLog 2384
-SHA256 0a2b4bd9d0bdc6f94c12b96d11d09db07442bfcf626fccbdbaab1dd8f3b3ddac ChangeLog 2384
+MISC ChangeLog 2669 RMD160 3291c1338c1390eaeabd59d7db51bedaf67edd46 SHA1 35009619ec6557492ce26a7db83177acca7e2fbd SHA256 24177a9ac593aad72e226b64682d0f7f2b3eefc9d8b263fb0ab93796825dd777
+MD5 c0d41ea6b622016344c54e98b9b9f56d ChangeLog 2669
+RMD160 3291c1338c1390eaeabd59d7db51bedaf67edd46 ChangeLog 2669
+SHA256 24177a9ac593aad72e226b64682d0f7f2b3eefc9d8b263fb0ab93796825dd777 ChangeLog 2669
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -33,10 +42,13 @@ SHA256 d64cc6fa39a62a23a842102782bc39cc69e6dee76f0ca1c864070a87e425b887 files/di
 MD5 ff7a8432caed77851c8d8e189a754e8f files/digest-generator-0.35-r2 268
 RMD160 48fd2f473fe4896a05c7ff970cd0b7c681418fc6 files/digest-generator-0.35-r2 268
 SHA256 ac0ab0054952af5117de70ecf7039c60ddd3b2bfa21dd901f5a626b51ababbaf files/digest-generator-0.35-r2 268
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE+jBx2CTtIKiFlQIRArf7AKCCUHwne9vIA4pu5IBYWN7GbBS5OQCgkJvf
-T1BAtMSb1nWOqu5pps+L380=
-=mWm8
+iD8DBQFFJDehkT4lNIS36YERAs7LAKDBc9JczkFPDjdVHP2uIjsN3VCK3ACgjgpb
+P68agIMcUsXNWNTg3w/Jt7M=
+=UJgm
 -----END PGP SIGNATURE-----
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
+}