9 files changed, 93 insertions, 15 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
 }