old

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

6 files changed, 7 insertions, 149 deletions

diff --git a/games-emulation/virtualjaguar/ChangeLog b/games-emulation/virtualjaguar/ChangeLog
index dbb13e31c220..d6ef97bc035c 100644
--- a/games-emulation/virtualjaguar/ChangeLog
+++ b/games-emulation/virtualjaguar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-emulation/virtualjaguar
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/virtualjaguar/ChangeLog,v 1.24 2015/02/10 10:10:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/virtualjaguar/ChangeLog,v 1.25 2015/02/19 01:52:35 mr_bones_ Exp $
+
+  19 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/1.0.7-cdintf_linux.patch, -files/virtualjaguar-1.0.7-array.patch,
+  -files/virtualjaguar-1.0.7-gcc43.patch,
+  -files/virtualjaguar-1.0.7-makefile.patch, -virtualjaguar-1.0.7-r1.ebuild:
+  old
 
   10 Feb 2015; Agostino Sarubbo <ago@gentoo.org> virtualjaguar-2.1.2-r1.ebuild:
   Stable for x86, wrt bug #539144
diff --git a/games-emulation/virtualjaguar/files/1.0.7-cdintf_linux.patch b/games-emulation/virtualjaguar/files/1.0.7-cdintf_linux.patch
deleted file mode 100644
index b98f5e1ba637..000000000000
--- a/games-emulation/virtualjaguar/files/1.0.7-cdintf_linux.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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/virtualjaguar-1.0.7-array.patch b/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-array.patch
deleted file mode 100644
index 1ebf07a78f4d..000000000000
--- a/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-array.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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-gcc43.patch b/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-gcc43.patch
deleted file mode 100644
index d185f0d0c093..000000000000
--- a/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-gcc43.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/sdlemu_config.cpp.old   2009-01-20 14:38:35.000000000 +0100
-+++ src/sdlemu_config.cpp       2009-01-20 14:39:44.000000000 +0100
-@@ -18,6 +18,8 @@
-  */
-
- #include <stdio.h>
-+#include <cstring>
-+#include <cstdlib>
- #include <string>
- #include <list>
- #include "sdlemu_config.h"
-
diff --git a/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-makefile.patch b/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-makefile.patch
deleted file mode 100644
index 996767e5b43d..000000000000
--- a/games-emulation/virtualjaguar/files/virtualjaguar-1.0.7-makefile.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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-r1.ebuild b/games-emulation/virtualjaguar/virtualjaguar-1.0.7-r1.ebuild
deleted file mode 100644
index 6b7d120cef67..000000000000
--- a/games-emulation/virtualjaguar/virtualjaguar-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 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-r1.ebuild,v 1.2 2014/12/21 14:22:14 mgorny Exp $
-
-EAPI=2
-inherit eutils 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="~ppc x86"
-IUSE=""
-
-DEPEND="virtual/opengl
-	media-libs/libsdl[sound,joystick,opengl,video]
-	sys-apps/gentoo-functions"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${P}-src
-
-src_prepare() {
-	mkdir obj || die
-	edos2unix src/sdlemu_config.cpp
-	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 SYSTYPE=__GCCUNIX__ \
-		GLLIB=-lGL \
-		SDLLIBTYPE=--libs
-	emake obj/m68kops.h || die
-	emake LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dogamesbin vj "${T}/virtualjaguar" || die "dogamebin failed"
-	dodoc docs/{README,TODO,WHATSNEW}
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "Please run ${PN} to create the necessary directories"
-	elog "in your home directory.  After that you may place ROM files"
-	elog "in ~/.vj/ROMs and they will be detected when you run virtualjaguar."
-	elog "You may then select which ROM to run from inside the emulator."
-	elog
-	elog "If you have previously run a version of ${PV} please note that"
-	elog "the location of the ROMs has changed."
-}