version bump; clean old

Package-Manager: portage-2.1.6.13/cvs/Linux i686

6 files changed, 42 insertions, 75 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/Manifest b/dev-games/vamos/Manifest
index dcf11281b3e1..28d3e0eeb8b2 100644
--- a/dev-games/vamos/Manifest
+++ b/dev-games/vamos/Manifest
@@ -1,19 +1,8 @@
------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
+AUX vamos-0.6.2-as-needed.patch 1122 RMD160 8a9db4f8414b257d9c9b9ecd80594c5ff6f6cc92 SHA1 6d979e566b05b5d3372959e950b8e5c38d46f231 SHA256 4978334a9dbf1ec1ca4bf9b8f35c9b37715fd90d4a3e3c47a84cddba65d92c0a
 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
+DIST vamos-0.6.2.tar.gz 1555156 RMD160 1a9b72e69cdaa4a273ea13b0fb56e6365391fabe SHA1 c2be97ed6fb3b276aadb22699880106a057c1167 SHA256 75f539bcdd6fa6f0cf7cb4014d27f0cd8f581f8ff690b3054eb644e573bc3646
 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
+EBUILD vamos-0.6.2.ebuild 1004 RMD160 8d317aee657b25aad81d4a1336e2cc98afbd00eb SHA1 138c860f738ecddd844cd69f16a3e29e4a7fd7b9 SHA256 919dbc6d168c66acab749a95b887c1a54d92d4c191de64896d5f4c32b079f9d9
+MISC ChangeLog 1658 RMD160 bdfd44420598c93bc5fb12f136bea2c3eacaa031 SHA1 86462ec5eb2aa75a2255e560f15a260325189ed4 SHA256 d6cf1769e90d49b9bdbeb47ce8a36110cbe9161519040ed361235059b0e5b95c
 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.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() {