diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2009-02-10 11:42:47 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2009-02-10 11:42:47 +0000 |
| commit | e4db64db3da025c51b7f3a2b518128cba822c56d (patch) | |
| tree | 693bdf5f4511cdad52c6baae25153de3a7596922 /games-puzzle | |
| parent | Version bump. Release candidates will be added hard masked. (diff) | |
| download | gentoo-2-e4db64db3da025c51b7f3a2b518128cba822c56d.tar.gz gentoo-2-e4db64db3da025c51b7f3a2b518128cba822c56d.tar.bz2 gentoo-2-e4db64db3da025c51b7f3a2b518128cba822c56d.zip | |
Fix --as-needed bug #247444
(Portage version: 2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 x86_64)
Diffstat (limited to 'games-puzzle')
| -rw-r--r-- | games-puzzle/picpuz/ChangeLog | 8 | ||||
| -rw-r--r-- | games-puzzle/picpuz/files/picpuz-1.7-gentoo.patch | 33 | ||||
| -rw-r--r-- | games-puzzle/picpuz/picpuz-1.7.ebuild | 21 |
3 files changed, 45 insertions, 17 deletions
diff --git a/games-puzzle/picpuz/ChangeLog b/games-puzzle/picpuz/ChangeLog index 4f503a9689ee..17c14560ef75 100644 --- a/games-puzzle/picpuz/ChangeLog +++ b/games-puzzle/picpuz/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-puzzle/picpuz -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/picpuz/ChangeLog,v 1.3 2008/08/25 22:54:38 mr_bones_ Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/picpuz/ChangeLog,v 1.4 2009/02/10 11:42:46 tupone Exp $ + + 10 Feb 2009; Alfredo Tupone <tupone@gentoo.org> + +files/picpuz-1.7-gentoo.patch, picpuz-1.7.ebuild: + Fix --as-needed bug #247444 by flameeyes@gentoo.org *picpuz-1.7 (25 Aug 2008) diff --git a/games-puzzle/picpuz/files/picpuz-1.7-gentoo.patch b/games-puzzle/picpuz/files/picpuz-1.7-gentoo.patch new file mode 100644 index 000000000000..9d6e1275388c --- /dev/null +++ b/games-puzzle/picpuz/files/picpuz-1.7-gentoo.patch @@ -0,0 +1,33 @@ +--- Makefile.old 2009-02-10 12:36:39.000000000 +0100 ++++ Makefile 2009-02-10 12:38:25.000000000 +0100 +@@ -2,8 +2,9 @@ + PROGRAM = picpuz + VERSION = 1.7 + SOURCE = $(PROGRAM)-$(VERSION).cpp +-CFLAGS = -O -Wall -c `pkg-config --cflags gtk+-2.0` +-LFLAGS = -O -Wall `pkg-config --libs gtk+-2.0 gthread-2.0` ++CXXFLAGS += `pkg-config --cflags gtk+-2.0` \ ++ -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" ++LDLIBS = `pkg-config --libs gtk+-2.0 gthread-2.0` + LAUNCHER = $(HOME)/Desktop/$(PROGRAM).desktop + + # use $PREFIX if defined, else assume /usr/local +@@ -18,16 +19,10 @@ + + + $(PROGRAM): $(PROGRAM).o zfuncs.o +- @g++ $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o ++ $(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -o $@ + + $(PROGRAM).o: $(SOURCE) zfuncs.h +- @g++ $(CFLAGS) -o $(PROGRAM).o $(SOURCE) \ +- -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" +- +-zfuncs.o: zfuncs.cpp zfuncs.h +- @g++ $(CFLAGS) zfuncs.cpp \ +- -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" +- ++ $(COMPILE.cc) $(OUTPUT_OPTION) $< + + install: $(PROGRAM) + mkdir -p $(DESTDIR)$(DATADIR) diff --git a/games-puzzle/picpuz/picpuz-1.7.ebuild b/games-puzzle/picpuz/picpuz-1.7.ebuild index f5e9f9d51da3..5f30bacccf97 100644 --- a/games-puzzle/picpuz/picpuz-1.7.ebuild +++ b/games-puzzle/picpuz/picpuz-1.7.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-puzzle/picpuz/picpuz-1.7.ebuild,v 1.1 2008/08/25 22:54:38 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/picpuz/picpuz-1.7.ebuild,v 1.2 2009/02/10 11:42:46 tupone Exp $ -inherit toolchain-funcs eutils games +EAPI=2 +inherit eutils games DESCRIPTION="a jigsaw puzzle program" HOMEPAGE="http://www.kornelix.com/picpuz" @@ -19,18 +20,8 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${PN} -src_unpack() { - unpack ${A} - cd "${S}" - - sed -i \ - -e 's/CFLAGS/CXXFLAGS/g' \ - -e '/LFLAGS/s/$/ $(LDFLAGS)/' \ - -e '/^CXXFLAGS/s/=/+=/' \ - -e 's/-O//' \ - -e "s/g++/$(tc-getCXX)/g" \ - Makefile \ - || die "sed failed" +src_prepare() { + epatch "${FILESDIR}"/${P}-gentoo.patch rm -f doc/COPYING mv doc/*pdf "${T}" || die "mv failed" } |