public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: profiles/, games-simulation/dangerdeep/, games-simulation/dangerdeep/files/
@ 2018-07-28 12:06 Michał Górny
  0 siblings, 0 replies; only message in thread
From: Michał Górny @ 2018-07-28 12:06 UTC (permalink / raw
  To: gentoo-commits

commit:     abf18fe077ccbd1638960f36fae854631bc631b6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 28 12:02:22 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 28 12:02:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abf18fe0

games-simulation/dangerdeep: Remove last-rited pkg

Closes: https://bugs.gentoo.org/630576

 games-simulation/dangerdeep/Manifest               |  2 -
 .../dangerdeep/dangerdeep-0.3.0.ebuild             | 63 -----------------
 .../dangerdeep/files/dangerdeep-0.3.0-build.patch  | 39 -----------
 .../dangerdeep/files/dangerdeep-0.3.0-gcc43.patch  | 80 ----------------------
 .../dangerdeep/files/dangerdeep-0.3.0-gcc44.patch  | 20 ------
 .../dangerdeep/files/dangerdeep-0.3.0-gcc47.patch  | 10 ---
 .../dangerdeep/files/dangerdeep-0.3.0-gcc6.patch   | 38 ----------
 games-simulation/dangerdeep/metadata.xml           | 11 ---
 profiles/package.mask                              |  4 --
 9 files changed, 267 deletions(-)

diff --git a/games-simulation/dangerdeep/Manifest b/games-simulation/dangerdeep/Manifest
deleted file mode 100644
index 73519e3f51f..00000000000
--- a/games-simulation/dangerdeep/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST dangerdeep-0.3.0.tar.gz 1100972 BLAKE2B 5f0de6c1e37759a480a8d6f835efb6dba96321697fb5a15559d35cb27a35356c4a307bf1138c237af1722365f18a9d341cf6cab122c8ebe4f1bacc088abc666a SHA512 97d47654d6d3728365ec0f7955f360a35ad105442663f5dd05f0a37ae6ae67216eb33f183df788c3cd0ba9878dbef22d607ddac86bf43159e87ef1c2429b7f87
-DIST dangerdeep-data-0.3.0.zip 61914764 BLAKE2B a727364509e8dc166338bb0c587d48f0b2ffbf406fde94aecae7435b8b1707af128ec80b6c74f04de46eb56d48189f7b7149f20f6a1836e4547fa30aa4c2eb42 SHA512 c6d7de055abc77c1c61d0f999d885f44121934d66f89c8e4e55231cc20605ef679cd278bebadc879862e3da07d46bae3ab02f97d3ee4179762efd895e8f91b3e

diff --git a/games-simulation/dangerdeep/dangerdeep-0.3.0.ebuild b/games-simulation/dangerdeep/dangerdeep-0.3.0.ebuild
deleted file mode 100644
index 44122c119cf..00000000000
--- a/games-simulation/dangerdeep/dangerdeep-0.3.0.ebuild
+++ /dev/null
@@ -1,63 +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="a World War II German submarine simulation"
-HOMEPAGE="http://dangerdeep.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://sourceforge/${PN}/${PN}-data-${PV}.zip"
-
-LICENSE="GPL-2 CC-BY-NC-ND-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_sse debug"
-
-RDEPEND="virtual/opengl
-	virtual/glu
-	sci-libs/fftw:3.0
-	media-libs/libsdl[joystick,opengl,video]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-net"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc47.patch \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-gcc6.patch
-	sed -i -e "/console_log.txt/ s:fopen.*:stderr;:" src/system.cpp || die
-}
-
-src_compile() {
-	local sse=-1
-
-	if use cpu_flags_x86_sse ; then
-		use amd64 && sse=3 || sse=1
-	fi
-
-	escons \
-		usex86sse=${sse} \
-		datadir="${GAMES_DATADIR}"/${PN} \
-		$(use_scons debug)
-}
-
-src_install() {
-	dogamesbin build/linux/${PN}
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r ../data/*
-
-	newicon dftd_icon.png ${PN}.png
-	make_desktop_entry ${PN} "Danger from the Deep"
-
-	dodoc ChangeLog CREDITS README
-	doman doc/man/${PN}.6
-
-	prepgamesdirs
-}

diff --git a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-build.patch b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-build.patch
deleted file mode 100644
index 367db1cfbb9..00000000000
--- a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- SConstruct
-+++ SConstruct
-@@ -119,6 +119,7 @@
- 
- else:
- 	print "Compiling for Unix/Posix/Linux Environment"
-+	SConsignFile()
- 	env = Environment(ENV = os.environ)
- 	env.Append(CPPPATH = ['/usr/include/SDL', '/usr/include/GL'])
- 	libpath = ['/usr/X11R6/lib']
-@@ -126,13 +127,18 @@
- 	sdllibs = ['SDL', 'SDL_image']
- 	ccflags = '-Wall `sdl-config --cflags` `pkg-config --cflags x11`'
- 	env.Append(LINKFLAGS = '`pkg-config --libs-only-L x11`')
-+	if os.environ.has_key('CXX'):
-+		env['CXX'] = os.environ['CXX']
-+	if os.environ.has_key('CXXFLAGS'):
-+		ccflags += os.environ['CXXFLAGS']
-+	if os.environ.has_key('LDFLAGS'):
-+		env.Append(LINKFLAGS = os.environ['LDFLAGS'])
- 	if (debug >= 3):
- 		ccflags += ' -g -pg -O3'	# profiling
- 	elif (debug == 2):
- 		ccflags += ' -g -O0'
- 		env.Append(CPPDEFINES = ['DEBUG'])
- 	elif (debug == 1):
--		ccflags += ' -g -O1'
- 		env.Append(CPPDEFINES = ['DEBUG'])
- 	elif (debug == -1):
- 		ccflags += ' -g -O3 -march=athlon-xp -mfpmath=sse -mmmx -msse -m3dnow'
-@@ -140,8 +144,6 @@
- 		ccflags += ' -g -O3 -march=athlon-xp -mfpmath=sse -mmmx -msse -m3dnow -ftree-vectorize -ftree-vectorizer-verbose=2'
- 	elif (debug == -3):	# special g++4.0+ auto vectorization
- 		ccflags += ' -g -O3 -march=athlon64 -mfpmath=sse -mmmx -msse -msse2 -m3dnow -ftree-vectorize -ftree-vectorizer-verbose=2'
--	else:
--		ccflags += ' -g -O2' # debug symbols will be stripped by the linker for a debian package
- 	# choose specific architecture if requested
- 	if archflag != '':
- 		ccflags += ' -march=' + archflag

diff --git a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc43.patch b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc43.patch
deleted file mode 100644
index 1588b0bbae0..00000000000
--- a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc43.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- src/bspline_test.cpp
-+++ src/bspline_test.cpp
-@@ -1,6 +1,7 @@
- // some test code for the 2d bsplines!
- #include "bspline.h"
- #include <fstream>
-+#include <cstdlib>
- using namespace std;
- 
- double rnd() { return double(rand())/RAND_MAX; }
---- src/convoy.h
-+++ src/convoy.h
-@@ -27,6 +27,7 @@
- #include "vector2.h"
- #include <new>
- #include <list>
-+#include <memory>
- class ship;
- 
- ///\brief Grouping of ships and other objects with central control.
---- src/date.cpp
-+++ src/date.cpp
-@@ -21,6 +21,7 @@
- // subsim (C)+(W) Markus Petermann and Thorsten Jordan. SEE LICENSE
- 
- #include <iomanip>
-+#include <cstdlib>
- #include "date.h"
- #include "texts.h"
- 
---- src/ocean_wave_generator.h
-+++ src/ocean_wave_generator.h
-@@ -29,6 +29,7 @@
- #include "environment.h"
- #include <complex>
- #include <vector>
-+#include <cstdlib>
- 
- // use float fftw (faster) or double (default) ?
- #ifdef WITH_FLOAT_FFTW
---- src/ptrlist.h
-+++ src/ptrlist.h
-@@ -25,6 +25,7 @@
- 
- #include <list>
- #include <stdexcept>
-+#include <memory>
- 
- // same as std::list regarding the interface (partly), but handles pointers.
- template <class T>
---- src/ptrvector.h
-+++ src/ptrvector.h
-@@ -25,6 +25,7 @@
- 
- #include <vector>
- #include <stdexcept>
-+#include <memory>
- 
- // same as std::vector regarding the interface, but handles pointers.
- template <class T>
---- src/sea_object.h
-+++ src/sea_object.h
-@@ -27,6 +27,7 @@
- #include "ptrvector.h"
- #include <new>
- #include <stdexcept>
-+#include <memory>
- 
- #include "vector3.h"
- #include "angle.h"
---- src/widget.cpp
-+++ src/widget.cpp
-@@ -32,6 +32,7 @@
- #include "datadirs.h"
- #include <set>
- #include <sstream>
-+#include <algorithm>
- using std::vector;
- using std::list;
- using std::string;

diff --git a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc44.patch b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc44.patch
deleted file mode 100644
index 23d3c470c90..00000000000
--- a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc44.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/date.cpp
-+++ src/date.cpp
-@@ -22,6 +22,7 @@
- 
- #include <iomanip>
- #include <cstdlib>
-+#include <cstdio>
- #include "date.h"
- #include "texts.h"
- 
---- src/filehelper.cpp
-+++ src/filehelper.cpp
-@@ -23,6 +23,7 @@
- #include "filehelper.h"
- #include "error.h"
- #include <vector>
-+#include <cstdio>
- using namespace std;
- 
- #ifdef WIN32

diff --git a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc47.patch b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc47.patch
deleted file mode 100644
index 54adcec10da..00000000000
--- a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc47.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/faulthandler.h.old	2012-07-25 14:37:32.000000000 +0200
-+++ src/faulthandler.h	2012-07-25 14:38:16.000000000 +0200
-@@ -50,6 +50,7 @@
- #include <signal.h>
- #include <string>
- #include <sstream>
-+#include <unistd.h>
- 
- // Note: use --export-dynamic as linker option or you won't get function names here.
- 

diff --git a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc6.patch b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc6.patch
deleted file mode 100644
index 1634aa763e4..00000000000
--- a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc6.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=610654
-Upstream Ticket: https://sourceforge.net/p/dangerdeep/patches/26/
-
---- a/src/system.cpp
-+++ b/src/system.cpp
-@@ -178,7 +178,7 @@
- 	instance = this;
- }
- 
--system::~system()
-+system::~system() DTOR_NOEXCEPT
- {
- 	if (!instance) {
- 		SDL_Quit();
---- a/src/system.h
-+++ b/src/system.h
-@@ -52,6 +52,12 @@
- #define ASSERT(a,...)
- #endif
- 
-+#if __cplusplus >= 201103L
-+#define DTOR_NOEXCEPT noexcept(false)
-+#else
-+#define DTOR_NOEXCEPT
-+#endif
-+
- class font;
- class texture;
- 
-@@ -61,7 +67,7 @@
- public:
- 	enum button_type { left_button=0x1, right_button=0x2, middle_button=0x4, wheel_up=0x8, wheel_down=0x10 };
- 	system(double nearz_, double farz_, unsigned res_x=1024, unsigned res_y=768, bool fullscreen=true);
--	~system();
-+	~system() DTOR_NOEXCEPT;
- 	void set_video_mode(unsigned res_x_, unsigned res_y_, bool fullscreen);
- 	void swap_buffers();
- 

diff --git a/games-simulation/dangerdeep/metadata.xml b/games-simulation/dangerdeep/metadata.xml
deleted file mode 100644
index 461e3ba8e89..00000000000
--- a/games-simulation/dangerdeep/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">dangerdeep</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 30cd715f8f9..a4b3b2fa67b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -249,10 +249,6 @@ sci-physics/hoomd-blue
 # (like soundconverter) instead (#629182). Removal in a month.
 media-sound/gnac
 
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Fails to run (#630576). Removal in a month.
-games-simulation/dangerdeep
-
 # Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
 # Dead since 2013, not compatible with latest profiles (#642568). Removal in
 # a month


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2018-07-28 12:06 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-28 12:06 [gentoo-commits] repo/gentoo:master commit in: profiles/, games-simulation/dangerdeep/, games-simulation/dangerdeep/files/ Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox