From 760d6cc587b1eef4a3df3817335f222e9579de5e Mon Sep 17 00:00:00 2001
From: Alfredo Tupone <tupone@gentoo.org>
Date: Fri, 30 Jan 2009 16:35:51 +0000
Subject: Fix --as-needed bug #247299 (Portage version: 2.1.6.4/cvs/Linux
 2.6.27-gentoo-r8 x86_64)

---
 games-arcade/cavezofphear/ChangeLog                |  8 ++++++--
 games-arcade/cavezofphear/cavezofphear-0.5.ebuild  | 19 +++++++----------
 .../files/cavezofphear-0.5-gentoo.patch            | 24 ++++++++++++++++++++++
 3 files changed, 37 insertions(+), 14 deletions(-)
 create mode 100644 games-arcade/cavezofphear/files/cavezofphear-0.5-gentoo.patch

(limited to 'games-arcade/cavezofphear')

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/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
+
+
-- 
cgit v1.2.3-65-gdbad