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

(Portage version: 2.1-r2)
 (Signed Manifest commit)

3 files changed, 27 insertions, 106 deletions

diff --git a/games-emulation/generator/Manifest b/games-emulation/generator/Manifest
index 2e948e990d7a..c16820faaf2e 100644
--- a/games-emulation/generator/Manifest
+++ b/games-emulation/generator/Manifest
@@ -1,44 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX generator-0.35-gcc.patch 869 RMD160 7811e635412b9d337df06b45279b63a98aa2db5c SHA1 b04fe28b4a7745fd01603ecb6f7e4ce315a8f812 SHA256 092700ea33fb0bbb92703f7a8d0d8a0dfea11fba0bb38b66604e54c8b8de754f size 869
-MD5 4e3f56fa4f130e01fac79543b75a50a6 files/generator-0.35-gcc.patch 869
-RMD160 7811e635412b9d337df06b45279b63a98aa2db5c files/generator-0.35-gcc.patch 869
-SHA256 092700ea33fb0bbb92703f7a8d0d8a0dfea11fba0bb38b66604e54c8b8de754f files/generator-0.35-gcc.patch 869
-AUX netbsd-gcc-3.3.patch 1345 RMD160 94d4d22321c81248f8b12c24389e517fe448b7a6 SHA1 6bc259408bb02411c014b9d146ab33e7237ddad4 SHA256 1cbc8749da616ebe356364a7730bbb7f1832456742dff6192ea9e152fa6ba906 size 1345
+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
+SHA256 18422a088e48d869ef8739a6725d48669a6035286e880e524c2d53e14da03b08 files/generator-0.35-gcc.patch 1150
+AUX netbsd-gcc-3.3.patch 1345 RMD160 94d4d22321c81248f8b12c24389e517fe448b7a6 SHA1 6bc259408bb02411c014b9d146ab33e7237ddad4 SHA256 1cbc8749da616ebe356364a7730bbb7f1832456742dff6192ea9e152fa6ba906
 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.tar.bz2 454740 RMD160 4bb53827645fdba237f08d9b60d01d8eccf05b10 SHA256 93ded1b0b3e61b729382c1bb143b8021b195264745c483650178f16ebb681fc1 size 454740
-DIST generator-0.35.tar.gz 469541 size 469541
-EBUILD generator-0.35-r1.ebuild 1725 RMD160 a122026528ece0f98f84acd90228a9aaf6bed269 SHA1 67b4412daf673e791f21017432eaec4e32b39caf SHA256 2299ff7ba2804ad71437f5137132e86380e096f6e54a6063c8b9070965dd2ed3 size 1725
-MD5 a00d177181819f33abf2638911c44cad generator-0.35-r1.ebuild 1725
-RMD160 a122026528ece0f98f84acd90228a9aaf6bed269 generator-0.35-r1.ebuild 1725
-SHA256 2299ff7ba2804ad71437f5137132e86380e096f6e54a6063c8b9070965dd2ed3 generator-0.35-r1.ebuild 1725
-EBUILD generator-0.35.ebuild 1738 RMD160 6f63e998f4f3ed36622f62f00cfe97bcc1371364 SHA1 8de0685a236340e435b59ea0e4e2488b5771bb05 SHA256 c0485e30c4d4855958264c7f992770446980c286a2f5ba2d974c5235481a16fb size 1738
+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.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 2152 RMD160 f9fa7dde788be45a40f9bede84af1b81f88bb285 SHA1 71bb405db9a02456a7589b44959bb55cbaaf4e65 SHA256 541fdaf0db2116c5431a543248bacf4441a6b4c8ed2377d015d9d89c8d4eacd8 size 2152
-MD5 8f002f30a2c8369dead63aeb24859ac7 ChangeLog 2152
-RMD160 f9fa7dde788be45a40f9bede84af1b81f88bb285 ChangeLog 2152
-SHA256 541fdaf0db2116c5431a543248bacf4441a6b4c8ed2377d015d9d89c8d4eacd8 ChangeLog 2152
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
+MISC ChangeLog 2384 RMD160 c53c967f143b739b900993c9cc8a790f2bc6b6e7 SHA1 a9f3f14964aa491c6d7446ed9b000334aeedebb6 SHA256 0a2b4bd9d0bdc6f94c12b96d11d09db07442bfcf626fccbdbaab1dd8f3b3ddac
+MD5 ead12655097785e875c23423b8fb559b ChangeLog 2384
+RMD160 c53c967f143b739b900993c9cc8a790f2bc6b6e7 ChangeLog 2384
+SHA256 0a2b4bd9d0bdc6f94c12b96d11d09db07442bfcf626fccbdbaab1dd8f3b3ddac ChangeLog 2384
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 693c422146d7001565fb916cbb84faf5 files/digest-generator-0.35 66
-RMD160 6f6e2b5e187c38d2b383eb53af434dba0d1bad2b files/digest-generator-0.35 66
-SHA256 f5550329f8e1d25c4395cc1e0e7bfc22182556486dd58238762ad9142d06dd94 files/digest-generator-0.35 66
-size 66 files/digest-generator-0.35 66
-MD5 ff7a8432caed77851c8d8e189a754e8f files/digest-generator-0.35-r1 268
-RMD160 48fd2f473fe4896a05c7ff970cd0b7c681418fc6 files/digest-generator-0.35-r1 268
-SHA256 ac0ab0054952af5117de70ecf7039c60ddd3b2bfa21dd901f5a626b51ababbaf files/digest-generator-0.35-r1 268
-size 268 files/digest-generator-0.35-r1 268
+MD5 667fba2b5f5659517031064f9654b0ec files/digest-generator-0.35 244
+RMD160 11220bd4156fa417b09f10fa250325d5f37e575d files/digest-generator-0.35 244
+SHA256 d64cc6fa39a62a23a842102782bc39cc69e6dee76f0ca1c864070a87e425b887 files/digest-generator-0.35 244
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFERwQv2+ySkm8kpY0RAp+BAJ0SroPH3Fzd1Ohc6HmFtz28ZQC70wCcD7T1
-bF0wU/FWR9gmxwJ2HNvCN6Q=
-=4MIT
+iD8DBQFE+jBx2CTtIKiFlQIRArf7AKCCUHwne9vIA4pu5IBYWN7GbBS5OQCgkJvf
+T1BAtMSb1nWOqu5pps+L380=
+=mWm8
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/generator/files/digest-generator-0.35-r1 b/games-emulation/generator/files/digest-generator-0.35-r1
deleted file mode 100644
index b386cf282598..000000000000
--- a/games-emulation/generator/files/digest-generator-0.35-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/generator-0.35-r1.ebuild b/games-emulation/generator/generator-0.35-r1.ebuild
deleted file mode 100644
index 8b0f5d5c11b9..000000000000
--- a/games-emulation/generator/generator-0.35-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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.2 2006/04/20 03:45:38 vapier 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
-}