Respect LDFLAGS. Bug #336111

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

4 files changed, 37 insertions, 22 deletions

diff --git a/games-puzzle/ngstar/ChangeLog b/games-puzzle/ngstar/ChangeLog
index c225817d0bf5..439675a715a5 100644
--- a/games-puzzle/ngstar/ChangeLog
+++ b/games-puzzle/ngstar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/ngstar
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ngstar/ChangeLog,v 1.7 2008/05/02 19:44:34 nyhm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ngstar/ChangeLog,v 1.8 2010/09/10 07:36:08 tupone Exp $
+
+  10 Sep 2010; Tupone Alfredo <tupone@gentoo.org> ngstar-2.1.8-r2.ebuild,
+  +files/ngstar-2.1.8-ldflags.patch:
+  Respect LDFLAGS. Bug #336111 by flameeyes@gentoo.org
 
   02 May 2008; Tristan Heaven <nyhm@gentoo.org>
   +files/ngstar-2.1.8-gcc43.patch, ngstar-2.1.8-r2.ebuild:
diff --git a/games-puzzle/ngstar/Manifest b/games-puzzle/ngstar/Manifest
index 34471d587493..1882c910dd0f 100644
--- a/games-puzzle/ngstar/Manifest
+++ b/games-puzzle/ngstar/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ngstar-2.1.8-gcc43.patch 208 RMD160 7faeac72ec763882ee3bf967c7aa2d47fb1d3af0 SHA1 61ae648e24d2eb9d2de7ca97c133f242b673329b SHA256 627a182a862cfa5623f81707b8f41d6e1f2410fbe13a660d69e21e94abc488fe
 AUX ngstar-2.1.8-gentoo-path.patch 534 RMD160 b70dbfb7e719739cf6e6bdb0cadb6b78cf832f48 SHA1 f02021ee4198445794bf37a8ab6eb5a1eb0b260f SHA256 32d0998b7f9416995a30c8b448040d3427c1e59ce66c9d25495ac3d909e8f45a
+AUX ngstar-2.1.8-ldflags.patch 671 RMD160 216ba3889d13fe5888662048f730904b96950d0b SHA1 7a0510682a9a76feaf665bfd428dbc8ae486e988 SHA256 8776817c496771d64bf5a74e8a41d350a2957a502cce0f9753c3f4c1fe476b17
 DIST ngstar-2.1.8-src.tar.bz2 45851 RMD160 6b31bcbf0c5bcf385bca391fd9dea92e207e7321 SHA1 cff5ed2d53e2722a479804c81cd0f6d7c2694bee SHA256 c8a2cf84d2a4bb40280d4ce307ceaed8f97d2183f79f7a82b38b78aaedb73fb3
-EBUILD ngstar-2.1.8-r2.ebuild 1167 RMD160 389898b79982b2fd8e51764ee85b7ad145c4d2be SHA1 aaba352f1d6ab2cd4022edb19ecdb997c2f33d8e SHA256 044c854e2df282c9395469fd2fd7997ec83011768134e39ba7296d2e87bb57c9
-MISC ChangeLog 1272 RMD160 64200ea0397ba41783473b6aa7a4e0b9e8ea5550 SHA1 ed23276b1bcc23bf21e43fc0441162c28fda509f SHA256 a5b22f9c73098b78341b0c3fe44035013aa936df8acf3479d0c3129a135e0d60
+EBUILD ngstar-2.1.8-r2.ebuild 1184 RMD160 d8606851f394b65701c4b58f0bfedb382dc68a1c SHA1 4e12cbfb44950a978130ed7cd52d3835c78e9e7a SHA256 cdefa7c7112cd85b531745e0d703e207c1a1d904c03ef27ba6865d38be95c589
+MISC ChangeLog 1441 RMD160 fcc6bfc2c30c932e49fdb6148e626c7d28a46998 SHA1 6a453399cc77c3e4349a5db78103512f3071c20d SHA256 427096dc64701f09568c8bdac5e5838f9c94dd7647cf2916ff1037917fe59484
 MISC metadata.xml 442 RMD160 43e82d19b4aa5d88c93e1e0084d96ab1b3d89989 SHA1 81183c35f178ad7c125b6b2384a1cd2ccfd5b518 SHA256 f363cdb47a1e0f84e72df3275cb8f5540924558aab077551c9709adcbe92920d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgbbygACgkQdz7hIScOURE0VACg6hM214I5gCdguqqzYWTgLM4/
-tg4AoMh/qjGtQZpn1T6VXV5CMUyl1aXd
-=E7j/
------END PGP SIGNATURE-----
diff --git a/games-puzzle/ngstar/files/ngstar-2.1.8-ldflags.patch b/games-puzzle/ngstar/files/ngstar-2.1.8-ldflags.patch
new file mode 100644
index 000000000000..3c8dd8e8fad8
--- /dev/null
+++ b/games-puzzle/ngstar/files/ngstar-2.1.8-ldflags.patch
@@ -0,0 +1,20 @@
+--- src/Makefile.old	2010-09-10 09:22:06.000000000 +0200
++++ src/Makefile	2010-09-10 09:33:20.000000000 +0200
+@@ -56,8 +56,7 @@
+ 
+ $(BIN) : $(SOURCE) $(BIN_DEPS)
+ 	echo "Compiling $(BIN)"
+-	$(CXX) $< $(BIN_DEPS) -o $@ $(CC_LIBS) $(CC_INCLUDES) $(CPPFLAGS)
+-	strip -s $@
++	$(CXX) ${LDFLAGS} $< $(BIN_DEPS) -o $@ $(CC_LIBS) $(CC_INCLUDES) $(CPPFLAGS)
+ ifdef USE_FLTK2
+ 	-ln -s `basename $(BIN)` $(BIN_FLTK2)
+ endif
+@@ -68,7 +67,6 @@
+ $(BIN_STATIC) : $(SOURCE) $(BIN_DEPS)
+ 	echo "Compiling $(BIN)"
+ 	$(CXX) -static $< $(BIN_DEPS) -o $@ $(CC_LIBS_STATIC) $(CC_INCLUDES) $(CPPFLAGS)
+-	strip -s $@
+ ifdef USE_FLTK2
+ 	-ln -s `basename $(BIN_STATIC)` $(BIN_STATIC_FLTK2)
+ endif
diff --git a/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild b/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild
index ea49a8ec7691..f05d8b5164f4 100644
--- a/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild
+++ b/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild,v 1.5 2008/05/02 19:44:34 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild,v 1.6 2010/09/10 07:36:08 tupone Exp $
+EAPI="2"
 
 inherit eutils games
 
@@ -16,25 +17,24 @@ IUSE=""
 DEPEND="sys-libs/ncurses
 	sys-libs/gpm"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-gentoo-path.patch \
-		"${FILESDIR}"/${P}-gcc43.patch
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
 	sed -i \
 		-e "s:@GENTOO_DATA@:${GAMES_DATADIR}:" \
 		-e "s:@GENTOO_BIN@:${GAMES_BINDIR}:" \
 		-e "/^CPPFLAGS/s:+=:+= ${CXXFLAGS}:" \
+		-e "/SILENT/d" \
 		configure || die "sed configure failed"
 	sed -i '/strip/d' src/Makefile || die "sed makefile failed"
 }
 
-src_compile() {
+src_configure() {
 	./configure \
 		--prefix "" \
 		--without-fltk2 || die "configure failed"
-	emake || die "emake failed"
 }
 
 src_install() {