version bump; clean old

(Portage version: 2.1.6.13/cvs/Linux i686)

5 files changed, 38 insertions, 60 deletions

diff --git a/dev-games/vamos/ChangeLog b/dev-games/vamos/ChangeLog
index c6d49cf1ea3f..14115ace602a 100644
--- a/dev-games/vamos/ChangeLog
+++ b/dev-games/vamos/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-games/vamos
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/vamos/ChangeLog,v 1.10 2009/10/12 17:53:03 mr_bones_ Exp $
+
+*vamos-0.6.2 (12 Oct 2009)
+
+  12 Oct 2009; Michael Sterrett <mr_bones_@gentoo.org> -vamos-0.6.0.ebuild,
+  -files/vamos-0.6.0-as-needed.patch, -files/vamos-0.6.0-gcc43.patch,
+  +vamos-0.6.2.ebuild, +files/vamos-0.6.2-as-needed.patch:
+  version bump; clean old
 
   12 Feb 2009; Tupone Alfredo <tupone@gentoo.org>
   +files/vamos-0.5.5-as-needed.patch, +files/vamos-0.6.0-as-needed.patch,
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
deleted file mode 100644
index 48159f99eb5e..000000000000
--- a/dev-games/vamos/files/vamos-0.6.0-as-needed.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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/files/vamos-0.6.0-gcc43.patch b/dev-games/vamos/files/vamos-0.6.0-gcc43.patch
deleted file mode 100644
index 11404071f09b..000000000000
--- a/dev-games/vamos/files/vamos-0.6.0-gcc43.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- caelum/Sky.cc
-+++ caelum/Sky.cc
-@@ -19,6 +19,7 @@
- #include "Sky.h"
- 
- #include <cassert>
-+#include <cstdlib>
- 
- #include <SDL/SDL.h>
- #include <GL/glut.h>
---- track/Gl_Road_Segment.cc
-+++ track/Gl_Road_Segment.cc
-@@ -22,6 +22,7 @@
- 
- #include <GL/glut.h>
- 
-+#include <algorithm>
- #include <cassert>
- 
- using namespace Vamos_Track;
---- vamos/vamos.cc
-+++ vamos/vamos.cc
-@@ -24,6 +24,8 @@
- #include "../world/Gl_World.h"
- #include "../world/Sounds.h"
- 
-+#include <cstdlib>
-+
- using namespace Vamos_Geometry;
- using namespace Vamos_Media;
- 
diff --git a/dev-games/vamos/files/vamos-0.6.2-as-needed.patch b/dev-games/vamos/files/vamos-0.6.2-as-needed.patch
new file mode 100644
index 000000000000..dbdbd4828e8f
--- /dev/null
+++ b/dev-games/vamos/files/vamos-0.6.2-as-needed.patch
@@ -0,0 +1,24 @@
+diff -ru vamos-0.6.2.orig/media/Makefile.in vamos-0.6.2/media/Makefile.in
+--- vamos-0.6.2.orig/media/Makefile.in	2009-06-12 21:38:13.000000000 -0400
++++ vamos-0.6.2/media/Makefile.in	2009-10-12 13:42:26.483990624 -0400
+@@ -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 -ru vamos-0.6.2.orig/world/Makefile.in vamos-0.6.2/world/Makefile.in
+--- vamos-0.6.2.orig/world/Makefile.in	2009-06-12 21:38:15.000000000 -0400
++++ vamos-0.6.2/world/Makefile.in	2009-10-12 13:42:01.310744776 -0400
+@@ -181,7 +181,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 Interactive_Driver.lo \
+ 	Robot_Driver.lo World.lo Controls.lo Gl_World.lo Sounds.lo
+ libvamos_world_la_OBJECTS = $(am_libvamos_world_la_OBJECTS)
diff --git a/dev-games/vamos/vamos-0.6.0.ebuild b/dev-games/vamos/vamos-0.6.2.ebuild
index 5102cec13f5f..23777e2b1d1c 100644
--- a/dev-games/vamos/vamos-0.6.0.ebuild
+++ b/dev-games/vamos/vamos-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2009/02/12 20:38:59 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/vamos/vamos-0.6.2.ebuild,v 1.1 2009/10/12 17:53:03 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="virtual/opengl
+RDEPEND="virtual/opengl
 	virtual/glu
 	virtual/glut
 	media-libs/libpng
@@ -23,17 +23,17 @@ DEPEND="virtual/opengl
 	media-libs/openal
 	media-libs/freealut
 	dev-libs/libsigc++:1.2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc43.patch" \
-		"${FILESDIR}"/${P}-as-needed.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
 }
 
 src_configure() {
 	econf \
 		--disable-dependency-tracking \
-		--disable-unit-tests \
-		|| die
+		--disable-unit-tests
 }
 
 src_install() {