tidy; add use deps; fix some compile warnings

(Portage version: 2.1.8.3/cvs/Linux i686)

4 files changed, 88 insertions, 24 deletions

diff --git a/games-emulation/virtualjaguar/ChangeLog b/games-emulation/virtualjaguar/ChangeLog
index 8aff95eba2f2..74cc1f3e1159 100644
--- a/games-emulation/virtualjaguar/ChangeLog
+++ b/games-emulation/virtualjaguar/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/virtualjaguar
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/virtualjaguar/ChangeLog,v 1.13 2010/09/30 15:54:06 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/virtualjaguar/ChangeLog,v 1.14 2010/10/13 17:55:20 mr_bones_ Exp $
+
+  13 Oct 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  virtualjaguar-1.0.7.ebuild, +files/virtualjaguar-1.0.7-array.patch,
+  +files/virtualjaguar-1.0.7-makefile.patch:
+  tidy; add use deps; fix some compile warnings
 
   30 Sep 2010; Tupone Alfredo <tupone@gentoo.org>
   virtualjaguar-1.0.7.ebuild:
diff --git a/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-array.patch b/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-array.patch
new file mode 100644
index 000000000000..1ebf07a78f4d
--- /dev/null
+++ b/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-array.patch
@@ -0,0 +1,17 @@
+--- virtualjaguar-1.0.7-src/src/m68k_in.c.orig	2010-10-13 13:46:25.248611132 -0400
++++ virtualjaguar-1.0.7-src/src/m68k_in.c	2010-10-13 13:47:09.783059297 -0400
+@@ -193,10 +193,11 @@
+ 			{

+ 				instr = ostruct->match | (i << 9) | j;

+ 				m68ki_instruction_jump_table[instr] = ostruct->opcode_handler;

+-				for(k=0;k<NUM_CPU_TYPES;k++)

++				for(k=0;k<NUM_CPU_TYPES;k++) {

+ 					m68ki_cycles[k][instr] = ostruct->cycles[k];

+-				if((instr & 0xf000) == 0xe000 && (!(instr & 0x20)))

+-					m68ki_cycles[0][instr] = m68ki_cycles[1][instr] = ostruct->cycles[k] + ((((j-1)&7)+1)<<1);

++					if((instr & 0xf000) == 0xe000 && (!(instr & 0x20)))

++						m68ki_cycles[0][instr] = m68ki_cycles[1][instr] = ostruct->cycles[k] + ((((j-1)&7)+1)<<1);

++				}

+ 			}

+ 		}

+ 		ostruct++;

diff --git a/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-makefile.patch b/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-makefile.patch
new file mode 100644
index 000000000000..996767e5b43d
--- /dev/null
+++ b/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-makefile.patch
@@ -0,0 +1,50 @@
+diff -ru virtualjaguar-1.0.7-src.orig/Makefile virtualjaguar-1.0.7-src/Makefile
+--- virtualjaguar-1.0.7-src.orig/Makefile	2004-04-18 18:09:14.000000000 -0400
++++ virtualjaguar-1.0.7-src/Makefile	2010-10-13 13:09:31.889211820 -0400
+@@ -6,23 +6,18 @@
+ # easier for the maintainers. :-)

+ #

+ 

+-CC         = gcc

+-LD         = gcc

+ TARGET     = vj$(EXESUFFIX)

+ 

+ # Note that we use optimization level 2 instead of 3--3 doesn't seem to gain much over 2

+-CFLAGS = -Wall -Wno-switch -Wno-non-virtual-dtor -O2 -D$(SYSTYPE) \

+-		-ffast-math -fomit-frame-pointer `sdl-config --cflags`

+-#		-fomit-frame-pointer `sdl-config --cflags` -g

+-#		-fomit-frame-pointer `sdl-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES

+-

+-LDFLAGS =

++CFLAGS += -Wall -Wno-switch -D$(SYSTYPE) `sdl-config --cflags`

++CXXFLAGS += -Wall -Wno-switch -Wno-non-virtual-dtor -D$(SYSTYPE) `sdl-config --cflags`

+ 

+ LIBS = -L/usr/local/lib -L/usr/lib `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB)

+ 

+ INCS = -I. -Isrc -Isrc/include -I/usr/local/include -I/usr/include

+ 

+ THECC = $(CC) $(CFLAGS) $(INCS)

++THECXX = $(CXX) $(CXXFLAGS) $(INCS)

+ 

+ OBJS = \

+ 	obj/anajoy.o \

+@@ -70,16 +65,16 @@
+ 	$(THECC) -c $< -o $@

+ 

+ obj/%.o: src/%.cpp src/include/%.h

+-	$(THECC) -c $< -o $@

++	$(THECXX) -c $< -o $@

+ 

+ obj/%.o: src/%.c

+ 	$(THECC) -c $< -o $@

+ 

+ obj/%.o: src/%.cpp

+-	$(THECC) -c $< -o $@

++	$(THECXX) -c $< -o $@

+ 

+ $(TARGET): $(OBJS)

+-	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)

++	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)

+ #	strip --strip-all vj$(EXESUFFIX)

+ #	upx -9 vj$(EXESUFFIX)

+ 

diff --git a/games-emulation/virtualjaguar/virtualjaguar-1.0.7.ebuild b/games-emulation/virtualjaguar/virtualjaguar-1.0.7.ebuild
index eaac4b3c5cbc..0c8be5b631c8 100644
--- a/games-emulation/virtualjaguar/virtualjaguar-1.0.7.ebuild
+++ b/games-emulation/virtualjaguar/virtualjaguar-1.0.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 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.6 2010/09/30 15:54:06 tupone Exp $
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/virtualjaguar/virtualjaguar-1.0.7.ebuild,v 1.7 2010/10/13 17:55:20 mr_bones_ Exp $
 
-inherit eutils toolchain-funcs games
+EAPI=2
+inherit eutils games
 
 DESCRIPTION="an Atari Jaguar emulator"
 HOMEPAGE="http://www.icculus.org/virtualjaguar/"
@@ -15,36 +15,28 @@ KEYWORDS="~ppc x86"
 IUSE=""
 
 DEPEND="virtual/opengl
-	media-libs/libsdl"
+	media-libs/libsdl[audio,joystick,opengl,video]"
 
 S=${WORKDIR}/${P}-src
 
 src_prepare() {
-	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
-
+	mkdir obj || die
 	edos2unix src/sdlemu_config.cpp
-	epatch "${FILESDIR}/${PV}-cdintf_linux.patch" \
-		"${FILESDIR}"/${P}-gcc43.patch
-
-	cp "${FILESDIR}/virtualjaguar" "${T}" || die "cp failed"
-
-	sed -i \
-		-e "s:GENTOODIR:${GAMES_BINDIR}:" \
-		"${T}/virtualjaguar" \
-		|| die "sed failed"
+	epatch \
+		"${FILESDIR}"/${PV}-cdintf_linux.patch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-makefile.patch \
+		"${FILESDIR}"/${P}-array.patch
+
+	sed -e "s:GENTOODIR:${GAMES_BINDIR}:" \
+		"${FILESDIR}/virtualjaguar" > "${T}/virtualjaguar" || die
 }
 
 src_compile() {
-	export ECFLAGS="${CFLAGS}" \
-		SYSTYPE=__GCCUNIX__ \
+	export SYSTYPE=__GCCUNIX__ \
 		GLLIB=-lGL \
 		SDLLIBTYPE=--libs
-	emake obj/m68kops.h || die # silly makefile
+	emake obj/m68kops.h || die
 	emake LDFLAGS="${LDFLAGS}" || die "emake failed"
 }