summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2009-01-30 16:35:51 +0000
committerAlfredo Tupone <tupone@gentoo.org>2009-01-30 16:35:51 +0000
commit7ae121074c6db99eba61e9698fc65f57f9445dbb (patch)
tree2b5c23210d655ba26b7b50e39082028637e86dab /games-arcade
parentwhitespace (diff)
downloadhistorical-7ae121074c6db99eba61e9698fc65f57f9445dbb.tar.gz
historical-7ae121074c6db99eba61e9698fc65f57f9445dbb.tar.bz2
historical-7ae121074c6db99eba61e9698fc65f57f9445dbb.zip
Fix --as-needed bug #247299
Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 x86_64
Diffstat (limited to 'games-arcade')
-rw-r--r--games-arcade/cavezofphear/ChangeLog8
-rw-r--r--games-arcade/cavezofphear/Manifest5
-rw-r--r--games-arcade/cavezofphear/cavezofphear-0.5.ebuild19
-rw-r--r--games-arcade/cavezofphear/files/cavezofphear-0.5-gentoo.patch24
4 files changed, 40 insertions, 16 deletions
diff --git a/games-arcade/cavezofphear/ChangeLog b/games-arcade/cavezofphear/ChangeLog
index c3e9e928502f..8de362e7ff74 100644
--- a/games-arcade/cavezofphear/ChangeLog
+++ b/games-arcade/cavezofphear/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-arcade/cavezofphear
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/cavezofphear/ChangeLog,v 1.9 2007/04/09 21:53:38 welp Exp $
+# 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 $
+
+ 30 Jan 2009; Alfredo Tupone <tupone@gentoo.org>
+ +files/cavezofphear-0.5-gentoo.patch, cavezofphear-0.5.ebuild:
+ Fix --as-needed bug #247299 by flameeyes@gentoo.org
09 Apr 2007; Peter Weller <welp@gentoo.org> cavezofphear-0.5.ebuild:
Keyworded ~x86-fbsd wrt bug 173405
diff --git a/games-arcade/cavezofphear/Manifest b/games-arcade/cavezofphear/Manifest
index 88bf53421af4..603058373d79 100644
--- a/games-arcade/cavezofphear/Manifest
+++ b/games-arcade/cavezofphear/Manifest
@@ -1,4 +1,5 @@
+AUX cavezofphear-0.5-gentoo.patch 469 RMD160 188e21e34e218b750fb8d6cd68616b2e399b315b SHA1 f304ff84e9a7e96966bc464594c88e723212f49f SHA256 7e0ae8c9ca452a4b90eca961a8a3649557501069cba4c55fc4364d4f29c605aa
DIST phear-0.5.tar.bz2 20502 RMD160 d727eef639e06869fd436e19450ff3a25d62e91a SHA1 5bd982ddbf014697d03e6d5d2d368e4da8e2a203 SHA256 1087c04347ff60d153ffceb91363a31643337ed71b4a40b68160392d32d68bb7
-EBUILD cavezofphear-0.5.ebuild 1162 RMD160 e3fc1a30a0e64afe3ec0647dc722a8b4ab081a46 SHA1 d2372e756bf8f2bbe80d052330047cd14f01edcb SHA256 45fbad8a2b8f4430da276dae29846b4a1838e4e5c3ee814308a144c7b16ef48f
-MISC ChangeLog 1104 RMD160 531488921643ba47098510c62a81310c91845103 SHA1 5612aad4310de0cd9806dafe1e08fe58835ef468 SHA256 70a2c43def83a78e7086f46164bc52214181223aa5dac3190d03e756b48989a0
+EBUILD cavezofphear-0.5.ebuild 1047 RMD160 526fe0e51e7571704aa439ac1b28293e242f1684 SHA1 0a467471a061c009444acded07d7e93461e4f1ca SHA256 0479eb30e988411f9286bb30097fceac814c99986c0271c92c842ab7ce53073f
+MISC ChangeLog 1277 RMD160 6b029fa63e37be26452c5b5509cbd7e47f41ac5b SHA1 768bf8c11f99ccc0b0e9323f810b2e42fc9b53e1 SHA256 694e644abdc177d59cd17c6161901cab757057eba41e3ffa5890cf0703a6428f
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 565b359ce004..d884a699f02a 100644
--- a/games-arcade/cavezofphear/cavezofphear-0.5.ebuild
+++ b/games-arcade/cavezofphear/cavezofphear-0.5.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.2 2007/04/09 21:53:38 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/cavezofphear/cavezofphear-0.5.ebuild,v 1.3 2009/01/30 16:35:51 tupone Exp $
-inherit toolchain-funcs games
+EAPI=2
+inherit toolchain-funcs eutils games
DESCRIPTION="A boulder dash / digger-like game for console using ncurses"
HOMEPAGE="http://www.x86.no/cavezofphear/"
@@ -15,18 +16,12 @@ IUSE=""
S=${WORKDIR}/${P/cavezof/}
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
+ export CC=$(tc-getCC)
sed -i \
-e 's/cd src.*/$(MAKE) -C src phear/' Makefile \
|| die "sed Makefile failed"
- sed -i \
- -e "/^CC/ s:gcc:$(tc-getCC):" \
- -e "/^CFLAGS/ s:=.*:= ${CFLAGS}:" \
- -e "/^LDFLAGS/ s:$: ${LDFLAGS}:" \
- src/Makefile \
- || die "sed src/Makefile failed"
+ epatch "${FILESDIR}"/${P}-gentoo.patch
sed -i \
-e "s:get_data_dir(.):\"${GAMES_DATADIR}/${PN}/\":" \
src/{chk.c,main.c,gplot.c} \
diff --git a/games-arcade/cavezofphear/files/cavezofphear-0.5-gentoo.patch b/games-arcade/cavezofphear/files/cavezofphear-0.5-gentoo.patch
new file mode 100644
index 000000000000..d7ffa2e4237c
--- /dev/null
+++ b/games-arcade/cavezofphear/files/cavezofphear-0.5-gentoo.patch
@@ -0,0 +1,24 @@
+--- src/Makefile.old 2009-01-30 17:22:01.000000000 +0100
++++ src/Makefile 2009-01-30 17:24:52.000000000 +0100
+@@ -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 $@
+
+ phear: $(OBJS)
+- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+
+ install: install-game
+
+