From 75701fb0f45f07e4529aa03f5817a36c8dc98262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 26 Jun 2016 17:14:21 +0200 Subject: [PATCH] games-sports/toycars: Remove last rited packages --- games-sports/toycars/Manifest | 1 - .../toycars/files/toycars-0.3.10-gcc45.patch | 37 ------- .../toycars/files/toycars-0.3.10-gcc46.patch | 10 -- .../files/toycars-0.3.10-glibc-2.10.patch | 101 ------------------ games-sports/toycars/metadata.xml | 18 ---- games-sports/toycars/toycars-0.3.10.ebuild | 55 ---------- profiles/package.mask | 5 - 7 files changed, 227 deletions(-) delete mode 100644 games-sports/toycars/Manifest delete mode 100644 games-sports/toycars/files/toycars-0.3.10-gcc45.patch delete mode 100644 games-sports/toycars/files/toycars-0.3.10-gcc46.patch delete mode 100644 games-sports/toycars/files/toycars-0.3.10-glibc-2.10.patch delete mode 100644 games-sports/toycars/metadata.xml delete mode 100644 games-sports/toycars/toycars-0.3.10.ebuild diff --git a/games-sports/toycars/Manifest b/games-sports/toycars/Manifest deleted file mode 100644 index c2b7f78106d26..0000000000000 --- a/games-sports/toycars/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST toycars-0.3.10.tar.gz 6390760 SHA256 8ead77f160128231e909e9c34dc158cbffe5917eb13effcfda4712484d609658 SHA512 48de5b4fccd39058bb32a6b4f4514d1d25ddcb3e39ac72798162a29975d0d6fe48ef1324237f7096edda7c3f927ad620679fa8b3e42be2e05f1293ed9358982e WHIRLPOOL 36ac699c136eec7b7b9583c4c5a1c307654c28ac5355172e4084e0bee9111f6966b2e551756dbed8385385efa70a2b32e664000ab588b959f5e8fc497d0274b0 diff --git a/games-sports/toycars/files/toycars-0.3.10-gcc45.patch b/games-sports/toycars/files/toycars-0.3.10-gcc45.patch deleted file mode 100644 index 0e4f350a89dd9..0000000000000 --- a/games-sports/toycars/files/toycars-0.3.10-gcc45.patch +++ /dev/null @@ -1,37 +0,0 @@ -Fixing compilation with gcc-4.5 - -http://bugs.gentoo.org/show_bug.cgi?id=317751 - -Patch written by Kacper Kowalik - ---- 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::list()); -+vehicleObj.getGeometry()->push_back(std::list()); - 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::list()); -+ geometry.push_back(std::list()); - std::list &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::list()); -+ geometry.push_back(std::list()); - std::list &convex = geometry.back(); - readPointsFromString(xConvex->FirstChild()->ToText()->Value(), convex, count); - } diff --git a/games-sports/toycars/files/toycars-0.3.10-gcc46.patch b/games-sports/toycars/files/toycars-0.3.10-gcc46.patch deleted file mode 100644 index 127b75920322c..0000000000000 --- a/games-sports/toycars/files/toycars-0.3.10-gcc46.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- toycars/src/MyFisix/Convex.h.old 2011-04-09 21:17:43.000000000 +0200 -+++ toycars/src/MyFisix/Convex.h 2011-04-09 21:18:22.000000000 +0200 -@@ -21,6 +21,7 @@ - #include "config.h" - #endif - -+#include - #include - using namespace std; - diff --git a/games-sports/toycars/files/toycars-0.3.10-glibc-2.10.patch b/games-sports/toycars/files/toycars-0.3.10-glibc-2.10.patch deleted file mode 100644 index e3c184724c6d1..0000000000000 --- a/games-sports/toycars/files/toycars-0.3.10-glibc-2.10.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff --git a/toycars_track_editor/src/TrackView.cxx b/toycars_track_editor/src/TrackView.cxx -index d52daba..e1a66df 100644 ---- a/toycars_track_editor/src/TrackView.cxx -+++ b/toycars_track_editor/src/TrackView.cxx -@@ -89,7 +89,7 @@ TiXmlDocument *findXMLFile(const char *filename, SearchDirectories *dirs, char * - //{jpg,png,bmp,pnm,pbm,pgm,ppm} - Fl_Image* loadImage(const char *filename) - { -- char *suffix = strrchr(filename, '.'); -+ const char *suffix = strrchr(filename, '.'); - if (suffix == NULL) - return NULL; - if (strcmp(suffix,".jpg") == 0) -@@ -969,13 +969,13 @@ void TrackView::installMap(const char *name) - uninstallMap(name); - - // chop off any .xml suffix -- temp = strrchr(name, '.'); -+ temp = const_cast( strrchr(name, '.') ); - if (temp) { - if (strcmp(temp, ".xml") == 0) - temp[0] = '\0'; - } - // remove path -- temp = strrchr(name, '/'); -+ temp = const_cast( strrchr(name, '/') ); - if (temp) { - strncpy(trackname, temp+1, 255); - } -@@ -1044,13 +1044,13 @@ void TrackView::uninstallMap(const char *name) - char *temp; - - // chop off any .xml suffix -- temp = strrchr(name, '.'); -+ temp = const_cast( strrchr(name, '.') ); - if (temp) { - if (strcmp(temp, ".xml") == 0) - temp[0] = '\0'; - } - // remove path -- temp = strrchr(name, '/'); -+ temp = const_cast( strrchr(name, '/') ); - if (temp) { - strncpy(trackname, temp+1, 255); - } -diff --git a/toycars_vehicle_editor/src/LoadSpriteFromImage.cpp b/toycars_vehicle_editor/src/LoadSpriteFromImage.cpp -index 4b6ff50..7aa6c40 100644 ---- a/toycars_vehicle_editor/src/LoadSpriteFromImage.cpp -+++ b/toycars_vehicle_editor/src/LoadSpriteFromImage.cpp -@@ -23,7 +23,7 @@ - //{jpg,png,bmp,pnm,pbm,pgm,ppm} - Fl_Image* loadImage(const char *filename) - { -- char *suffix = strrchr(filename, '.'); -+ const char *suffix = strrchr(filename, '.'); - if (suffix == NULL) - return NULL; - if (strcmp(suffix,".jpg") == 0) -diff --git a/toycars_vehicle_editor/src/VehicleObject.cpp b/toycars_vehicle_editor/src/VehicleObject.cpp -index 3f61114..0bd2978 100644 ---- a/toycars_vehicle_editor/src/VehicleObject.cpp -+++ b/toycars_vehicle_editor/src/VehicleObject.cpp -@@ -533,13 +533,13 @@ void VehicleObject::installVehicle(const char *name) - uninstallVehicle(name); - - // chop off any .xml suffix -- temp = strrchr(name, '.'); -+ temp = const_cast( strrchr(name, '.') ); - if (temp) { - if (strcmp(temp, ".xml") == 0) - temp[0] = '\0'; - } - // remove path -- temp = strrchr(name, '/'); -+ temp = const_cast( strrchr(name, '/') ); - if (temp) { - strncpy(carname, temp+1, 255); - } -@@ -610,13 +610,13 @@ void VehicleObject::uninstallVehicle(const char *name) - char *temp; - - // chop off any .xml suffix -- temp = strrchr(name, '.'); -+ temp = const_cast( strrchr(name, '.') ); - if (temp) { - if (strcmp(temp, ".xml") == 0) - temp[0] = '\0'; - } - // remove path -- temp = strrchr(name, '/'); -+ temp = const_cast( strrchr(name, '/') ); - if (temp) { - strncpy(carname, temp+1, 255); - } -@@ -675,4 +675,4 @@ void VehicleObject::uninstallVehicle(const char *name) - system(str); - */ - #endif --} -\ No newline at end of file -+} diff --git a/games-sports/toycars/metadata.xml b/games-sports/toycars/metadata.xml deleted file mode 100644 index 66f76be64b140..0000000000000 --- a/games-sports/toycars/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - games@gentoo.org - Gentoo Games Project - - -Toy Cars is a physics based 2-D racer. In Timed Race mode the aim is to complete -four laps in the best time you can. In Hot Potato mode the aim is to avoid -having the bomb when the fuse runs out. The bomb can be transfered between -players if they crash into each other. In Knock 'em Out mode the aim is to -race around the track and to try and prevent your car from going off the screen. - - - toycars - - diff --git a/games-sports/toycars/toycars-0.3.10.ebuild b/games-sports/toycars/toycars-0.3.10.ebuild deleted file mode 100644 index c0a9ae00d0e88..0000000000000 --- a/games-sports/toycars/toycars-0.3.10.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils flag-o-matic games - -DESCRIPTION="a physics based 2-D racer inspired by Micro Machines" -HOMEPAGE="http://sourceforge.net/projects/toycars" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="media-libs/libsdl[sound,video,joystick] - media-libs/sdl-image[png] - x11-libs/fltk:1[opengl] - >=media-libs/fmod-4.25.07-r1:1 - virtual/glu - virtual/opengl" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-glibc-2.10.patch \ - "${FILESDIR}"/${P}-gcc45.patch \ - "${FILESDIR}"/${P}-gcc46.patch - mv data/tracks/Corner/{c,C}orner.map -} - -src_configure() { - append-ldflags -L/opt/fmodex/api/lib - egamesconf -} - -src_install() { - default - local d f - - newicon toycars/celica-render.png ${PN}.png - make_desktop_entry ${PN} "Toy Cars" - - for d in toycars toycars_track_editor toycars_vehicle_editor - do - for f in ChangeLog README TODO - do - if [[ -s $d/$f ]] ; then - newdoc $d/$f $d.$f - fi - done - done - prepgamesdirs -} diff --git a/profiles/package.mask b/profiles/package.mask index badd33b1f54da..a1f987dcc433e 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -294,11 +294,6 @@ www-client/luakit # Security mask of older branches, wrt bug #5567810 (19 Apr 2016) -# No release in 6 years and segfaults on modern systems. (bug #311809) -# Masked for removal on 20160519 -games-sports/toycars - # Andreas K. Hüttel (16 Apr 2016) # Masked because of security bug 580210 =www-misc/monitorix-3.6.0