cleanup

(Portage version: 2.1.2-r6)

4 files changed, 6 insertions, 117 deletions

diff --git a/games-emulation/generator/files/digest-generator-0.35-r2 b/games-emulation/generator/files/digest-generator-0.35-r2
deleted file mode 100644
index b386cf282598..000000000000
--- a/games-emulation/generator/files/digest-generator-0.35-r2
+++ /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/files/generator-0.35-gcc.patch b/games-emulation/generator/files/generator-0.35-gcc.patch
deleted file mode 100644
index e4c56e6a9865..000000000000
--- a/games-emulation/generator/files/generator-0.35-gcc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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/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
deleted file mode 100644
index 72b766417f39..000000000000
--- a/games-emulation/generator/generator-0.35-r2.ebuild
+++ /dev/null
@@ -1,70 +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-r2.ebuild,v 1.2 2006/12/06 17:15:36 wolf31o2 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}
-	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
-}
diff --git a/games-emulation/generator/generator-0.35-r3.ebuild b/games-emulation/generator/generator-0.35-r3.ebuild
index 79e5250432dd..dcba5b7dfe4e 100644
--- a/games-emulation/generator/generator-0.35-r3.ebuild
+++ b/games-emulation/generator/generator-0.35-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/generator-0.35-r3.ebuild,v 1.2 2007/02/03 08:01:50 nyhm Exp $
 
-inherit eutils toolchain-funcs flag-o-matic games
+inherit eutils toolchain-funcs games
 
 DESCRIPTION="Sega Genesis / Mega Drive emulator"
 HOMEPAGE="http://www.ghostwhitecrab.com/generator/"
@@ -11,9 +11,9 @@ 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"
+IUSE="gtk sdlaudio svga"
 
-S="${WORKDIR}/${P}-cbiere-r2"
+S=${WORKDIR}/${P}-cbiere-r2
 
 RDEPEND="media-libs/jpeg
 	media-libs/libsdl
@@ -46,9 +46,6 @@ src_compile() {
 	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 \
@@ -56,7 +53,7 @@ src_compile() {
 			--with-${mygui} \
 			--with-gcc=$(gcc-major-version) \
 			$(use_with sdlaudio sdl-audio) \
-			--disable-dependency-tracking || die "econf failed"
+			--disable-dependency-tracking || die
 		emake -j1 || die "building ${mygui}"
 		mv main/generator-${mygui} my-bins/
 	done