clean out old files

(Portage version: 2.0.53)

10 files changed, 8 insertions, 386 deletions

diff --git a/games-emulation/snes9x/ChangeLog b/games-emulation/snes9x/ChangeLog
index a459846612a9..f446130b8b3a 100644
--- a/games-emulation/snes9x/ChangeLog
+++ b/games-emulation/snes9x/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/snes9x
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/ChangeLog,v 1.20 2005/12/26 16:35:53 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/ChangeLog,v 1.21 2005/12/26 19:27:54 mr_bones_ Exp $
+
+  26 Dec 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/snes9x-139-r1-BE-sound-fix.diff, -files/1.41.1-system-zlib.patch,
+  -files/snes9x-gcc3.diff, -files/snes9x-139-r1-Makefile-ppc.diff,
+  -files/1.42-system-zlib.patch, -snes9x-1.42-r1.ebuild,
+  -snes9x-1.43.ebuild:
+  clean out old files
 
   26 Dec 2005; Simon Stelling <blubb@gentoo.org> snes9x-1.43-r1.ebuild:
   fix bug 103775
diff --git a/games-emulation/snes9x/files/1.41.1-system-zlib.patch b/games-emulation/snes9x/files/1.41.1-system-zlib.patch
deleted file mode 100644
index 62703d8b153b..000000000000
--- a/games-emulation/snes9x/files/1.41.1-system-zlib.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- Makefile.in.orig	2003-08-13 00:44:11.999413120 -0400
-+++ Makefile.in	2003-08-13 00:44:57.784452736 -0400
-@@ -74,8 +74,6 @@
-         CHEATS.O cheats2.o data.o unix/unix.o unix/config.o GLOBALS.O \
- 	$(SPC7110OBJ) $(OBC1OBJ) $(SETAOBJ) $(KREEDOBJ)
- 
--OBJECTS += ../zlib/libz.a
--
- ifdef GUI
- GUIOBJS = unix/snes9x_gui.o unix/moc_snes9x_gui.o
- GUILIBS = -L$(QTDIR)/lib -lqt
-@@ -132,7 +130,7 @@
- CC = @CC@
- NASM = @NASM@
- 
--INCLUDES = -I../zlib @XINCLUDES@
-+INCLUDES = @XINCLUDES@
- 
- OPTIMISE = @OPTIMIZE@
- 
-@@ -170,7 +168,7 @@
- CFLAGS=$(CCFLAGS)
- 
- .SUFFIXES: .o .cpp .c .cc .h .m .i .S .asm .obj .O .CPP .C .ASM
--LDLIBS = -L/usr/X11R6/lib -L../zlib
-+LDLIBS = -L/usr/X11R6/lib
- 
- ifdef GLIDE
- all: offsets gsnes9x
-@@ -206,22 +204,19 @@
- 	$(CCC) $(INCLUDES) -o $@ offsets.o
- 	./offsets >i386/offsets.h
- 
--../zlib/libz.a:
--	cd ../zlib && sh ./configure && make
--
--snes9x: $(OBJECTS) ../zlib/libz.a unix/x11.o $(AIDOOBJS) $(GUIOBJS)
-+snes9x: $(OBJECTS)  unix/x11.o $(AIDOOBJS) $(GUIOBJS)
- 	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(AIDOOBJS) $(GLIDEOBJS) $(OPENGLOBJS) unix/x11.o $(GUIOBJS) $(LDLIBS) $(GLIDELIBS) $(OPENGLLIBS) $(GUILIBS) @SYSLIBS@ -lXext -lX11 $(EXTRALIBS) -lz -lm
- 
--ssnes9x: $(OBJECTS) ../zlib/libz.a unix/svga.o 
-+ssnes9x: $(OBJECTS)  unix/svga.o 
- 	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) unix/svga.o $(LDLIBS) $(GLIDELIBS) -lvga -lvgagl -lz $(EXTRALIBS) -lm
- 
--gsnes9x: $(OBJECTS) ../zlib/libz.a $(GLIDEOBJS)
-+gsnes9x: $(OBJECTS)  $(GLIDEOBJS)
- 	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) $(LDLIBS) -lglide -lz $(EXTRALIBS) -lm
- 
--ggisnes9x: $(OBJECTS) ../zlib/libz.a unix/ggi.o
-+ggisnes9x: $(OBJECTS)  unix/ggi.o
- 	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) unix/ggi.o $(LDLIBS) -lggi -lz $(EXTRALIBS) -lm
- 
--osnes9x: $(OBJECTS) ../zlib/libz.a unix/x11.o $(OPENGLOBJS)
-+osnes9x: $(OBJECTS)  unix/x11.o $(OPENGLOBJS)
- 	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) unix/x11.o $(OPENGLOBJS) $(LDLIBS) $(OPENGLLIBS) @SYSLIBS@ -lXext -lX11 $(EXTRALIBS) -lz -lm
- 
- s9xserver: $(SERVER_OBJECTS)
diff --git a/games-emulation/snes9x/files/1.42-system-zlib.patch b/games-emulation/snes9x/files/1.42-system-zlib.patch
deleted file mode 100644
index 62703d8b153b..000000000000
--- a/games-emulation/snes9x/files/1.42-system-zlib.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- Makefile.in.orig	2003-08-13 00:44:11.999413120 -0400
-+++ Makefile.in	2003-08-13 00:44:57.784452736 -0400
-@@ -74,8 +74,6 @@
-         CHEATS.O cheats2.o data.o unix/unix.o unix/config.o GLOBALS.O \
- 	$(SPC7110OBJ) $(OBC1OBJ) $(SETAOBJ) $(KREEDOBJ)
- 
--OBJECTS += ../zlib/libz.a
--
- ifdef GUI
- GUIOBJS = unix/snes9x_gui.o unix/moc_snes9x_gui.o
- GUILIBS = -L$(QTDIR)/lib -lqt
-@@ -132,7 +130,7 @@
- CC = @CC@
- NASM = @NASM@
- 
--INCLUDES = -I../zlib @XINCLUDES@
-+INCLUDES = @XINCLUDES@
- 
- OPTIMISE = @OPTIMIZE@
- 
-@@ -170,7 +168,7 @@
- CFLAGS=$(CCFLAGS)
- 
- .SUFFIXES: .o .cpp .c .cc .h .m .i .S .asm .obj .O .CPP .C .ASM
--LDLIBS = -L/usr/X11R6/lib -L../zlib
-+LDLIBS = -L/usr/X11R6/lib
- 
- ifdef GLIDE
- all: offsets gsnes9x
-@@ -206,22 +204,19 @@
- 	$(CCC) $(INCLUDES) -o $@ offsets.o
- 	./offsets >i386/offsets.h
- 
--../zlib/libz.a:
--	cd ../zlib && sh ./configure && make
--
--snes9x: $(OBJECTS) ../zlib/libz.a unix/x11.o $(AIDOOBJS) $(GUIOBJS)
-+snes9x: $(OBJECTS)  unix/x11.o $(AIDOOBJS) $(GUIOBJS)
- 	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(AIDOOBJS) $(GLIDEOBJS) $(OPENGLOBJS) unix/x11.o $(GUIOBJS) $(LDLIBS) $(GLIDELIBS) $(OPENGLLIBS) $(GUILIBS) @SYSLIBS@ -lXext -lX11 $(EXTRALIBS) -lz -lm
- 
--ssnes9x: $(OBJECTS) ../zlib/libz.a unix/svga.o 
-+ssnes9x: $(OBJECTS)  unix/svga.o 
- 	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) unix/svga.o $(LDLIBS) $(GLIDELIBS) -lvga -lvgagl -lz $(EXTRALIBS) -lm
- 
--gsnes9x: $(OBJECTS) ../zlib/libz.a $(GLIDEOBJS)
-+gsnes9x: $(OBJECTS)  $(GLIDEOBJS)
- 	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) $(LDLIBS) -lglide -lz $(EXTRALIBS) -lm
- 
--ggisnes9x: $(OBJECTS) ../zlib/libz.a unix/ggi.o
-+ggisnes9x: $(OBJECTS)  unix/ggi.o
- 	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) unix/ggi.o $(LDLIBS) -lggi -lz $(EXTRALIBS) -lm
- 
--osnes9x: $(OBJECTS) ../zlib/libz.a unix/x11.o $(OPENGLOBJS)
-+osnes9x: $(OBJECTS)  unix/x11.o $(OPENGLOBJS)
- 	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) unix/x11.o $(OPENGLOBJS) $(LDLIBS) $(OPENGLLIBS) @SYSLIBS@ -lXext -lX11 $(EXTRALIBS) -lz -lm
- 
- s9xserver: $(SERVER_OBJECTS)
diff --git a/games-emulation/snes9x/files/digest-snes9x-1.42-r1 b/games-emulation/snes9x/files/digest-snes9x-1.42-r1
deleted file mode 100644
index 82c4c2809c48..000000000000
--- a/games-emulation/snes9x/files/digest-snes9x-1.42-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1e8af4c590e35352ddac58d25a468676 snes9x-1.42-src.tar.gz 945282
diff --git a/games-emulation/snes9x/files/digest-snes9x-1.43 b/games-emulation/snes9x/files/digest-snes9x-1.43
deleted file mode 100644
index b8b43bedd773..000000000000
--- a/games-emulation/snes9x/files/digest-snes9x-1.43
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2b86716203b6ce1dbfe0395c66bb46b5 snes9x-1.43-src.tar.gz 1016251
diff --git a/games-emulation/snes9x/files/snes9x-139-r1-BE-sound-fix.diff b/games-emulation/snes9x/files/snes9x-139-r1-BE-sound-fix.diff
deleted file mode 100644
index b24de16d41c1..000000000000
--- a/games-emulation/snes9x/files/snes9x-139-r1-BE-sound-fix.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- release/unix/unix.cpp.orig	2003-03-02 03:33:54.000000000 +0100
-+++ release/unix/unix.cpp	2003-03-02 03:35:10.000000000 +0100
-@@ -1463,7 +1463,11 @@
- 	perror ("ioctl SNDCTL_DSP_SETTRIGGER");
- #endif
- 
-+#ifdef MSB_FIRST
-+    J = AFMT_S16_BE;
-+#else
-     J = AFMT_S16_LE;
-+#endif
- //    J = AFMT_U8;
-     if (ioctl (so.sound_fd, SNDCTL_DSP_SETFMT, &J) < 0)
-     {
-@@ -1471,7 +1475,11 @@
- 	return (FALSE);
-     }
- 
-+#ifdef MSB_FIRST
-+    if (J != AFMT_S16_BE)
-+#else
-     if (J != AFMT_S16_LE)
-+#endif
-     {
- 	so.sixteen_bit = FALSE;
- 	J = AFMT_U8;
diff --git a/games-emulation/snes9x/files/snes9x-139-r1-Makefile-ppc.diff b/games-emulation/snes9x/files/snes9x-139-r1-Makefile-ppc.diff
deleted file mode 100644
index 09fee05cb903..000000000000
--- a/games-emulation/snes9x/files/snes9x-139-r1-Makefile-ppc.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- release.orig/Makefile.linux	2003-02-11 05:27:20.000000000 +0000
-+++ release/Makefile.linux	2003-02-11 05:28:24.000000000 +0000
-@@ -1,13 +1,13 @@
--ZSNESFX=1
--ZSNESC4=1
--ASMCPU=1
-+#ZSNESFX=1
-+#ZSNESC4=1
-+#ASMCPU=1
- #SPC700ASM=1
- NETPLAY=1
- UNZIP=1
- #GLIDE=1
- #OPENGL=1
- THREAD_SOUND=1
--ASMKREED=1
-+#ASMKREED=1
- 
- ifdef ZSNESFX
- FXOBJ=i386/fxemu2b.o i386/fxemu2.o i386/fxemu2c.o i386/fxtable.o i386/sfxproc.o i386/zsnes.o
-@@ -39,7 +39,7 @@
- SOUNDOBJ=spctool/spc700.o spctool/dsp.o spctool.o spctool/soundmod.o spc.o
- SOUNDDEFINES=-DSPCTOOL
- else
--SOUNDOBJ=spc700.o soundux.o apu.o i386/spc.o
-+SOUNDOBJ=spc700.o soundux.o apu.o
- SOUNDDEFINES=-DSPC700_C
- endif
- 
-@@ -111,7 +111,6 @@
- OPTIMISE=
- 
- CCFLAGS = $(OPTIMISE) -DMITSHM \
---Ii386 \
- -I. \
- -Iunzip \
- -DJOYSTICK_SUPPORT \
diff --git a/games-emulation/snes9x/files/snes9x-gcc3.diff b/games-emulation/snes9x/files/snes9x-gcc3.diff
deleted file mode 100644
index d65616446cff..000000000000
--- a/games-emulation/snes9x/files/snes9x-gcc3.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur release.orig/Makefile.linux release/Makefile.linux
---- release.orig/Makefile.linux	Sun Jul 14 18:24:34 2002
-+++ release/Makefile.linux	Sun Jul 14 18:24:48 2002
-@@ -102,7 +102,7 @@
- OPENGLNO_DEPENDS=use_opengl
- endif
- 
--CCC = gcc
-+CCC = g++
- CC = gcc
- NASM = nasm
- 
-diff -ur release.orig/unix/config.c release/unix/config.c
---- release.orig/unix/config.c	Sun Jul 14 18:24:34 2002
-+++ release/unix/config.c	Sun Jul 14 18:25:01 2002
-@@ -528,7 +528,7 @@
-       p = find_config_string(config[0], section, name, NULL);
- 
-    if (p)
--      return (p->data ? p->data : "");
-+      return (p->data ? p->data : (char*) "");
-    else
-       return def;
- }
---- release.orig/Makefile.linux	2002-10-03 16:04:29.000000000 -0400
-+++ release/Makefile.linux	2001-09-18 02:04:07.000000000 -0400
-@@ -108,7 +108,7 @@
- 
- INCLUDES=-I/usr/X11R6/include -I/usr/local/include
- 
--OPTIMISE=-O6 -mpentium -fomit-frame-pointer -fno-exceptions
-+OPTIMISE=
- 
- CCFLAGS = $(OPTIMISE) -DMITSHM \
- -Ii386 \
diff --git a/games-emulation/snes9x/snes9x-1.42-r1.ebuild b/games-emulation/snes9x/snes9x-1.42-r1.ebuild
deleted file mode 100644
index e45f1b532f0a..000000000000
--- a/games-emulation/snes9x/snes9x-1.42-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/snes9x-1.42-r1.ebuild,v 1.7 2005/01/03 06:48:40 vapier Exp $
-
-inherit eutils games
-
-DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
-HOMEPAGE="http://www.snes9x.com/"
-SRC_URI="http://www.lysator.liu.se/snes9x/${PV}/snes9x-${PV}-src.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ppc ~amd64"
-IUSE="3dfx opengl X joystick"
-
-RDEPEND="sys-libs/zlib
-	virtual/x11
-	media-libs/libpng
-	opengl? ( virtual/opengl )
-	3dfx? ( media-libs/glide-v3 )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	x86? ( dev-lang/nasm )"
-
-S="${WORKDIR}/${P}-src"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}/snes9x"
-	epatch "${FILESDIR}/${PV}-system-zlib.patch"
-	epatch "${FILESDIR}/nojoy.patch"
-}
-
-src_compile() {
-	local vidconf=
-	local target=
-	local vid=
-
-	mkdir mybins
-	for vid in 3dfx opengl X ; do
-		use ${vid} || continue
-		cd "${S}/snes9x"
-		case ${vid} in
-			3dfx)
-				vidconf="--with-glide --without-opengl --without-x"
-				target=gsnes9x;;
-			opengl)
-				vidconf="--with-opengl --without-glide --without-x"
-				target=osnes9x;;
-			X)
-				vidconf="--with-x --without-glide --without-opengl"
-				target=snes9x;;
-		esac
-		# this stuff is ugly but hey the build process sucks ;)
-		OPTFLAGS="${CXXFLAGS} -DHAVE_LIBPNG" \
-		egamesconf \
-			--with-screenshot \
-			$(use_with joystick) \
-			${vidconf} \
-			$(use_with x86 assembler) \
-				|| die
-		emake \
-			EXTRALIBS="$(libpng-config --libs) -lpthread" \
-			${target} || die "making ${target}"
-		mv ${target} "${S}/mybins/"
-		cd "${WORKDIR}"
-		rm -rf "${S}/snes9x"
-		src_unpack
-	done
-}
-
-src_install() {
-	dogamesbin mybins/* || die "dogamesbin failed"
-	dodoc faqs.txt readme.txt readme.unix snes9x/*.txt
-	prepgamesdirs
-}
diff --git a/games-emulation/snes9x/snes9x-1.43.ebuild b/games-emulation/snes9x/snes9x-1.43.ebuild
deleted file mode 100644
index 474c13de7a09..000000000000
--- a/games-emulation/snes9x/snes9x-1.43.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/snes9x-1.43.ebuild,v 1.6 2005/08/27 04:25:46 vapier Exp $
-
-# 3dfx support (glide) is disabled because it requires
-# glide-v2 while we only provide glide-v3 in portage
-# http://bugs.gentoo.org/show_bug.cgi?id=93097
-
-inherit eutils games flag-o-matic
-
-DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
-HOMEPAGE="http://www.snes9x.com/"
-SRC_URI="http://www.lysator.liu.se/snes9x/${PV}/snes9x-${PV}-src.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="opengl X joystick zlib dga debug"
-
-RDEPEND="zlib? ( sys-libs/zlib )
-	virtual/x11
-	media-libs/libpng
-	amd64? ( emul-linux-x86-xlibs )
-	opengl? ( virtual/opengl virtual/glu )"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )"
-
-S=${WORKDIR}/${P}-src
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/snes9x
-	epatch "${FILESDIR}"/nojoy.patch
-	sed -i 's:png_jmpbuf:png_write_info:g' configure
-
-	rm offsets # stupid prebuilt file
-	sed -i -e 's:-lXext -lX11::' Makefile.in
-	sed -i -e '/X_LDFLAGS=/d' configure
-	cp Makefile.in{,.orig}
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	if use amd64 ; then
-		export ABI=x86
-		append-flags -m32
-		append-ldflags -m32
-	fi
-
-	local vidconf=
-	local target=
-	local vid=
-
-	mkdir mybins
-	for vid in opengl X fallback ; do
-		if [[ ${vid} != "fallback" ]] ; then
-			use ${vid} || continue
-		fi
-		cd "${S}"/snes9x
-		case ${vid} in
-#			3dfx)
-#				vidconf="--with-glide --without-opengl --without-x"
-#				target=gsnes9x;;
-			opengl)
-				vidconf="--with-opengl --without-glide --without-x"
-				target=osnes9x;;
-			fallback|X)
-				vidconf="--with-x --without-glide --without-opengl"
-				target=snes9x;;
-		esac
-		# this stuff is ugly but hey the build process sucks ;)
-		egamesconf \
-			${vidconf} \
-			$(use_with x86 assembler) \
-			$(use_with joystick) \
-			$(use_with debug debugger) \
-			$(use_with zlib) \
-			--with-screenshot \
-			$(use_with dga extensions) \
-			|| die
-		# Makefile doesnt quite support parallel builds
-		emake -j1 offsets || die "making offsets"
-		emake ${target} || die "making ${target}"
-		mv ${target} "${S}"/mybins/
-		cd "${WORKDIR}"
-		rm -r "${S}"/snes9x
-		src_unpack
-	done
-}
-
-src_install() {
-	dogamesbin mybins/* || die "dogamesbin failed"
-	dodoc faqs.txt readme.txt readme.unix snes9x/*.txt
-	prepgamesdirs
-}