fix the patch (bug #283736)

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 36 insertions, 24 deletions

diff --git a/games-arcade/cavezofphear/ChangeLog b/games-arcade/cavezofphear/ChangeLog
index 8de362e7ff74..16d9b7ab1b7f 100644
--- a/games-arcade/cavezofphear/ChangeLog
+++ b/games-arcade/cavezofphear/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/cavezofphear
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/cavezofphear/ChangeLog,v 1.10 2009/01/30 16:35:51 tupone Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/cavezofphear/ChangeLog,v 1.11 2009/09/05 15:04:05 mr_bones_ Exp $
+
+  05 Sep 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  cavezofphear-0.5.ebuild, files/cavezofphear-0.5-gentoo.patch:
+  fix the patch (bug #283736)
 
   30 Jan 2009; Alfredo Tupone <tupone@gentoo.org>
   +files/cavezofphear-0.5-gentoo.patch, cavezofphear-0.5.ebuild:
diff --git a/games-arcade/cavezofphear/Manifest b/games-arcade/cavezofphear/Manifest
index 603058373d79..54c3b5f8fede 100644
--- a/games-arcade/cavezofphear/Manifest
+++ b/games-arcade/cavezofphear/Manifest
@@ -1,5 +1,5 @@
-AUX cavezofphear-0.5-gentoo.patch 469 RMD160 188e21e34e218b750fb8d6cd68616b2e399b315b SHA1 f304ff84e9a7e96966bc464594c88e723212f49f SHA256 7e0ae8c9ca452a4b90eca961a8a3649557501069cba4c55fc4364d4f29c605aa
+AUX cavezofphear-0.5-gentoo.patch 840 RMD160 5374b88ce1ca0f3b00b8a36009a0fa485e287f57 SHA1 6347895ba872cfb559e40d484b5ea59545aa13de SHA256 71edf405d66f87224567684c41a60f41edba6ead8ebb38d97bcac49561c3ff10
 DIST phear-0.5.tar.bz2 20502 RMD160 d727eef639e06869fd436e19450ff3a25d62e91a SHA1 5bd982ddbf014697d03e6d5d2d368e4da8e2a203 SHA256 1087c04347ff60d153ffceb91363a31643337ed71b4a40b68160392d32d68bb7
-EBUILD cavezofphear-0.5.ebuild 1047 RMD160 526fe0e51e7571704aa439ac1b28293e242f1684 SHA1 0a467471a061c009444acded07d7e93461e4f1ca SHA256 0479eb30e988411f9286bb30097fceac814c99986c0271c92c842ab7ce53073f
-MISC ChangeLog 1277 RMD160 6b029fa63e37be26452c5b5509cbd7e47f41ac5b SHA1 768bf8c11f99ccc0b0e9323f810b2e42fc9b53e1 SHA256 694e644abdc177d59cd17c6161901cab757057eba41e3ffa5890cf0703a6428f
+EBUILD cavezofphear-0.5.ebuild 919 RMD160 3bf742b0fafba488fadb594b37164e076716eae1 SHA1 a984c0799712f3f2f5bd8f188d9e4f47d10362ec SHA256 28240e12bf7791a79f361d2b6434108a07ba73241886f76b52d847dd0c0b800f
+MISC ChangeLog 1430 RMD160 c3d8da14f16c35a4a79a382312976bc7f8a1808c SHA1 cd9fcff12a07423e3d52d449e55a9072cef8e512 SHA256 e8ab4fabfe29c87a63479ca607d3eee1915e7f3ecfd9b6411f64844eb09f6059
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-arcade/cavezofphear/cavezofphear-0.5.ebuild b/games-arcade/cavezofphear/cavezofphear-0.5.ebuild
index d884a699f02a..71b3eff328e0 100644
--- a/games-arcade/cavezofphear/cavezofphear-0.5.ebuild
+++ b/games-arcade/cavezofphear/cavezofphear-0.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/cavezofphear/cavezofphear-0.5.ebuild,v 1.3 2009/01/30 16:35:51 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/cavezofphear/cavezofphear-0.5.ebuild,v 1.4 2009/09/05 15:04:05 mr_bones_ Exp $
 
 EAPI=2
-inherit toolchain-funcs eutils games
+inherit eutils games
 
 DESCRIPTION="A boulder dash / digger-like game for console using ncurses"
 HOMEPAGE="http://www.x86.no/cavezofphear/"
@@ -17,10 +17,6 @@ IUSE=""
 S=${WORKDIR}/${P/cavezof/}
 
 src_prepare() {
-	export CC=$(tc-getCC)
-	sed -i \
-		-e 's/cd src.*/$(MAKE) -C src phear/' Makefile \
-		|| die "sed Makefile failed"
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 	sed -i \
 		-e "s:get_data_dir(.):\"${GAMES_DATADIR}/${PN}/\":" \
diff --git a/games-arcade/cavezofphear/files/cavezofphear-0.5-gentoo.patch b/games-arcade/cavezofphear/files/cavezofphear-0.5-gentoo.patch
index d7ffa2e4237c..80169259d023 100644
--- a/games-arcade/cavezofphear/files/cavezofphear-0.5-gentoo.patch
+++ b/games-arcade/cavezofphear/files/cavezofphear-0.5-gentoo.patch
@@ -1,24 +1,36 @@
---- src/Makefile.old    2009-01-30 17:22:01.000000000 +0100
-+++ src/Makefile        2009-01-30 17:24:52.000000000 +0100
+diff -ru phear-0.5.orig/Makefile phear-0.5/Makefile
+--- phear-0.5.orig/Makefile	2007-02-27 06:21:55.000000000 -0500
++++ phear-0.5/Makefile	2009-09-05 11:01:08.534701774 -0400
+@@ -2,7 +2,7 @@
+ DESTDIR_DATA = /usr/local/share
+ 
+ make:
+-	cd src && make
++	$(MAKE) -C src phear
+ clean:
+ 	rm -f phear editor
+ install:
+diff -ru phear-0.5.orig/src/Makefile phear-0.5/src/Makefile
+--- phear-0.5.orig/src/Makefile	2007-02-27 04:59:26.000000000 -0500
++++ phear-0.5/src/Makefile	2009-09-05 11:01:57.341827885 -0400
 @@ -2,10 +2,8 @@
-
+ 
  DESTDIR = ..
-
+ 
 -CC = gcc
  INSTALL = install
 -CFLAGS = -s -Wall -O2
 -LDFLAGS = -lncurses
 +LDLIBS = -lncurses
-
+ 
  all: phear install clean
-
+ 
 @@ -13,7 +11,7 @@
-        $(CC) $(CFLAGS) -c $^ -o $@
-
+ 	$(CC) $(CFLAGS) -c $^ -o $@
+ 
  phear: $(OBJS)
--       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
-+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
-
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+ 
  install: install-game
-
-
+