ver bump

30 files changed, 171 insertions, 144 deletions

diff --git a/games-emulation/pcsx2/ChangeLog b/games-emulation/pcsx2/ChangeLog
index 7c629318b21a..6a8c9abd6dd7 100644
--- a/games-emulation/pcsx2/ChangeLog
+++ b/games-emulation/pcsx2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/pcsx2
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx2/ChangeLog,v 1.2 2003/09/10 15:58:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx2/ChangeLog,v 1.3 2003/12/12 22:03:46 vapier Exp $
+
+*pcsx2-0.5 (12 Dec 2003)
+
+  12 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage.
 
 *pcsx2-0.41 (14 Aug 2003)
 
diff --git a/games-emulation/pcsx2/files/0.5-time-renames.patch b/games-emulation/pcsx2/files/0.5-time-renames.patch
new file mode 100644
index 000000000000..96b924beffd7
--- /dev/null
+++ b/games-emulation/pcsx2/files/0.5-time-renames.patch
@@ -0,0 +1,16 @@
+--- Pcsx2Src/RPC/80000001fileio.h.orig	2003-08-14 11:39:42.319499152 -0400
++++ Pcsx2Src/RPC/80000001fileio.h	2003-08-14 11:40:09.145420992 -0400
+@@ -73,10 +73,10 @@
+ 					4 Symbolic link */
+ 	unsigned int st_attr;// Flag compatible with memory card mode
+ 	unsigned int st_size;
+-	unsigned char st_ctime[8];// Creation time
+-	unsigned char st_atime[8];/* This field is updated at the same time as last access time
++	unsigned char sr_ctime[8];// Creation time
++	unsigned char sr_atime[8];/* This field is updated at the same time as last access time
+ 				and last update time. */
+-	unsigned char st_mtime[8];/* Last update time
++	unsigned char sr_mtime[8];/* Last update time
+ 				byte0 Reserved
+ 				byte1 Seconds
+ 				byte2 Minutes
diff --git a/games-emulation/pcsx2/files/digest-pcsx2-0.5 b/games-emulation/pcsx2/files/digest-pcsx2-0.5
new file mode 100644
index 000000000000..b31be86cf526
--- /dev/null
+++ b/games-emulation/pcsx2/files/digest-pcsx2-0.5
@@ -0,0 +1 @@
+MD5 5f149055af85f2e728f808e75b497250 Pcsx2Src-0.5.tgz 936311
diff --git a/games-emulation/pcsx2/files/pcsx2 b/games-emulation/pcsx2/files/pcsx2
index 6a4776c3c882..e46f76428243 100644
--- a/games-emulation/pcsx2/files/pcsx2
+++ b/games-emulation/pcsx2/files/pcsx2
@@ -13,6 +13,7 @@ if [ ! -f ${HOME}/.pcsx2/Pcsx2.cfg ]; then
 	ln -s /usr/games/bin/pcsx2.bin pcsx2
 	ln -s /usr/games/lib/ps2emu/plugins/* Plugins/
 	ln -s /usr/games/lib/ps2emu/Langs Langs
+	ln -s /usr/games/lib/ps2emu/cfg cfg
 
 	cd Bios
 	if [ -f /usr/games/lib/ps2emu/bios/scph1001.bin ]; then
@@ -23,13 +24,15 @@ if [ ! -f ${HOME}/.pcsx2/Pcsx2.cfg ]; then
 	fi
 	cd ..
 
+	firstplugin() { echo $(basename $(ls "$@" | cut -f1 -d\ ) ) 2>/dev/null ; }
 	cat >${HOME}/.pcsx2/Pcsx2.cfg <<EOF
 Bios = $biosname
-GS = $(basename $(ls Plugins/libGS* | cut -f1 -d\ ) )
-SPU2 = $(basename $(ls Plugins/libSPU2* | cut -f1 -d\ ) )
-CDVD = $(basename $(ls Plugins/libCDVD* | cut -f1 -d\ ) )
-PAD1 = $(basename $(ls Plugins/libPADxwin-* | cut -f1 -d\ ) )
-PAD2 = $(basename $(ls Plugins/libPADxwin-* | cut -f1 -d\ ) )
+GS = $(firstplugin Plugins/libGS* )
+SPU2 = $(firstplugin Plugins/libSPU2* )
+CDVD = $(firstplugin Plugins/libCDVD* )
+PAD1 = $(firstplugin Plugins/libPADxwin* )
+PAD2 = $(firstplugin Plugins/libPADxwin* )
+DEV9 = $(firstplugin Plugins/libDEV9null* )
 Mcd1 = ${HOME}/.pcsx2/memcards/Mcd001.mcr
 Mcd2 = ${HOME}/.pcsx2/memcards/Mcd002.mcr
 PluginsDir = ${HOME}/.pcsx2/Plugins/
diff --git a/games-emulation/pcsx2/pcsx2-0.5.ebuild b/games-emulation/pcsx2/pcsx2-0.5.ebuild
new file mode 100644
index 000000000000..46574cabada5
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-0.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx2/pcsx2-0.5.ebuild,v 1.1 2003/12/12 22:03:46 vapier Exp $
+
+inherit games eutils
+
+DESCRIPTION="Playstation2 emulator"
+HOMEPAGE="http://www.pcsx2.net/"
+SRC_URI="http://www.pcsx2.net/download/${PV:0:3}release/Pcsx2Src-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+
+RDEPEND="virtual/x11
+	=x11-libs/gtk+-1*
+	|| (
+		>=games-emulation/ps2emu-cddvdlinuz-0.3
+		>=games-emulation/ps2emu-cdvdiso-0.3
+	)
+	>=games-emulation/ps2emu-gssoft-0.61
+	>=games-emulation/ps2emu-padxwin-0.5
+	>=games-emulation/ps2emu-spu2null-0.21
+	>=games-emulation/ps2emu-dev9null-0.1"
+DEPEND="${RDEPEND}
+	dev-lang/nasm"
+
+S=${WORKDIR}/Pcsx2Src-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-time-renames.patch
+}
+
+src_compile() {
+	cd ${S}/ix86-32/GoldRec
+	emake OPTIMIZE="${CFLAGS}" || die "goldrec building failed"
+	cd ${S}/Linux
+	emake OPTIMIZE="${CFLAGS}" || die "linux building failed"
+}
+
+src_install() {
+	newgamesbin Linux/pcsx2 pcsx2.bin
+	dogamesbin ${FILESDIR}/pcsx2
+	dodir ${GAMES_LIBDIR}/ps2emu/Langs
+	rm -rf Intl/Langs/cvs
+	cp -r Intl/Langs/* ${D}/${GAMES_LIBDIR}/ps2emu/Langs/
+	dodoc Docs/*.txt
+	prepgamesdirs
+}
diff --git a/games-emulation/ps2emu-cddvdlinuz/ChangeLog b/games-emulation/ps2emu-cddvdlinuz/ChangeLog
index cd062a2fe575..3c40a6e87db8 100644
--- a/games-emulation/ps2emu-cddvdlinuz/ChangeLog
+++ b/games-emulation/ps2emu-cddvdlinuz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/ps2emu-cddvdlinuz
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-cddvdlinuz/ChangeLog,v 1.2 2003/09/10 15:58:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-cddvdlinuz/ChangeLog,v 1.3 2003/12/12 22:04:45 vapier Exp $
+
+*ps2emu-cddvdlinuz-0.3-r1 (12 Dec 2003)
+
+  12 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage.
 
 *ps2emu-cddvdlinuz-0.3 (14 Aug 2003)
 
diff --git a/games-emulation/ps2emu-cddvdlinuz/files/digest-ps2emu-cddvdlinuz-0.3 b/games-emulation/ps2emu-cddvdlinuz/files/digest-ps2emu-cddvdlinuz-0.3
deleted file mode 100644
index 3d95670ed018..000000000000
--- a/games-emulation/ps2emu-cddvdlinuz/files/digest-ps2emu-cddvdlinuz-0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cd9cf5e6cb9cb34470a0e1b68419e30c CDVDlinuz-0.3.gz 20048
diff --git a/games-emulation/ps2emu-cddvdlinuz/files/digest-ps2emu-cddvdlinuz-0.3-r1 b/games-emulation/ps2emu-cddvdlinuz/files/digest-ps2emu-cddvdlinuz-0.3-r1
new file mode 100644
index 000000000000..2d4d36b1663c
--- /dev/null
+++ b/games-emulation/ps2emu-cddvdlinuz/files/digest-ps2emu-cddvdlinuz-0.3-r1
@@ -0,0 +1 @@
+MD5 026397f310cef0fbb2dd8526e791976b CDVDlinuz0.3.zip 26264
diff --git a/games-emulation/ps2emu-cddvdlinuz/ps2emu-cddvdlinuz-0.3.ebuild b/games-emulation/ps2emu-cddvdlinuz/ps2emu-cddvdlinuz-0.3-r1.ebuild
index 9022eb6872b1..e6b7adea277e 100644
--- a/games-emulation/ps2emu-cddvdlinuz/ps2emu-cddvdlinuz-0.3.ebuild
+++ b/games-emulation/ps2emu-cddvdlinuz/ps2emu-cddvdlinuz-0.3-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-cddvdlinuz/ps2emu-cddvdlinuz-0.3.ebuild,v 1.1 2003/09/09 16:26:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-cddvdlinuz/ps2emu-cddvdlinuz-0.3-r1.ebuild,v 1.1 2003/12/12 22:04:45 vapier Exp $
 
 inherit games
 
 DESCRIPTION="PSEmu2 CD/DVD plugin"
 HOMEPAGE="http://www.pcsx2.net/"
-SRC_URI="http://www.pcsx2.net/download/0.4release/CDVDlinuz-${PV}.gz"
+SRC_URI="http://www.pcsx2.net/download/0.5release/CDVDlinuz${PV}.zip"
 
 LICENSE="freedist"
 SLOT="0"
@@ -18,9 +18,7 @@ S=${WORKDIR}/CDVDlinuz
 
 src_unpack() {
 	unpack ${A}
-	tar -xf CDVDlinuz-${PV} || die "unpacking tar"
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-makefile.patch
+	sed -i 's:-O2 -fomit-frame-pointer:$(OPTFLAGS):' ${S}/Src/Makefile
 }
 
 src_compile() {
@@ -30,8 +28,7 @@ src_compile() {
 
 src_install() {
 	dodoc ReadMe.txt
-	cd Src
 	exeinto ${GAMES_LIBDIR}/ps2emu/plugins
-	doexe lib*
+	newexe Src/libCDVDlinuz.so libCDVDlinuz-${PV}.so
 	prepgamesdirs
 }
diff --git a/games-emulation/ps2emu-cdvdiso/ChangeLog b/games-emulation/ps2emu-cdvdiso/ChangeLog
index cdae2215c5e4..8e123fd6c10d 100644
--- a/games-emulation/ps2emu-cdvdiso/ChangeLog
+++ b/games-emulation/ps2emu-cdvdiso/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/ps2emu-cdvdiso
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-cdvdiso/ChangeLog,v 1.2 2003/09/10 16:04:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-cdvdiso/ChangeLog,v 1.3 2003/12/12 22:06:51 vapier Exp $
+
+*ps2emu-cdvdiso-0.3 (12 Dec 2003)
+
+  12 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage.
 
 *ps2emu-cdvdiso-0.2 (14 Aug 2003)
 
diff --git a/games-emulation/ps2emu-cdvdiso/files/0.2-makefile.patch b/games-emulation/ps2emu-cdvdiso/files/0.2-makefile.patch
deleted file mode 100644
index b05e8bb61494..000000000000
--- a/games-emulation/ps2emu-cdvdiso/files/0.2-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Linux/Makefile.orig	2003-08-14 20:56:46.568240992 -0400
-+++ src/Linux/Makefile	2003-08-14 20:56:54.059102208 -0400
-@@ -6,7 +6,7 @@
- BUILD = 2
- PLUGIN = libCDVDiso-${VERSION}.${BUILD}.so
- CFG = cfgCDVDiso
--CFLAGS = -fPIC -Wall -O2 -fomit-frame-pointer -I.. -I. -D__LINUX__
-+CFLAGS = -fPIC -Wall $(OPTFLAGS) -I.. -I. -D__LINUX__
- OBJECTS = ../CDVDiso.o Config.o Linux.o
- CFGOBJS = conf.o interface.o support.o Config.o
- LIBS = -lz -lbz2
diff --git a/games-emulation/ps2emu-cdvdiso/files/digest-ps2emu-cdvdiso-0.2 b/games-emulation/ps2emu-cdvdiso/files/digest-ps2emu-cdvdiso-0.2
deleted file mode 100644
index 257b86e02015..000000000000
--- a/games-emulation/ps2emu-cdvdiso/files/digest-ps2emu-cdvdiso-0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9dac871710e7d5fe56db66a4917fca65 CDVDiso-0.2.zip 151378
diff --git a/games-emulation/ps2emu-cdvdiso/files/digest-ps2emu-cdvdiso-0.3 b/games-emulation/ps2emu-cdvdiso/files/digest-ps2emu-cdvdiso-0.3
new file mode 100644
index 000000000000..ca2100851504
--- /dev/null
+++ b/games-emulation/ps2emu-cdvdiso/files/digest-ps2emu-cdvdiso-0.3
@@ -0,0 +1 @@
+MD5 3919692abbe394b0b0591ada75cad0f9 CDVDiso0.3.zip 215328
diff --git a/games-emulation/ps2emu-cdvdiso/ps2emu-cdvdiso-0.2.ebuild b/games-emulation/ps2emu-cdvdiso/ps2emu-cdvdiso-0.3.ebuild
index 445827ecc6c6..e2b039196342 100644
--- a/games-emulation/ps2emu-cdvdiso/ps2emu-cdvdiso-0.2.ebuild
+++ b/games-emulation/ps2emu-cdvdiso/ps2emu-cdvdiso-0.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-cdvdiso/ps2emu-cdvdiso-0.2.ebuild,v 1.1 2003/09/09 16:26:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-cdvdiso/ps2emu-cdvdiso-0.3.ebuild,v 1.1 2003/12/12 22:06:52 vapier Exp $
 
 inherit games
 
 DESCRIPTION="PSEmu2 CD/DVD iso plugin"
 HOMEPAGE="http://www.pcsx2.net/"
-SRC_URI="http://www.pcsx2.net/download/0.4release/CDVDiso-${PV}.zip"
+SRC_URI="http://www.pcsx2.net/download/0.5release/CDVDiso${PV}.zip"
 
 LICENSE="freedist"
 SLOT="0"
@@ -18,8 +18,7 @@ S=${WORKDIR}/CDVDiso
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-makefile.patch
+	sed -i 's:-O2 -fomit-frame-pointer:$(OPTFLAGS):' ${S}/src/Linux/Makefile
 }
 
 src_compile() {
@@ -31,7 +30,7 @@ src_install() {
 	dodoc ReadMe.txt
 	cd src/Linux
 	exeinto ${GAMES_LIBDIR}/ps2emu/plugins
-	doexe lib*
+	newexe libCDVDiso.so libCDVDiso-${PV}.so
 	exeinto ${GAMES_LIBDIR}/ps2emu/cfg
 	doexe cfgCDVDiso
 	prepgamesdirs
diff --git a/games-emulation/ps2emu-gssoft/ChangeLog b/games-emulation/ps2emu-gssoft/ChangeLog
index 0ed8e3ab0fec..b5498e3868a7 100644
--- a/games-emulation/ps2emu-gssoft/ChangeLog
+++ b/games-emulation/ps2emu-gssoft/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/ps2emu-gssoft
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-gssoft/ChangeLog,v 1.2 2003/09/10 16:01:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-gssoft/ChangeLog,v 1.3 2003/12/12 22:08:53 vapier Exp $
+
+*ps2emu-gssoft-0.61 (12 Dec 2003)
+
+  12 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage.
 
 *ps2emu-gssoft-0.5 (14 Aug 2003)
 
diff --git a/games-emulation/ps2emu-gssoft/files/0.5-makefile.patch b/games-emulation/ps2emu-gssoft/files/0.5-makefile.patch
deleted file mode 100644
index c0e79a8d0c75..000000000000
--- a/games-emulation/ps2emu-gssoft/files/0.5-makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- Src/Linux/Makefile.orig	2003-08-14 13:11:45.664823032 -0400
-+++ Src/Linux/Makefile	2003-08-14 13:13:07.997306592 -0400
-@@ -5,13 +5,17 @@
- VERSION = 0

- BUILD = 5

- PLUGIN = libGSsoftx-${VERSION}.${BUILD}.so

--CFLAGS+= -fPIC -Wall -O3 -fomit-frame-pointer -I. -I..

-+CFLAGS+= -fPIC -Wall $(OPTFLAGS) -I. -I..

- OBJS = ../GS.o ../Prim.o ../Soft.o ../Draw.o ../Texts.o ../Color.o

- OBJS+= X11.o Conf.o interface.o support.o DrawString.o

- DEPS:= $(OBJS:.o=.d)

- LIBS = $(shell gtk-config --libs) -lX11

- CFLAGS+= $(shell gtk-config --cflags) -D__LINUX__ -DVERSION=${VERSION} -DBUILD=${BUILD}

- 

-+ifeq (${USE_SDL},1)
-+	CFLAGS+= $(shell sdl-config --cflags) -I../../nsx2/ -I../../nsx2/iniapi
-+	LIBS+= $(shell sdl-config --libs)
-+endif
- ifeq (${USE_DGA2}, TRUE)

- 	CFLAGS+= -DUSE_DGA2

- 	LIBS+= -lXxf86dga

diff --git a/games-emulation/ps2emu-gssoft/files/digest-ps2emu-gssoft-0.5 b/games-emulation/ps2emu-gssoft/files/digest-ps2emu-gssoft-0.5
deleted file mode 100644
index 8a4eb33b1d8f..000000000000
--- a/games-emulation/ps2emu-gssoft/files/digest-ps2emu-gssoft-0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0c9bbadca3b483a68b785c8ba61f29cf Gssoft-0.5.zip 188616
diff --git a/games-emulation/ps2emu-gssoft/files/digest-ps2emu-gssoft-0.61 b/games-emulation/ps2emu-gssoft/files/digest-ps2emu-gssoft-0.61
new file mode 100644
index 000000000000..d18968723245
--- /dev/null
+++ b/games-emulation/ps2emu-gssoft/files/digest-ps2emu-gssoft-0.61
@@ -0,0 +1 @@
+MD5 448fc6d9bc04b16a2002799c327b6373 GSsoft-0.61.tgz 199903
diff --git a/games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.5.ebuild b/games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.5.ebuild
deleted file mode 100644
index 691085c74f6c..000000000000
--- a/games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.5.ebuild,v 1.1 2003/09/09 16:26:50 vapier Exp $
-
-inherit games
-
-DESCRIPTION="PSEmu2 GPU plugin"
-HOMEPAGE="http://www.pcsx2.net/"
-SRC_URI="http://www.pcsx2.net/download/0.4release/Gssoft-${PV}.zip"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND="virtual/opengl
-	virtual/x11"
-#	sdl? ( media-libs/libsdl )"
-
-S=${WORKDIR}/GSsoft-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-makefile.patch
-}
-
-src_compile() {
-	cd Src/Linux
-	emake OPTFLAGS="${CFLAGS}" || die "building X"
-	mv lib* ${S}/
-	#requires stuff from nSX2 which atm is win32 only
-	#if [ `use sdl` ] ; then
-	#	cd ..
-	#	ln -s GS.h gs.h
-	#	epatch ${FILESDIR}/${PV}-sdl.patch
-	#	mv Linux-SDL/* Linux/
-	#	cd Linux
-	#	make clean || die "making clean"
-	#	emake OPTFLAGS="${CFLAGS}" || die "building sdl"
-	#fi
-}
-
-src_install() {
-	dodoc ReadMe.txt
-	exeinto ${GAMES_LIBDIR}/ps2emu/plugins
-	doexe lib*
-	prepgamesdirs
-}
diff --git a/games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.61.ebuild b/games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.61.ebuild
new file mode 100644
index 000000000000..963df1e4c319
--- /dev/null
+++ b/games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.61.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.61.ebuild,v 1.1 2003/12/12 22:08:53 vapier Exp $
+
+inherit games
+
+DESCRIPTION="PSEmu2 GPU plugin"
+HOMEPAGE="http://www.pcsx2.net/"
+SRC_URI="http://www.pcsx2.net/download/0.5release/GSsoft-${PV}.tgz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="x86"
+
+DEPEND="virtual/opengl
+	virtual/x11
+	=x11-libs/gtk+-1*"
+
+S=${WORKDIR}/GSsoft
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i 's:-O3 -fomit-frame-pointer:$(OPTFLAGS):' ${S}/Src/Linux/Makefile
+}
+
+src_compile() {
+	cd Src/Linux
+	emake OPTFLAGS="${CFLAGS}" || die "building X"
+}
+
+src_install() {
+	dodoc ReadMe.txt
+	exeinto ${GAMES_LIBDIR}/ps2emu/plugins
+	newexe Src/Linux/libGSsoftx.so libGSsoftx-${PV}.so
+	prepgamesdirs
+}
diff --git a/games-emulation/ps2emu-padxwin/ChangeLog b/games-emulation/ps2emu-padxwin/ChangeLog
index 8f2d82fd5dc4..085ae92478b6 100644
--- a/games-emulation/ps2emu-padxwin/ChangeLog
+++ b/games-emulation/ps2emu-padxwin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/ps2emu-padxwin
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-padxwin/ChangeLog,v 1.2 2003/09/10 16:03:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-padxwin/ChangeLog,v 1.3 2003/12/12 22:10:04 vapier Exp $
+
+*ps2emu-padxwin-0.5 (12 Dec 2003)
+
+  12 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage.
 
 *ps2emu-padxwin-0.3 (14 Aug 2003)
 
diff --git a/games-emulation/ps2emu-padxwin/files/0.3-makefile.patch b/games-emulation/ps2emu-padxwin/files/0.3-makefile.patch
deleted file mode 100644
index e819216106ae..000000000000
--- a/games-emulation/ps2emu-padxwin/files/0.3-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Src/Makefile.orig	2003-08-14 21:09:59.330722776 -0400
-+++ Src/Makefile	2003-08-14 21:10:08.885270264 -0400
-@@ -2,7 +2,7 @@
- VERSION = 0
- BUILD = 3
- PLUGIN = libPADxwin-${VERSION}.${BUILD}.so
--CFLAGS = -fPIC -Wall -O2 -fomit-frame-pointer -D__LINUX__
-+CFLAGS = -fPIC -Wall $(OPTFLAGS) -D__LINUX__
- OBJECTS = PAD.o Conf.o
- OBJECTS+= interface.o support.o
- LIBS = $(shell gtk-config --libs)
diff --git a/games-emulation/ps2emu-padxwin/files/digest-ps2emu-padxwin-0.3 b/games-emulation/ps2emu-padxwin/files/digest-ps2emu-padxwin-0.3
deleted file mode 100644
index 253206c46afe..000000000000
--- a/games-emulation/ps2emu-padxwin/files/digest-ps2emu-padxwin-0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 12d166dbe8e84c4db459ab335ceb564b PADxwin-0.3.gz 21351
diff --git a/games-emulation/ps2emu-padxwin/files/digest-ps2emu-padxwin-0.5 b/games-emulation/ps2emu-padxwin/files/digest-ps2emu-padxwin-0.5
new file mode 100644
index 000000000000..acaca883892e
--- /dev/null
+++ b/games-emulation/ps2emu-padxwin/files/digest-ps2emu-padxwin-0.5
@@ -0,0 +1 @@
+MD5 2d90c08652d80acee7322cb6e7d71faa PADwin0.5.zip 386378
diff --git a/games-emulation/ps2emu-padxwin/ps2emu-padxwin-0.3.ebuild b/games-emulation/ps2emu-padxwin/ps2emu-padxwin-0.5.ebuild
index aa9ca97a0b5d..dd20b04f0c8e 100644
--- a/games-emulation/ps2emu-padxwin/ps2emu-padxwin-0.3.ebuild
+++ b/games-emulation/ps2emu-padxwin/ps2emu-padxwin-0.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-padxwin/ps2emu-padxwin-0.3.ebuild,v 1.1 2003/09/09 16:26:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-padxwin/ps2emu-padxwin-0.5.ebuild,v 1.1 2003/12/12 22:10:04 vapier Exp $
 
 inherit games
 
 DESCRIPTION="PSEmu2 PAD plugin"
 HOMEPAGE="http://www.pcsx2.net/"
-SRC_URI="http://www.pcsx2.net/download/0.4release/PADxwin-${PV}.gz"
+SRC_URI="http://www.pcsx2.net/download/0.5release/PADwin${PV}.zip"
 
 LICENSE="freedist"
 SLOT="0"
@@ -14,13 +14,11 @@ KEYWORDS="x86"
 
 DEPEND="=x11-libs/gtk+-1*"
 
-S=${WORKDIR}/PADxwin
+S=${WORKDIR}/PADwin
 
 src_unpack() {
 	unpack ${A}
-	tar -xf PADxwin-${PV} || die "unpacking tar"
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-makefile.patch
+	sed -i 's:-O2 -fomit-frame-pointer:$(OPTFLAGS):' ${S}/Src/Makefile
 }
 
 src_compile() {
@@ -30,8 +28,7 @@ src_compile() {
 
 src_install() {
 	dodoc ReadMe.txt
-	cd Src
 	exeinto ${GAMES_LIBDIR}/ps2emu/plugins
-	doexe lib*
+	newexe Src/libPADxwin.so libPADxwin-${PV}.so
 	prepgamesdirs
 }
diff --git a/games-emulation/ps2emu-spu2null/ChangeLog b/games-emulation/ps2emu-spu2null/ChangeLog
index 72d4bf4cd58e..d32f25663384 100644
--- a/games-emulation/ps2emu-spu2null/ChangeLog
+++ b/games-emulation/ps2emu-spu2null/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/ps2emu-spu2null
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-spu2null/ChangeLog,v 1.2 2003/09/10 16:02:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-spu2null/ChangeLog,v 1.3 2003/12/12 22:10:51 vapier Exp $
+
+*ps2emu-spu2null-0.21 (12 Dec 2003)
+
+  12 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage.
 
 *ps2emu-spu2null-0.2 (14 Aug 2003)
 
diff --git a/games-emulation/ps2emu-spu2null/files/0.2-makefile.patch b/games-emulation/ps2emu-spu2null/files/0.2-makefile.patch
deleted file mode 100644
index 468f96b3408b..000000000000
--- a/games-emulation/ps2emu-spu2null/files/0.2-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Src/Makefile.orig	2003-08-14 21:14:02.092817328 -0400
-+++ Src/Makefile	2003-08-14 21:14:09.306720648 -0400
-@@ -4,7 +4,7 @@
- VERSION = 0
- BUILD = 2
- PLUGIN = libSPU2null-${VERSION}.${BUILD}.so
--CFLAGS+= -fPIC -Wall -O2 -fomit-frame-pointer -D__LINUX__
-+CFLAGS+= -fPIC -Wall $(OPTFLAGS) -D__LINUX__
- OBJS = SPU2.o
- DEPS:= $(OBJS:.o=.d)
- LIBS = $(shell gtk-config --libs) 
diff --git a/games-emulation/ps2emu-spu2null/files/digest-ps2emu-spu2null-0.2 b/games-emulation/ps2emu-spu2null/files/digest-ps2emu-spu2null-0.2
deleted file mode 100644
index d307f631d7fb..000000000000
--- a/games-emulation/ps2emu-spu2null/files/digest-ps2emu-spu2null-0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7c778c52bd7233910baa573e502c7d36 SPU2null-0.2.zip 38242
diff --git a/games-emulation/ps2emu-spu2null/files/digest-ps2emu-spu2null-0.21 b/games-emulation/ps2emu-spu2null/files/digest-ps2emu-spu2null-0.21
new file mode 100644
index 000000000000..683a73f2bca1
--- /dev/null
+++ b/games-emulation/ps2emu-spu2null/files/digest-ps2emu-spu2null-0.21
@@ -0,0 +1 @@
+MD5 6e54ffc22ba6482db3d9a8b655692470 SPU2null0.21.zip 40105
diff --git a/games-emulation/ps2emu-spu2null/ps2emu-spu2null-0.2.ebuild b/games-emulation/ps2emu-spu2null/ps2emu-spu2null-0.21.ebuild
index 60ce561d2087..29b2b526b24a 100644
--- a/games-emulation/ps2emu-spu2null/ps2emu-spu2null-0.2.ebuild
+++ b/games-emulation/ps2emu-spu2null/ps2emu-spu2null-0.21.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-spu2null/ps2emu-spu2null-0.2.ebuild,v 1.1 2003/09/09 16:26:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-spu2null/ps2emu-spu2null-0.21.ebuild,v 1.1 2003/12/12 22:10:51 vapier Exp $
 
 inherit games
 
 DESCRIPTION="PSEmu2 NULL Sound plugin"
 HOMEPAGE="http://www.pcsx2.net/"
-SRC_URI="http://www.pcsx2.net/download/0.4release/SPU2null-${PV}.zip"
+SRC_URI="http://www.pcsx2.net/download/0.5release/SPU2null${PV}.zip"
 
 LICENSE="freedist"
 SLOT="0"
@@ -18,8 +18,7 @@ S=${WORKDIR}/SPU2null
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-makefile.patch
+	sed -i 's:-O2 -fomit-frame-pointer:$(OPTFLAGS):' ${S}/Src/Makefile
 }
 
 src_compile() {
@@ -29,8 +28,7 @@ src_compile() {
 
 src_install() {
 	dodoc ReadMe.txt
-	cd Src
 	exeinto ${GAMES_LIBDIR}/ps2emu/plugins
-	doexe lib*
+	newexe Src/libSPU2null.so libSPU2null-${PV}.so
 	prepgamesdirs
 }