fixed patch names

5 files changed, 54 insertions, 10 deletions

diff --git a/games-emulation/mupen64-blight-input/ChangeLog b/games-emulation/mupen64-blight-input/ChangeLog
index 11c5f92bec2a..03de9b54ab77 100644
--- a/games-emulation/mupen64-blight-input/ChangeLog
+++ b/games-emulation/mupen64-blight-input/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for games-emulation/blight_input
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-blight-input/ChangeLog,v 1.1 2005/01/06 02:51:04 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-blight-input/ChangeLog,v 1.2 2005/01/06 04:58:18 morfic Exp $
+
+  05 Jan 2005; Daniel Goller <morfic@gentoo.org>
+  +files/mupen64-blight-input-SDL_ttf.patch,
+  +files/mupen64-blight-input-cflags.patch,
+  mupen64-blight-input-0.0.8-r1.ebuild:
+  Moved patches to match
+
+  05 Jan 2005; Daniel Goller <morfic@gentoo.org>
+  +files/mupen64-blight_input-SDL_ttf.patch,
+  +files/mupen64-blight_input-cflags.patch,
+  mupen64-blight-input-0.0.8-r1.ebuild:
+  Fixed ebuild to work with new mupen64 ebuild
 
 *mupen64-blight-input-0.0.8-r1 (05 Jan 2005)
 
diff --git a/games-emulation/mupen64-blight-input/Manifest b/games-emulation/mupen64-blight-input/Manifest
index a621777091d7..d6a38f9a48a2 100644
--- a/games-emulation/mupen64-blight-input/Manifest
+++ b/games-emulation/mupen64-blight-input/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c4b4a0d56fae34e3156f774d1e831822 ChangeLog 1625
+MD5 2be7a6fb59f41467039a196112757dcb ChangeLog 2055
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 b833f1a460867831b021d7d106cd130b mupen64-blight-input-0.0.8-r1.ebuild 969
+MD5 cfd0b4cadce29c22104b3b6abefba499 mupen64-blight-input-0.0.8-r1.ebuild 1014
 MD5 82f760f850552f3be75d5dd733687219 files/digest-mupen64-blight-input-0.0.8-r1 72
+MD5 ba8b60aba3d62bdaf3f7a817cbe2d61d files/mupen64-blight-input-cflags.patch 422
+MD5 f63e1260b9d35674f21fdcfff3be5c16 files/mupen64-blight-input-SDL_ttf.patch 353
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFB3KgVUpKYMelfdYERAodJAJ9BAJPLNIURIAS+As2+1F3KDP6DSQCfVHWq
-ayuPmdUdB2N1oWETlqGF7SI=
-=w0Jb
+iD8DBQFB3MXHUpKYMelfdYERAhz0AJ97IxFuOGuRI8O5Is75OFeTs97EUgCffA0l
+Y7P/svkBArrSvWOKwlSHycY=
+=0NrQ
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64-blight-input/files/mupen64-blight-input-SDL_ttf.patch b/games-emulation/mupen64-blight-input/files/mupen64-blight-input-SDL_ttf.patch
new file mode 100644
index 000000000000..24c246d049bc
--- /dev/null
+++ b/games-emulation/mupen64-blight-input/files/mupen64-blight-input-SDL_ttf.patch
@@ -0,0 +1,12 @@
+--- blight_input-0.0.8-b/src/SDL_ttf.c.orig	2005-01-01 00:34:42.153211968 -0600
++++ blight_input-0.0.8-b/src/SDL_ttf.c	2005-01-01 00:31:41.263711352 -0600
+@@ -39,6 +39,9 @@
+ #define FREEA(p) free(p)
+ #endif
+ 
++#include <ft2build.h>
++#include FT_FREETYPE_H
++
+ #include <freetype/freetype.h>
+ #include <freetype/ftoutln.h>
+ #include <freetype/ttnameid.h>
diff --git a/games-emulation/mupen64-blight-input/files/mupen64-blight-input-cflags.patch b/games-emulation/mupen64-blight-input/files/mupen64-blight-input-cflags.patch
new file mode 100644
index 000000000000..1e7085b6f578
--- /dev/null
+++ b/games-emulation/mupen64-blight-input/files/mupen64-blight-input-cflags.patch
@@ -0,0 +1,16 @@
+--- blight_input-0.0.8-b/configure.old	2005-01-02 16:19:54.094170638 -0800
++++ blight_input-0.0.8-b/configure	2005-01-02 16:21:37.380781639 -0800
+@@ -6022,12 +6022,7 @@
+   :
+ fi
+ 
+-
+-if test "$debug" = no ; then
+-	CFLAGS="$CFLAGS -O3 -fomit-frame-pointer -finline-functions -funroll-loops -march=`uname -m`"
+-else
+-	CFLAGS="$CFLAGS -g3 -O0 -Wall -D_DEBUG"
+-fi
++CFLAGS="${CFLAGS}"
+ 
+ trap '' 1 2 15
+ cat > confcache <<\EOF
diff --git a/games-emulation/mupen64-blight-input/mupen64-blight-input-0.0.8-r1.ebuild b/games-emulation/mupen64-blight-input/mupen64-blight-input-0.0.8-r1.ebuild
index ceafdc66177f..5aa60741553b 100644
--- a/games-emulation/mupen64-blight-input/mupen64-blight-input-0.0.8-r1.ebuild
+++ b/games-emulation/mupen64-blight-input/mupen64-blight-input-0.0.8-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-blight-input/mupen64-blight-input-0.0.8-r1.ebuild,v 1.1 2005/01/06 02:51:04 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-blight-input/mupen64-blight-input-0.0.8-r1.ebuild,v 1.2 2005/01/06 04:58:18 morfic Exp $
 
-inherit games
+inherit games eutils
 
 DESCRIPTION="An input plugin for the mupen64 N64 emulator"
 HOMEPAGE="http://mupen64.emulation64.com/"
-SRC_URI="http://deltaanime.ath.cx/~blight/n64/blight_input_plugin/blight_input-0.0.8-b.tar.gz"
+SRC_URI="mirror://gentoo/blight_input-${PV}-b.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,7 +17,7 @@ DEPEND=">=media-libs/libsdl-1.2.4
 	media-libs/sdl-ttf
 	media-libs/freetype"
 
-S="${WORKDIR}/blight_input-0.0.8-b"
+S="${WORKDIR}/blight_input-${PV}-b"
 
 src_unpack() {
 	unpack ${A}
@@ -25,6 +25,8 @@ src_unpack() {
 
 	# Death to all who distribute their stinking config.cache files!
 	rm -f config.cache
+	epatch ${FILESDIR}/${PN}-SDL_ttf.patch
+	epatch ${FILESDIR}/${PN}-cflags.patch
 }
 
 src_install() {