Fix --as-needed bug #250072

(Portage version: 2.1.6.4/cvs/Linux 2.6.26-gentoo-r3 i686)

5 files changed, 75 insertions, 13 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/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() {