rm old revisions

Package-Manager: portage-2.1.2.3

9 files changed, 25 insertions, 365 deletions

diff --git a/games-emulation/mupen64/Manifest b/games-emulation/mupen64/Manifest
index da7666be6a8b..477e7d682b90 100644
--- a/games-emulation/mupen64/Manifest
+++ b/games-emulation/mupen64/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mupen64-0.5-anisotropic.patch 5322 RMD160 7e3f27579118cf925611c8d2e892b2bc44a28ce3 SHA1 5af8d04739293e328c4de0e15fed0317d0427d57 SHA256 348b4dd68cd8408cec0f4293b9a0a6079098044029a20536561048c326c36c33
 MD5 6699bb75844089112962119f37641928 files/mupen64-0.5-anisotropic.patch 5322
 RMD160 7e3f27579118cf925611c8d2e892b2bc44a28ce3 files/mupen64-0.5-anisotropic.patch 5322
@@ -6,14 +9,6 @@ AUX mupen64-0.5-gentoo3.patch 9728 RMD160 97777a87ebf3f41391e46c1b5d9c685cbf455d
 MD5 4f9049dc56c46096e3ef5149884aed6d files/mupen64-0.5-gentoo3.patch 9728
 RMD160 97777a87ebf3f41391e46c1b5d9c685cbf455d90 files/mupen64-0.5-gentoo3.patch 9728
 SHA256 40134e02ddd5abf8fcfa6d62a63d14f059e8eafc76edea565d3d75458baa46d8 files/mupen64-0.5-gentoo3.patch 9728
-AUX mupen64-0.5-paths.patch 3364 RMD160 5bb3d1480b57a39c72f738ab95bd41220c0a20a9 SHA1 1a5710ece08b3d50fdc3b765844abc1fda9bbb96 SHA256 d712ed85c1db3b27cf19edf8ca308c4f839273bcbb40fc1f61e05031556a7026
-MD5 9d1f4aa5017f9c174204b7241fcb2abb files/mupen64-0.5-paths.patch 3364
-RMD160 5bb3d1480b57a39c72f738ab95bd41220c0a20a9 files/mupen64-0.5-paths.patch 3364
-SHA256 d712ed85c1db3b27cf19edf8ca308c4f839273bcbb40fc1f61e05031556a7026 files/mupen64-0.5-paths.patch 3364
-AUX mupen64-0.5-sdl-ttf.patch 1036 RMD160 67a6a8f27b5a5b6d1bdf8997004bc4565add893f SHA1 3dc703d54c7ac7ea891b4b8ca81cff80af92f2e5 SHA256 5dfc12b60b2068eb4a6c299e9a3bf4f5a419510bd3c16100b425b85829fea355
-MD5 2f740d9ff20f547c6dfcd0c4dc22ac17 files/mupen64-0.5-sdl-ttf.patch 1036
-RMD160 67a6a8f27b5a5b6d1bdf8997004bc4565add893f files/mupen64-0.5-sdl-ttf.patch 1036
-SHA256 5dfc12b60b2068eb4a6c299e9a3bf4f5a419510bd3c16100b425b85829fea355 files/mupen64-0.5-sdl-ttf.patch 1036
 AUX mupen64-glN64-noasmfix.patch 434 RMD160 ad05e4ec5b2be7e6cd62d9ed6bbf6ff0f53a0b7f SHA1 fca5d07a155a77d65348e29d98d9383a1f8a5510 SHA256 5efc2720f222bdd1cb8980633719d653c31ad8ca892cd785906b316ceca49a40
 MD5 b0c33e3753683fb114b88170723aad42 files/mupen64-glN64-noasmfix.patch 434
 RMD160 ad05e4ec5b2be7e6cd62d9ed6bbf6ff0f53a0b7f files/mupen64-glN64-noasmfix.patch 434
@@ -23,32 +18,25 @@ MD5 e0727b9a7c6d622eb66ecd5ea6d4ab1e files/mupen64-glN64-ucode.patch 3343
 RMD160 1a9070c59b56e89579f0695d3da5503f80f5cd71 files/mupen64-glN64-ucode.patch 3343
 SHA256 e54108cddf3e92f863e672e458b9bf776cbce672a34eee367032fcbd9ec5a9d5 files/mupen64-glN64-ucode.patch 3343
 DIST mupen64_src-0.5.tar.bz2 1981046 RMD160 da916bc77f2f06ed92630332545dc3ee5ae1ff51 SHA1 fe1c9999fca780f2f8243d36ea7d8c42eca5659b SHA256 1b8e4188ab7a94d8125b77aed8725ee348c24818622b881adfe16be510487dfd
-EBUILD mupen64-0.5-r2.ebuild 2315 RMD160 9db192afa0a5a19b54e63cbc80cbafc39877718e SHA1 cc06c12d1c5fbef6408b0b2dc30f92fec4fd87db SHA256 7b2f95ead8bc3f1399556df3bbf4d0b252ff35916a317efae205a781d8c38ece
-MD5 4e95fc3a6c93c1f2a30adafe163b90aa mupen64-0.5-r2.ebuild 2315
-RMD160 9db192afa0a5a19b54e63cbc80cbafc39877718e mupen64-0.5-r2.ebuild 2315
-SHA256 7b2f95ead8bc3f1399556df3bbf4d0b252ff35916a317efae205a781d8c38ece mupen64-0.5-r2.ebuild 2315
-EBUILD mupen64-0.5-r3.ebuild 2153 RMD160 f3c4d4ed79e70dda8f3eb95a7a20743d6620a631 SHA1 bf68a859cbda87f089570a5489f2554365334d18 SHA256 1faae6ea271ce1ddca3b5f11ad618ecc95c0c9b341154b333451c2fe7668cbb4
-MD5 beb26ec2933f73f52f3027d426c2e960 mupen64-0.5-r3.ebuild 2153
-RMD160 f3c4d4ed79e70dda8f3eb95a7a20743d6620a631 mupen64-0.5-r3.ebuild 2153
-SHA256 1faae6ea271ce1ddca3b5f11ad618ecc95c0c9b341154b333451c2fe7668cbb4 mupen64-0.5-r3.ebuild 2153
-EBUILD mupen64-0.5-r4.ebuild 2240 RMD160 365fedbc16e8c9a036424649f8906fe8d25862bd SHA1 54f35f789d21f5a26a68de583d92db4771dfe70e SHA256 a1f7d17e2438177182983c7af83b37bb3dbe5199b9908b0dd0b84dc5c1f491f9
-MD5 c643c0c046fea5e40adbd4148d520f09 mupen64-0.5-r4.ebuild 2240
-RMD160 365fedbc16e8c9a036424649f8906fe8d25862bd mupen64-0.5-r4.ebuild 2240
-SHA256 a1f7d17e2438177182983c7af83b37bb3dbe5199b9908b0dd0b84dc5c1f491f9 mupen64-0.5-r4.ebuild 2240
+EBUILD mupen64-0.5-r4.ebuild 2130 RMD160 0fa7b3b6889ce51e17f0b9d70caf30c6adf791e2 SHA1 2b10eb4d5b78c54b3126f80bc531b80253b8608e SHA256 5e6e149d834f5f51c4bff748e11e8de555b84078e467edd4d11f4e866e012c7b
+MD5 c39382be83f65387549981061782372a mupen64-0.5-r4.ebuild 2130
+RMD160 0fa7b3b6889ce51e17f0b9d70caf30c6adf791e2 mupen64-0.5-r4.ebuild 2130
+SHA256 5e6e149d834f5f51c4bff748e11e8de555b84078e467edd4d11f4e866e012c7b mupen64-0.5-r4.ebuild 2130
 MISC ChangeLog 4746 RMD160 e24ee40b8da01e72cdc969449cc81a6c8fe1308b SHA1 958069a26c536e66e5465a095cc03f0f21f885be SHA256 29bff17d341a2488e4ff228364eb63a8fdef4441f7af5e23549c7508d2cac342
 MD5 3e297af7d7c20d9025ebc898a11aeb02 ChangeLog 4746
 RMD160 e24ee40b8da01e72cdc969449cc81a6c8fe1308b ChangeLog 4746
 SHA256 29bff17d341a2488e4ff228364eb63a8fdef4441f7af5e23549c7508d2cac342 ChangeLog 4746
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
-SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 0cdd256b3d2df86cac038aa9d538aedf files/digest-mupen64-0.5-r2 253
-RMD160 f626935bb3e16eb360edde7e315583121ad7652c files/digest-mupen64-0.5-r2 253
-SHA256 d3dbd70b6d9bca726be6e4b697f985cd7a83e1bd494f7074e11052da1f3b07d9 files/digest-mupen64-0.5-r2 253
-MD5 0cdd256b3d2df86cac038aa9d538aedf files/digest-mupen64-0.5-r3 253
-RMD160 f626935bb3e16eb360edde7e315583121ad7652c files/digest-mupen64-0.5-r3 253
-SHA256 d3dbd70b6d9bca726be6e4b697f985cd7a83e1bd494f7074e11052da1f3b07d9 files/digest-mupen64-0.5-r3 253
+MISC metadata.xml 251 RMD160 34b81b2f432154df8884235405a1ee197c99341d SHA1 6fe636d53a3c5939cca378223f1eb653976e5663 SHA256 e2b320a1c73bb9401f423703e2320fb4d80aeca04cb6cb4bb13584b0b6740043
+MD5 f5546c1006097671a46b1b8c9135c766 metadata.xml 251
+RMD160 34b81b2f432154df8884235405a1ee197c99341d metadata.xml 251
+SHA256 e2b320a1c73bb9401f423703e2320fb4d80aeca04cb6cb4bb13584b0b6740043 metadata.xml 251
 MD5 0cdd256b3d2df86cac038aa9d538aedf files/digest-mupen64-0.5-r4 253
 RMD160 f626935bb3e16eb360edde7e315583121ad7652c files/digest-mupen64-0.5-r4 253
 SHA256 d3dbd70b6d9bca726be6e4b697f985cd7a83e1bd494f7074e11052da1f3b07d9 files/digest-mupen64-0.5-r4 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGESAUdz7hIScOURERAsZdAKDnBHN63PLC5iNi48LOqUkmY+CSyQCdEroL
+eDCWuKkGKoZwjU2GEIvoc5Y=
+=RIpI
+-----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64/files/digest-mupen64-0.5-r2 b/games-emulation/mupen64/files/digest-mupen64-0.5-r2
deleted file mode 100644
index f5e4ac023a01..000000000000
--- a/games-emulation/mupen64/files/digest-mupen64-0.5-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 11f994bed40e00fad5b82333b553e421 mupen64_src-0.5.tar.bz2 1981046
-RMD160 da916bc77f2f06ed92630332545dc3ee5ae1ff51 mupen64_src-0.5.tar.bz2 1981046
-SHA256 1b8e4188ab7a94d8125b77aed8725ee348c24818622b881adfe16be510487dfd mupen64_src-0.5.tar.bz2 1981046
diff --git a/games-emulation/mupen64/files/digest-mupen64-0.5-r3 b/games-emulation/mupen64/files/digest-mupen64-0.5-r3
deleted file mode 100644
index f5e4ac023a01..000000000000
--- a/games-emulation/mupen64/files/digest-mupen64-0.5-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 11f994bed40e00fad5b82333b553e421 mupen64_src-0.5.tar.bz2 1981046
-RMD160 da916bc77f2f06ed92630332545dc3ee5ae1ff51 mupen64_src-0.5.tar.bz2 1981046
-SHA256 1b8e4188ab7a94d8125b77aed8725ee348c24818622b881adfe16be510487dfd mupen64_src-0.5.tar.bz2 1981046
diff --git a/games-emulation/mupen64/files/mupen64-0.5-paths.patch b/games-emulation/mupen64/files/mupen64-0.5-paths.patch
deleted file mode 100644
index f6bd21fcdaa4..000000000000
--- a/games-emulation/mupen64/files/mupen64-0.5-paths.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- main/gui_gtk/main_gtk.c
-+++ main/gui_gtk/main_gtk.c
-@@ -1881,7 +1881,7 @@
- 	     unsigned char byte;
- 	     dest = fopen(temp, "wb");
- 	     strcpy(orig, WITH_HOME);
--	     strcat(orig, "share/mupen64/mupen64.ini");
-+	     strcat(orig, "lib/mupen64/mupen64.ini");
- 	     src = fopen(orig, "rb");
- 	     while(fread(&byte, 1, 1, src))
- 	       fwrite(&byte, 1, 1, dest);
-@@ -1893,7 +1893,7 @@
- 	strcpy(temp, g_WorkingDir);
- 	strcat(temp, "lang");
- 	strcpy(orig, WITH_HOME);
--	strcat(orig, "share/mupen64/lang");
-+	strcat(orig, "lib/mupen64/lang");
- 	symlink(orig, temp);
- 	
- 	/*strcpy(temp, g_WorkingDir);
-@@ -1906,14 +1906,14 @@
- 	strcat(temp, "plugins");
- 	mkdir(temp, 0700);
- 	strcpy(orig, WITH_HOME);
--	strcat(orig, "share/mupen64/plugins");
-+	strcat(orig, "lib/mupen64/plugins");
- 	dir = opendir(orig);
- 	while((entry = readdir(dir)) != NULL)
- 	  {
- 	     if(strcmp(entry->d_name + strlen(entry->d_name) - 3, ".so"))
- 	       {
- 		  strcpy(orig, WITH_HOME);
--		  strcat(orig, "share/mupen64/plugins/");
-+		  strcat(orig, "lib/mupen64/plugins/");
- 		  strcat(orig, entry->d_name);
- 		  src = fopen(orig, "rb");
- 		  if(src == NULL) continue;
-@@ -1939,7 +1939,7 @@
- 		  strcat(temp, "plugins/");
- 		  strcat(temp, entry->d_name);
- 		  strcpy(orig, WITH_HOME);
--		  strcat(orig, "share/mupen64/plugins/");
-+		  strcat(orig, "lib/mupen64/plugins/");
- 		  strcat(orig, entry->d_name);
- 		  symlink(orig, temp);
- 	       }
---- main/main.c
-+++ main/main.c
-@@ -37,6 +37,8 @@
- 
- #include <stdlib.h>
- #include <unistd.h>
-+#include <dirent.h>
-+#include <sys/stat.h>
- 
- #include "main.h"
- #include "guifuncs.h"
-@@ -263,7 +265,7 @@
- 	     unsigned char byte;
- 	     dest = fopen(temp, "wb");
- 	     strcpy(orig, WITH_HOME);
--	     strcat(orig, "share/mupen64/mupen64.ini");
-+	     strcat(orig, "lib/mupen64/mupen64.ini");
- 	     src = fopen(orig, "rb");
- 	     while(fread(&byte, 1, 1, src))
- 	       fwrite(&byte, 1, 1, dest);
-@@ -275,7 +277,7 @@
- 	strcpy(temp, g_WorkingDir);
- 	strcat(temp, "lang");
- 	strcpy(orig, WITH_HOME);
--	strcat(orig, "share/mupen64/lang");
-+	strcat(orig, "lib/mupen64/lang");
- 	symlink(orig, temp);
- 	
- 	/*strcpy(temp, g_WorkingDir);
-@@ -288,14 +290,14 @@
- 	strcat(temp, "plugins");
- 	mkdir(temp, 0700);
- 	strcpy(orig, WITH_HOME);
--	strcat(orig, "share/mupen64/plugins");
-+	strcat(orig, "lib/mupen64/plugins");
- 	dir = opendir(orig);
- 	while((entry = readdir(dir)) != NULL)
- 	  {
- 	     if(strcmp(entry->d_name + strlen(entry->d_name) - 3, ".so"))
- 	       {
- 		  strcpy(orig, WITH_HOME);
--		  strcat(orig, "share/mupen64/plugins/");
-+		  strcat(orig, "lib/mupen64/plugins/");
- 		  strcat(orig, entry->d_name);
- 		  src = fopen(orig, "rb");
- 		  if(src == NULL) continue;
-@@ -321,7 +323,7 @@
- 		  strcat(temp, "plugins/");
- 		  strcat(temp, entry->d_name);
- 		  strcpy(orig, WITH_HOME);
--		  strcat(orig, "share/mupen64/plugins/");
-+		  strcat(orig, "lib/mupen64/plugins/");
- 		  strcat(orig, entry->d_name);
- 		  symlink(orig, temp);
- 	       }
---- Makefile
-+++ Makefile
-@@ -166,7 +166,7 @@
- endif
- 
- PREFIX		=$(shell grep WITH_HOME config.h | cut -d '"' -f 2)
--SHARE		="$(PREFIX)share/mupen64/"
-+SHARE		="$(PREFIX)lib/mupen64/"
- 
- PLUGINS		=plugins/mupen64_input.so plugins/blight_input.so plugins/mupen64_hle_rsp_azimer.so plugins/dummyaudio.so plugins/mupen64_audio.so plugins/jttl_audio.so plugins/mupen64_soft_gfx.so plugins/glN64.so
- 
diff --git a/games-emulation/mupen64/files/mupen64-0.5-sdl-ttf.patch b/games-emulation/mupen64/files/mupen64-0.5-sdl-ttf.patch
deleted file mode 100644
index a8d599d385c7..000000000000
--- a/games-emulation/mupen64/files/mupen64-0.5-sdl-ttf.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -80,7 +80,6 @@
- OBJ_INPUT	=mupen64_input/main.o
- 
- OBJ_BLIGHT	=blight_input/plugin.o \
--		blight_input/SDL_ttf.o \
- 		blight_input/arial.ttf.o \
- 		blight_input/configdialog_sdl.o \
- 		blight_input/pad.o
-@@ -223,8 +222,6 @@
- blight_input/plugin.o:		blight_input/plugin.c
- 				$(CC) $(CFLAGS) "-DPACKAGE=\"$(shell grep PACKAGE blight_input/package | cut -d "=" -f 2)\"" "-DVERSION=\"$(shell grep VERSION blight_input/package | cut -d "=" -f 2)\"" `sdl-config --cflags` -DGUI_SDL -c -o $@ $<
- 
--blight_input/SDL_ttf.o:		blight_input/SDL_ttf.c
--				$(CC) $(CFLAGS) `freetype-config --cflags` `sdl-config --cflags` -c -o $@ $<
- 
- blight_input/arial.ttf.o:	blight_input/arial.ttf.c
- 
-@@ -367,7 +364,7 @@
- 			  strip --strip-all $@
- 
- plugins/blight_input.so: $(OBJ_BLIGHT)
--			 $(CC) $^ -Wl,-Bsymbolic -shared `sdl-config --libs` `freetype-config --libs` -o $@
-+			 $(CC) $^ -Wl,-Bsymbolic -shared `sdl-config --libs` -lSDL_ttf -o $@
- 			 strip --strip-all $@
- 
- plugins/mupen64_hle_rsp_azimer.so: $(OBJ_RSPHLE)
diff --git a/games-emulation/mupen64/metadata.xml b/games-emulation/mupen64/metadata.xml
index d3c2cc926f0b..2a5c75c7fd81 100644
--- a/games-emulation/mupen64/metadata.xml
+++ b/games-emulation/mupen64/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<maintainer>
+<email>joker@gentoo.org</email>
+<name>Christian Birchinger</name>
+</maintainer>
 <herd>games</herd>
 </pkgmetadata>
diff --git a/games-emulation/mupen64/mupen64-0.5-r2.ebuild b/games-emulation/mupen64/mupen64-0.5-r2.ebuild
deleted file mode 100644
index 389cd9075528..000000000000
--- a/games-emulation/mupen64/mupen64-0.5-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.5-r2.ebuild,v 1.3 2007/02/22 09:59:30 blubb Exp $
-
-inherit eutils multilib games
-
-MY_P=${PN}_src-${PV}
-DESCRIPTION="A Nintendo 64 (N64) emulator"
-HOMEPAGE="http://mupen64.emulation64.com/"
-SRC_URI="http://mupen64.emulation64.com/files/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 x86"
-IUSE=""
-
-RDEPEND="virtual/opengl
-	>=x11-libs/gtk+-2
-	media-libs/libsdl
-	media-libs/sdl-ttf
-	amd64? (
-		app-emulation/emul-linux-x86-gtklibs
-		>=app-emulation/emul-linux-x86-sdl-10.0
-	)"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	!games-emulation/mupen64-blight-input
-	!games-emulation/mupen64-glN64
-	!games-emulation/mupen64-jttl_sound"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -f plugins/empty blight_input/SDL_ttf*
-
-	# FIXME: libdir breakage on amd64
-	epatch \
-		"${FILESDIR}"/${P}-paths.patch \
-		"${FILESDIR}"/${P}-sdl-ttf.patch
-
-	sed -i "s:#undef WITH_HOME:#define WITH_HOME \"${GAMES_PREFIX}/\":" \
-		config.h \
-		|| die "sed failed"
-
-	# FIXME: -fPIC should only be used on shared objects
-	sed -i \
-		-e '/strip/d' \
-		-e "s:CFLAGS[[:space:]]*=\(.*\):CFLAGS=-fPIC ${CFLAGS}:" \
-		-e "s:CXXFLAGS[[:space:]]*=\(.*\):CXXFLAGS=-fPIC ${CXXFLAGS}:" \
-		Makefile \
-		|| die "sed failed"
-}
-
-src_compile() {
-	use amd64 && multilib_toolchain_setup x86
-
-	local t
-	for t in \
-		mupen64 \
-		mupen64_nogui \
-		plugins/mupen64_input.so \
-		plugins/blight_input.so \
-		plugins/mupen64_hle_rsp_azimer.so \
-		plugins/dummyaudio.so \
-		plugins/mupen64_audio.so \
-		plugins/jttl_audio.so \
-		plugins/mupen64_soft_gfx.so \
-		plugins/glN64.so
-	do
-		emake ${t} || die "emake ${t} failed"
-	done
-}
-
-src_install() {
-	dogamesbin mupen64 mupen64_nogui || die "dogamesbin failed"
-
-	insinto "${GAMES_LIBDIR}"/${PN}
-	doins -r mupen64.ini jttl_audio.conf lang roms plugins || die "doins failed"
-
-	dodoc *.txt doc/readme.pdf
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	ewarn "If you are upgrading from a previous version of mupen64,"
-	ewarn "backup your saved games then run rm -rf on your"
-	ewarn ".mupen64 directory. After launching the new version, copy"
-	ewarn "your saved games to their original place."
-	echo
-}
diff --git a/games-emulation/mupen64/mupen64-0.5-r3.ebuild b/games-emulation/mupen64/mupen64-0.5-r3.ebuild
deleted file mode 100644
index eb450e56075a..000000000000
--- a/games-emulation/mupen64/mupen64-0.5-r3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.5-r3.ebuild,v 1.1 2007/03/27 15:17:01 joker Exp $
-
-inherit eutils multilib games
-
-MY_P=${PN}_src-${PV}
-DESCRIPTION="A Nintendo 64 (N64) emulator"
-HOMEPAGE="http://mupen64.emulation64.com/"
-SRC_URI="http://mupen64.emulation64.com/files/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="virtual/opengl
-	>=x11-libs/gtk+-2
-	media-libs/libsdl
-	media-libs/sdl-ttf
-	amd64? (
-		app-emulation/emul-linux-x86-gtklibs
-		>=app-emulation/emul-linux-x86-sdl-10.0
-	)"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	!games-emulation/mupen64-blight-input
-	!games-emulation/mupen64-glN64
-	!games-emulation/mupen64-jttl_sound"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	has_multilib_profile && multilib_toolchain_setup x86
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -f plugins/empty blight_input/SDL_ttf*
-
-	epatch \
-		"${FILESDIR}"/${P}-anisotropic.patch \
-		"${FILESDIR}"/${P}-gentoo3.patch
-
-	sed -i \
-		-e "s:#undef WITH_HOME:#define WITH_HOME \"$(games_get_libdir)/\":" \
-		-e "s:#undef SHARE:#define SHARE \"$(games_get_libdir)/${PN}/\":" \
-		config.h \
-		|| die "sed failed"
-}
-
-src_compile() {
-	local t
-	for t in \
-		mupen64 \
-		mupen64_nogui \
-		plugins/mupen64_input.so \
-		plugins/blight_input.so \
-		plugins/mupen64_hle_rsp_azimer.so \
-		plugins/dummyaudio.so \
-		plugins/mupen64_audio.so \
-		plugins/jttl_audio.so \
-		plugins/mupen64_soft_gfx.so \
-		plugins/glN64.so
-	do
-		emake ${t} || die "emake ${t} failed"
-	done
-}
-
-src_install() {
-	dogamesbin mupen64 mupen64_nogui || die "dogamesbin failed"
-
-	insinto "$(games_get_libdir)/${PN}"
-	doins -r mupen64.ini jttl_audio.conf lang roms plugins || die "doins failed"
-
-	dodoc *.txt doc/readme.pdf
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	ewarn "If you are upgrading from a previous version of mupen64,"
-	ewarn "backup your saved games then run rm -rf on your"
-	ewarn ".mupen64 directory. After launching the new version, copy"
-	ewarn "your saved games to their original place."
-	echo
-}
diff --git a/games-emulation/mupen64/mupen64-0.5-r4.ebuild b/games-emulation/mupen64/mupen64-0.5-r4.ebuild
index b355f75bd999..c35ad323b95d 100644
--- a/games-emulation/mupen64/mupen64-0.5-r4.ebuild
+++ b/games-emulation/mupen64/mupen64-0.5-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.5-r4.ebuild,v 1.1 2007/03/28 00:58:24 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.5-r4.ebuild,v 1.2 2007/04/02 15:23:58 nyhm Exp $
 
 inherit eutils multilib games
 
@@ -11,7 +11,7 @@ SRC_URI="http://mupen64.emulation64.com/files/${PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 IUSE=""
 
 RDEPEND="virtual/opengl
@@ -23,10 +23,7 @@ RDEPEND="virtual/opengl
 		>=app-emulation/emul-linux-x86-sdl-10.0
 	)"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	!games-emulation/mupen64-blight-input
-	!games-emulation/mupen64-glN64
-	!games-emulation/mupen64-jttl_sound"
+	dev-util/pkgconfig"
 
 S=${WORKDIR}/${MY_P}