From: Tristan Heaven <tristan@gentoo.org>
Date: Wed, 14 Feb 2007 14:27:57 +0000 (+0000)
Subject: Use external sdl-ttf, bug #166531
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e5ea15e34a0e221df36288b559b695746f06bd8e;p=gentoo.git

Use external sdl-ttf, bug #166531
Package-Manager: portage-2.1.2-r9
---

diff --git a/games-emulation/mupen64/ChangeLog b/games-emulation/mupen64/ChangeLog
index d9d68566f604..c8e9aacd8221 100644
--- a/games-emulation/mupen64/ChangeLog
+++ b/games-emulation/mupen64/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/mupen64
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/ChangeLog,v 1.21 2006/09/17 18:15:57 joker Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/ChangeLog,v 1.22 2007/02/14 14:27:57 nyhm Exp $
+
+*mupen64-0.5-r2 (14 Feb 2007)
+
+  14 Feb 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/mupen64-0.5-paths.patch, +files/mupen64-0.5-sdl-ttf.patch,
+  +mupen64-0.5-r2.ebuild:
+  Use external sdl-ttf, bug #166531
 
 *mupen64-0.5-r1 (17 Sep 2006)
 
diff --git a/games-emulation/mupen64/Manifest b/games-emulation/mupen64/Manifest
index 60c131712204..d4b903f1ff73 100644
--- a/games-emulation/mupen64/Manifest
+++ b/games-emulation/mupen64/Manifest
@@ -1,61 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX mupen64 751 RMD160 bf3d2411176a8d6b086a3c65139f076f0426a0e7 SHA1 66b3d1a3ecd799e5715c661f480bfdb665c08c76 SHA256 04313e794db8792f6be7d8489e0d9c25c2bd64eebb1ccef9e00b1db7ac0ceb3e
-MD5 a7ebb16b1b250e889d5acd49537a9ece files/mupen64 751
-RMD160 bf3d2411176a8d6b086a3c65139f076f0426a0e7 files/mupen64 751
-SHA256 04313e794db8792f6be7d8489e0d9c25c2bd64eebb1ccef9e00b1db7ac0ceb3e files/mupen64 751
-AUX mupen64-confdir.patch 171 RMD160 c5a2f34d4c5449b179a349f7f69af7d0a283fbd0 SHA1 ebf415370bccccfbbfca1d5a33236d18775d1ce2 SHA256 7fefee300002c1b9a5453c2c59d34cf86762a2c1fe3c62b123597d930f135e95
-MD5 72f9db08fce1cb715c16d28c11f1cf9a files/mupen64-confdir.patch 171
-RMD160 c5a2f34d4c5449b179a349f7f69af7d0a283fbd0 files/mupen64-confdir.patch 171
-SHA256 7fefee300002c1b9a5453c2c59d34cf86762a2c1fe3c62b123597d930f135e95 files/mupen64-confdir.patch 171
-AUX mupen64-gentoo.patch 4733 RMD160 16e5c6c53c5390530d7c2df4b56f8c231c28f937 SHA1 42df47e17a15895e216bc7622e1a55962935aa86 SHA256 a643f0e20e1b5716e9b807d0545d81173a8d6c9fd6291ea7fea1da3cce675351
-MD5 b381211a271e1298be2393f4d329d51f files/mupen64-gentoo.patch 4733
-RMD160 16e5c6c53c5390530d7c2df4b56f8c231c28f937 files/mupen64-gentoo.patch 4733
-SHA256 a643f0e20e1b5716e9b807d0545d81173a8d6c9fd6291ea7fea1da3cce675351 files/mupen64-gentoo.patch 4733
-AUX mupen64-gtk2-makefile.patch 4845 RMD160 3b06b062cfaac84d935f7c6546099735cb6ba6e7 SHA1 7f7ea3eb1790ee80d523b30a54c2f51518727bf4 SHA256 c012ff05fdb8f47b4c57b5bb847040cb547014fcc20fc3581c73104fa7c82ce7
-MD5 c9949136ca13fb53bdbe8cdcf0374ead files/mupen64-gtk2-makefile.patch 4845
-RMD160 3b06b062cfaac84d935f7c6546099735cb6ba6e7 files/mupen64-gtk2-makefile.patch 4845
-SHA256 c012ff05fdb8f47b4c57b5bb847040cb547014fcc20fc3581c73104fa7c82ce7 files/mupen64-gtk2-makefile.patch 4845
-AUX mupen64-makefiles.patch 2052 RMD160 032460d2ec6674c786f1595150dc03e08f4f3622 SHA1 7758313d199550fb60f137531b0760c718c9d856 SHA256 8641c253900ed6476a16363bcd6d5acf8e691d88377541f209268885e9c8bad2
-MD5 8a58a3ce196f2d69b21339244722e957 files/mupen64-makefiles.patch 2052
-RMD160 032460d2ec6674c786f1595150dc03e08f4f3622 files/mupen64-makefiles.patch 2052
-SHA256 8641c253900ed6476a16363bcd6d5acf8e691d88377541f209268885e9c8bad2 files/mupen64-makefiles.patch 2052
-AUX mupen64-noasm.patch 229 RMD160 a07517e6c95cd0193ce3e5c879728c39f8862a8b SHA1 71aad074c1da507857a0cee4de2959df984078e0 SHA256 8b8b874b892ded7f8168885944ea541cb6f6cd0c4cfdf9f2bd7105c02a2a357f
-MD5 638046a5841774d744611e9f38751bcc files/mupen64-noasm.patch 229
-RMD160 a07517e6c95cd0193ce3e5c879728c39f8862a8b files/mupen64-noasm.patch 229
-SHA256 8b8b874b892ded7f8168885944ea541cb6f6cd0c4cfdf9f2bd7105c02a2a357f files/mupen64-noasm.patch 229
-DIST hack_azi_rsp_hle.tar.bz2 38268 RMD160 284cb9ffe4157d580d1c9924cbf40ea34bfee752 SHA1 9ba4a945c1b13d6a239bdc1d81f0c7fd92742d9e SHA256 cf9a2c0340f5eb3c06580e44af645fa3a06bc4c7e64c33e51b7a146c703d4aae
-DIST mupen64_input.tar.bz2 4438 RMD160 8e2d9b278ff8988c5fc171b25bd1a279fb44b994 SHA1 691bdb0e238b659e1db93fb50723892d8f2411c6 SHA256 d4eac5e204e094f32c46230aacb206468a0f8d3a62b2b654d17b00e86d20500d
-DIST mupen64_sound.tar.bz2 5932 RMD160 618773689a1cd5a70082bd619584f5df03f05575 SHA1 7d930175051ca8fcba4b85d9ae6eeaf7fe09fe87 SHA256 df53df36a416dad22db87325dae8dc14174f5b7ef6a7e8680b2ff855eb31581a
-DIST mupen64_src-0.4.tar.bz2 1871148 RMD160 dbae6b939129c4867ade445ddd8676fb645608f4 SHA1 b42ff1eb2b896bf38986522bbd341e0ba94e7532 SHA256 12958fa185c8a851f31ea007a1bb4df2bb6eeed582bc6af234ae5b9d57a8f3ae
+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
 DIST mupen64_src-0.5.tar.bz2 1981046 RMD160 da916bc77f2f06ed92630332545dc3ee5ae1ff51 SHA1 fe1c9999fca780f2f8243d36ea7d8c42eca5659b SHA256 1b8e4188ab7a94d8125b77aed8725ee348c24818622b881adfe16be510487dfd
-EBUILD mupen64-0.4-r2.ebuild 2410 RMD160 878c0b7dc0dfd91d5a3b0e440339f188e5a45a0d SHA1 0d33afd80f371b66a17ae7f80bff1d1d0fb73965 SHA256 a4f10e27b2514aec593fb15dcd0970440c472876091ba921fc78190f5cd4a66a
-MD5 49a7654deda668a03424e9b35090ba40 mupen64-0.4-r2.ebuild 2410
-RMD160 878c0b7dc0dfd91d5a3b0e440339f188e5a45a0d mupen64-0.4-r2.ebuild 2410
-SHA256 a4f10e27b2514aec593fb15dcd0970440c472876091ba921fc78190f5cd4a66a mupen64-0.4-r2.ebuild 2410
-EBUILD mupen64-0.5-r1.ebuild 2441 RMD160 15801e63ef4c64bc3cbc1a003aad894324a65513 SHA1 0c5ac540da14d87adb41153d3a7cf4c5027092b9 SHA256 10326dfc0e7814bbc06b6ffaf9670306348af883fedfdea4dd06f30dae6c2eb8
-MD5 f9e665c01f1b1f9074e32f2541467285 mupen64-0.5-r1.ebuild 2441
-RMD160 15801e63ef4c64bc3cbc1a003aad894324a65513 mupen64-0.5-r1.ebuild 2441
-SHA256 10326dfc0e7814bbc06b6ffaf9670306348af883fedfdea4dd06f30dae6c2eb8 mupen64-0.5-r1.ebuild 2441
-MISC ChangeLog 3843 RMD160 c09b73fbf271f6109e5ec85fa90f926f07e6ddfd SHA1 8f1a87ec5c649d7fb32ca3d4282c1b9825ceec69 SHA256 d7aad162e0222e22c0715df5e857ae335b4a7cb45677abc1946e5eaf47bbca7d
-MD5 19f67066d936ef969f17682014f0c7c8 ChangeLog 3843
-RMD160 c09b73fbf271f6109e5ec85fa90f926f07e6ddfd ChangeLog 3843
-SHA256 d7aad162e0222e22c0715df5e857ae335b4a7cb45677abc1946e5eaf47bbca7d ChangeLog 3843
+EBUILD mupen64-0.5-r2.ebuild 2218 RMD160 f915bfed47854f04d011e46e71bc03b7807c21cd SHA1 51245aec252b3e896d3cdb92ff4d21129793abd5 SHA256 10f482cb035f325ebf0f87049f8efc4ecb2ae1c7c988b07c569bba736708fdb3
+MD5 2b4a521fb80025b18c09a7a3d17efecd mupen64-0.5-r2.ebuild 2218
+RMD160 f915bfed47854f04d011e46e71bc03b7807c21cd mupen64-0.5-r2.ebuild 2218
+SHA256 10f482cb035f325ebf0f87049f8efc4ecb2ae1c7c988b07c569bba736708fdb3 mupen64-0.5-r2.ebuild 2218
+MISC ChangeLog 4052 RMD160 0fddcc437730465aa6cab5fcb44fb27b6f4562ad SHA1 06605171eeab189aa57573e247d37e3329f8664f SHA256 50b7200b07c4bfb536ad38cc9220d2ab0c6209e5e2872a85817336d18103a1ee
+MD5 d80996f57d3649a61b1ade7967a9a5f9 ChangeLog 4052
+RMD160 0fddcc437730465aa6cab5fcb44fb27b6f4562ad ChangeLog 4052
+SHA256 50b7200b07c4bfb536ad38cc9220d2ab0c6209e5e2872a85817336d18103a1ee ChangeLog 4052
 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 505759ccda3199fe238cd6900af59425 files/digest-mupen64-0.4-r2 979
-RMD160 43d1544497b771934518bc16369860adc626205a files/digest-mupen64-0.4-r2 979
-SHA256 aee927f62051c0dbe1cd820473d131f24134c988cd187af19b7a7d9599d3e6b3 files/digest-mupen64-0.4-r2 979
-MD5 0cdd256b3d2df86cac038aa9d538aedf files/digest-mupen64-0.5-r1 253
-RMD160 f626935bb3e16eb360edde7e315583121ad7652c files/digest-mupen64-0.5-r1 253
-SHA256 d3dbd70b6d9bca726be6e4b697f985cd7a83e1bd494f7074e11052da1f3b07d9 files/digest-mupen64-0.5-r1 253
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFxDGydz7hIScOURERAh4bAJ9fyHpcLWIkH5jqjBrMf11AviSi7ACgnd06
-vMDF+5S5eU8KiKmqKaF11II=
-=SzNX
+iD8DBQFF0xx1dz7hIScOURERAgQwAJ95IDOSNZCSBDYV2CgTny4yasw+2QCcCeRy
+P4B4MECQTXA8Q70j/XTzrEo=
+=81xd
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64/files/digest-mupen64-0.4-r2 b/games-emulation/mupen64/files/digest-mupen64-0.4-r2
deleted file mode 100644
index 4007c6a32525..000000000000
--- a/games-emulation/mupen64/files/digest-mupen64-0.4-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 9eb823e0f4a62c8ef0428dabf3f01370 hack_azi_rsp_hle.tar.bz2 38268
-RMD160 284cb9ffe4157d580d1c9924cbf40ea34bfee752 hack_azi_rsp_hle.tar.bz2 38268
-SHA256 cf9a2c0340f5eb3c06580e44af645fa3a06bc4c7e64c33e51b7a146c703d4aae hack_azi_rsp_hle.tar.bz2 38268
-MD5 14fc6075a19bb567afebedd5ab2ea6c1 mupen64_input.tar.bz2 4438
-RMD160 8e2d9b278ff8988c5fc171b25bd1a279fb44b994 mupen64_input.tar.bz2 4438
-SHA256 d4eac5e204e094f32c46230aacb206468a0f8d3a62b2b654d17b00e86d20500d mupen64_input.tar.bz2 4438
-MD5 88dfa0045794db7f1fc100b4c7b23125 mupen64_sound.tar.bz2 5932
-RMD160 618773689a1cd5a70082bd619584f5df03f05575 mupen64_sound.tar.bz2 5932
-SHA256 df53df36a416dad22db87325dae8dc14174f5b7ef6a7e8680b2ff855eb31581a mupen64_sound.tar.bz2 5932
-MD5 322f2226f4f67e24868592c6b441e76a mupen64_src-0.4.tar.bz2 1871148
-RMD160 dbae6b939129c4867ade445ddd8676fb645608f4 mupen64_src-0.4.tar.bz2 1871148
-SHA256 12958fa185c8a851f31ea007a1bb4df2bb6eeed582bc6af234ae5b9d57a8f3ae mupen64_src-0.4.tar.bz2 1871148
diff --git a/games-emulation/mupen64/files/digest-mupen64-0.5-r1 b/games-emulation/mupen64/files/digest-mupen64-0.5-r2
similarity index 100%
rename from games-emulation/mupen64/files/digest-mupen64-0.5-r1
rename to games-emulation/mupen64/files/digest-mupen64-0.5-r2
diff --git a/games-emulation/mupen64/files/mupen64 b/games-emulation/mupen64/files/mupen64
deleted file mode 100644
index e6ae559f0d95..000000000000
--- a/games-emulation/mupen64/files/mupen64
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-if [ ! -d ~/.mupen64/save ] ; then
-	mkdir -p ~/.mupen64/save
-	if [ -h ~/.mupen64/plugins ]; then
-		rm ~/.mupen64/plugins
-	fi
-	mkdir -p ~/.mupen64/plugins
-	cd ~/.mupen64
-	ln -s GENTOO_DIR/mupen64 mupen64
-	ln -s GENTOO_DIR/mupen64_nogui mupen64_nogui
-	cp GENTOO_DIR/mupen64.ini .
-fi
-
-cd ~/.mupen64/plugins
-
-cleanlinks
-ln -sf GENTOO_DIR/plugins/*.so .
-for i in GENTOO_DIR/plugins/*.{ini,conf}; do
-	lfile=`basename $i`
-	if [ -h $lfile ]; then
-		rm $lfile
-		cp $i .
-	fi
-done
-cd ..
-
-# We must execute ./blah not /foo/bar/blah because mupen64 tries to
-# write to files in the directory from which the application is run.
-# It segfaults if it can't write to the directory.  Upstream has been
-# notified of the problem.
-exec ./$(basename $0) "$@"
diff --git a/games-emulation/mupen64/files/mupen64-gentoo.patch b/games-emulation/mupen64/files/mupen64-0.5-paths.patch
similarity index 68%
rename from games-emulation/mupen64/files/mupen64-gentoo.patch
rename to games-emulation/mupen64/files/mupen64-0.5-paths.patch
index 54e3efdb7dc1..f6bd21fcdaa4 100644
--- a/games-emulation/mupen64/files/mupen64-gentoo.patch
+++ b/games-emulation/mupen64/files/mupen64-0.5-paths.patch
@@ -1,7 +1,5 @@
-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
+--- main/gui_gtk/main_gtk.c
++++ main/gui_gtk/main_gtk.c
 @@ -1881,7 +1881,7 @@
  	     unsigned char byte;
  	     dest = fopen(temp, "wb");
@@ -46,9 +44,8 @@ diff -u -r mupen64_src-0.5/main/gui_gtk/main_gtk.c mupen64_src-0.5.fixed/main/gu
  		  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
+--- main/main.c
++++ main/main.c
 @@ -37,6 +37,8 @@
  
  #include <stdlib.h>
@@ -102,9 +99,8 @@ diff -u -r mupen64_src-0.5/main/main.c mupen64_src-0.5.fixed/main/main.c
  		  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
+--- Makefile
++++ Makefile
 @@ -166,7 +166,7 @@
  endif
  
@@ -114,12 +110,3 @@ diff -u -r mupen64_src-0.5/Makefile mupen64_src-0.5.fixed/Makefile
  
  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/files/mupen64-0.5-sdl-ttf.patch b/games-emulation/mupen64/files/mupen64-0.5-sdl-ttf.patch
new file mode 100644
index 000000000000..a8d599d385c7
--- /dev/null
+++ b/games-emulation/mupen64/files/mupen64-0.5-sdl-ttf.patch
@@ -0,0 +1,28 @@
+--- 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/files/mupen64-confdir.patch b/games-emulation/mupen64/files/mupen64-confdir.patch
deleted file mode 100644
index d0705336faa8..000000000000
--- a/games-emulation/mupen64/files/mupen64-confdir.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- emu64/path.cfg.orig	2004-07-05 20:37:13.000000000 +0000
-+++ emu64/path.cfg	2004-07-16 22:40:43.000000000 +0000
-@@ -1 +1 @@
--/bidon/roms/
-+/usr/games/lib/mupen64/roms/
diff --git a/games-emulation/mupen64/files/mupen64-gtk2-makefile.patch b/games-emulation/mupen64/files/mupen64-gtk2-makefile.patch
deleted file mode 100644
index f79c4c01ef39..000000000000
--- a/games-emulation/mupen64/files/mupen64-gtk2-makefile.patch
+++ /dev/null
@@ -1,127 +0,0 @@
---- emu64/Makefile	2005-03-21 19:24:41.000000000 +0100
-+++ emu64/Makefile	2005-03-21 19:21:52.000000000 +0100
-@@ -87,46 +87,49 @@
- PREFIX		=$(shell grep WITH_HOME config.h | cut -d '"' -f 2)
- SHARE		="$(PREFIX)share/mupen64/"
- 
-+GTK_CFLAGS	= `pkg-config --cflags gtk+-2.0` -D_GTK2
-+GTK_LIBS	= `pkg-config --libs gtk+-2.0`
-+
- all:	mupen64
- 
- main/main.o:	main/main.c
- 		$(CC) $(CFLAGS) -c -o $@ $<
- 
- main/main_gtk.o:	main/main_gtk.c
--			$(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags`
-+			$(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS)
- 
- main/gui_gtk/main_gtk.o:	main/gui_gtk/main_gtk.c
--				$(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags`
-+				$(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS)
- 
- main/gui_gtk/translate.o:	main/gui_gtk/translate.c
--				$(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags`
-+				$(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS)
- 
- main/gui_gtk/messagebox.o:	main/gui_gtk/messagebox.c
--				$(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags`
-+				$(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS)
- 
- main/gui_gtk/aboutdialog.o:	main/gui_gtk/aboutdialog.c
--				$(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags`
-+				$(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS)
- 
- main/gui_gtk/configdialog.o:	main/gui_gtk/configdialog.c
--				$(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags`
-+				$(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS)
- 
- main/gui_gtk/support.o:		main/gui_gtk/support.c
--				$(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags`
-+				$(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS)
- 
- main/gui_gtk/rombrowser.o:	main/gui_gtk/rombrowser.c
--				$(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags`
-+				$(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS)
- 
- main/gui_gtk/romproperties.o:	main/gui_gtk/romproperties.c
--				$(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags`
-+				$(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS)
- 
- main/gui_gtk/config.o:		main/gui_gtk/config.c
--				$(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags`
-+				$(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS)
- 
- main/gui_gtk/dirbrowser.o:	main/gui_gtk/dirbrowser.c
--				$(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags`
-+				$(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS)
- 
- main/gui_gtk/vcrcomp_dialog.o:	main/gui_gtk/vcrcomp_dialog.c
--				$(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags`
-+				$(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS)
- 
- main/vcr_compress.o:		main/vcr_compress.cpp
- 				$(CXX) $(CXXFLAGS) -c -o $@ $< `avifile-config --cflags`
-@@ -138,13 +141,13 @@
- ifneq ("$(shell grep VCR config.h)","\#define VCR_SUPPORT 1")
- 
- mupen64:	$(OBJ) $(OBJ_X86) $(OBJ_GTK_GUI)
--		$(CC) $^ $(CFLAGS) $(LIB) -Wl,-export-dynamic `gtk-config --libs` -L/usr/X11R6/lib -lSDL -lGL -lpthread -ldl -o $@
-+		$(CC) $^ $(CFLAGS) $(LIB) -Wl,-export-dynamic $(GTK_LIBS) -L/usr/X11R6/lib -lSDL -lGL -lpthread -ldl -o $@
- 		strip --strip-all $@
- 
- else
- 
- mupen64:	$(OBJ) $(OBJ_X86) $(OBJ_GTK_GUI) $(OBJ_VCR)
--		$(CXX) $^ $(CFLAGS) $(LIB) -Wl,-export-dynamic `gtk-config --libs` `avifile-config --libs` -L/usr/X11R6/lib -lSDL -lGL -lpthread -ldl -o $@
-+		$(CXX) $^ $(CFLAGS) $(LIB) -Wl,-export-dynamic $(GTK_LIBS) `avifile-config --libs` -L/usr/X11R6/lib -lSDL -lGL -lpthread -ldl -o $@
- 		strip --strip-all $@
- endif
- 
-diff -ru work/hack_azi_rsp_hle/Makefile work.new/hack_azi_rsp_hle/Makefile
---- hack_azi_rsp_hle/Makefile	2005-03-21 19:25:04.000000000 +0100
-+++ hack_azi_rsp_hle/Makefile	2005-03-21 19:28:01.000000000 +0100
-@@ -1,7 +1,7 @@
- CC = gcc
--CFLAGS = -fPIC -DUSE_GTK `gtk-config --cflags`
-+CFLAGS = -fPIC -DUSE_GTK `pkg-config gtk+-2.0 --cflags`
- CXX = g++
--CXXFLAGS = -fPIC -DUSE_GTK `gtk-config --cflags`
-+CXXFLAGS = -fPIC -DUSE_GTK `pkg-config gtk+-2.0 --cflags`
- LD = g++
- LDFLAGS =
- 
-@@ -11,7 +11,7 @@
- all:	$(TARGET) instruction
- 
- $(TARGET): $(OBJECTS)
--	$(LD) -shared -Wl,-Bsymbolic `gtk-config --libs` $(LDFLAGS) -o $@ $(OBJECTS)
-+	$(LD) -shared -Wl,-Bsymbolic `pkg-config gtk+-2.0 --libs` $(LDFLAGS) -o $@ $(OBJECTS)
- 	strip --strip-all $@
- 
- instruction:
-diff -ru work/mupen64_input/Makefile work.new/mupen64_input/Makefile
---- mupen64_input/Makefile	2005-03-21 19:24:41.000000000 +0100
-+++ mupen64_input/Makefile	2005-03-21 19:28:25.000000000 +0100
-@@ -8,7 +8,7 @@
- 
- 
- mupen64_input.so:	$(OBJ)
--			$(CC) $(OBJ) -Wl,-Bsymbolic -shared -lSDL `gtk-config --cflags --libs` -o $@
-+			$(CC) $(OBJ) -Wl,-Bsymbolic -shared -lSDL `pkg-config gtk+-2.0 --cflags --libs` -o $@
- 			strip --strip-all $@
- 
- instruction:
-diff -ru work/mupen64_sound/Makefile work.new/mupen64_sound/Makefile
---- mupen64_sound/Makefile	2005-03-21 19:25:04.000000000 +0100
-+++ mupen64_sound/Makefile	2005-03-21 19:28:58.000000000 +0100
-@@ -1,7 +1,7 @@
- CC = gcc
--CFLAGS = -fPIC `gtk-config --cflags` -DUSE_GTK
-+CFLAGS = -fPIC `pkg-config gtk+-2.0 --cflags` -DUSE_GTK
- LD = gcc
--LDFLAGS = -shared -Wl,-Bsymbolic `gtk-config --libs` -lpthread
-+LDFLAGS = -shared -Wl,-Bsymbolic `pkg-config gtk+-2.0 --libs` -lpthread
- 
- OBJECTS	=	main.o
- 
diff --git a/games-emulation/mupen64/files/mupen64-makefiles.patch b/games-emulation/mupen64/files/mupen64-makefiles.patch
deleted file mode 100644
index 5da004d2e85e..000000000000
--- a/games-emulation/mupen64/files/mupen64-makefiles.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- emu64/Makefile.orig	2004-07-15 21:50:36.577147160 +0000
-+++ emu64/Makefile	2004-07-15 21:53:11.189642488 +0000
-@@ -3,14 +3,9 @@
- CC		=gcc
- CXX		=g++
- 
--#CFLAGS		=-DX86 -O3 -mpentium -Wall -DEMU64_DEBUG
--CFLAGS		=-DX86 -O3 -fomit-frame-pointer -funroll-loops -ffast-math -mcpu=athlon -Wall -pipe
--#CFLAGS		=-DX86 -O3 -mcpu=pentium -Wall -g -pg
--#CFLAGS		=-DX86 -Wall -pipe -g3 -DEMU64_DEBUG
--#CFLAGS		=-DX86 -Wall -pipe -g -DEMU64_DEBUG -DCOMPARE_CORE
--#CFLAGS		=-DX86 -Wall -pipe -g
--
--CXXFLAGS	=$(CFLAGS)
-+COMFLAGS	=-DX86
-+CFLAGS		=$(COMFLAGS)
-+CXXFLAGS	=$(COMFLAGS)
- 
- GL_PATH		=-I/usr/X11R6/include
- 
- #endif /* CONFIG_H */
---- mupen64_input/Makefile.orig	2004-07-15 21:53:51.944446816 +0000
-+++ mupen64_input/Makefile	2004-07-15 21:54:34.593963104 +0000
-@@ -1,8 +1,5 @@
- #Makefile GRAPHIC
--#CXX  		=g++ -O3 -mpentium -Wall -DEMU64_DEBUG
--#CC		=gcc -O3 -I/usr/X11R6/include -fPIC -fomit-frame-pointer -funroll-loops -ffast-math -mcpu=pentium -pipe
--#CC		=gcc -O3 -mpentium -Wall -g -pg
--CC 		=gcc -O3 -fomit-frame-pointer -funroll-loops -ffast-math -mcpu=athlon -Wall -DUSE_GTK `gtk-config --cflags` -I/usr/X11R6/include -pipe
-+CC		=gcc -fPIC
- 
- OBJ		=main.o
- 
---- hack_azi_rsp_hle/Makefile.orig	2004-07-15 21:56:27.429809448 +0000
-+++ hack_azi_rsp_hle/Makefile	2004-07-15 21:57:15.940434712 +0000
-@@ -1,9 +1,7 @@
- CC = gcc
--CFLAGS = -DUSE_GTK `gtk-config --cflags` -O3 -mcpu=athlon \
--         -ffast-math -funroll-loops -fomit-frame-pointer
--#CFLAGS = -DUSE_GTK `gtk-config --cflags` -g -fPIC
-+CFLAGS = -fPIC -DUSE_GTK `gtk-config --cflags`
- CXX = g++
--CXXFLAGS = $(CFLAGS)
-+CXXFLAGS = -fPIC -DUSE_GTK `gtk-config --cflags`
- LD = g++
- LDFLAGS =
- 
---- mupen64_sound/Makefile.orig	2004-07-04 04:43:39.000000000 -0500
-+++ mupen64_sound/Makefile	2004-12-31 23:53:55.329185760 -0600
-@@ -1,5 +1,5 @@
- CC = gcc
--CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -ffast-math -mcpu=athlon `gtk-config --cflags` -DUSE_GTK -Wall
-+CFLAGS = -fPIC `gtk-config --cflags` -DUSE_GTK
- LD = gcc
- LDFLAGS = -shared -Wl,-Bsymbolic `gtk-config --libs` -lpthread
-   
diff --git a/games-emulation/mupen64/files/mupen64-noasm.patch b/games-emulation/mupen64/files/mupen64-noasm.patch
deleted file mode 100644
index 7b740acb85f6..000000000000
--- a/games-emulation/mupen64/files/mupen64-noasm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- emu64/Makefile.old	2005-01-02 12:57:37.444075589 -0800
-+++ emu64/Makefile	2005-01-02 12:57:44.673605061 -0800
-@@ -3,7 +3,7 @@
- CC		=gcc
- CXX		=g++
- 
--COMFLAGS	=-DX86
-+COMFLAGS	=
- CFLAGS		=$(COMFLAGS)
- CXXFLAGS	=$(COMFLAGS)
- 
diff --git a/games-emulation/mupen64/mupen64-0.4-r2.ebuild b/games-emulation/mupen64/mupen64-0.4-r2.ebuild
deleted file mode 100644
index 06ea34e2ee94..000000000000
--- a/games-emulation/mupen64/mupen64-0.4-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.4-r2.ebuild,v 1.7 2005/11/08 01:33:05 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
-	http://mupen64.emulation64.com/files/${PV}/mupen64_input.tar.bz2
-	http://mupen64.emulation64.com/files/${PV}/mupen64_sound.tar.bz2
-	http://mupen64.emulation64.com/files/${PV}/hack_azi_rsp_hle.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-amd64 x86"
-IUSE="asm"
-
-RDEPEND="sys-libs/zlib
-	media-libs/libsdl
-	virtual/glu
-	virtual/opengl
-	=x11-libs/gtk+-2*"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-RDEPEND="${RDEPEND}
-	>=games-emulation/mupen64-glN64-0.4.1_rc2-r1"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-makefiles.patch" \
-		"${FILESDIR}/${PN}-confdir.patch" \
-		"${FILESDIR}/${PN}-gtk2-makefile.patch"
-
-	if ! use asm ; then
-		epatch "${FILESDIR}/${PN}-noasm.patch"
-	fi
-	sed -i \
-		-e "s:CFLAGS.*=\(.*\):CFLAGS=\1 -fPIC ${CFLAGS}:" \
-		-e "s:CXXFLAGS.*=\(.*\):CXXFLAGS=\1 -fPIC ${CXXFLAGS}:" \
-		*/Makefile \
-		|| die "sed failed"
-}
-
-src_compile() {
-	local d
-
-	for d in *; do
-		emake -C $d || die "emake failed on $d"
-	done
-}
-
-src_install() {
-	local dir=${GAMES_LIBDIR}/${PN}
-
-	exeinto "${dir}/plugins"
-	doexe */*.so || die "doexe failed"
-	insinto "${dir}/plugins"
-	doins */*.ini || die "doins failed"
-	rm "${D}/${dir}"/plugins/mupen64*.ini
-
-	cd emu64
-	cp -r mupen64* lang plugins save roms path.cfg "${D}/${dir}/" \
-		|| die "cp failed"
-	rm "${D}/${dir}/mupen64_test.ini"
-
-	dogamesbin "${FILESDIR}/mupen64" || die "dogamesbin failed"
-	newgamesbin "${FILESDIR}/mupen64" mupen64_nogui || die "newgamesbin failed"
-	sed -i \
-		-e "s:GENTOO_DIR:${dir}:" \
-		"${D}${GAMES_BINDIR}/mupen64" \
-		"${D}${GAMES_BINDIR}/mupen64_nogui" \
-		|| die "sed failed"
-
-	# plugins docs are in subdirs of the doc main directory
-	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 "you have to do rm -rf on your .mupen64 directory."
-	ewarn "Copy your saved games and after launching new mupen"
-	ewarn "copy it to the original place."
-	echo
-}
diff --git a/games-emulation/mupen64/mupen64-0.5-r1.ebuild b/games-emulation/mupen64/mupen64-0.5-r2.ebuild
similarity index 62%
rename from games-emulation/mupen64/mupen64-0.5-r1.ebuild
rename to games-emulation/mupen64/mupen64-0.5-r2.ebuild
index ab758cf5e12f..0b2b9d4b7bc3 100644
--- a/games-emulation/mupen64/mupen64-0.5-r1.ebuild
+++ b/games-emulation/mupen64/mupen64-0.5-r2.ebuild
@@ -1,8 +1,8 @@
 # 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-r1.ebuild,v 1.3 2007/02/03 06:54:35 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.5-r2.ebuild,v 1.1 2007/02/14 14:27:57 nyhm Exp $
 
-inherit eutils flag-o-matic multilib games
+inherit eutils multilib games
 
 MY_P=${PN}_src-${PV}
 DESCRIPTION="A Nintendo 64 (N64) emulator"
@@ -11,16 +11,17 @@ SRC_URI="http://mupen64.emulation64.com/files/${PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="opengl"
+KEYWORDS="-* ~amd64 x86"
+IUSE=""
 
-RDEPEND="opengl? ( virtual/opengl )
+RDEPEND="virtual/opengl
 	>=x11-libs/gtk+-2
-	amd64? ( app-emulation/emul-linux-x86-gtklibs
-		 app-emulation/emul-linux-x86-sdl )
 	media-libs/libsdl
-	media-libs/sdl-sound"
-# Block the now included external plugins.
+	media-libs/sdl-ttf
+	amd64? (
+		app-emulation/emul-linux-x86-gtklibs
+		app-emulation/emul-linux-x86-sdl
+	)"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	!games-emulation/mupen64-blight-input
@@ -31,10 +32,12 @@ S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
-	epatch "${FILESDIR}"/${PN}-gentoo.patch
-
 	cd "${S}"
-	rm -f plugins/empty
+	rm -f plugins/empty blight_input/SDL_ttf*
+
+	epatch \
+		"${FILESDIR}"/${P}-paths.patch \
+		"${FILESDIR}"/${P}-sdl-ttf.patch
 
 	sed -i "s:#undef WITH_HOME:#define WITH_HOME \"${GAMES_PREFIX}/\":" \
 		config.h \
@@ -51,20 +54,21 @@ src_unpack() {
 src_compile() {
 	use amd64 && multilib_toolchain_setup x86
 
-	emake mupen64 || die "emake failed"
-	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"
-
-	emake plugins/blight_input.so || die "emake failed"
-	emake plugins/jttl_audio.so || die "emake failed"
-
-	if use opengl; then
-		emake plugins/glN64.so || die "emake failed"
-	fi
+	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() {