diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2009-09-05 15:04:06 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2009-09-05 15:04:06 +0000 |
| commit | f2ae5695bc48f5f8af081cff2a8b58aed3bf42dd (patch) | |
| tree | d193e458e73b6db0943a45ae4df6abab2b1d8ad5 /games-arcade | |
| parent | Version bump #283608 by zehner. (diff) | |
| download | gentoo-2-f2ae5695bc48f5f8af081cff2a8b58aed3bf42dd.tar.gz gentoo-2-f2ae5695bc48f5f8af081cff2a8b58aed3bf42dd.tar.bz2 gentoo-2-f2ae5695bc48f5f8af081cff2a8b58aed3bf42dd.zip | |
fix the patch (bug #283736)
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'games-arcade')
| -rw-r--r-- | games-arcade/cavezofphear/ChangeLog | 8 | ||||
| -rw-r--r-- | games-arcade/cavezofphear/cavezofphear-0.5.ebuild | 8 | ||||
| -rw-r--r-- | games-arcade/cavezofphear/files/cavezofphear-0.5-gentoo.patch | 38 |
3 files changed, 33 insertions, 21 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/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 - - + |