Fix --as-needed bug #247490

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.26-gentoo-r3 i686

5 files changed, 55 insertions, 29 deletions

diff --git a/games-strategy/galaxyhack/ChangeLog b/games-strategy/galaxyhack/ChangeLog
index 8511e69cd70f..26358665fbdc 100644
--- a/games-strategy/galaxyhack/ChangeLog
+++ b/games-strategy/galaxyhack/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/galaxyhack
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/galaxyhack/ChangeLog,v 1.6 2008/08/31 05:18:06 mr_bones_ Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/galaxyhack/ChangeLog,v 1.7 2009/02/11 21:35:08 tupone Exp $
+
+  11 Feb 2009; Tupone Alfredo <tupone@gentoo.org>
+  files/galaxyhack-1.74-destdirs.patch, +files/galaxyhack-1.74-gentoo.patch,
+  galaxyhack-1.74.ebuild:
+  Fix --as-needed bug #247490 by flameeyes@gentoo.org
 
   31 Aug 2008; Michael Sterrett <mr_bones_@gentoo.org>
   +files/galaxyhack-1.74-gcc43.patch, galaxyhack-1.74.ebuild:
diff --git a/games-strategy/galaxyhack/Manifest b/games-strategy/galaxyhack/Manifest
index de4ee9534a05..3acdf75a6027 100644
--- a/games-strategy/galaxyhack/Manifest
+++ b/games-strategy/galaxyhack/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX galaxyhack-1.74-boost.patch 245 RMD160 07182eeefde50834a051bd19a98c45885503226d SHA1 aa702e4fd2e7c4f3e50bfa364fbc5e8f50a52558 SHA256 1aeb8d201d8d76fe9953afa34e93e82cd31c62234a5fd33bb6b776f3e7980722
-AUX galaxyhack-1.74-destdirs.patch 767 RMD160 417696eaf75f10ebb0bf58e317bee730b877541b SHA1 8889d58bd6611b92b40b2f3627aad3a42e10b215 SHA256 6a469f6a3c1cfb556483f42d4d3aad90fb2ea99c4df5edaaf134c229e7d38f05
+AUX galaxyhack-1.74-destdirs.patch 386 RMD160 0410695d3d16856550222eff7fe1ced909be914f SHA1 4ba4c58f7d9fe1e14b510e16c563f17a12890967 SHA256 c9a6ce4657120c0d50f8b606db1b5b54131821397a18187a5f8a4dff12f04927
 AUX galaxyhack-1.74-gcc43.patch 309 RMD160 50961e62a78ac56545307eb0c4ca4f4c68566bf5 SHA1 32b630e1841b4074df1bc6c17190c445ec243b82 SHA256 7808ab6f84a6467b09699762fba3225275936647f34408c423499bed5faa1ca3
+AUX galaxyhack-1.74-gentoo.patch 969 RMD160 7323fc045da8e7d91cd803817bf8004f1a9b0255 SHA1 e0377698b7fccb6cf51739363c2e685093b6b4a2 SHA256 be73f1f52a0c2200ae1a486d4f9bb7c152dfffa89b9d86ef637f9983cd3f8e46
 DIST galaxyhack-1.74.tar.bz2 9948336 RMD160 b84de9a93709093d572732018f30cafeb3c7439c SHA1 0e5e691662bfe5b52689efda883b94813897a85c SHA256 ae6529008fe5be76607ce78833ef3b5d55e10f60a998b5747255b0854037880a
 DIST galaxyhack.png 819 RMD160 8cf27749f4672158d66a39c760bdef21306ecc23 SHA1 a01db93f2b3c3c32cfd447e26b5b4f389efe05fd SHA256 248d32aeaa03e4183cf0333bd4da1d32ea11883fcb77efe6ebc6e2be201e9903
-EBUILD galaxyhack-1.74.ebuild 1779 RMD160 a4aa96d919c93abcb54a635b4f8a6f8bfe8e4fa1 SHA1 234f60adfcfe9abbe48145c700db8298757dc3e7 SHA256 a0b832a1c328976875f2bff4fdb60b6c908912542c548a0e9a480e3505069850
-MISC ChangeLog 1232 RMD160 1e28e2ae236fcfddc8196da76cce495d3e770ed0 SHA1 868b3c098209512155caa8245f3157157534893e SHA256 28757a8c2bdee8437b5e3eb6ae8142c7e935b972091c220c0fe7a80f4cb5b733
+EBUILD galaxyhack-1.74.ebuild 1676 RMD160 d36a87571cf7a2c9453db91d670c55944044c2e2 SHA1 9aaa39a7ba4196514b758ee8e901c017d4527094 SHA256 0cb7f8668cd9a911ccdc59fd2709d7fa6018cda0747b8add310eb26a6d85ce04
+MISC ChangeLog 1437 RMD160 f55ec2d9ac8ccc1d307d52b5baec5db99f9ce994 SHA1 eeca6392f24135b61a572ed8542f24697d86d92d SHA256 4a93ea2eb1cdc6f38d04a65976d8888e6e30be0842235fa1f14871cfe1615563
 MISC metadata.xml 1207 RMD160 42f594c141624b20faf04966bda60ef38998871a SHA1 a0e134c3a46fa92c1f076814b5e57da2c1d8dd7f SHA256 b49a896d99275f98ee92e6b225f573551e4eb1af5af57b88ebf2d8d5fa63c295
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmTRJcACgkQSYz9rjec82bIoQCfbt6MglmrYbjxsroL0IMBFbJK
+XaIAoMfHj+MXrtfSNLVeyd0HWmyc0G6N
+=3j3L
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch
index c20529e410fa..4b5beef56ac7 100644
--- a/games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch
@@ -1,16 +1,3 @@
---- Makefile.old	2006-07-28 00:02:20.000000000 +0200
-+++ Makefile	2006-07-28 00:02:59.000000000 +0200
-@@ -6,8 +6,8 @@
- # James Gregory and Everton da Silva Marques <evertonsm@yahoo.com.br>
- #
- 
--INSTALL_DIR=/usr/local/share
--INSTALL_BIN_DIR=/usr/local/bin
-+INSTALL_DIR="${GAMES_DATADIR}"
-+INSTALL_BIN_DIR="${GAMES_BINDIR}"
- 
- CXX = g++
- CXXFLAGS = $(shell sdl-config --cflags) -O3
 --- Main.cpp.old	2006-07-28 00:04:46.000000000 +0200
 +++ Main.cpp	2006-07-28 00:08:28.000000000 +0200
 @@ -184,7 +184,7 @@
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-gentoo.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-gentoo.patch
new file mode 100644
index 000000000000..b5406305c372
--- /dev/null
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-gentoo.patch
@@ -0,0 +1,28 @@
+--- Makefile.old	2009-02-11 22:21:26.000000000 +0100
++++ Makefile	2009-02-11 22:20:58.000000000 +0100
+@@ -6,12 +6,11 @@
+ # James Gregory and Everton da Silva Marques <evertonsm@yahoo.com.br>
+ #
+ 
+-INSTALL_DIR=/usr/local/share
+-INSTALL_BIN_DIR=/usr/local/bin
++INSTALL_DIR="${GAMES_DATADIR}"
++INSTALL_BIN_DIR="${GAMES_BINDIR}"
+ 
+-CXX = g++
+-CXXFLAGS = $(shell sdl-config --cflags) -O3
+-LDFLAGS = $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lboost_filesystem
++CXXFLAGS += $(shell sdl-config --cflags)
++LDLIBS = $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lboost_filesystem
+ 
+ OBJS = AIInterpreter.o AutoFireUnit.o BCCompiler.o DerivedGroups.o DragWindow.o \
+ 	ForceSelect.o ForceSelectWin.o GenWindow.o GenWindow_Base.o GFX.o Globals.o \
+@@ -40,7 +39,7 @@
+ 	install $(TARGET) $(INSTALL_BIN_DIR)
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+ 
+ %.o: %.cpp
+ 	$(CXX) $(CXXFLAGS) -c $< -o $@
diff --git a/games-strategy/galaxyhack/galaxyhack-1.74.ebuild b/games-strategy/galaxyhack/galaxyhack-1.74.ebuild
index 77c3c7462c84..e55c0c86e845 100644
--- a/games-strategy/galaxyhack/galaxyhack-1.74.ebuild
+++ b/games-strategy/galaxyhack/galaxyhack-1.74.ebuild
@@ -1,7 +1,8 @@
-# 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-strategy/galaxyhack/galaxyhack-1.74.ebuild,v 1.2 2008/08/31 05:18:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/galaxyhack/galaxyhack-1.74.ebuild,v 1.3 2009/02/11 21:35:08 tupone Exp $
 
+EAPI=2
 inherit eutils games
 
 DESCRIPTION="Multiplayer AI script based strategy game."
@@ -21,25 +22,19 @@ DEPEND="media-libs/libsdl
 
 S=${WORKDIR}/${PN}/src
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	edos2unix Makefile
 	epatch \
 		"${FILESDIR}"/${P}-destdirs.patch \
 		"${FILESDIR}"/${P}-boost.patch \
-		"${FILESDIR}"/${P}-gcc43.patch
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gentoo.patch
 	sed -i "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \
 		Main.cpp \
 		|| die "sed Main.cpp failed"
 	sed -i "/Base data path/s:pwd:${GAMES_DATADIR}/${PN}:" \
 		../settings.dat \
 		|| die "sed settings.dat failed"
-	sed -i \
-		-e "/^CXXFLAGS/s:-O3:${CXXFLAGS}:" \
-		-e '/^LDFLAGS/s:=:+=:' \
-		Makefile \
-		|| die "sed Makefile failed"
 }
 
 src_install() {