Update gtk2 patch (from Arnaud Lech via bug #86156); tidy ebuild

(Portage version: 2.0.51.19)

5 files changed, 166 insertions, 6 deletions

diff --git a/games-emulation/mupen64/ChangeLog b/games-emulation/mupen64/ChangeLog
index 3210ced04e5a..d54348074273 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.11 2005/01/20 04:31:50 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/ChangeLog,v 1.12 2005/03/25 05:42:54 mr_bones_ Exp $
+
+*mupen64-0.4-r2 (25 Mar 2005)
+
+  25 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  files/mupen64-gtk2-makefile.patch, +mupen64-0.4-r2.ebuild:
+  Update gtk2 patch (from Arnaud Lech via bug #86156); tidy ebuild
 
   19 Jan 2005; Daniel Goller <morfic@gentoo.org> mupen64-0.4-r1.ebuild:
   Stable on x86
diff --git a/games-emulation/mupen64/Manifest b/games-emulation/mupen64/Manifest
index dd9471084d49..fd74ad7d8205 100644
--- a/games-emulation/mupen64/Manifest
+++ b/games-emulation/mupen64/Manifest
@@ -1,15 +1,17 @@
 MD5 f6bfd9794da0fe9049e93a34b6b4dfe0 ChangeLog 2368
 MD5 a3e62bf537d9a02609601aa9ba76da7e metadata.xml 247
 MD5 3735ddd63ea90f06aef989a1e68eb890 mupen64-0.4-r1.ebuild 2713
+MD5 92b2c0d2c2b5fc73efc77539836ba693 mupen64-0.4-r2.ebuild 2658
 MD5 e2b006764c1bac03ac2667ad60a66101 files/0.3-gcc3.patch 3662
 MD5 b21462ab51b383d28ca9d83f6531c664 files/digest-mupen64-0.4-r1 265
+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 04a919e368e803ceda85d809cc767b0a files/mupen64-gentoo-avi.patch 255
 MD5 623f09fd7f622d43901a028d7069ac04 files/mupen64-gentoo-sdl.patch 1558
-MD5 8cb72fa87f95c2a79540ea5e4a15c0b9 files/mupen64-gtk2-makefile.patch 3144
+MD5 3c91d6930aa4c6e746a1a5a02ab866e6 files/mupen64-gtk2-makefile.patch 4833
 MD5 948cf998de2319579074b530861362aa files/mupen64-makefiles.patch 2040
 MD5 638046a5841774d744611e9f38751bcc files/mupen64-noasm.patch 229
 MD5 87053b50f759d8d4b65a2369fe42338a files/mupen64-rice-confdir.patch 1208
diff --git a/games-emulation/mupen64/files/digest-mupen64-0.4-r2 b/games-emulation/mupen64/files/digest-mupen64-0.4-r2
new file mode 100644
index 000000000000..235e4ebb6a71
--- /dev/null
+++ b/games-emulation/mupen64/files/digest-mupen64-0.4-r2
@@ -0,0 +1,4 @@
+MD5 322f2226f4f67e24868592c6b441e76a mupen64_src-0.4.tar.bz2 1871148
+MD5 14fc6075a19bb567afebedd5ab2ea6c1 mupen64_input.tar.bz2 4438
+MD5 88dfa0045794db7f1fc100b4c7b23125 mupen64_sound.tar.bz2 5932
+MD5 9eb823e0f4a62c8ef0428dabf3f01370 hack_azi_rsp_hle.tar.bz2 38268
diff --git a/games-emulation/mupen64/files/mupen64-gtk2-makefile.patch b/games-emulation/mupen64/files/mupen64-gtk2-makefile.patch
index 3f6c4adbf4eb..3e11e0a8f993 100644
--- a/games-emulation/mupen64/files/mupen64-gtk2-makefile.patch
+++ b/games-emulation/mupen64/files/mupen64-gtk2-makefile.patch
@@ -1,6 +1,6 @@
---- emu64/Makefile.orig	2004-11-26 17:04:12.407300864 +0000
-+++ emu64/Makefile	2004-11-26 17:10:14.568244032 +0000
-@@ -92,46 +92,49 @@
+--- 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/"
  
@@ -62,7 +62,7 @@
  
  main/vcr_compress.o:		main/vcr_compress.cpp
  				$(CXX) $(CXXFLAGS) -c -o $@ $< `avifile-config --cflags`
-@@ -143,13 +146,13 @@
+@@ -138,13 +141,13 @@
  ifneq ("$(shell grep VCR config.h)","\#define VCR_SUPPORT 1")
  
  mupen64:	$(OBJ) $(OBJ_X86) $(OBJ_GTK_GUI)
@@ -78,3 +78,50 @@
  		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 = -DUSE_GTK `gtk-config --cflags` -fPIC
++CFLAGS = -DUSE_GTK `pkg-config gtk+-2.0 --cflags` -fPIC
+ CXX = g++
+-CXXFLAGS = -DUSE_GTK `gtk-config --cflags` -fPIC
++CXXFLAGS = -DUSE_GTK `pkg-config gtk+-2.0 --cflags` -fPIC
+ 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 = `gtk-config --cflags` -DUSE_GTK
++CFLAGS = `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/mupen64-0.4-r2.ebuild b/games-emulation/mupen64/mupen64-0.4-r2.ebuild
new file mode 100644
index 000000000000..2ac8f9bf65e9
--- /dev/null
+++ b/games-emulation/mupen64/mupen64-0.4-r2.ebuild
@@ -0,0 +1,101 @@
+# 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.1 2005/03/25 05:42:54 mr_bones_ Exp $
+
+inherit games gcc eutils libtool
+
+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="x86"
+IUSE="avi gtk2 asm"
+
+RDEPEND="sys-libs/zlib
+	media-libs/libsdl
+	virtual/glu
+	virtual/opengl
+	avi? ( media-video/avifile )
+	!gtk2? ( =x11-libs/gtk+-1.2* )
+	gtk2? ( =x11-libs/gtk+-2* )"
+DEPEND="${RDEPEND}
+	gtk2? ( 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"
+	epatch "${FILESDIR}/${PN}-confdir.patch"
+	# gtk2 breaks some configuration dialogs (bug 56195 #35)
+	use gtk2 && epatch "${FILESDIR}/${PN}-gtk2-makefile.patch"
+	use avi && epatch "${FILESDIR}/${PN}-gentoo-avi.patch"
+
+	if use x86 ; then
+		if ! use asm ; then
+			epatch "${FILESDIR}/${PN}-noasm.patch"
+		fi
+	fi
+	sed -i \
+		-e "s:CFLAGS.*=\(.*\):CFLAGS=\1 ${CFLAGS}:" \
+		-e "s:CXXFLAGS.*=\(.*\):CXXFLAGS=\1 ${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
+}