Bump to 0.5

(Portage version: 2.0.53_rc7)

5 files changed, 217 insertions, 13 deletions

diff --git a/games-emulation/mupen64/ChangeLog b/games-emulation/mupen64/ChangeLog
index 160d2fa4e92a..06bf607dfdda 100644
--- a/games-emulation/mupen64/ChangeLog
+++ b/games-emulation/mupen64/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-emulation/mupen64
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/ChangeLog,v 1.18 2005/11/08 01:33:05 morfic Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/ChangeLog,v 1.19 2006/01/27 23:31:55 morfic Exp $
+
+*mupen64-0.5 (27 Jan 2006)
+
+  27 Jan 2006; Daniel Goller <morfic@gentoo.org>
+  +files/mupen64-gentoo.patch, +mupen64-0.5.ebuild:
+  Bump to 0.5
 
   08 Nov 2005; Daniel Goller <morfic@gentoo.org>
   -files/mupen64-gentoo-avi.patch, mupen64-0.4-r2.ebuild:
diff --git a/games-emulation/mupen64/Manifest b/games-emulation/mupen64/Manifest
index 9176f4bbd152..31fbf7337488 100644
--- a/games-emulation/mupen64/Manifest
+++ b/games-emulation/mupen64/Manifest
@@ -1,24 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 bc84826291bd32f93d21767d8101d457 ChangeLog 3338
+MD5 714ea640c08338b69c40e88ca07c3493 ChangeLog 2550
 MD5 a3e62bf537d9a02609601aa9ba76da7e metadata.xml 247
 MD5 49a7654deda668a03424e9b35090ba40 mupen64-0.4-r2.ebuild 2410
+MD5 714ea640c08338b69c40e88ca07c3493 mupen64-0.5.ebuild 2550
 MD5 e2b006764c1bac03ac2667ad60a66101 files/0.3-gcc3.patch 3662
 MD5 b21462ab51b383d28ca9d83f6531c664 files/digest-mupen64-0.4-r2 265
 MD5 a7ebb16b1b250e889d5acd49537a9ece files/mupen64 751
 MD5 f63e1260b9d35674f21fdcfff3be5c16 files/mupen64-SDL_ttf.patch 353
 MD5 72f9db08fce1cb715c16d28c11f1cf9a files/mupen64-confdir.patch 171
 MD5 e2b006764c1bac03ac2667ad60a66101 files/mupen64-gcc3.patch 3662
+MD5 57081903734e88cab155cd0c900960d4 files/digest-mupen64-0.5 69
 MD5 623f09fd7f622d43901a028d7069ac04 files/mupen64-gentoo-sdl.patch 1558
 MD5 c9949136ca13fb53bdbe8cdcf0374ead files/mupen64-gtk2-makefile.patch 4845
 MD5 8a58a3ce196f2d69b21339244722e957 files/mupen64-makefiles.patch 2052
 MD5 638046a5841774d744611e9f38751bcc files/mupen64-noasm.patch 229
 MD5 87053b50f759d8d4b65a2369fe42338a files/mupen64-rice-confdir.patch 1208
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDcABK/aM9DdBw91cRApbTAJ9TZeXzSalBKJLbXk76ig4jGfWh0wCeOyS3
-awRl6gBOlwl2vVs+GP3solw=
-=2V7I
------END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64/files/digest-mupen64-0.5 b/games-emulation/mupen64/files/digest-mupen64-0.5
new file mode 100644
index 000000000000..e1c23469858a
--- /dev/null
+++ b/games-emulation/mupen64/files/digest-mupen64-0.5
@@ -0,0 +1 @@
+MD5 11f994bed40e00fad5b82333b553e421 mupen64_src-0.5.tar.bz2 1981046
diff --git a/games-emulation/mupen64/files/mupen64-gentoo.patch b/games-emulation/mupen64/files/mupen64-gentoo.patch
new file mode 100644
index 000000000000..54e3efdb7dc1
--- /dev/null
+++ b/games-emulation/mupen64/files/mupen64-gentoo.patch
@@ -0,0 +1,125 @@
+File mupen64_src-0.5/compare_pipe is a fifo while file mupen64_src-0.5.fixed/compare_pipe is a fifo
+diff -u -r mupen64_src-0.5/main/gui_gtk/main_gtk.c mupen64_src-0.5.fixed/main/gui_gtk/main_gtk.c
+--- mupen64_src-0.5/main/gui_gtk/main_gtk.c	2005-08-26 15:08:13.000000000 -0500
++++ mupen64_src-0.5.fixed/main/gui_gtk/main_gtk.c	2005-09-09 23:00:17.000000000 -0500
+@@ -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);
+ 	       }
+diff -u -r mupen64_src-0.5/main/main.c mupen64_src-0.5.fixed/main/main.c
+--- mupen64_src-0.5/main/main.c	2005-08-26 14:52:11.000000000 -0500
++++ mupen64_src-0.5.fixed/main/main.c	2005-09-09 22:06:12.000000000 -0500
+@@ -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);
+ 	       }
+diff -u -r mupen64_src-0.5/Makefile mupen64_src-0.5.fixed/Makefile
+--- mupen64_src-0.5/Makefile	2005-08-26 14:52:13.000000000 -0500
++++ mupen64_src-0.5.fixed/Makefile	2005-09-09 22:45:40.000000000 -0500
+@@ -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
+ 
+@@ -405,7 +405,7 @@
+ 	
+ clean:
+ 	find . -name '*.o' -print0 | xargs -0r rm -f
+-	rm mupen64 mupen64_nogui mupen64_dbg plugins/mupen64_input.so blight_input/arial.ttf.c blight_input/ttftoh 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
++	rm -f mupen64 mupen64_nogui mupen64_dbg plugins/mupen64_input.so blight_input/arial.ttf.c blight_input/ttftoh 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
+ 
+ clean_o:
+ 	find . -name '*.o' -print0 | xargs -0r rm -f
diff --git a/games-emulation/mupen64/mupen64-0.5.ebuild b/games-emulation/mupen64/mupen64-0.5.ebuild
new file mode 100644
index 000000000000..5ecb15f213fc
--- /dev/null
+++ b/games-emulation/mupen64/mupen64-0.5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.5.ebuild,v 1.1 2006/01/27 23:31:55 morfic Exp $
+
+inherit eutils games
+
+DESCRIPTION="A Nintendo 64 (N64) emulator"
+HOMEPAGE="http://mupen64.emulation64.com/"
+SRC_URI="http://mupen64.emulation64.com/files/${PV}/mupen64_src-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/zlib
+	>=x11-libs/gtk+-2
+	media-libs/libsdl"
+DEPEND="${RDEPEND}
+	 dev-util/pkgconfig"
+
+S=${WORKDIR}/mupen64_src-${PV}
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${PN}-gentoo.patch"
+
+	cd "${S}"
+
+	sed -i "s:#undef WITH_HOME:#define WITH_HOME \"/usr/games/\":" config.h \
+		|| die "sed failed"
+
+	sed -i \
+		-e "s:CFLAGS.*=\(.*\):CFLAGS=-fPIC ${CFLAGS}:" \
+		-e "s:CXXFLAGS.*=\(.*\):CXXFLAGS=-fPIC ${CXXFLAGS}:" \
+		Makefile \
+		|| die "sed failed"
+}
+
+src_compile() {
+	emake mupen64 || die "emake failed on $d"
+	emake mupen64_nogui || die "emake failed"
+	emake plugins/mupen64_input.so || die "emake failed"
+	emake plugins/mupen64_hle_rsp_azimer.so || die "emake failed"
+	emake plugins/dummyaudio.so || die "emake failed"
+	emake plugins/mupen64_audio.so || die "emake failed"
+	emake plugins/mupen64_soft_gfx.so || die "emake failed"
+}
+
+src_install() {
+	local dir=${GAMES_LIBDIR}/${PN}
+
+	exeinto "${GAMES_BINDIR}"
+	doexe mupen64 || die "doexe failed"
+	doexe mupen64_nogui || die "doexe failed"
+
+	insinto "${dir}"
+	doins mupen64.ini || "doins failed"
+
+	dodir ${dir}/save
+
+	cp -r lang roms plugins "${D}/${dir}/" \
+		|| die "cp failed"
+
+	rm "${D}/${dir}/plugins/empty"
+	dodoc *.txt
+	cp doc/readme.pdf "${D}/usr/share/doc/${PF}"
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	echo
+	ewarn "If you are upgrading from previous version of mupen64"
+	ewarn "backup your saved games then do a rm -rf on your"
+	ewarn ".mupen64 directory. After launching then new mupen copy"
+	ewarn "your saved games to the original place."
+	echo
+}