version bump (bug #52253)

(Portage version: 2.0.51-r15)

6 files changed, 129 insertions, 28 deletions

diff --git a/games-emulation/psemu-peopssoftgpu/ChangeLog b/games-emulation/psemu-peopssoftgpu/ChangeLog
index a444fc460db9..917633b6381d 100644
--- a/games-emulation/psemu-peopssoftgpu/ChangeLog
+++ b/games-emulation/psemu-peopssoftgpu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/psemu-peopssoftgpu
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/psemu-peopssoftgpu/ChangeLog,v 1.6 2004/08/15 06:31:49 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/psemu-peopssoftgpu/ChangeLog,v 1.7 2005/02/19 07:28:08 mr_bones_ Exp $
+
+*psemu-peopssoftgpu-1.16 (19 Feb 2005)
+
+  19 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/1.16-makefile-cflags.patch, psemu-peopssoftgpu-1.15.ebuild,
+  +psemu-peopssoftgpu-1.16.ebuild:
+  version bump (bug #52253)
 
   15 Aug 2004; Mike Frysinger <vapier@gentoo.org>
   psemu-peopssoftgpu-1.15.ebuild:
diff --git a/games-emulation/psemu-peopssoftgpu/Manifest b/games-emulation/psemu-peopssoftgpu/Manifest
index 16fdb414da50..a0f9b96b06cf 100644
--- a/games-emulation/psemu-peopssoftgpu/Manifest
+++ b/games-emulation/psemu-peopssoftgpu/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4cf78553e3e69ab08c7f863055e8dea4 ChangeLog 1750
-MD5 99763a19e9d7d9959f2cab3981865858 psemu-peopssoftgpu-1.15.ebuild 1436
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 0b8bb66603cb69180832081bf70de316 psemu-peopssoftgpu-1.15.ebuild 1533
+MD5 0b8bb66603cb69180832081bf70de316 psemu-peopssoftgpu-1.16.ebuild 1533
 MD5 d7d6d0e073fab50e7fc57d7efe5dcf31 files/1.15-makefile-cflags.patch 971
 MD5 2bb8283c0041934b8dcf50003f408ea0 files/digest-psemu-peopssoftgpu-1.15 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBHwORHTu7gpaalycRAviGAJwNGBsoxuMYCMlihjer4r0FtUx3TACgitMF
-fxPh7mo2jcLGQCtKncJV7ZE=
-=maCa
------END PGP SIGNATURE-----
+MD5 933706295eaebb39f5550e2b22a5481d files/digest-psemu-peopssoftgpu-1.16 67
diff --git a/games-emulation/psemu-peopssoftgpu/files/1.16-makefile-cflags.patch b/games-emulation/psemu-peopssoftgpu/files/1.16-makefile-cflags.patch
new file mode 100644
index 000000000000..ec6c69b49c01
--- /dev/null
+++ b/games-emulation/psemu-peopssoftgpu/files/1.16-makefile-cflags.patch
@@ -0,0 +1,27 @@
+--- 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
+--- 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.16

+ 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/games-emulation/psemu-peopssoftgpu/files/digest-psemu-peopssoftgpu-1.16 b/games-emulation/psemu-peopssoftgpu/files/digest-psemu-peopssoftgpu-1.16
new file mode 100644
index 000000000000..0d06c10bcbd8
--- /dev/null
+++ b/games-emulation/psemu-peopssoftgpu/files/digest-psemu-peopssoftgpu-1.16
@@ -0,0 +1 @@
+MD5 a189736ea111e146c95862177ec02da1 PeopsSoftGpu116.tar.gz 642273
diff --git a/games-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.15.ebuild b/games-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.15.ebuild
index 65219d120973..99625145d618 100644
--- a/games-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.15.ebuild
+++ b/games-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.15.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.15.ebuild,v 1.7 2004/08/15 06:31:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.15.ebuild,v 1.8 2005/02/19 07:28:08 mr_bones_ Exp $
 
-inherit games eutils
+inherit eutils games
 
 DESCRIPTION="P.E.Op.S Software GPU plugin"
 HOMEPAGE="http://sourceforge.net/projects/peops/"
@@ -13,10 +13,11 @@ SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE="sdl"
 
-DEPEND="=x11-libs/gtk+-1*
-	dev-util/pkgconfig
+RDEPEND="=x11-libs/gtk+-1*
 	sdl? ( media-libs/libsdl )
-	virtual/x11
+	virtual/x11"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	x86? ( dev-lang/nasm )
 	amd64? ( dev-lang/nasm )"
 
@@ -24,15 +25,18 @@ S=${WORKDIR}
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${PV}-makefile-cflags.patch
+	epatch "${FILESDIR}/${PV}-makefile-cflags.patch"
 
 	if [ "${ARCH}" != "x86" ] ; then
 		cd src
-		sed -i -e "s/^CPU = i386/CPU = ${ARCH}/g" makes/mk.x11
+		sed -i \
+			-e "s/^CPU = i386/CPU = ${ARCH}/g" \
+			-e '/^XF86VM =/s:TRUE:FALSE:' makes/mk.x11 \
+			|| die "sed failed"
 		sed -i \
 			-e "s/OBJECTS.*i386.o//g" \
-			-e "s/-D__i386__//g" makes/mk.fpse
-		sed -i -e '/^XF86VM =/s:TRUE:FALSE:' makes/mk.x11
+			-e "s/-D__i386__//g" makes/mk.fpse \
+			|| die "sed failed"
 	fi
 }
 
@@ -49,12 +53,12 @@ src_compile() {
 
 src_install() {
 	dodoc *.txt
-	insinto ${GAMES_LIBDIR}/psemu/cfg
+	insinto "${GAMES_LIBDIR}/psemu/cfg"
 	doins gpuPeopsSoftX.cfg
 	cd src
-	exeinto ${GAMES_LIBDIR}/psemu/plugins
-	doexe libgpuPeops* || die
-	exeinto ${GAMES_LIBDIR}/psemu/cfg
-	doexe cfgPeopsSoft || die
+	exeinto "${GAMES_LIBDIR}/psemu/plugins"
+	doexe libgpuPeops* || die "doexe failed"
+	exeinto "${GAMES_LIBDIR}/psemu/cfg"
+	doexe cfgPeopsSoft || die "doexe failed"
 	prepgamesdirs
 }
diff --git a/games-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.16.ebuild b/games-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.16.ebuild
new file mode 100644
index 000000000000..b29026ea0150
--- /dev/null
+++ b/games-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.16.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/psemu-peopssoftgpu/psemu-peopssoftgpu-1.16.ebuild,v 1.1 2005/02/19 07:28:08 mr_bones_ Exp $
+
+inherit eutils games
+
+DESCRIPTION="P.E.Op.S Software GPU plugin"
+HOMEPAGE="http://sourceforge.net/projects/peops/"
+SRC_URI="mirror://sourceforge/peops/PeopsSoftGpu${PV//.}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc x86"
+IUSE="sdl"
+
+RDEPEND="=x11-libs/gtk+-1*
+	sdl? ( media-libs/libsdl )
+	virtual/x11"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x86? ( dev-lang/nasm )
+	amd64? ( dev-lang/nasm )"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	return 0
+	epatch "${FILESDIR}/${PV}-makefile-cflags.patch"
+
+	if [ "${ARCH}" != "x86" ] ; then
+		cd src
+		sed -i \
+			-e "s/^CPU = i386/CPU = ${ARCH}/g" \
+			-e '/^XF86VM =/s:TRUE:FALSE:' makes/mk.x11 \
+			|| die "sed failed"
+		if use sdl ; then
+			sed -i \
+				-e "s/OBJECTS.*i386.o//g" \
+				-e "s/-D__i386__//g" makes/mk.fpse \
+				|| die "sed failed"
+		fi
+	fi
+}
+
+src_compile() {
+	cd src
+	emake OPTFLAGS="${CFLAGS}" || die "x11 build failed"
+
+	# FIXME: this breaks if src_compile is called twice
+	if use sdl ; then
+		sed -i \
+			-e 's:mk.x11:mk.fpse:g' Makefile \
+			|| die "sed failed"
+		make clean || die "make clean failed"
+		emake OPTFLAGS="${CFLAGS}" || die "sdl build failed"
+	fi
+}
+
+src_install() {
+	dodoc *.txt
+	insinto "${GAMES_LIBDIR}/psemu/cfg"
+	doins gpuPeopsSoftX.cfg
+	exeinto "${GAMES_LIBDIR}/psemu/plugins"
+	doexe src/libgpuPeops* || die "doexe failed"
+	exeinto "${GAMES_LIBDIR}/psemu/cfg"
+	doexe src/cfgPeopsSoft || die "doexe failed"
+	prepgamesdirs
+}