diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2009-02-02 11:41:34 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2009-02-02 11:41:34 +0000 |
| commit | 23eeb93e0602c3ded84127315148be7aaeeccda8 (patch) | |
| tree | 37803d726803f5225425ec0d330a44e3e63e59fb /games-arcade | |
| parent | add passdb field fix (diff) | |
| download | gentoo-2-23eeb93e0602c3ded84127315148be7aaeeccda8.tar.gz gentoo-2-23eeb93e0602c3ded84127315148be7aaeeccda8.tar.bz2 gentoo-2-23eeb93e0602c3ded84127315148be7aaeeccda8.zip | |
Fix --as-needed bug #247304
(Portage version: 2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 x86_64)
Diffstat (limited to 'games-arcade')
| -rw-r--r-- | games-arcade/nibbles/ChangeLog | 8 | ||||
| -rw-r--r-- | games-arcade/nibbles/files/nibbles-0.0.4-as-needed.patch | 24 | ||||
| -rw-r--r-- | games-arcade/nibbles/nibbles-0.0.4.ebuild | 18 |
3 files changed, 36 insertions, 14 deletions
diff --git a/games-arcade/nibbles/ChangeLog b/games-arcade/nibbles/ChangeLog index b72c23c0b5f7..828aa35dc0b9 100644 --- a/games-arcade/nibbles/ChangeLog +++ b/games-arcade/nibbles/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/nibbles -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/nibbles/ChangeLog,v 1.12 2008/03/20 00:40:14 nyhm Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/nibbles/ChangeLog,v 1.13 2009/02/02 11:41:34 tupone Exp $ + + 02 Feb 2009; Alfredo Tupone <tupone@gentoo.org> + +files/nibbles-0.0.4-as-needed.patch, nibbles-0.0.4.ebuild: + Fix --as-needed bug #247304 by flameeyes@gentoo.org 20 Mar 2008; Tristan Heaven <nyhm@gentoo.org> nibbles-0.0.4.ebuild: Add ~amd64 keyword diff --git a/games-arcade/nibbles/files/nibbles-0.0.4-as-needed.patch b/games-arcade/nibbles/files/nibbles-0.0.4-as-needed.patch new file mode 100644 index 000000000000..7e27d1fb9cac --- /dev/null +++ b/games-arcade/nibbles/files/nibbles-0.0.4-as-needed.patch @@ -0,0 +1,24 @@ +--- Makefile.old 2009-02-02 12:40:36.000000000 +0100 ++++ Makefile 2009-02-02 12:41:22.000000000 +0100 +@@ -1,19 +1,14 @@ +-CC = gcc -Wall -g +- + SRCS = player.c main.c loadMap.c cmdline.c ncdrawlib.c scoring.c + OBJS = $(SRCS:.c=.o) +-LIBS = -lncurses ++LDLIBS = -lncurses + + INSTALL=/usr/bin/install -c + INSTALL_FOLDER=/usr/games + + all: nibbles + +-.c.o: +- $(CC) -c $*.c -o $*.o +- + nibbles: $(OBJS) +- $(CC) $(LIBS) $(OBJS) -o $@ ++ $(CC) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $@ + + clean: + rm -f *~ *.o nibbles diff --git a/games-arcade/nibbles/nibbles-0.0.4.ebuild b/games-arcade/nibbles/nibbles-0.0.4.ebuild index 4ac943d9714d..bd62a2f0c8bc 100644 --- a/games-arcade/nibbles/nibbles-0.0.4.ebuild +++ b/games-arcade/nibbles/nibbles-0.0.4.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2008 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/nibbles/nibbles-0.0.4.ebuild,v 1.11 2008/03/20 00:40:14 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/nibbles/nibbles-0.0.4.ebuild,v 1.12 2009/02/02 11:41:34 tupone Exp $ -inherit games +EAPI=2 +inherit eutils games MY_P=${PN}-v${PV} DESCRIPTION="An ncurses-based Nibbles clone" @@ -18,10 +19,7 @@ DEPEND="sys-libs/ncurses" S="${WORKDIR}/${MY_P}" -src_unpack() { - unpack ${A} - cd "${S}" - +src_prepare() { sed -i \ -e "s#/usr/local/games/nibbles.levels#${GAMES_DATADIR}/${PN}#" \ nibbles.h \ @@ -31,11 +29,7 @@ src_unpack() { -e "s#/var/lib/games/nibbles.score#${GAMES_STATEDIR}/nibbles.scores#" \ scoring.h \ || die "sed failed" - sed -i \ - -e '/c.o:/d' \ - -e '/CC.*-c/d' \ - -e '/^CC/d' Makefile \ - || die "sed failed" + epatch "${FILESDIR}"/${P}-as-needed.patch } src_install() { |