Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/rafkill/, games-action/rafkill/files/, profiles/
Date: Tue, 11 Dec 2018 13:45:44
Message-Id: 1544535921.0c1e120a3113b5cbe1771509b720b624cf0a6b0a.mgorny@gentoo
1 commit: 0c1e120a3113b5cbe1771509b720b624cf0a6b0a
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 11 13:44:36 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 11 13:45:21 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c1e120a
7
8 games-action/rafkill: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/638096
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 games-action/rafkill/Manifest | 1 -
14 .../rafkill/files/rafkill-1.2.3-build.patch | 27 ------
15 .../rafkill/files/rafkill-1.2.3-gcc43.patch | 106 ---------------------
16 .../rafkill/files/rafkill-1.2.3-gcc47.patch | 11 ---
17 .../rafkill/files/rafkill-1.2.3-ldflags.patch | 17 ----
18 games-action/rafkill/metadata.xml | 11 ---
19 games-action/rafkill/rafkill-1.2.3-r1.ebuild | 48 ----------
20 profiles/package.mask | 4 -
21 8 files changed, 225 deletions(-)
22
23 diff --git a/games-action/rafkill/Manifest b/games-action/rafkill/Manifest
24 deleted file mode 100644
25 index e8c490bc5d0..00000000000
26 --- a/games-action/rafkill/Manifest
27 +++ /dev/null
28 @@ -1 +0,0 @@
29 -DIST rafkill-1.2.3.tar.gz 6221729 BLAKE2B e3ea686f95299f3e6726e75ccf25231dcd57e5c1e03e3212b55b8179b3961a59935c3c5be9d4557bc38f8a29c90dbd758ff8d4de01e1abdcf4f7a7f10e664b7c SHA512 1ab8ce90f9b823092432519dbafed43db3eb6f9189dda4ced1bbce78b826b37759d0768fffdd2df1c77cbbbf1c3c88db1cc9fe1b59c815d832ebc9aed279d03c
30
31 diff --git a/games-action/rafkill/files/rafkill-1.2.3-build.patch b/games-action/rafkill/files/rafkill-1.2.3-build.patch
32 deleted file mode 100644
33 index 26e5aa64c10..00000000000
34 --- a/games-action/rafkill/files/rafkill-1.2.3-build.patch
35 +++ /dev/null
36 @@ -1,27 +0,0 @@
37 ---- a/SConstruct
38 -+++ b/SConstruct
39 -@@ -8,8 +8,8 @@
40 -
41 - print "Use 'scons -h' for help"
42 -
43 --prefix = '/usr/local/games'
44 --bin = '/usr/local/bin'
45 -+prefix = 'data'
46 -+bin = 'src'
47 - if sys.platform == 'win32':
48 - try:
49 - Execute(Mkdir('gen'))
50 -@@ -46,7 +46,12 @@
51 - # print "Install directory = $prefix"
52 - # print "Directory where symlinked binary will go = $bin"
53 -
54 --flags = [ '-g3', '-Wall', '-fno-rtti', '-Woverloaded-virtual', '-O2', '-DINSTALL_DIR=\\\"$prefix\\\"' ];
55 -+SConsignFile()
56 -+env.Replace(CXX = os.environ['CXX'])
57 -+if os.environ.get('CXXFLAGS'):
58 -+ env.Replace(CPPFLAGS = os.environ['CXXFLAGS'])
59 -+
60 -+flags = [ '-Wall', '-fno-rtti', '-Woverloaded-virtual' ];
61 - env.Append( CCFLAGS = flags, CPPPATH = [ "build" ] )
62 -
63 - # SConscript( 'src/SConscript', build_dir='build', exports = 'env' );
64
65 diff --git a/games-action/rafkill/files/rafkill-1.2.3-gcc43.patch b/games-action/rafkill/files/rafkill-1.2.3-gcc43.patch
66 deleted file mode 100644
67 index 7284a74a1ac..00000000000
68 --- a/games-action/rafkill/files/rafkill-1.2.3-gcc43.patch
69 +++ /dev/null
70 @@ -1,106 +0,0 @@
71 -Index: rafkill-1.2.2/src/guns/gun_findgun.cpp
72 -===================================================================
73 ---- rafkill-1.2.2.orig/src/guns/gun_findgun.cpp 2006-05-07 15:50:04.000000000 +0100
74 -+++ rafkill-1.2.2/src/guns/gun_findgun.cpp 2008-04-09 22:54:54.000000000 +0100
75 -@@ -5,6 +5,7 @@
76 - #include "weaponobj.h"
77 - #include "hulls/hull_weapon_machine.h"
78 - #include "spaceobj.h"
79 -+#include <cstdlib>
80 - #include <vector>
81 - #include <math.h>
82 -
83 -Index: rafkill-1.2.2/src/guns/gun_machine_circle.cpp
84 -===================================================================
85 ---- rafkill-1.2.2.orig/src/guns/gun_machine_circle.cpp 2006-05-02 02:50:40.000000000 +0100
86 -+++ rafkill-1.2.2/src/guns/gun_machine_circle.cpp 2008-04-09 22:54:54.000000000 +0100
87 -@@ -3,6 +3,7 @@
88 - #include "weaponobj.h"
89 - #include "hulls/hull_weapon_machine.h"
90 - #include "trigtable.h"
91 -+#include <cstdlib>
92 -
93 - // #define d_circle_move (2.9*8)
94 -
95 -Index: rafkill-1.2.2/src/guns/gun_saber.cpp
96 -===================================================================
97 ---- rafkill-1.2.2.orig/src/guns/gun_saber.cpp 2006-05-02 02:52:23.000000000 +0100
98 -+++ rafkill-1.2.2/src/guns/gun_saber.cpp 2008-04-09 22:54:54.000000000 +0100
99 -@@ -5,6 +5,7 @@
100 - #include "weapons/weapon_beam.h"
101 - #include "spaceobj.h"
102 - #include "ebox.h"
103 -+#include <cstdlib>
104 - #include <vector>
105 -
106 - using namespace std;
107 -Index: rafkill-1.2.2/src/menu.cpp
108 -===================================================================
109 ---- rafkill-1.2.2.orig/src/menu.cpp 2008-04-09 22:53:35.000000000 +0100
110 -+++ rafkill-1.2.2/src/menu.cpp 2008-04-09 22:54:54.000000000 +0100
111 -@@ -1,4 +1,5 @@
112 - #include <stdio.h>
113 -+#include <cstdlib>
114 - #include "defs.h"
115 - #include "menu.h"
116 - #include "loadsave.h"
117 -Index: rafkill-1.2.2/src/weapons/weapon_follow.cpp
118 -===================================================================
119 ---- rafkill-1.2.2.orig/src/weapons/weapon_follow.cpp 2006-03-25 23:29:05.000000000 +0000
120 -+++ rafkill-1.2.2/src/weapons/weapon_follow.cpp 2008-04-09 22:54:54.000000000 +0100
121 -@@ -3,6 +3,7 @@
122 - #include "weapon_follow.h"
123 - #include "hulls/hull_weapon_follow.h"
124 - #include "spaceobj.h"
125 -+#include <cstdlib>
126 - #include <vector>
127 -
128 - using namespace std;
129 -Index: rafkill-1.2.2/src/hulls/hull_weapon_beam.cpp
130 -===================================================================
131 ---- rafkill-1.2.2.orig/src/hulls/hull_weapon_beam.cpp 2006-05-02 03:12:50.000000000 +0100
132 -+++ rafkill-1.2.2/src/hulls/hull_weapon_beam.cpp 2008-04-09 22:54:54.000000000 +0100
133 -@@ -4,6 +4,7 @@
134 - #include "hull_weapon_beam.h"
135 - #include "trigtable.h"
136 - #include "ebox.h"
137 -+#include <cstdlib>
138 -
139 - #ifndef debug
140 - #include <iostream>
141 -Index: rafkill-1.2.2/src/drawer.cpp
142 -===================================================================
143 ---- rafkill-1.2.2.orig/src/drawer.cpp 2008-04-09 22:55:06.000000000 +0100
144 -+++ rafkill-1.2.2/src/drawer.cpp 2008-04-09 22:55:55.000000000 +0100
145 -@@ -11,6 +11,7 @@
146 - #include "trigtable.h"
147 - #include "pck.h"
148 - #include <iostream>
149 -+#include <cstring>
150 -
151 - /* TODO:
152 - * Add weapon icons to HUD
153 -Index: rafkill-1.2.2/src/loadsave.cpp
154 -===================================================================
155 ---- rafkill-1.2.2.orig/src/loadsave.cpp 2008-04-09 22:55:19.000000000 +0100
156 -+++ rafkill-1.2.2/src/loadsave.cpp 2008-04-09 22:55:55.000000000 +0100
157 -@@ -7,6 +7,7 @@
158 - #include "spaceobj.h"
159 - #include "strings.h"
160 - #include <string>
161 -+#include <cstring>
162 - #include <vector>
163 - #include "gunobj.h"
164 - #include "hull.h"
165 -Index: rafkill-1.2.2/src/system.cpp
166 -===================================================================
167 ---- rafkill-1.2.2.orig/src/system.cpp 2008-04-09 22:55:29.000000000 +0100
168 -+++ rafkill-1.2.2/src/system.cpp 2008-04-09 22:55:55.000000000 +0100
169 -@@ -1,6 +1,7 @@
170 - #include "system.h"
171 - #include <strings.h>
172 - #include <string>
173 -+#include <cstring>
174 -
175 - #ifdef WINDOWS
176 - static const char * type(){
177
178 diff --git a/games-action/rafkill/files/rafkill-1.2.3-gcc47.patch b/games-action/rafkill/files/rafkill-1.2.3-gcc47.patch
179 deleted file mode 100644
180 index 3c95e02869d..00000000000
181 --- a/games-action/rafkill/files/rafkill-1.2.3-gcc47.patch
182 +++ /dev/null
183 @@ -1,11 +0,0 @@
184 ---- a/src/system.cpp 2012-07-19 13:37:12.324303303 +0200
185 -+++ b/src/system.cpp 2012-07-19 13:38:05.451584273 +0200
186 -@@ -2,6 +2,8 @@
187 - #include <strings.h>
188 - #include <string>
189 - #include <cstring>
190 -+#include <unistd.h>
191 -+#include <sys/types.h>
192 -
193 - #ifdef WINDOWS
194 - static const char * type(){
195
196 diff --git a/games-action/rafkill/files/rafkill-1.2.3-ldflags.patch b/games-action/rafkill/files/rafkill-1.2.3-ldflags.patch
197 deleted file mode 100644
198 index 4adf853e912..00000000000
199 --- a/games-action/rafkill/files/rafkill-1.2.3-ldflags.patch
200 +++ /dev/null
201 @@ -1,17 +0,0 @@
202 ---- a/SConstruct 2010-10-07 10:37:26.000000000 +0200
203 -+++ b/SConstruct 2010-10-07 10:39:33.000000000 +0200
204 -@@ -1,5 +1,6 @@
205 - import os
206 - import sys
207 -+import SCons.Util
208 -
209 - env = Environment( ENV = os.environ );
210 - config = env.Configure();
211 -@@ -36,6 +37,7 @@
212 -
213 - env.BuildDir( 'build/', 'src/' )
214 - env.Append( LIBS = [ 'aldmb', 'dumb' ] );
215 -+env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
216 - if sys.platform == 'win32':
217 - env.Append( CCFLAGS = [ '-DWINDOWS' ] )
218 - env.Append( LIBS = [ 'alleg', 'pthreadGC2' ] )
219
220 diff --git a/games-action/rafkill/metadata.xml b/games-action/rafkill/metadata.xml
221 deleted file mode 100644
222 index cf6a276e766..00000000000
223 --- a/games-action/rafkill/metadata.xml
224 +++ /dev/null
225 @@ -1,11 +0,0 @@
226 -<?xml version="1.0" encoding="UTF-8"?>
227 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
228 -<pkgmetadata>
229 - <maintainer type="project">
230 - <email>games@g.o</email>
231 - <name>Gentoo Games Project</name>
232 - </maintainer>
233 - <upstream>
234 - <remote-id type="sourceforge">raptorv2</remote-id>
235 - </upstream>
236 -</pkgmetadata>
237
238 diff --git a/games-action/rafkill/rafkill-1.2.3-r1.ebuild b/games-action/rafkill/rafkill-1.2.3-r1.ebuild
239 deleted file mode 100644
240 index d277190f452..00000000000
241 --- a/games-action/rafkill/rafkill-1.2.3-r1.ebuild
242 +++ /dev/null
243 @@ -1,48 +0,0 @@
244 -# Copyright 1999-2018 Gentoo Foundation
245 -# Distributed under the terms of the GNU General Public License v2
246 -
247 -EAPI=6
248 -
249 -inherit desktop scons-utils toolchain-funcs
250 -
251 -DESCRIPTION="Space shoot-em-up game"
252 -HOMEPAGE="http://raptorv2.sourceforge.net/"
253 -SRC_URI="mirror://sourceforge/raptorv2/${P}.tar.gz"
254 -
255 -LICENSE="GPL-2"
256 -SLOT="0"
257 -KEYWORDS="~amd64 ~x86"
258 -IUSE=""
259 -
260 -DEPEND="<media-libs/allegro-5
261 - media-libs/aldumb"
262 -RDEPEND=${DEPEND}
263 -
264 -PATCHES=(
265 - "${FILESDIR}"/${P}-build.patch
266 - "${FILESDIR}"/${P}-gcc43.patch
267 - "${FILESDIR}"/${P}-gcc47.patch
268 - "${FILESDIR}"/${P}-ldflags.patch
269 -)
270 -
271 -src_prepare() {
272 - default
273 -
274 - rm -f {data,music}/.sconsign || die
275 -
276 - sed -i \
277 - -e "/^#define INSTALL_DIR/s:\.:/usr/share:" \
278 - src/defs.cpp || die
279 -}
280 -
281 -src_compile() {
282 - tc-export CXX
283 - escons
284 -}
285 -
286 -src_install() {
287 - dobin ${PN}
288 - insinto /usr/share/${PN}
289 - doins -r data music
290 - dodoc README
291 -}
292
293 diff --git a/profiles/package.mask b/profiles/package.mask
294 index 5587f502f52..cc689546707 100644
295 --- a/profiles/package.mask
296 +++ b/profiles/package.mask
297 @@ -192,10 +192,6 @@ app-forensics/libbfio
298 # month.
299 sys-apps/likwid
300
301 -# Pacho Ramos <pacho@g.o> (11 Nov 2018)
302 -# Doesn't build for a long time (#638096). Removal in a month.
303 -games-action/rafkill
304 -
305 # Pacho Ramos <pacho@g.o> (11 Nov 2018)
306 # Fails to build (#662000), not compatible with kernel-4, use kernel driver rtsx_pci
307 # instead. Removal in a month.