Fix --as-needed as reported by Bug #281990

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 40 insertions, 16 deletions

diff --git a/games-puzzle/sgt-puzzles/ChangeLog b/games-puzzle/sgt-puzzles/ChangeLog
index 23b2431c7b1b..de8195679c7d 100644
--- a/games-puzzle/sgt-puzzles/ChangeLog
+++ b/games-puzzle/sgt-puzzles/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/sgt-puzzles
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog,v 1.1 2009/08/18 09:52:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog,v 1.2 2009/09/11 12:02:01 tupone Exp $
+
+  11 Sep 2009; Tupone Alfredo <tupone@gentoo.org>
+  +files/sgt-puzzles-8605-gentoo.patch, sgt-puzzles-8605.ebuild:
+  Fix --as-needed as reported by Bug #281990 by James Rowe <jnrowe@gmail.com>
 
 *sgt-puzzles-99999999 (18 Aug 2009)
 *sgt-puzzles-8605 (18 Aug 2009)
diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest
index 6c51b60ae859..b83609038e13 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX sgt-puzzles-8605-gentoo.patch 1316 RMD160 30e84619a9b25e4deebc1f7d7d02f872f1e6653d SHA1 aa9a064d4f4872f7112176e72a0ea5603957a10d SHA256 4f39cd5d488a7e5885bb47a548fc9a7fda8fdc156a0e691562415377cd980938
 DIST puzzles-r8605.tar.gz 2155649 RMD160 0dd87cfad27c22ab46680943dd89fcd219af10e5 SHA1 1400fbdeffb5f9c42c3e050f86a95e2b21465641 SHA256 eae484f74061ed340a31c2fb5248c2003cd5d7b04ee581185e187e45c9f10003
-EBUILD sgt-puzzles-8605.ebuild 1728 RMD160 e8cb9e1ad3723b03073471fc996a88cedb428f46 SHA1 af48d18357bc3b3d6df5a289c63885df39671f50 SHA256 77fd6442ec54245e8d73a34ea35b76ab4c5673a07c1b05d242e1fff34f674316
+EBUILD sgt-puzzles-8605.ebuild 1692 RMD160 f8169d931a33895d63deeae240fc350088dce075 SHA1 2ec89e1d2c915a81e0b810d47e96ac5c74d4115c SHA256 e5d742ed914842fb9f04ce0250d3056dfca491e3b5cf2a2caa6d374fa077e673
 EBUILD sgt-puzzles-99999999.ebuild 1732 RMD160 e6c127b726114346cd4655f8653e08a023cafb8c SHA1 334fa722088c6a610fedfb085b9b620821327b77 SHA256 bb76b47a00f9c43234b17a58f1e0d5b72f03d6580e19d6d53cd5d0f557db8e3f
-MISC ChangeLog 488 RMD160 eee4bdd86dfd3a8a501520fcc58b19f4558fa91a SHA1 23c0ada3404cbbdc38728d204feb35685243078e SHA256 60b1d259c93bab32f2478742d79346a78405fdb9f61b6084d2a5eb55284def86
+MISC ChangeLog 682 RMD160 9d5561d173676efd7dd07b83a678d97bc19c1f94 SHA1 85a0c50ca1556629de69f0b16fd07c984e78d72b SHA256 b114ed7a797fa198d6c123082880c135f0f44641f18094e1b8f5aa2699b24817
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqKeesACgkQlPl3HsVfCDoUxACfRby47WKQcQFqHLHgJIpjraLQ
-ZuMAnA59bW+LShZTIk5y2S0ySNeBJJqo
-=7PNA
------END PGP SIGNATURE-----
diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles-8605-gentoo.patch b/games-puzzle/sgt-puzzles/files/sgt-puzzles-8605-gentoo.patch
new file mode 100644
index 000000000000..89638f60944d
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/files/sgt-puzzles-8605-gentoo.patch
@@ -0,0 +1,29 @@
+--- mkfiles.pl.old	2009-09-11 13:39:57.000000000 +0200
++++ mkfiles.pl	2009-09-11 13:44:40.000000000 +0200
+@@ -1110,8 +1110,8 @@
+     "\n".
+     &splitline("CFLAGS = -O2 -Wall -Werror -ansi -pedantic -g " .
+ 	       (join " ", map {"-I$dirpfx$_"} @srcdirs) .
+-	       " `\$(GTK_CONFIG) --cflags`")."\n".
+-    "XLDFLAGS = `\$(GTK_CONFIG) --libs`\n".
++	       " `pkg-config gtk+-2.0 --cflags`")."\n".
++    "XLDLIBS = `pkg-config gtk+-2.0 --libs`\n".
+     "ULDFLAGS =#\n".
+     "INSTALL=install\n",
+     "INSTALL_PROGRAM=\$(INSTALL)\n",
+@@ -1130,8 +1130,13 @@
+       $objstr = &objects($p, "X.o", undef, undef);
+       print &splitline($prog . ": " . $objstr), "\n";
+       $libstr = &objects($p, undef, undef, "-lX");
+-      print &splitline("\t\$(CC)" . $mw . " \$(${type}LDFLAGS) -o \$@ " .
+-                       $objstr . " $libstr", 69), "\n\n";
++      if ($type eq "X") {
++        print &splitline("\t\$(CC)" . $mw . " \$(LDFLAGS) -o \$@ " .
++                         $objstr . " $libstr \$(XLDLIBS)", 69), "\n\n";
++      } else {
++        print &splitline("\t\$(CC)" . $mw . " \$(LDFLAGS) -o \$@ " .
++                         $objstr . " $libstr", 69), "\n\n";
++      }
+     }
+     foreach $d (&deps("X.o", undef, $dirpfx, "/")) {
+       print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-8605.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-8605.ebuild
index 4953d853de59..91f8630f9754 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-8605.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-8605.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-8605.ebuild,v 1.1 2009/08/18 09:52:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-8605.ebuild,v 1.2 2009/09/11 12:02:01 tupone Exp $
 
 EAPI="2"
 
@@ -29,9 +29,9 @@ DEPEND="${RDEPEND}
 	doc? ( >=app-doc/halibut-1.0 )"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	./mkfiles.pl
 	sed -i \
-		-e '1iPKG_CONFIG ?= pkg-config' \
-		-e '/^GTK_CONFIG/s:=.*:= $(PKG_CONFIG) gtk+-2.0:' \
 		-e 's:= -O2 -Wall -Werror -ansi -pedantic -g:+= $(CPPFLAGS):' \
 		-e '/LDFLAGS/s:=:=$(LDFLAGS) :' \
 		Makefile || die