4 files changed, 13 insertions, 123 deletions
diff --git a/games-emulation/mupen64/ChangeLog b/games-emulation/mupen64/ChangeLog
index d54348074273..f7f906db1a62 100644
--- a/games-emulation/mupen64/ChangeLog
+++ b/games-emulation/mupen64/ChangeLog
@@ -1,6 +1,10 @@
 # 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.12 2005/03/25 05:42:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/ChangeLog,v 1.13 2005/04/18 05:52:31 mr_bones_ Exp $
+
+  18 Apr 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -mupen64-0.4-r1.ebuild:
+  clean old ebuild
 
 *mupen64-0.4-r2 (25 Mar 2005)
 
diff --git a/games-emulation/mupen64/Manifest b/games-emulation/mupen64/Manifest
index 4adaddefdffc..bf2337ed02f4 100644
--- a/games-emulation/mupen64/Manifest
+++ b/games-emulation/mupen64/Manifest
@@ -1,17 +1,15 @@
-MD5 0c94af5b5ce0aadb311549e57055e3a1 ChangeLog 2586
 MD5 a3e62bf537d9a02609601aa9ba76da7e metadata.xml 247
-MD5 3735ddd63ea90f06aef989a1e68eb890 mupen64-0.4-r1.ebuild 2713
+MD5 5a698a6783288ca286a9ca28800d5a75 ChangeLog 2687
 MD5 f25c9c6f5ed8d5386443e451753d5f8f mupen64-0.4-r2.ebuild 2658
+MD5 948cf998de2319579074b530861362aa files/mupen64-makefiles.patch 2040
 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 a7ebb16b1b250e889d5acd49537a9ece files/mupen64 751
+MD5 87053b50f759d8d4b65a2369fe42338a files/mupen64-rice-confdir.patch 1208
+MD5 b21462ab51b383d28ca9d83f6531c664 files/digest-mupen64-0.4-r2 265
 MD5 623f09fd7f622d43901a028d7069ac04 files/mupen64-gentoo-sdl.patch 1558
 MD5 3c91d6930aa4c6e746a1a5a02ab866e6 files/mupen64-gtk2-makefile.patch 4833
-MD5 948cf998de2319579074b530861362aa files/mupen64-makefiles.patch 2040
+MD5 f63e1260b9d35674f21fdcfff3be5c16 files/mupen64-SDL_ttf.patch 353
+MD5 04a919e368e803ceda85d809cc767b0a files/mupen64-gentoo-avi.patch 255
 MD5 638046a5841774d744611e9f38751bcc files/mupen64-noasm.patch 229
-MD5 87053b50f759d8d4b65a2369fe42338a files/mupen64-rice-confdir.patch 1208
+MD5 e2b006764c1bac03ac2667ad60a66101 files/mupen64-gcc3.patch 3662
diff --git a/games-emulation/mupen64/files/digest-mupen64-0.4-r1 b/games-emulation/mupen64/files/digest-mupen64-0.4-r1
deleted file mode 100644
index 235e4ebb6a71..000000000000
--- a/games-emulation/mupen64/files/digest-mupen64-0.4-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-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/mupen64-0.4-r1.ebuild b/games-emulation/mupen64/mupen64-0.4-r1.ebuild
deleted file mode 100644
index 912774c195c2..000000000000
--- a/games-emulation/mupen64/mupen64-0.4-r1.ebuild
+++ /dev/null
@@ -1,108 +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-r1.ebuild,v 1.3 2005/02/12 00:58:40 mr_bones_ Exp $
-
-inherit games gcc eutils libtool
-
-IUSE="avi gtk2 asm"
-
-DESCRIPTION="A Nintendo 64 (N64) emulator"
-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"
-
-HOMEPAGE="http://mupen64.emulation64.com/"
-
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND="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* )"
-
-RDEPEND="${RDEPEND}
-	>=games-emulation/mupen64-glN64-0.4.1_rc2-r1
-	>=sys-apps/sed-4"
-
-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
-			einfo "using x86 asm where aviable"
-		else
-			epatch ${FILESDIR}/${PN}-noasm.patch
-		fi
-	fi
-	# polish locales
-	cp ${FILESDIR}/polish.lng ${S}/emu64/lang
-}
-
-src_compile() {
-
-	for i in *; do
-		einfo ""
-		einfo "Entering $i and make"
-		cd ${S}/${i}
-		sed -i -e "s:CFLAGS.*=\(.*\):CFLAGS=\1 ${CFLAGS}:" \
-				-e "s:CXXFLAGS.*=\(.*\):CXXFLAGS=\1 ${CXXFLAGS}:" \
-				Makefile ||  die "couldn't apply cflags"
-		emake || die "emake failed on $i"
-		einfo "and done."
-	done
-
-}
-
-src_install() {
-	local dir=${GAMES_LIBDIR}/${PN}
-	dodir ${dir}
-
-	cd ${S}
-
-	exeinto ${dir}/plugins
-	doexe */*.so
-	insinto ${dir}/plugins
-	doins */*.ini
-	rm ${D}/${dir}/plugins/mupen64*.ini
-
-	cd ${S}/emu64
-	cp -r mupen64* lang plugins save roms path.cfg ${D}/${dir}/
-	rm ${D}/${dir}/mupen64_test.ini
-
-	dogamesbin ${FILESDIR}/mupen64 || die "dogamesbin failed"
-	dosed "s:GENTOO_DIR:${dir}:" ${GAMES_BINDIR}/mupen64
-	newgamesbin ${FILESDIR}/mupen64 mupen64_nogui || die "newgamesbin failed"
-	dosed "s:GENTOO_DIR:${dir}:" ${GAMES_BINDIR}/mupen64_nogui
-
-	# plugins docs are in subdirs of the doc main directory
-	cd "${S}/emu64"
-	dodoc *.txt doc/readme.pdf
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	ewarn "If you are upgreading 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."
-}
-