games.eclass + version bump

6 files changed, 70 insertions, 33 deletions

diff --git a/app-emulation/psemu-cdr/ChangeLog b/app-emulation/psemu-cdr/ChangeLog
index de286df2c398..4e8388e387b5 100644
--- a/app-emulation/psemu-cdr/ChangeLog
+++ b/app-emulation/psemu-cdr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/psemu-cdr
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/psemu-cdr/ChangeLog,v 1.5 2003/06/29 20:06:54 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/psemu-cdr/ChangeLog,v 1.6 2003/08/14 06:18:53 vapier Exp $
+
+*psemu-cdr-1.8 (14 Aug 2003)
+
+  14 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + games.eclass support.
 
 *psemu-cdr-1.62 (27 Jul 2002)
 
@@ -8,13 +13,9 @@
   Added -ppc to keywords
 
   27 Jul 2002; Stuart Bouyer <stubear@gentoo.org> psemu-cdr.ebuild :
-
   Added KEYWORDS="x86" and SLOT.
 
-*psemu-cdr (2 June 2002)
-
   2 June 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
-  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/app-emulation/psemu-cdr/files/1.8-makefile-cflags.patch b/app-emulation/psemu-cdr/files/1.8-makefile-cflags.patch
new file mode 100644
index 000000000000..8b26c890d594
--- /dev/null
+++ b/app-emulation/psemu-cdr/files/1.8-makefile-cflags.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.orig	2003-08-14 01:09:20.989215312 -0400
++++ src/Makefile	2003-08-14 01:09:36.660832864 -0400
+@@ -25,7 +25,7 @@
+ 
+ OBJECTS = cdr.o cfg.o
+ LIBS = -lpthread
+-CFLAGS = -g -fPIC -Wall -O2 -fomit-frame-pointer \
++CFLAGS = -fPIC -Wall $(OPTFLAGS) \
+ 	-D_REENTRANT -DVERSION=$(VERSION) -DBUILD=$(BUILD)
+ 
+ 
diff --git a/app-emulation/psemu-cdr/files/digest-psemu-cdr-1.62 b/app-emulation/psemu-cdr/files/digest-psemu-cdr-1.62
deleted file mode 100644
index 5bb965011919..000000000000
--- a/app-emulation/psemu-cdr/files/digest-psemu-cdr-1.62
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d8a69d63e8fb9b6ef8b1e9d3d158a7f7 cdr-1.62.tgz 12854
diff --git a/app-emulation/psemu-cdr/files/digest-psemu-cdr-1.8 b/app-emulation/psemu-cdr/files/digest-psemu-cdr-1.8
new file mode 100644
index 000000000000..42e1339ca73f
--- /dev/null
+++ b/app-emulation/psemu-cdr/files/digest-psemu-cdr-1.8
@@ -0,0 +1 @@
+MD5 0144ddcd5acff5130f075a3cf7819bdd cdr-1.8.tar.gz 44115
diff --git a/app-emulation/psemu-cdr/psemu-cdr-1.62.ebuild b/app-emulation/psemu-cdr/psemu-cdr-1.62.ebuild
deleted file mode 100644
index c79da99dadef..000000000000
--- a/app-emulation/psemu-cdr/psemu-cdr-1.62.ebuild
+++ /dev/null
@@ -1,27 +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-cdr/psemu-cdr-1.62.ebuild,v 1.7 2003/02/13 07:15:20 vapier Exp $
-
-DESCRIPTION="PSEmu plugin to read from CD-ROM"
-HOMEPAGE="http://www.pcsx.net"
-LICENSE="GPL-2"
-KEYWORDS="x86 -ppc"
-SLOT="0"
-SRC_URI="http://linux.pcsx.net/downloads/plugins/cdr-${PV}.tgz"
-DEPEND="x11-libs/gtk+"
-S=${WORKDIR}
-IUSE=""
-
-src_compile() {
-	cd src
-	( echo CFLAGS = ${CFLAGS}
-	  sed 's/CFLAGS =/CFLAGS +=/' < Makefile ) >Makefile.gentoo
-	emake -f Makefile.gentoo
-}
-
-src_install () {
-	insinto /usr/lib/psemu/plugins/
-	doins src/libcdr-*
-	chmod 755 ${D}/usr/lib/psemu/plugins/*
-	dodoc ReadMe.txt
-}
diff --git a/app-emulation/psemu-cdr/psemu-cdr-1.8.ebuild b/app-emulation/psemu-cdr/psemu-cdr-1.8.ebuild
new file mode 100644
index 000000000000..b8e18bba102f
--- /dev/null
+++ b/app-emulation/psemu-cdr/psemu-cdr-1.8.ebuild
@@ -0,0 +1,52 @@
+# 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-cdr/psemu-cdr-1.8.ebuild,v 1.1 2003/08/14 06:18:53 vapier Exp $
+
+inherit games eutils
+
+DESCRIPTION="PSEmu plugin to read from CD-ROM"
+HOMEPAGE="http://www.pcsx.net/"
+SRC_URI="http://linuzappz.pcsx.net/downloads/cdr-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+IUSE="gtk gtk2"
+
+DEPEND="|| (
+		gtk2? ( =x11-libs/gtk+-2* )
+		gtk? ( =x11-libs/gtk+-1* )
+		=x11-libs/gtk+-2*
+	)
+	dev-util/pkgconfig"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-makefile-cflags.patch
+}
+
+src_compile() {
+	local gtk
+	if [ `use gtk2` ] ; then
+		gtk=gtk+2
+	elif [ `use gtk` ] ; then
+		gtk=gtk
+	else
+		gtk=gtk+2
+	fi
+	cd src
+	emake OPTFLAGS="${CFLAGS}" GUI="${gtk}" || die
+}
+
+src_install() {
+	exeinto ${GAMES_LIBDIR}/psemu/plugins
+	doexe src/libcdr-*
+	exeinto ${GAMES_LIBDIR}/psemu/cfg
+	doexe src/cfg-gtk*/cfgCdr
+	insinto ${GAMES_LIBDIR}/psemu/cfg
+	doins cdr.cfg
+	dodoc ReadMe.txt
+	prepgamesdirs
+}