make wrapper honor games eclass; version bump (bug #70323); tidy ebuilds and old versions

9 files changed, 110 insertions, 65 deletions

diff --git a/games-emulation/virtualjaguar/ChangeLog b/games-emulation/virtualjaguar/ChangeLog
index d48713505e6d..4febbcdf2cb3 100644
--- a/games-emulation/virtualjaguar/ChangeLog
+++ b/games-emulation/virtualjaguar/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-emulation/virtualjaguar
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/virtualjaguar/ChangeLog,v 1.5 2004/06/24 22:37:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/virtualjaguar/ChangeLog,v 1.6 2004/12/12 06:49:55 mr_bones_ Exp $
+
+*virtualjaguar-1.0.7 (11 Dec 2004)
+
+  11 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> files/virtualjaguar,
+  -virtualjaguar-1.0.5.ebuild, virtualjaguar-1.0.6.ebuild,
+  +virtualjaguar-1.0.7.ebuild:
+  make wrapper honor games eclass; version bump (bug #70323); tidy ebuilds and
+  old versions
 
   02 Mar 2004; David Holm <dholm@gentoo.org> virtualjaguar-1.0.6.ebuild:
   Added to ~ppc.
diff --git a/games-emulation/virtualjaguar/Manifest b/games-emulation/virtualjaguar/Manifest
index 8416b184664c..e1d8824b0c28 100644
--- a/games-emulation/virtualjaguar/Manifest
+++ b/games-emulation/virtualjaguar/Manifest
@@ -1,8 +1,8 @@
-MD5 063defb74c6f44911469c909cca1d686 virtualjaguar-1.0.6.ebuild 1261
-MD5 68a40406a92c78a96e6028f1436b4a81 virtualjaguar-1.0.5.ebuild 1238
 MD5 9966bdfa71b432abacc5ccdb790005b9 ChangeLog 884
 MD5 7a689486cd6c3a2e1f3d389286d81ec9 metadata.xml 418
-MD5 537c716601ef69dc13d9285e99d0f339 files/digest-virtualjaguar-1.0.5 72
-MD5 8c33120cd4e2306208ebe81ada04636d files/digest-virtualjaguar-1.0.6 76
+MD5 063defb74c6f44911469c909cca1d686 virtualjaguar-1.0.6.ebuild 1261
+MD5 6cf20de9db7c4bd8d4ed2c245fc0804b virtualjaguar-1.0.7.ebuild 1407
 MD5 8425919508218348801f7b6be2262dcd files/gcc331.patch 1930
-MD5 9041bc767f021b4d3df1c02a71b7fae0 files/virtualjaguar 742
+MD5 32f53c4a21b92b69625a0eb7ab422232 files/digest-virtualjaguar-1.0.7 76
+MD5 8c33120cd4e2306208ebe81ada04636d files/digest-virtualjaguar-1.0.6 76
+MD5 08f683df0d145f3e5e9e11c02ebf7d59 files/virtualjaguar 737
diff --git a/games-emulation/virtualjaguar/files/1.0.7-cdintf_linux.patch b/games-emulation/virtualjaguar/files/1.0.7-cdintf_linux.patch
new file mode 100644
index 000000000000..b98f5e1ba637
--- /dev/null
+++ b/games-emulation/virtualjaguar/files/1.0.7-cdintf_linux.patch
@@ -0,0 +1,9 @@
+--- src/cdintf_linux.cpp	2004-10-06 21:44:14.000000000 -0400
++++ src/cdintf_linux.cpp.fix	2004-11-06 23:09:53.217375640 -0500
+@@ -217,5 +217,5 @@
+ {

+ 	WriteLog("CDINTF: GetTrackInfo unimplemented!\n");

+ 	return 0xFF;

+-

++}

+ #endif

diff --git a/games-emulation/virtualjaguar/files/digest-virtualjaguar-1.0.5 b/games-emulation/virtualjaguar/files/digest-virtualjaguar-1.0.5
deleted file mode 100644
index d76035a83eac..000000000000
--- a/games-emulation/virtualjaguar/files/digest-virtualjaguar-1.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 83b1f1078c8993ead3d81e6ccf7a0316 virtualjaguar-1.0.5-src.tbz 164876
diff --git a/games-emulation/virtualjaguar/files/digest-virtualjaguar-1.0.7 b/games-emulation/virtualjaguar/files/digest-virtualjaguar-1.0.7
new file mode 100644
index 000000000000..8d42067fb6df
--- /dev/null
+++ b/games-emulation/virtualjaguar/files/digest-virtualjaguar-1.0.7
@@ -0,0 +1 @@
+MD5 9c19203f3532f1ab2bc5eb4db072e43d virtualjaguar-1.0.7-src.tar.bz2 255401
diff --git a/games-emulation/virtualjaguar/files/virtualjaguar b/games-emulation/virtualjaguar/files/virtualjaguar
index 006935bacd31..9d0243be0818 100644
--- a/games-emulation/virtualjaguar/files/virtualjaguar
+++ b/games-emulation/virtualjaguar/files/virtualjaguar
@@ -3,7 +3,7 @@
 # Script for launching virtualjaguar 
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/virtualjaguar/files/virtualjaguar,v 1.3 2004/07/14 22:14:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/virtualjaguar/files/virtualjaguar,v 1.4 2004/12/12 06:49:55 mr_bones_ Exp $
 
 source /sbin/functions.sh
 
@@ -17,6 +17,10 @@ if [ ! -d ~/.vj/eeproms ] ; then
     mkdir -p ~/.vj/eeproms
 fi
 
+if [ ! -d ~/.vj/ROMs ] ; then
+    mkdir -p ~/.vj/ROMs
+fi
+
 cd ~/.vj
 
 # check for bios
@@ -29,4 +33,4 @@ if [ -z "`cd ./bios && ls`" ] ; then
 fi
 
 # execute program (with args)
-exec /usr/games/bin/vj "$@"
+exec GENTOODIR/vj "$@"
diff --git a/games-emulation/virtualjaguar/virtualjaguar-1.0.5.ebuild b/games-emulation/virtualjaguar/virtualjaguar-1.0.5.ebuild
deleted file mode 100644
index cd29c5be045a..000000000000
--- a/games-emulation/virtualjaguar/virtualjaguar-1.0.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/virtualjaguar/virtualjaguar-1.0.5.ebuild,v 1.4 2004/06/24 22:37:01 agriffis Exp $
-
-inherit games
-
-S="${WORKDIR}/${P}-src"
-DESCRIPTION="an Atari Jaguar emulator"
-HOMEPAGE="http://www.icculus.org/virtualjaguar/"
-SRC_URI="http://www.icculus.org/virtualjaguar/tarballs/${P}-src.tbz"
-
-LICENSE="GPL-2"
-KEYWORDS="x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=media-libs/libsdl-1.2.5
-	>=sys-libs/zlib-1.1.4"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	bzip2 -dc ${DISTDIR}/${A} | tar -xf -
-	cd ${S}
-
-	sed -i \
-		-e "s:-O3:${CFLAGS}:" Makefile.unix || \
-			die "sed Makefile.unix failed"
-}
-
-src_compile() {
-	emake -j1 -f Makefile.unix
-}
-
-src_install() {
-	dogamesbin vj
-	dogamesbin ${FILESDIR}/virtualjaguar
-	dodoc INSTALL docs/{README,TODO,WHATSNEW}
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	einfo "Please run virtualjaguar to create the necessary directories"
-	einfo "in your home directory.  After that you man place ROM files"
-	einfo "in ~/.vj and they will be detected when you run virtualjaguar."
-	einfo "You may then select which ROM to run from inside the emulator."
-}
diff --git a/games-emulation/virtualjaguar/virtualjaguar-1.0.6.ebuild b/games-emulation/virtualjaguar/virtualjaguar-1.0.6.ebuild
index bd6cc96f8a35..aa42e7c4db46 100644
--- a/games-emulation/virtualjaguar/virtualjaguar-1.0.6.ebuild
+++ b/games-emulation/virtualjaguar/virtualjaguar-1.0.6.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/virtualjaguar/virtualjaguar-1.0.6.ebuild,v 1.5 2004/06/24 22:37:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/virtualjaguar/virtualjaguar-1.0.6.ebuild,v 1.6 2004/12/12 06:49:55 mr_bones_ Exp $
 
 inherit eutils games
 
-S="${WORKDIR}/${P}-src"
 DESCRIPTION="an Atari Jaguar emulator"
 HOMEPAGE="http://www.icculus.org/virtualjaguar/"
 SRC_URI="http://www.icculus.org/virtualjaguar/tarballs/${P}-src.tar.bz2"
@@ -19,14 +18,22 @@ RDEPEND=">=media-libs/libsdl-1.2.5
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
+S="${WORKDIR}/${P}-src"
+
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
+
+	sed -i \
+		-e "s:-O3:${CFLAGS}:" Makefile.unix \
+		|| die "sed Makefile.unix failed"
+	epatch "${FILESDIR}/gcc331.patch"
+	cp "${FILESDIR}/virtualjaguar" "${T}" || die "cp failed"
 
 	sed -i \
-		-e "s:-O3:${CFLAGS}:" Makefile.unix || \
-			die "sed Makefile.unix failed"
-	epatch ${FILESDIR}/gcc331.patch
+		-e "s:GENTOODIR:${GAMES_BINDIR}:" \
+		"${T}/virtualjaguar" \
+		|| die "sed failed"
 }
 
 src_compile() {
@@ -34,8 +41,7 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin vj
-	dogamesbin ${FILESDIR}/virtualjaguar
+	dogamesbin vj "${T}/virtualjaguar" || die "dogamesbin failed"
 	dodoc INSTALL docs/{README,TODO,WHATSNEW}
 	prepgamesdirs
 }
diff --git a/games-emulation/virtualjaguar/virtualjaguar-1.0.7.ebuild b/games-emulation/virtualjaguar/virtualjaguar-1.0.7.ebuild
new file mode 100644
index 000000000000..20796cec3305
--- /dev/null
+++ b/games-emulation/virtualjaguar/virtualjaguar-1.0.7.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/virtualjaguar/virtualjaguar-1.0.7.ebuild,v 1.1 2004/12/12 06:49:55 mr_bones_ Exp $
+
+inherit eutils toolchain-funcs games
+
+DESCRIPTION="an Atari Jaguar emulator"
+HOMEPAGE="http://www.icculus.org/virtualjaguar/"
+SRC_URI="http://www.icculus.org/virtualjaguar/tarballs/${P}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc"
+IUSE=""
+
+DEPEND="virtual/opengl
+	>=media-libs/libsdl-1.2.5
+	>=sys-libs/zlib-1.1.4"
+
+S="${WORKDIR}/${P}-src"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e '/^CC/d' \
+		-e "/^LD\b/s:=.*:=$(tc-getCXX):" \
+		-e 's:-O2:$(ECFLAGS):' Makefile \
+		|| die "sed Makefile failed"
+	mkdir obj || die "mkdir failed" # silly makefile
+
+	epatch "${FILESDIR}/${PV}-cdintf_linux.patch"
+
+	cp "${FILESDIR}/virtualjaguar" "${T}" || die "cp failed"
+
+	sed -i \
+		-e "s:GENTOODIR:${GAMES_BINDIR}:" \
+		"${T}/virtualjaguar" \
+		|| die "sed failed"
+}
+
+src_compile() {
+	export ECFLAGS="${CFLAGS}" \
+		SYSTYPE=__GCCUNIX__ \
+		GLLIB=-lGL \
+		SDLLIBTYPE=--libs
+	emake obj/m68kops.h || die # silly makefile
+	emake || die "emake failed"
+}
+
+src_install() {
+	dogamesbin vj "${T}/virtualjaguar" || die "dogamebin failed"
+	dodoc INSTALL docs/{README,TODO,WHATSNEW}
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	einfo "Please run ${PN} to create the necessary directories"
+	einfo "in your home directory.  After that you may place ROM files"
+	einfo "in ~/.vj/ROMs and they will be detected when you run virtualjaguar."
+	einfo "You may then select which ROM to run from inside the emulator."
+	echo
+	einfo "If you have previously run a version of ${PV} please note that"
+	einfo "the location of the ROMs has changed."
+}