tidy; add use deps; fix some compile warnings

Package-Manager: portage-2.1.8.3/cvs/Linux i686

5 files changed, 92 insertions, 26 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/Manifest b/games-emulation/virtualjaguar/Manifest
index 5b60676f86ee..ac0a838919e8 100644
--- a/games-emulation/virtualjaguar/Manifest
+++ b/games-emulation/virtualjaguar/Manifest
@@ -1,7 +1,9 @@
 AUX 1.0.7-cdintf_linux.patch 236 RMD160 5787e8497c93cf1e0b4513959d463b05b1b6a6b8 SHA1 cbec3199e2728c13525d4a770b603baefc34ce11 SHA256 60701b2729d87c1337c75a9ad72b77ddf386ff408d28c682bf7f5a8a9a9ec9f0
 AUX virtualjaguar 819 RMD160 34c071ab68b1ef26ba1b804dcc6002727e2a04e5 SHA1 0f12393c82468cbe88f5fe8425776695360999b1 SHA256 28f00cc287b384d9ba66a836f4f3a9733f0d68e01998cd4a80743d39e5b3bff3
+AUX virtualjaguar-1.0.7-array.patch 778 RMD160 e86f930380807ea6dccceb9d8049dbc97d4bafed SHA1 a3bd33d93c6133e4f316aaa43d780c078ccfdfd7 SHA256 3a3e22dea63c8ecbc2175999d9c94623ddedabce2da7637697091516ec7394ed
 AUX virtualjaguar-1.0.7-gcc43.patch 285 RMD160 0250632f1ce11688181c49f97ff918e94ec044a0 SHA1 725532f1c75b2ecc5bfbe1b1e1caf4b6277e829f SHA256 22a2eb8a906912729e982e0cb79db45c1c0b85a766a123cd12e79c57de4d71d9
+AUX virtualjaguar-1.0.7-makefile.patch 1577 RMD160 4bccab9c8224e523119790960a0c165ca1f0e4ca SHA1 9241dbbfafbd6cb82f5e7ad19890f4e87ca0c434 SHA256 a87d2decbf519d933b18131e05ad31dfa038542d51e788036b7e3ef6ccee0972
 DIST virtualjaguar-1.0.7-src.tar.bz2 255401 RMD160 c923657f97b6467fdb458d7ca68bcc61f80a5a18 SHA1 7c3426f4bb2510e79f3a629e566c049709187b07 SHA256 31309ffb2776df880729ef0ba69f973d54712ce94a0d66c1eddac375bbd365c0
-EBUILD virtualjaguar-1.0.7.ebuild 1811 RMD160 0c4a75fb5101fc782d7b7d6ec6e9ba8a3bb67228 SHA1 93db8e63e6b79ceb3f66fe4967c9aad4f06eddf1 SHA256 9ad3fdfb1136ed1378e2ee65cfefd603d4c7dd422946ba7e221c23fd810e0453
-MISC ChangeLog 2046 RMD160 cfdbfb6c8e4d5eca20f1c95166870b6aab597ce9 SHA1 d7dcd094776c169a028f58ecb1be06d98a293da0 SHA256 579003a7675e1225a8d1877c84508e092414414dfb87f2fbecc0d24922250c5b
+EBUILD virtualjaguar-1.0.7.ebuild 1645 RMD160 6a5746d6713dc42654a2e4366bad0a3f3acf5123 SHA1 96293e38f4f01b089bef642e1c33c93b919a2794 SHA256 cdc89cfae022b6e60bbc6f7ad59ba7d15864b6da72534e51837158afd461d5a7
+MISC ChangeLog 2268 RMD160 d8d58309d82de07ac989a203b52c2de52e76fd59 SHA1 1cf6d9e29a06040949a7235fbeb46931c35e7e33 SHA256 f941bfaabbcbfafb9d71661785ef79d81a45f1e261b26ee81438414af20909eb
 MISC metadata.xml 325 RMD160 379b7c0d9904bf3cecd39172bbfdfa700904e85b SHA1 3911693b64b01f599e0e6a31cdb4d26897ad8067 SHA256 e463174ec5fbe97c9081552d17e71c466132640cddd3d998212d253af5349ac1
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"
 }