improve use flag deps; add gcc45 patch from Kacper Kowalik (Xarthisius) via bug #317751

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

4 files changed, 52 insertions, 7 deletions

diff --git a/games-sports/toycars/ChangeLog b/games-sports/toycars/ChangeLog
index 09fa8920dc27..bae7d28a118c 100644
--- a/games-sports/toycars/ChangeLog
+++ b/games-sports/toycars/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-sports/toycars
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/toycars/ChangeLog,v 1.16 2010/03/31 19:56:12 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/toycars/ChangeLog,v 1.17 2010/04/29 15:45:29 mr_bones_ Exp $
+
+  29 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  toycars-0.3.10.ebuild, +files/toycars-0.3.10-gcc45.patch:
+  improve use flag deps; add gcc45 patch from Kacper Kowalik (Xarthisius)
+  via bug #317751
 
   31 Mar 2010; Tupone Alfredo <tupone@gentoo.org> toycars-0.3.10.ebuild:
   Rename corner.map to fix bug #311811 by Robert Cernansky
diff --git a/games-sports/toycars/Manifest b/games-sports/toycars/Manifest
index abe47c98b9e3..efccb8379ad4 100644
--- a/games-sports/toycars/Manifest
+++ b/games-sports/toycars/Manifest
@@ -1,5 +1,6 @@
+AUX toycars-0.3.10-gcc45.patch 1428 RMD160 625731a29840b39da1904af6d6c458aa1253ef15 SHA1 6bdbca6c9df9c5b4f62c14e7f1d9f1cb7be7b04e SHA256 07eae3db69fa651bce4d8889be4e88d9d667bd3428d287bc383104c1960d7cbc
 AUX toycars-0.3.10-glibc-2.10.patch 3321 RMD160 608e4c5fdf3cb90cd9ea6ebd9df0a85aa6aa4c05 SHA1 a068ac460a6c50d57ffb391f89fb17c05780618c SHA256 376863d635af659e4eda893c2ccd5718c9a93ca74deb2172bd047ab9f12c3bcf
 DIST toycars-0.3.10.tar.gz 6390760 RMD160 f613c7472cd8872d26ef7b4239bef8c744ee3073 SHA1 594f7cd3b586fc68289ea36945464dd4125dfded SHA256 8ead77f160128231e909e9c34dc158cbffe5917eb13effcfda4712484d609658
-EBUILD toycars-0.3.10.ebuild 1189 RMD160 712c93f61cfcb6f8f546521d199c3dea5e4a73fd SHA1 8f27507308fcc6fd8c5af1c7bb2fb8383360a1dd SHA256 3c6ef700189c3ac40e924944003a6373280b8e70478c4a9506ace843b65e1202
-MISC ChangeLog 2611 RMD160 9dce127783605525e9a6e71af7fdacbc9711c848 SHA1 50e46b3aef164232a7d227761f9fae2d9626511f SHA256 fd1b77e08341e81fe5e0920aa88fad42f1a72c4522de6cdcd94482df587ce7a4
+EBUILD toycars-0.3.10.ebuild 1254 RMD160 579f4a43cd7c1c54c102c83caa9321741a380014 SHA1 f00c4952a74b5e1eabce2bf8162f9698b4e9175c SHA256 403c4b3c99409b065129c4275d043e76ab5b98a0153d06a82602a5c7b26b7834
+MISC ChangeLog 2822 RMD160 719da86558c9f9fc5355af55c56709df6ddd5db5 SHA1 1c003166f02f24a89ece2d773eb27f0f3e693f18 SHA256 f7e4989e7f9c38f1365b14aba84ba8e35425a7a4f19b8d4a38c218a9e1f51649
 MISC metadata.xml 592 RMD160 22f227feb81d3d4aac659471c21dec61af220b46 SHA1 484057930ea56def340f4d0d322b1703c8de2074 SHA256 9ebc59b9b09bb528703fa1886257d647fbe8a1266b7256ca28ff4daa19094e80
diff --git a/games-sports/toycars/files/toycars-0.3.10-gcc45.patch b/games-sports/toycars/files/toycars-0.3.10-gcc45.patch
new file mode 100644
index 000000000000..0e4f350a89dd
--- /dev/null
+++ b/games-sports/toycars/files/toycars-0.3.10-gcc45.patch
@@ -0,0 +1,37 @@
+Fixing compilation with gcc-4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=317751
+
+Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
+
+--- toycars_vehicle_editor/src/VehicleEditorUI.cxx
++++ toycars_vehicle_editor/src/VehicleEditorUI.cxx
+@@ -228,7 +228,7 @@
+ sprintf(str, "%d", n);
+ convexChoice->add(str);
+ convexChoice->value(n);
+-vehicleObj.getGeometry()->push_back(std::list<Vec2D>::list());
++vehicleObj.getGeometry()->push_back(std::list<Vec2D>());
+ spriteView->setConvexChoice(n);
+ spriteView->redraw();
+ }
+--- toycars_vehicle_editor/src/VehicleObject.cpp
++++ toycars_vehicle_editor/src/VehicleObject.cpp
+@@ -152,7 +152,7 @@
+    short count;
+    geometry.clear();
+    for (xConvex = xGeometry->FirstChild(); xConvex != NULL; xConvex = xConvex->NextSibling("convex")) {
+-      geometry.push_back(std::list<Vec2D>::list());
++      geometry.push_back(std::list<Vec2D>());
+       std::list<Vec2D> &convex = geometry.back();
+       readPointsFromString(xConvex->FirstChild()->ToText()->Value(), convex, count);
+    }
+@@ -411,7 +411,7 @@
+    short count;
+    geometry.clear();
+    for (xConvex = xGeometry->FirstChild(); xConvex != NULL; xConvex = xConvex->NextSibling("convex")) {
+-      geometry.push_back(std::list<Vec2D>::list());
++      geometry.push_back(std::list<Vec2D>());
+       std::list<Vec2D> &convex = geometry.back();
+       readPointsFromString(xConvex->FirstChild()->ToText()->Value(), convex, count);
+    }
diff --git a/games-sports/toycars/toycars-0.3.10.ebuild b/games-sports/toycars/toycars-0.3.10.ebuild
index 5c2393cb3dfc..709199216afa 100644
--- a/games-sports/toycars/toycars-0.3.10.ebuild
+++ b/games-sports/toycars/toycars-0.3.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/toycars/toycars-0.3.10.ebuild,v 1.5 2010/03/31 19:56:12 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/toycars/toycars-0.3.10.ebuild,v 1.6 2010/04/29 15:45:29 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils flag-o-matic games
@@ -14,15 +14,17 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="media-libs/libsdl[video]
+DEPEND="media-libs/libsdl[audio,video,joystick]
 	media-libs/sdl-image[png]
-	>=x11-libs/fltk-1.1.9:1.1
+	>=x11-libs/fltk-1.1.9:1.1[opengl]
 	>=media-libs/fmod-4.25.07-r1:1
 	virtual/glu
 	virtual/opengl"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+	epatch \
+		"${FILESDIR}"/${P}-glibc-2.10.patch \
+		"${FILESDIR}"/${P}-gcc45.patch
 	mv data/tracks/Corner/{c,C}orner.map
 }