Gentoo Archives: gentoo-commits

From: "Azamat H. Hackimov" <winterheart@××××××.ru>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gamerlay:master commit in: games-action/d2x-rebirth/files/, games-action/d1x-rebirth/files/, ...
Date: Wed, 21 Mar 2018 12:50:39
Message-Id: 1521636452.60f203a9f82ab415dd39820217c7884faa222f3e.winterheart@gentoo
1 commit: 60f203a9f82ab415dd39820217c7884faa222f3e
2 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
3 AuthorDate: Wed Mar 21 12:47:32 2018 +0000
4 Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
5 CommitDate: Wed Mar 21 12:47:32 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=60f203a9
7
8 Remove old games-action/d[12]x-rebirth
9
10 Failed to compile with physfs-3.0.0, masked in portage (#634116),
11 superseeded by games-action/dxx-rebirth
12
13 games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild | 95 ----------------------
14 .../files/d1x-rebirth-0.58.1-flags.patch | 27 ------
15 games-action/d1x-rebirth/metadata.xml | 23 ------
16 games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild | 93 ---------------------
17 .../files/d2x-rebirth-0.58.1-flags.patch | 27 ------
18 games-action/d2x-rebirth/metadata.xml | 25 ------
19 6 files changed, 290 deletions(-)
20
21 diff --git a/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild b/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild
22 deleted file mode 100644
23 index 4801e11..0000000
24 --- a/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild
25 +++ /dev/null
26 @@ -1,95 +0,0 @@
27 -# Copyright 1999-2014 Gentoo Foundation
28 -# Distributed under the terms of the GNU General Public License v2
29 -# $Header: $
30 -
31 -EAPI=5
32 -
33 -inherit eutils games scons-utils
34 -
35 -DV=1
36 -MY_P=${PN}_v${PV}-src
37 -DESCRIPTION="Descent Rebirth - enhanced Descent ${DV} engine"
38 -HOMEPAGE="http://www.dxx-rebirth.com/"
39 -SRC_URI="http://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz
40 - opl3-musicpack? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-opl3-music.dxa )
41 - sc55-musicpack? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-sc55-music.dxa )
42 - linguas_de? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-briefings-ger.dxa )
43 - textures? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-hires.dxa )"
44 -
45 -LICENSE="D1X GPL-2 public-domain"
46 -SLOT="0"
47 -KEYWORDS="~amd64 ~x86"
48 -IUSE="+data debug ipv6 linguas_de +music +opengl opl3-musicpack sc55-musicpack +textures"
49 -
50 -REQUIRED_USE="?? ( opl3-musicpack sc55-musicpack )
51 - opl3-musicpack? ( music )
52 - sc55-musicpack? ( music )"
53 -
54 -RDEPEND="dev-games/physfs[hog,zip]
55 - media-libs/libsdl:0[X,sound,joystick,opengl?,video]
56 - music? (
57 - media-libs/sdl-mixer:0[timidity]
58 - )
59 - opengl? (
60 - virtual/opengl
61 - virtual/glu
62 - )"
63 -DEPEND="${RDEPEND}"
64 -PDEPEND="data? ( || (
65 - games-action/descent1-data
66 - games-action/descent1-demodata
67 -) )"
68 -
69 -S=${WORKDIR}/${MY_P}
70 -
71 -RESTRICT=mirror
72 -
73 -src_unpack() {
74 - unpack ${MY_P}.tar.gz
75 -}
76 -
77 -src_prepare() {
78 - DOCS=({CHANGELOG,COPYING,INSTALL,README,RELEASE-NOTES}.txt)
79 - edos2unix ${DOCS[@]}
80 - epatch "${FILESDIR}"/${P}-flags.patch
81 -}
82 -
83 -src_compile() {
84 - escons \
85 - verbosebuild=1 \
86 - sharepath="${GAMES_DATADIR}/d${DV}x" \
87 - $(use_scons debug) \
88 - $(use_scons ipv6) \
89 - $(use_scons music sdlmixer) \
90 - $(use_scons opengl) \
91 - || die
92 -}
93 -
94 -src_install() {
95 - dodoc ${DOCS[@]}
96 -
97 - insinto "${GAMES_DATADIR}/d${DV}x"
98 -
99 - use opl3-musicpack && doins "${DISTDIR}"/d${DV}xr-opl3-music.dxa
100 - use sc55-musicpack && doins "${DISTDIR}"/d${DV}xr-sc55-music.dxa
101 - use linguas_de && doins "${DISTDIR}"/d${DV}xr-briefings-ger.dxa
102 - use textures && doins "${DISTDIR}"/d${DV}xr-hires.dxa
103 -
104 - doicon "${S}/${PN}.xpm"
105 -
106 - dogamesbin d${DV}x-rebirth
107 - make_desktop_entry d${DV}x-rebirth "Descent ${DV} Rebirth"
108 - prepgamesdirs
109 -}
110 -
111 -pkg_postinst() {
112 - games_pkg_postinst
113 -
114 - if ! use data ; then
115 - echo
116 - elog "To play the game enable USE=\"data\" or manually "
117 - elog "copy the files to ${GAMES_DATADIR}/d${DV}x."
118 - elog "See /usr/share/doc/${PF}/INSTALL.txt.bz2 for details."
119 - echo
120 - fi
121 -}
122
123 diff --git a/games-action/d1x-rebirth/files/d1x-rebirth-0.58.1-flags.patch b/games-action/d1x-rebirth/files/d1x-rebirth-0.58.1-flags.patch
124 deleted file mode 100644
125 index e852d1e..0000000
126 --- a/games-action/d1x-rebirth/files/d1x-rebirth-0.58.1-flags.patch
127 +++ /dev/null
128 @@ -1,27 +0,0 @@
129 ---- d1x-rebirth_v0.58.1-src/SConstruct
130 -+++ d1x-rebirth_v0.58.1-src/SConstruct
131 -@@ -218,7 +218,6 @@
132 - env.Append(CPPFLAGS = ['-g'])
133 - else:
134 - env.Append(CPPDEFINES = ['NDEBUG', 'RELEASE'])
135 -- env.Append(CPPFLAGS = ['-O2'])
136 -
137 - # profiler?
138 - if (self.user_settings.profiler == 1):
139 -@@ -352,6 +351,7 @@
140 - self.common_sources += self.sources_use_udp
141 -
142 - env.Append(CPPDEFINES = [('SHAREPATH', '\\"' + str(self.user_settings.sharepath) + '\\"')])
143 -+ env.Append(LINKFLAGS = [str(self.platform_settings.lflags)])
144 -
145 - def _register_program(self,dxxstr,program_specific_objects=[]):
146 - env = self.env
147 -@@ -364,7 +364,7 @@
148 - versid_cppdefines.append(('DESCENT_VERSION_EXTRA', '\\"%s\\"' % self.user_settings.extra_version))
149 - objects.append(self.env.StaticObject(target='%s%s%s' % (self.user_settings.builddir, 'main/vers_id', self.env["OBJSUFFIX"]), source='main/vers_id.c', CPPDEFINES=versid_cppdefines))
150 - # finally building program...
151 -- env.Program(target='%s%s' % (self.user_settings.builddir, str(exe_target)), source = objects, LIBS = self.platform_settings.libs, LINKFLAGS = str(self.platform_settings.lflags))
152 -+ env.Program(target='%s%s' % (self.user_settings.builddir, str(exe_target)), source = objects, LIBS = self.platform_settings.libs)
153 - if (sys.platform != 'darwin'):
154 - env.Install(self.user_settings.BIN_DIR, str(exe_target))
155 - env.Alias('install', self.user_settings.BIN_DIR)
156
157 diff --git a/games-action/d1x-rebirth/metadata.xml b/games-action/d1x-rebirth/metadata.xml
158 deleted file mode 100644
159 index 7a44d1e..0000000
160 --- a/games-action/d1x-rebirth/metadata.xml
161 +++ /dev/null
162 @@ -1,23 +0,0 @@
163 -<?xml version="1.0" encoding="UTF-8"?>
164 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
165 -<pkgmetadata>
166 - <herd>games</herd>
167 - <longdescription>
168 - Descent 1 is a classic first-person shooter released in 1995 by Interplay
169 - and Parallax. It was one of the first games with true 3-dimensional
170 - graphics, movement, and light sourcing. D1X-Rebirth is a modification of the
171 - Descent 1 source that was released by Parallax and is based on the D1X source.
172 - </longdescription>
173 - <use>
174 - <flag name="linguas_de">Provides German translations for the game's
175 - briefings, robot descriptions, and outro of the original campaign</flag>
176 - <flag name="opl3-musicpack">Include alternate version of the game's
177 - music, recorded with the Yamaha YMF262 OPL3 soundchip</flag>
178 - <flag name="sc55-musicpack">Include alternate version of the game's
179 - music, recorded with the Roland Sound Canvas SC-55 MIDI module</flag>
180 - <flag name="textures">Include high resolution (640x480) backgrounds,
181 - briefing images and fonts</flag>
182 - <flag name="music">Adds music support</flag>
183 - <flag name="data">Install data files</flag>
184 - </use>
185 -</pkgmetadata>
186
187 diff --git a/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild b/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild
188 deleted file mode 100644
189 index b0413ac..0000000
190 --- a/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild
191 +++ /dev/null
192 @@ -1,93 +0,0 @@
193 -# Copyright 1999-2014 Gentoo Foundation
194 -# Distributed under the terms of the GNU General Public License v2
195 -# $Header: $
196 -
197 -EAPI=5
198 -
199 -inherit eutils games scons-utils
200 -
201 -DV=2
202 -MY_P=${PN}_v${PV}-src
203 -DESCRIPTION="Descent Rebirth - enhanced Descent ${DV} engine"
204 -HOMEPAGE="http://www.dxx-rebirth.com/"
205 -SRC_URI="http://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz
206 - opl3-musicpack? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-opl3-music.dxa )
207 - sc55-musicpack? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-sc55-music.dxa )
208 - linguas_de? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-briefings-ger.dxa )"
209 -
210 -LICENSE="D1X GPL-2 public-domain"
211 -SLOT="0"
212 -KEYWORDS="~amd64 ~x86"
213 -IUSE="+data debug ipv6 linguas_de +music +opengl opl3-musicpack sc55-musicpack"
214 -
215 -REQUIRED_USE="?? ( opl3-musicpack sc55-musicpack )
216 - opl3-musicpack? ( music )
217 - sc55-musicpack? ( music )"
218 -
219 -RDEPEND="dev-games/physfs[hog,mvl,zip]
220 - media-libs/libsdl:0[X,sound,joystick,opengl?,video]
221 - music? (
222 - media-libs/sdl-mixer:0[timidity,vorbis]
223 - )
224 - opengl? (
225 - virtual/opengl
226 - virtual/glu
227 - )"
228 -DEPEND="${RDEPEND}"
229 -PDEPEND="data? ( || (
230 - games-action/descent2-data
231 - games-action/descent2-demodata
232 -) )"
233 -
234 -S=${WORKDIR}/${MY_P}
235 -
236 -RESTRICT=mirror
237 -
238 -src_unpack() {
239 - unpack ${MY_P}.tar.gz
240 -}
241 -
242 -src_prepare() {
243 - DOCS=({CHANGELOG,COPYING,INSTALL,README,RELEASE-NOTES}.txt)
244 - edos2unix ${DOCS[@]}
245 - epatch "${FILESDIR}"/${P}-flags.patch
246 -}
247 -
248 -src_compile() {
249 - escons \
250 - verbosebuild=1 \
251 - sharepath="${GAMES_DATADIR}/d${DV}x" \
252 - $(use_scons debug) \
253 - $(use_scons ipv6) \
254 - $(use_scons music sdlmixer) \
255 - $(use_scons opengl) \
256 - || die
257 -}
258 -
259 -src_install() {
260 - dodoc ${DOCS[@]}
261 -
262 - insinto "${GAMES_DATADIR}/d${DV}x"
263 -
264 - use opl3-musicpack && doins "${DISTDIR}"/d${DV}xr-opl3-music.dxa
265 - use sc55-musicpack && doins "${DISTDIR}"/d${DV}xr-sc55-music.dxa
266 - use linguas_de && doins "${DISTDIR}"/d${DV}xr-briefings-ger.dxa
267 -
268 - doicon "${S}/${PN}.xpm"
269 -
270 - dogamesbin d${DV}x-rebirth
271 - make_desktop_entry d${DV}x-rebirth "Descent ${DV} Rebirth"
272 - prepgamesdirs
273 -}
274 -
275 -pkg_postinst() {
276 - games_pkg_postinst
277 -
278 - if ! use data ; then
279 - echo
280 - elog "To play the game enable USE=\"data\" or manually "
281 - elog "copy the files to ${GAMES_DATADIR}/d${DV}x."
282 - elog "See /usr/share/doc/${PF}/INSTALL.txt.bz2 for details."
283 - echo
284 - fi
285 -}
286
287 diff --git a/games-action/d2x-rebirth/files/d2x-rebirth-0.58.1-flags.patch b/games-action/d2x-rebirth/files/d2x-rebirth-0.58.1-flags.patch
288 deleted file mode 100644
289 index 3d54761..0000000
290 --- a/games-action/d2x-rebirth/files/d2x-rebirth-0.58.1-flags.patch
291 +++ /dev/null
292 @@ -1,27 +0,0 @@
293 ---- d2x-rebirth_v0.58.1-src/SConstruct
294 -+++ d2x-rebirth_v0.58.1-src/SConstruct
295 -@@ -220,7 +220,6 @@
296 - env.Append(CPPFLAGS = ['-g'])
297 - else:
298 - env.Append(CPPDEFINES = ['NDEBUG', 'RELEASE'])
299 -- env.Append(CPPFLAGS = ['-O2'])
300 -
301 - # profiler?
302 - if (self.user_settings.profiler == 1):
303 -@@ -354,6 +353,7 @@
304 - self.common_sources += self.sources_use_udp
305 -
306 - env.Append(CPPDEFINES = [('SHAREPATH', '\\"' + str(self.user_settings.sharepath) + '\\"')])
307 -+ env.Append(LINKFLAGS = [str(self.platform_settings.lflags)])
308 -
309 - def _register_program(self,dxxstr,program_specific_objects=[]):
310 - env = self.env
311 -@@ -368,7 +368,7 @@
312 - versid_cppdefines.append(('DESCENT_VERSION_EXTRA', '\\"%s\\"' % self.user_settings.extra_version))
313 - objects.append(self.env.StaticObject(target='%s%s%s' % (self.user_settings.builddir, 'main/vers_id', self.env["OBJSUFFIX"]), source='main/vers_id.c', CPPDEFINES=versid_cppdefines))
314 - # finally building program...
315 -- env.Program(target='%s%s' % (self.user_settings.builddir, str(exe_target)), source = objects, LIBS = self.platform_settings.libs, LINKFLAGS = str(self.platform_settings.lflags))
316 -+ env.Program(target='%s%s' % (self.user_settings.builddir, str(exe_target)), source = objects, LIBS = self.platform_settings.libs)
317 - if (sys.platform != 'darwin'):
318 - if self.user_settings.register_install_target:
319 - install_dir = os.path.join(self.user_settings.DESTDIR or '', self.user_settings.BIN_DIR)
320
321 diff --git a/games-action/d2x-rebirth/metadata.xml b/games-action/d2x-rebirth/metadata.xml
322 deleted file mode 100644
323 index d1e4c62..0000000
324 --- a/games-action/d2x-rebirth/metadata.xml
325 +++ /dev/null
326 @@ -1,25 +0,0 @@
327 -<?xml version="1.0" encoding="UTF-8"?>
328 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
329 -<pkgmetadata>
330 - <herd>games</herd>
331 - <longdescription>
332 - Descent 2 is a classic 'tunnel shooter' released for the PC in 1996. It
333 - was developed by Parallax Software and published by Interplay. It, along
334 - with its predecessor Descent, was one of the first games to offer true
335 - 3-dimensional graphics, 6 degrees of freedom in movement, and the
336 - capability to join multiplayer games on-the-fly. DXX-Rebirth is a
337 - modification of the Descent 2 source that was released by Parallax,
338 - offering OpenGL graphics, advanced multiplayer, new features, and
339 - cross-platform compatibility.
340 - </longdescription>
341 - <use>
342 - <flag name="linguas_de">Provides German translations for the game's
343 - briefings, robot descriptions, and outro of the original campaign</flag>
344 - <flag name="opl3-musicpack">Include alternate version of the game's
345 - music, recorded with the Yamaha YMF262 OPL3 soundchip</flag>
346 - <flag name="sc55-musicpack">Include alternate version of the game's
347 - music, recorded with the Roland Sound Canvas SC-55 MIDI module</flag>
348 - <flag name="music">Adds music support</flag>
349 - <flag name="data">Install data files</flag>
350 - </use>
351 -</pkgmetadata>