Fix --as-needed bug #247444

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 x86_64

4 files changed, 48 insertions, 19 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/Manifest b/games-puzzle/picpuz/Manifest
index a70dcb7ab61e..cfe6c7025453 100644
--- a/games-puzzle/picpuz/Manifest
+++ b/games-puzzle/picpuz/Manifest
@@ -1,4 +1,5 @@
+AUX picpuz-1.7-gentoo.patch 1060 RMD160 507ef04cae88111a6b25deb2c2e156aeb885b944 SHA1 f5324dc9e465483c10445734d1ac75924e77e699 SHA256 b5fe6b436e3676afe23b5986bbd78f6284d660409c3adbb633b112bf0e90d6cf
 DIST picpuz-1.7.tar.gz 239703 RMD160 84d8da71b2fd88e01be09a3121b37477d15a91b9 SHA1 c3db324565251b63f3f8a81fdb179228156e862f SHA256 d310922cf4daa3f947c16d86dbe7c659b62ec2bb49b17fdc24b767630279415f
-EBUILD picpuz-1.7.ebuild 1310 RMD160 082227f1c2168e786832c786539d9606bace4bdc SHA1 0071e3075ed0fbec8cd9e0e1886b6acca802874a SHA256 314a2542dfd2feac7e9497e75c5c1dcc22bb015e52ad3b7643efb714f1d4e500
-MISC ChangeLog 647 RMD160 0271722cfd6de5b84d1daa5715253af99df96d22 SHA1 098f01fde047ec0aae78eafd0bcb2a4de3b825b0 SHA256 564d9193e1d6719ba354a8bbf5478865532fa03fc5897aa642e9646a1ac687c7
+EBUILD picpuz-1.7.ebuild 1132 RMD160 a12f50bbd18cf152e0fe536d5488ef0447da749d SHA1 e0a0c291a852f43d883ea9e92f94a8e1ca492221 SHA256 264673c4805f2b22e925983a3f502135f58e79b535e16d758740631e38057006
+MISC ChangeLog 802 RMD160 d2a8c150a5ee556e03638c6c0f02e32670fccd92 SHA1 8944729e5f42b4d4574e3fbfde8283b5684c1c27 SHA256 f8f46ba887af0cdba4e1a1c1b4bbedc065d786e9c4b89d741634032bd1f65ad3
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
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"
 }