Fix --as-needed bug #250072

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

6 files changed, 90 insertions, 16 deletions

diff --git a/dev-games/vamos/ChangeLog b/dev-games/vamos/ChangeLog
index 1bcc93369198..c6d49cf1ea3f 100644
--- a/dev-games/vamos/ChangeLog
+++ b/dev-games/vamos/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-games/vamos
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/vamos/ChangeLog,v 1.8 2008/08/19 01:44:56 mr_bones_ Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/vamos/ChangeLog,v 1.9 2009/02/12 20:38:59 tupone Exp $
+
+  12 Feb 2009; Tupone Alfredo <tupone@gentoo.org>
+  +files/vamos-0.5.5-as-needed.patch, +files/vamos-0.6.0-as-needed.patch,
+  vamos-0.5.5.ebuild, vamos-0.6.0.ebuild:
+  Fix --as-needed bug #250072 by flameeyes@gentoo.org
 
   19 Aug 2008; Michael Sterrett <mr_bones_@gentoo.org>
   +files/vamos-0.6.0-gcc43.patch, vamos-0.6.0.ebuild:
diff --git a/dev-games/vamos/Manifest b/dev-games/vamos/Manifest
index 658d190d1dd5..dcf11281b3e1 100644
--- a/dev-games/vamos/Manifest
+++ b/dev-games/vamos/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX vamos-0.5.5-as-needed.patch 1137 RMD160 7710fc3925f800eae757074e9d019d9e07c14a38 SHA1 6e3c55c62e50917e562385a7b99e0021887d2631 SHA256 e357fb23f15bc067d04f193fbd6a0f56131c9727afec88cb79d90ee62427eef8
+AUX vamos-0.6.0-as-needed.patch 886 RMD160 fb45424d14ff7a0268e516ee6a92784e66e6aa5b SHA1 936958359e80fec8daf0c7c57293ca649a322496 SHA256 9da8e8461668def879e8ff1cebadba7e9cda78351fe9636efa6a0cffb6ead4ba
 AUX vamos-0.6.0-gcc43.patch 543 RMD160 aa64dcd54bb67449781f30647ba49f4f856e3e07 SHA1 27176cc918cc927238286f2c7159f71705bb035e SHA256 266cc43709cad16ff1f0785b535109a4a0102b1dff3b21764e28051b178c8cd5
 DIST vamos-0.5.5.tar.gz 1474804 RMD160 bb9888dc9ec81da23da16bb9295a765bab59a90c SHA1 1e875fa9fdac48c266715bd99e44e05bc0b0d42a SHA256 16d6faec2f23e5540378f17cd33326ec8db6aa35e47a87522f4298f07aaadcea
 DIST vamos-0.6.0.tar.gz 1534139 RMD160 8700bb40e739161ad68c30960d3451d2feac8b15 SHA1 60df35b996aae37730b88e23fc028d05a25a30e4 SHA256 425c0270a239bff2733197caf79658ed076e6265057ad9a963efedc33031f13c
-EBUILD vamos-0.5.5.ebuild 757 RMD160 d78d14a96ce4b77cc7d1ec10c92a4f86cbb9db4b SHA1 ceb02d0c3e89c27ae5b0aa41adc1ffa13568be79 SHA256 2f74641a38406ec1c1e0f2e9e7cbc098394e0cdc57755f64483f672e1763f1b3
-EBUILD vamos-0.6.0.ebuild 1020 RMD160 8873a22ab36a73497e7badca24d652389b272016 SHA1 23415bfb1805d2f310752c0c696dc3601e224588 SHA256 629e238ebb6edb7b2eadd2c8631f7a52d8d91724d29f8b924ef5df5a56ae0924
-MISC ChangeLog 1176 RMD160 4eecf52feb73f2f9c5909b054fc5ba0299e5dfff SHA1 6226837889f502456177b2a3b4b504c7afba9bd5 SHA256 8298c322a0153a8a768b32f7d59244e2a4d3dfa9eb460b256a375136e72deae9
+EBUILD vamos-0.5.5.ebuild 824 RMD160 71d90dd96725ec04a720350afa7760b7bb3da74d SHA1 6fc078cf1f0bac4279d87dbfb7ded9525156f0ed SHA256 fb4599bfca0903127eafe3c7a9739ef5f0558bf5bb8da067d687c7878e360f9a
+EBUILD vamos-0.6.0.ebuild 1006 RMD160 2850280350e8ebf78c0c2a38682dab39da7b26bb SHA1 d3e27019652a7e964c3a6fb45f9170841def8fa9 SHA256 24f683b362e9aa0ab466fb457cea2949b1f19a4631c377d1986770434db8a279
+MISC ChangeLog 1394 RMD160 a3250f3074c49a897f0c7aed6ef377e862a969b1 SHA1 24009b10c17412d4c18b15d83caba88596c5c500 SHA256 4733655552a100c31d83062465f6b29fd0bd4fb210c6240b0a4ab24aee65b7bd
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmUiO8ACgkQSYz9rjec82ZDcgCgieTLMdSU2brWseaVinwaKyjH
+t88AoIQwhuxi5gzD3BINz5tT1clhZxrm
+=oobs
+-----END PGP SIGNATURE-----
diff --git a/dev-games/vamos/files/vamos-0.5.5-as-needed.patch b/dev-games/vamos/files/vamos-0.5.5-as-needed.patch
new file mode 100644
index 000000000000..1218a980d5b2
--- /dev/null
+++ b/dev-games/vamos/files/vamos-0.5.5-as-needed.patch
@@ -0,0 +1,32 @@
+--- world/Makefile.in.old	2009-02-12 20:30:44.000000000 +0100
++++ world/Makefile.in	2009-02-12 20:31:31.000000000 +0100
+@@ -155,7 +155,7 @@
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ 
+ libvamos_world_la_LDFLAGS =
+-libvamos_world_la_LIBADD =
++libvamos_world_la_LIBADD = `pkg-config --libs sigc++-1.2`
+ am_libvamos_world_la_OBJECTS = Atmosphere.lo World.lo Controls.lo \
+ 	Gl_World.lo Sounds.lo
+ libvamos_world_la_OBJECTS = $(am_libvamos_world_la_OBJECTS)
+--- caelum/Sky.cc.old	2009-02-12 20:35:43.000000000 +0100
++++ caelum/Sky.cc	2009-02-12 20:36:03.000000000 +0100
+@@ -19,6 +19,7 @@
+ #include "Sky.h"
+ 
+ #include <cassert>
++#include <cstdlib>
+ 
+ // Windows puts OpenGL 1.2 and 1.3 stuff in glext.h.
+ #if HAVE_GL_GLEXT_H
+--- media/Makefile.in.old	2009-02-12 20:37:50.000000000 +0100
++++ media/Makefile.in	2009-02-12 20:39:12.000000000 +0100
+@@ -150,7 +150,7 @@
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ 
+ libvamos_media_la_LDFLAGS =
+-libvamos_media_la_LIBADD =
++libvamos_media_la_LIBADD = ../geometry/libvamos-geometry.la
+ am_libvamos_media_la_OBJECTS = Ac3d.lo Sample.lo Texture_Image.lo
+ libvamos_media_la_OBJECTS = $(am_libvamos_media_la_OBJECTS)
+ 
diff --git a/dev-games/vamos/files/vamos-0.6.0-as-needed.patch b/dev-games/vamos/files/vamos-0.6.0-as-needed.patch
new file mode 100644
index 000000000000..48159f99eb5e
--- /dev/null
+++ b/dev-games/vamos/files/vamos-0.6.0-as-needed.patch
@@ -0,0 +1,22 @@
+--- world/Makefile.in.old	2009-02-12 21:13:10.000000000 +0100
++++ world/Makefile.in	2009-02-12 21:13:26.000000000 +0100
+@@ -176,7 +176,7 @@
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ 
+ libvamos_world_la_LDFLAGS =
+-libvamos_world_la_LIBADD =
++libvamos_world_la_LIBADD = `pkg-config --libs sigc++-1.2`
+ am_libvamos_world_la_OBJECTS = Atmosphere.lo World.lo Controls.lo \
+ 	Gl_World.lo Sounds.lo
+ libvamos_world_la_OBJECTS = $(am_libvamos_world_la_OBJECTS)
+--- media/Makefile.in.old	2009-02-12 21:13:35.000000000 +0100
++++ media/Makefile.in	2009-02-12 21:13:50.000000000 +0100
+@@ -174,7 +174,7 @@
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ 
+ libvamos_media_la_LDFLAGS =
+-libvamos_media_la_LIBADD =
++libvamos_media_la_LIBADD = ../geometry/libvamos-geometry.la
+ am_libvamos_media_la_OBJECTS = Ac3d.lo Sample.lo Texture_Image.lo \
+ 	XML_Parser.lo
+ libvamos_media_la_OBJECTS = $(am_libvamos_media_la_OBJECTS)
diff --git a/dev-games/vamos/vamos-0.5.5.ebuild b/dev-games/vamos/vamos-0.5.5.ebuild
index 5e72ef5f7526..e15ce35f23a2 100644
--- a/dev-games/vamos/vamos-0.5.5.ebuild
+++ b/dev-games/vamos/vamos-0.5.5.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/vamos/vamos-0.5.5.ebuild,v 1.2 2006/02/10 16:25:53 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/vamos/vamos-0.5.5.ebuild,v 1.3 2009/02/12 20:38:59 tupone Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="an automotive simulation framework"
@@ -22,6 +23,10 @@ RDEPEND="media-libs/libpng
 DEPEND="${RDEPEND}
 	media-libs/plib"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+}
+
 src_install() {
 	make DESTDIR="${D}" install || die "make install"
 	dobin caelum/.libs/caelum || die "caelum"
diff --git a/dev-games/vamos/vamos-0.6.0.ebuild b/dev-games/vamos/vamos-0.6.0.ebuild
index 4d71f28d8e52..5102cec13f5f 100644
--- a/dev-games/vamos/vamos-0.6.0.ebuild
+++ b/dev-games/vamos/vamos-0.6.0.ebuild
@@ -1,8 +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/dev-games/vamos/vamos-0.6.0.ebuild,v 1.2 2008/08/19 01:44:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/vamos/vamos-0.6.0.ebuild,v 1.3 2009/02/12 20:38:59 tupone Exp $
 
-EAPI=1
+EAPI=2
 inherit eutils
 
 DESCRIPTION="an automotive simulation framework"
@@ -24,18 +24,16 @@ DEPEND="virtual/opengl
 	media-libs/freealut
 	dev-libs/libsigc++:1.2"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gcc43.patch" \
+		"${FILESDIR}"/${P}-as-needed.patch
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		--disable-dependency-tracking \
 		--disable-unit-tests \
 		|| die
-	emake || die "emake failed"
 }
 
 src_install() {