commit: a7af8dd2c93642dc75f42ff31b6ce3f6e6701c01 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Oct 26 07:32:27 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Oct 26 07:39:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7af8dd2
games-action/btanks: Remove last-rited pkg Closes: https://bugs.gentoo.org/735532 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> games-action/btanks/Manifest | 1 - games-action/btanks/btanks-0.9.8083.ebuild | 54 ----------- .../btanks/files/btanks-0.9.8083-gcc46.patch | 10 -- .../btanks/files/btanks-0.9.8083-gcc47.patch | 103 --------------------- .../btanks/files/btanks-0.9.8083-gcc6.patch | 34 ------- .../btanks/files/btanks-0.9.8083-scons-blows.patch | 93 ------------------- games-action/btanks/metadata.xml | 19 ---- profiles/package.mask | 1 - 8 files changed, 315 deletions(-) diff --git a/games-action/btanks/Manifest b/games-action/btanks/Manifest deleted file mode 100644 index afcf2b05db9..00000000000 --- a/games-action/btanks/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST btanks-0.9.8083.tar.bz2 28754069 BLAKE2B c187fe1deca9cdb5efcbb279215c369542e1e5e1ce93b0cecac077733a1b56359caa9dd49629305c566d8c86da1f05a6f4f61d1e41888c6c8076c9494fe5df03 SHA512 beef8f480e4c20c4f3d29aaa63fd52b370b89cceb8a7dda92f0d0fa5517969abf1fce6b0109782300f1b5bb92cf3c599677b168cd66f3b44c2d2dd1742ce0241 diff --git a/games-action/btanks/btanks-0.9.8083.ebuild b/games-action/btanks/btanks-0.9.8083.ebuild deleted file mode 100644 index 6036ed703de..00000000000 --- a/games-action/btanks/btanks-0.9.8083.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils scons-utils games - -DESCRIPTION="Fast 2D tank arcade game with multiplayer and split-screen modes" -HOMEPAGE="http://btanks.sourceforge.net/"; -SRC_URI="mirror://sourceforge/btanks/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-lang/lua-5.1:0 - media-libs/libsdl[joystick,video] - media-libs/libvorbis - virtual/opengl - dev-libs/expat - media-libs/smpeg - media-libs/sdl-image[jpeg,png] - media-libs/sdl-gfx" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - rm -rf sdlx/gfx - epatch "${FILESDIR}"/${P}-scons-blows.patch \ - "${FILESDIR}"/${P}-gcc46.patch \ - "${FILESDIR}"/${P}-gcc47.patch \ - "${FILESDIR}"/${P}-gcc6.patch -} - -src_compile() { - escons \ - prefix="${GAMES_PREFIX}" \ - lib_dir="$(games_get_libdir)"/${PN} \ - plugins_dir="$(games_get_libdir)"/${PN} \ - resources_dir="${GAMES_DATADIR}"/${PN} -} - -src_install() { - dogamesbin build/release/engine/btanks - newgamesbin build/release/editor/bted btanksed - exeinto "$(games_get_libdir)"/${PN} - doexe build/release/*/*.so - insinto "${GAMES_DATADIR}"/${PN} - doins -r data - newicon engine/src/bt.xpm ${PN}.xpm - make_desktop_entry ${PN} "Battle Tanks" - dodoc ChangeLog *.txt - prepgamesdirs -} diff --git a/games-action/btanks/files/btanks-0.9.8083-gcc46.patch b/games-action/btanks/files/btanks-0.9.8083-gcc46.patch deleted file mode 100644 index 367c33cc6f2..00000000000 --- a/games-action/btanks/files/btanks-0.9.8083-gcc46.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- engine/sl08/sl08.h.old 2011-04-19 17:20:34.055776870 +0200 -+++ engine/sl08/sl08.h 2011-04-19 17:20:59.471398921 +0200 -@@ -22,6 +22,7 @@ - /* DO NOT MODIFY THIS FILE: IT'S AUTOGENERATED */ - - #include <list> -+#include <cstddef> - - #ifndef NULL - #define NULL ((void*) 0) diff --git a/games-action/btanks/files/btanks-0.9.8083-gcc47.patch b/games-action/btanks/files/btanks-0.9.8083-gcc47.patch deleted file mode 100644 index 13a4cf3723a..00000000000 --- a/games-action/btanks/files/btanks-0.9.8083-gcc47.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- mrt/base_file.h.old 2012-10-08 10:16:43.941487723 +0200 -+++ mrt/base_file.h 2012-10-08 10:18:55.788771445 +0200 -@@ -20,6 +20,7 @@ - */ - - #include <string> -+#include <unistd.h> - #include "export_mrt.h" - - namespace mrt { ---- math/range_list.h.old 2012-10-08 09:49:34.283887937 +0200 -+++ math/range_list.h 2012-10-08 09:50:36.258212096 +0200 -@@ -53,14 +53,14 @@ - return; - } - -- typename parent_type::iterator i = lower_bound(value); -+ typename parent_type::iterator i = this->lower_bound(value); - if (i != parent_type::end()) { - if (i->first == value) - return; - - if (value + 1 == i->first) { - T e = i->second; -- erase(i); -+ this->erase(i); - i = parent_type::insert(typename parent_type::value_type(value, e)).first; //expand beginning - i = pack_left(i); - } ---- engine/sl08/sl08.h.old 2012-10-04 09:50:37.845681514 +0200 -+++ engine/sl08/sl08.h 2012-10-08 09:58:32.873166723 +0200 -@@ -272,7 +272,7 @@ - inline slot1(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {} - - inline void assign(object_type *o, func_t f) { object = o; func = f; } -- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); } -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); } - - inline return_type operator() (arg1_type a1) const { - return (object->*func) (a1) ; -@@ -293,7 +293,7 @@ - inline slot1 () : object(NULL), func(NULL) {} - inline slot1 (object_type *object, func_t func) : object(object), func(func) {} - inline void assign(object_type *o, func_t f) { object = o; func = f; } -- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); } -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); } - - inline void operator() (arg1_type a1) const { - (object->*func) (a1); -@@ -447,7 +447,7 @@ - inline slot2(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {} - - inline void assign(object_type *o, func_t f) { object = o; func = f; } -- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); } -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); } - - inline return_type operator() (arg1_type a1, arg2_type a2) const { - return (object->*func) (a1, a2) ; -@@ -468,7 +468,7 @@ - inline slot2 () : object(NULL), func(NULL) {} - inline slot2 (object_type *object, func_t func) : object(object), func(func) {} - inline void assign(object_type *o, func_t f) { object = o; func = f; } -- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); } -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); } - - inline void operator() (arg1_type a1, arg2_type a2) const { - (object->*func) (a1, a2); -@@ -643,7 +643,7 @@ - inline slot3 () : object(NULL), func(NULL) {} - inline slot3 (object_type *object, func_t func) : object(object), func(func) {} - inline void assign(object_type *o, func_t f) { object = o; func = f; } -- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); } -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); } - - inline void operator() (arg1_type a1, arg2_type a2, arg3_type a3) const { - (object->*func) (a1, a2, a3); -@@ -797,7 +797,7 @@ - inline slot4(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {} - - inline void assign(object_type *o, func_t f) { object = o; func = f; } -- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); } -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); } - - inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const { - return (object->*func) (a1, a2, a3, a4) ; -@@ -818,7 +818,7 @@ - inline slot4 () : object(NULL), func(NULL) {} - inline slot4 (object_type *object, func_t func) : object(object), func(func) {} - inline void assign(object_type *o, func_t f) { object = o; func = f; } -- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); } -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); } - - inline void operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const { - (object->*func) (a1, a2, a3, a4); -@@ -972,7 +972,7 @@ - inline slot5(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {} - - inline void assign(object_type *o, func_t f) { object = o; func = f; } -- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); } -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); } - - inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4, arg5_type a5) const { - return (object->*func) (a1, a2, a3, a4, a5) ; diff --git a/games-action/btanks/files/btanks-0.9.8083-gcc6.patch b/games-action/btanks/files/btanks-0.9.8083-gcc6.patch deleted file mode 100644 index 5f11379d805..00000000000 --- a/games-action/btanks/files/btanks-0.9.8083-gcc6.patch +++ /dev/null @@ -1,34 +0,0 @@ -Bug: https://bugs.gentoo.org/609692 - ---- a/mrt/timespy.cpp -+++ b/mrt/timespy.cpp -@@ -43,7 +43,7 @@ - throw_io(("gettimeofday")); - } - --TimeSpy::~TimeSpy() { -+TimeSpy::~TimeSpy() DTOR_NOEXCEPT { - struct timeval now; - if (gettimeofday(&now, NULL) == -1) - throw_io(("gettimeofday")); ---- a/mrt/timespy.h -+++ b/mrt/timespy.h -@@ -37,11 +37,17 @@ - #include "fmt.h" - #include "export_mrt.h" - -+#if __cplusplus >= 201103L -+#define DTOR_NOEXCEPT noexcept(false) -+#else -+#define DTOR_NOEXCEPT -+#endif -+ - namespace mrt { - class MRTAPI TimeSpy { - public: - TimeSpy(const std::string &message); -- ~TimeSpy(); -+ ~TimeSpy() DTOR_NOEXCEPT; - private: - TimeSpy(const TimeSpy&); - const TimeSpy& operator=(const TimeSpy&); diff --git a/games-action/btanks/files/btanks-0.9.8083-scons-blows.patch b/games-action/btanks/files/btanks-0.9.8083-scons-blows.patch deleted file mode 100644 index 47ce410f0bf..00000000000 --- a/games-action/btanks/files/btanks-0.9.8083-scons-blows.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- mrt/export_base.h.old 2010-01-09 17:38:47.000000000 +0100 -+++ mrt/export_base.h 2010-01-09 17:39:23.000000000 +0100 -@@ -1,7 +1,7 @@ - #ifndef MRT_EXPORT_MACRO_H__ - #define MRT_EXPORT_MACRO_H__ - --// Shared library support -+/* Shared library support */ - #ifdef _WINDOWS - - # pragma warning(disable:4251) /* needs to have dll-interface used by client */ ---- SConstruct.old 2010-01-09 17:43:36.000000000 +0100 -+++ SConstruct 2010-01-09 17:45:25.000000000 +0100 -@@ -50,7 +50,7 @@ - if os.environ.has_key('CC'): - env['CC'] = os.environ['CC'] - if os.environ.has_key('CFLAGS'): -- env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) -+ env['CFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) - if os.environ.has_key('CXX'): - env['CXX'] = os.environ['CXX'] - if os.environ.has_key('CXXFLAGS'): -@@ -91,19 +91,9 @@ - #env.Append(CPPDEFINES = ['NDEBUG']) - - else: -- if env['gcc_visibility']: -- env.Append(CCFLAGS=['-fvisibility=hidden']); -- env.Append(CXXFLAGS=['-fvisibility-inlines-hidden', '-fvisibility=hidden']); -- -- if debug: -- env.Append(CCFLAGS=['-ggdb', '-D_FORTIFY_SOURCE=2']) -- env.Append(CPPFLAGS=['-ggdb', '-D_FORTIFY_SOURCE=2']) -- else: -- env.Append(CCFLAGS=['-O3']) -- env.Append(CPPFLAGS=['-O3']) - -- env.Append(CPPFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pipe', '-pthread']) -- env.Append(CCFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pipe', '-pthread']) -+ env.Append(CPPFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pthread']) -+ env.Append(CCFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pthread']) - - - conf_env = env.Clone() ---- sdlx/SConscript.old 2010-01-09 17:46:05.000000000 +0100 -+++ sdlx/SConscript 2010-01-09 17:46:55.000000000 +0100 -@@ -12,7 +12,7 @@ - - env.MergeFlags(sdl_cflags, sdl_libs) - --libs = ['mrt', 'SDL', 'SDL_image'] -+libs = ['mrt', 'SDL', 'SDL_image', 'SDL_gfx'] - - if sys.platform != "win32": - c_map_env= env.Clone() -@@ -35,7 +35,6 @@ - sdlx_sources = ['cursor.cpp', 'sdl_ex.cpp', 'surface.cpp', 'system.cpp', 'joystick.cpp', - 'thread.cpp', 'mutex.cpp', 'semaphore.cpp', 'color.cpp', - c_map, 'font.cpp', 'timer.cpp', 'module.cpp', 'file_rw.cpp', -- 'gfx/SDL_rotozoom.c', - ] # 'ttf.cpp', - - if sys.platform == 'win32': ---- sdlx/surface.cpp.old 2010-01-09 17:47:33.000000000 +0100 -+++ sdlx/surface.cpp 2010-01-09 17:48:19.000000000 +0100 -@@ -425,7 +425,7 @@ - throw_sdl(("SDL_SetColorKey")); - } - --#include "gfx/SDL_rotozoom.h" -+#include <SDL_rotozoom.h> - - void Surface::rotozoom(const sdlx::Surface &src, double angle, double zoom, bool smooth) { - if (src.isNull()) ---- sdlx/wrappers/glSDL.c.old 2010-01-09 17:48:50.000000000 +0100 -+++ sdlx/wrappers/glSDL.c 2010-01-09 17:49:23.000000000 +0100 -@@ -11,8 +11,6 @@ - - #ifdef HAVE_OPENGL - --//#define LEAK_TRACKING -- - #define DBG(x) /*error messages, warnings*/ - #define DBG2(x) /*texture allocation*/ - #define DBG3(x) /*chopping/tiling*/ -@@ -951,7 +949,6 @@ - } - gl_doublebuf = flags & SDL_DOUBLEBUF; - SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, gl_doublebuf); -- //SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, gl_doublebuf ? 1: 0); - - scale = 1; - diff --git a/games-action/btanks/metadata.xml b/games-action/btanks/metadata.xml deleted file mode 100644 index 3574b919826..00000000000 --- a/games-action/btanks/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Games Project</name> - </maintainer> - <longdescription lang="en"> -"Battle Tanks" is a funny battle on your desk, where you can choose one of three -vehicles and eliminate your enemy using the whole arsenal of weapons. It has -original cartoon-like graphics and cool music, it's fun and dynamic, it has -several network modes for deathmatch and cooperative --- what else is needed to -have fun with your friends? And all is packed and ready for you in "Battle -Tanks". -</longdescription> - <upstream> - <remote-id type="sourceforge">btanks</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index e9683f4ab7a..7a8a99453c1 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -260,7 +260,6 @@ dev-python/singledispatch # from this list unless you actually port them to Python 3. # Removal in 30 days. Please find relevant bugs on tracker bug #635934. dev-libs/mongo-cxx-driver -games-action/btanks # Michał Górny <[email protected]> (2020-09-25) # PyPy3.7 alpha. Known to break a few packages. Masked until it
