Fix --as-needed bug #247496

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

4 files changed, 36 insertions, 12 deletions

diff --git a/games-strategy/lgeneral/ChangeLog b/games-strategy/lgeneral/ChangeLog
index 6e0013554766..51c9fbe6c9ad 100644
--- a/games-strategy/lgeneral/ChangeLog
+++ b/games-strategy/lgeneral/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/lgeneral
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.25 2007/05/24 06:35:26 opfer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.26 2009/02/12 09:13:08 tupone Exp $
+
+  12 Feb 2009; Alfredo Tupone <tupone@gentoo.org>
+  +files/lgeneral-1.2_beta12-as-needed.patch, lgeneral-1.2_beta12-r1.ebuild:
+  Fix --as-needed bug #247496 by flameeyes@gentoo.org
 
   24 May 2007; Christian Faulhammer <opfer@gentoo.org>
   lgeneral-1.2_beta12-r1.ebuild:
diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest
index 716fb71267d0..5896271df218 100644
--- a/games-strategy/lgeneral/Manifest
+++ b/games-strategy/lgeneral/Manifest
@@ -1,5 +1,6 @@
 AUX 1.1.1-netbsd-audio.patch 813 RMD160 7c8aff0e60b45ccae4b3f891f0f92a503cf8f590 SHA1 510a79663ca44200d6d671250c346a1782b14db4 SHA256 dca1503e39d23e452a6107f11cc06600248660d27195d7616c21b1dabd3514b0
 AUX lgeneral-1.2_beta12-64bit.patch 339 RMD160 e68c24f17b82a16db06230323362756593414e88 SHA1 3f5ab08c14959cd149d438d4abaab39663dcad20 SHA256 541bef53004cb900e842d2eb4dc8f144e313a23d194b8b3feeb0bfdb2ebf6487
+AUX lgeneral-1.2_beta12-as-needed.patch 623 RMD160 af27d4d75b94958d7fd5068dd1ddc781227212d9 SHA1 583b46cd7600337ceaf662cfaef5b63a54007b34 SHA256 6f1ebf7fc00acc9c910d3d52616044df6612702c2e7f9f5ac9ac3c22f5d7a9d5
 AUX lgeneral-1.2_beta12-build.patch 318 RMD160 05d9dc69438f42f1ac51479af15d9ec0a1eb64af SHA1 030aa4cb3215b1c3e3add11374472ddf90799789 SHA256 6d173938dfd0b013614734a4705cdcdfcab57fa831afa59a8008d371f7751ced
 AUX lgeneral-1.2_beta12-gentoo-path.patch 2393 RMD160 8bf62ea88afb1e0e480436eb298aa1f0abc3f07e SHA1 3f2b6e0463b04b9b929d196c838aa9fc4d82a84d SHA256 199427f23522583fa6a97776bb0710841f961d3528afb8cc3c610e7eed082933
 AUX lgeneral-1.2_beta12-gettext.patch 1352 RMD160 02190ad461ac5ee53b3c8eb9ec987ab6dc8a81d6 SHA1 d6a782e714b23ad8ab16a952be2cc6cf222fcf27 SHA256 4e76d9dfeba12160504cb8f034ed11d5b27e361e3eb05c1583c428b021192c1b
@@ -8,6 +9,6 @@ DIST lgeneral-1.2beta-12.tar.gz 1428381 RMD160 a7a08d50fb400389078ba7716460fce24
 DIST lgeneral-data-1.1.3.tar.gz 1073781 RMD160 d314d174fbec5200f80c88fc6642f90005c54537 SHA1 e0e2afd114e178206d99c1d572525b9814ea60db SHA256 bc4dddc25488dd863b0f4eb9d120e5017055ecbcc2cc53ba12d713681e47f10b
 DIST pg-data.tar.gz 410454 RMD160 0f05a0a521639cdf04c8fe6ac8950d5794ccdb0a SHA1 d78db7705e55751332fd1163311311ec36fff3ea SHA256 f2f74022cf8c279451911dda0a57cffab26ebf11429d61a6596310340ed23f76
 EBUILD lgeneral-1.1.1-r1.ebuild 1132 RMD160 c67f31c44ffb97cea7168a3aba83db6e51c09f2b SHA1 381457da249178045d57dc6a31240320dd64298e SHA256 895f35da4a51fe572de3e3880135a30d266b5b1291a51797a1cbaddc345fe169
-EBUILD lgeneral-1.2_beta12-r1.ebuild 2194 RMD160 f2006c958fffe1362c23fcf9d200dec9db9d8953 SHA1 dc8d9ee9b4c6af681ffee2155c406ef718372906 SHA256 4b49b36f0eec8198e90bdfda9d4f27aacce5a55414fb629dd4d97fcd6e8f2d9c
-MISC ChangeLog 5031 RMD160 e69dfed16b65ae39f4fc0adaf111e512781ae2e8 SHA1 904e248f9a1eb3c1b3fc736d23220897db0bad83 SHA256 6848421bb887a0785aaeff01783e39b17f12ac1e0e883d9c45e1c872fbca9437
+EBUILD lgeneral-1.2_beta12-r1.ebuild 2298 RMD160 09df136c038a64e34be767f25fbd672b8eebb842 SHA1 79ad68ff32a65bb6424ba0f07525d0e90a15a961 SHA256 8a5994da7532ed8e409f85be1be0aa8638a5d7deed156e2e3a90297fa8a11f6d
+MISC ChangeLog 5214 RMD160 11d0104a3be4b90b1cbe37b7bdf6fbeb3c1baa81 SHA1 bd00ef1a2f1c510ba5b8a7a3a747cadd03228518 SHA256 d76d0516f473e812c17d7cefa23bb83053403234ebe51a1d2f9c8852f4d23358
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-strategy/lgeneral/files/lgeneral-1.2_beta12-as-needed.patch b/games-strategy/lgeneral/files/lgeneral-1.2_beta12-as-needed.patch
new file mode 100644
index 000000000000..2361aa54d569
--- /dev/null
+++ b/games-strategy/lgeneral/files/lgeneral-1.2_beta12-as-needed.patch
@@ -0,0 +1,13 @@
+--- tools/ltrextract/Makefile.am.old    2009-02-12 09:48:37.000000000 +0100
++++ tools/ltrextract/Makefile.am        2009-02-12 09:50:36.000000000 +0100
+@@ -3,9 +3,8 @@
+ 
+ bin_PROGRAMS = ltrextract
+ 
+-LIBS = $(top_builddir)/util/libutil.a $(INTLLIBS)
+ AM_CFLAGS = -DLTREXTRACT @dis_flag@ -I$(LGENERAL_PATH) -I$(top_srcdir) -I$(top_srcdir)/util $(INTLINCLUDES)
+-ltrextract_LDFLAGS = -lm
++ltrextract_LDADD = $(top_builddir)/util/libutil.a $(INTLLIBS)
+ ltrextract_SOURCES = ltrextract.c util.c util.h \
+ 	terrain.c terrain.h map.c map.h nation.c nation.h \
+ 	unit_lib.c unit_lib.h scenario.c scenario.h campaign.c campaign.h \
diff --git a/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild b/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild
index 6b7c3fa246d2..14cefab874f0 100644
--- a/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 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/lgeneral/lgeneral-1.2_beta12-r1.ebuild,v 1.6 2007/05/24 06:35:26 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild,v 1.7 2009/02/12 09:13:08 tupone Exp $
 
+EAPI=2
 inherit eutils autotools games
 
 MY_P="${P/_/}"
@@ -24,14 +25,13 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-gentoo-path.patch \
 		"${FILESDIR}"/${P}-gettext.patch \
 		"${FILESDIR}"/${P}-64bit.patch \
-		"${FILESDIR}"/${P}-build.patch
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-as-needed.patch
 
 	cp /usr/share/gettext/config.rpath .
 	rm -f missing
@@ -53,12 +53,11 @@ src_unpack() {
 		|| die "sed failed (tmp)"
 }
 
-src_compile() {
+src_configure() {
 	egamesconf \
 		--disable-dependency-tracking \
 		$(use_enable nls) \
 		|| die
-	emake || die "emake failed"
 
 	# Build the temporary lgc-pg:
 	cd "${WORKDIR}"/tmp-build
@@ -67,6 +66,13 @@ src_compile() {
 		--disable-nls \
 		--datadir="${D}/${GAMES_DATADIR}" \
 		|| die
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	# Build the temporary lgc-pg:
+	cd "${WORKDIR}"/tmp-build
 	emake || die "emake failed (tmp)"
 }