add games.eclass support and bump the version

7 files changed, 56 insertions, 66 deletions

diff --git a/app-emulation/psemu-peopssoftgpu/ChangeLog b/app-emulation/psemu-peopssoftgpu/ChangeLog
index 2598ee570a86..9069496310ec 100644
--- a/app-emulation/psemu-peopssoftgpu/ChangeLog
+++ b/app-emulation/psemu-peopssoftgpu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/psemu-peopssoftgpu
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/psemu-peopssoftgpu/ChangeLog,v 1.7 2003/07/13 07:09:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/psemu-peopssoftgpu/ChangeLog,v 1.8 2003/08/14 06:27:28 vapier Exp $
+
+*psemu-peopssoftgpu-1.15 (14 Aug 2003)
+
+  14 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + games.eclass support.
 
 *psemu-peopssoftgpu-1.14 (13 Jul 2003)
 
diff --git a/app-emulation/psemu-peopssoftgpu/files/1.15-makefile-cflags.patch b/app-emulation/psemu-peopssoftgpu/files/1.15-makefile-cflags.patch
new file mode 100644
index 000000000000..b0e2d5ede69c
--- /dev/null
+++ b/app-emulation/psemu-peopssoftgpu/files/1.15-makefile-cflags.patch
@@ -0,0 +1,28 @@
+--- src/makes/plg.mk.orig	2003-08-14 02:03:31.283095536 -0400
++++ src/makes/plg.mk	2003-08-14 02:03:54.843513808 -0400
+@@ -4,7 +4,7 @@
+ 
+ PLUGIN = libgpuPeops$(VERSION).so
+ PLUGINTYPE = libgpu.so
+-CFLAGS = -g -Wall -fPIC -O4 -fomit-frame-pointer -ffast-math $(INCLUDE)
++CFLAGS = -Wall -fPIC $(OPTFLAGS) $(INCLUDE)
+ #CFLAGS = -g -Wall -fPIC -O3 -mpentium -fomit-frame-pointer -ffast-math $(INCLUDE)
+ INCLUDE = -I/usr/local/include
+ OBJECTS = gpu.o cfg.o draw.o fps.o key.o menu.o prim.o soft.o
+--- src/makes/mk.fpse.orig	2003-08-14 02:04:25.902792080 -0400
++++ src/makes/mk.fpse	2003-08-14 02:05:06.265655992 -0400
+@@ -5,12 +5,12 @@
+ CC = gcc

+ LD = gcc

+ NASM = nasm

+-INCLUDE += -I./fpse `gtk-config --cflags`

++INCLUDE += -I./fpse `gtk-config --cflags` `sdl-config --cflags`

+ VERSION = SDL

+ NUMBER = 1.0.15

+ CFLAGS +=  -D_FPSE -D_SDL -D__i386__ -D_SDL2

+ ASMFLAGS += -f elf

+-LIBS += -lSDL

++LIBS += `sdl-config --libs`

+ OBJECTS += fpsewp.o

+ OBJECTS += i386.o

+ 

diff --git a/app-emulation/psemu-peopssoftgpu/files/digest-psemu-peopssoftgpu-1.14 b/app-emulation/psemu-peopssoftgpu/files/digest-psemu-peopssoftgpu-1.14
deleted file mode 100644
index 0682067d8ca1..000000000000
--- a/app-emulation/psemu-peopssoftgpu/files/digest-psemu-peopssoftgpu-1.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ff6e7e5048552e5f26276300b3fd60d6 PeopsSoftGpu114.tar.gz 569171
diff --git a/app-emulation/psemu-peopssoftgpu/files/digest-psemu-peopssoftgpu-1.15 b/app-emulation/psemu-peopssoftgpu/files/digest-psemu-peopssoftgpu-1.15
new file mode 100644
index 000000000000..521f6997355c
--- /dev/null
+++ b/app-emulation/psemu-peopssoftgpu/files/digest-psemu-peopssoftgpu-1.15
@@ -0,0 +1 @@
+MD5 5758a24331dd91c3a10dddee80fae008 PeopsSoftGpu115.tar.gz 598169
diff --git a/app-emulation/psemu-peopssoftgpu/files/digest-psemu-peopssoftgpu-1.6 b/app-emulation/psemu-peopssoftgpu/files/digest-psemu-peopssoftgpu-1.6
deleted file mode 100644
index 5a96119dfe1f..000000000000
--- a/app-emulation/psemu-peopssoftgpu/files/digest-psemu-peopssoftgpu-1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 93a49d390ded0c2db945927e1306be08 PeopsSoftGpu106.tar.gz 614725
diff --git a/app-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.14.ebuild b/app-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.15.ebuild
index 9aca68d361e9..0e4aaca63fdc 100644
--- a/app-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.14.ebuild
+++ b/app-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.15.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.14.ebuild,v 1.2 2003/07/16 07:22:36 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.15.ebuild,v 1.1 2003/08/14 06:27:28 vapier Exp $
+
+inherit games eutils
 
 DESCRIPTION="P.E.Op.S Software GPU plugin"
 HOMEPAGE="http://sourceforge.net/projects/peops/"
@@ -12,34 +14,38 @@ KEYWORDS="x86 -ppc"
 IUSE="sdl"
 
 DEPEND="=x11-libs/gtk+-1*
+	dev-util/pkgconfig
 	sdl? ( media-libs/libsdl )
+	virtual/x11
 	dev-lang/nasm"
 
 S=${WORKDIR}
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-makefile-cflags.patch
+}
+
 src_compile() {
 	cd src
-	sed -i -e 's:CFLAGS =:CFLAGS +=:' makes/plg.mk || die "cflag fix failed"
 
-	emake || die "x11 build failed"
+	emake OPTFLAGS="${CFLAGS}" || die "x11 build failed"
 
 	if [ `use sdl` ] ; then
 		sed -i 's:mk.x11:mk.fpse:g' Makefile
-		sed -i \
-			-e '/^INCLUDE =/s:$: `sdl-config --cflags`:' \
-			-e 's:-lSDL:`sdl-config --cflags`:' \
-			makes/mk.fpse
-		make clean || die
-		emake || die "sdl build failed"
+		make clean || die "make clean failed"
+		emake OPTFLAGS="${CFLAGS}" || die "sdl build failed"
 	fi
 }
 
 src_install() {
-	exeinto /usr/lib/psemu/plugins
-	doexe src/libgpuPeops*.so* cfgPeopsSoft || die
-
-	insinto /usr/lib/psemu/cfg
-	doins gpuPeopsSoftX.cfg
-
 	dodoc *.txt
+	insinto ${GAMES_LIBDIR}/psemu/cfg
+	doins gpuPeopsSoftX.cfg
+	cd src
+	exeinto ${GAMES_LIBDIR}/psemu/plugins
+	doexe libgpuPeops*
+	exeinto ${GAMES_LIBDIR}/psemu/cfg
+	doexe cfgPeopsSoft
+	prepgamesdirs
 }
diff --git a/app-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.6.ebuild b/app-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.6.ebuild
deleted file mode 100644
index 09c8c91ebeaf..000000000000
--- a/app-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.6.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/app-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.6.ebuild,v 1.9 2003/02/13 07:16:05 vapier Exp $
-
-IUSE="sdl"
-
-DESCRIPTION="P.E.Op.S Software GPU plugin"
-HOMEPAGE="http://peops.sourceforge.net"
-LICENSE="GPL-2"
-KEYWORDS="x86 -ppc"
-SLOT="0"
-DEPEND="x11-libs/gtk+
-	dev-lang/nasm
-	sdl? ( media-libs/libsdl )"
-SRC_URI="mirror://sourceforge/peops/PeopsSoftGpu106.tar.gz"
-S=${WORKDIR}
-
-lowercase() {
-	for f in $*; do
-		mv "$f" "$(echo $f | tr A-Z a-z)"
-	done
-}
-
-src_compile() {
-	cd src
-	lowercase makes/mk.X11 Gpu.[ch] Stdafx.h Cfg.c Draw.c Key.c Menu.c \
-	          Prim.c Soft.c
-	sed 's:CFLAGS =:CFLAGS +=:g' <makes/plg.mk >makes/plg.mk.tmp
-	mv -f makes/plg.mk.tmp makes/plg.mk
-
-	emake || die "Failed to make X11-version"
-
-	use sdl && (
-		sed 's:mk.x11:mk.fpse:g' <Makefile >Makefile.sdl
-		echo 'INCLUDE = `sdl-config --cflags`' >makes/mk.fpse.tmp
-		sed 's:-lSDL:`sdl-config --libs`:g' <makes/mk.fpse >>makes/mk.fpse.tmp
-		mv -f makes/mk.fpse.tmp makes/mk.fpse
-		make clean
-		emake -f Makefile.sdl || die "Failed to make SDL-version"
-	)
-}
-
-src_install () {
-	insinto /usr/lib/psemu/plugins/
-	doins src/libgpu*
-	dodoc readme_1_6.txt version_1_6.txt
-}
-