Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gamerlay:master commit in: games-action/dxx-rebirth/, games-action/dxx-rebirth/files/
Date: Sat, 29 Apr 2017 20:04:45
Message-Id: 1493496153.b728de5810229591127739e01c179dee71d3b88a.chewi@gentoo
1 commit: b728de5810229591127739e01c179dee71d3b88a
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 29 20:02:33 2017 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 29 20:02:33 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=b728de58
7
8 games-action/dxx-rebirth: Improved version in Gentoo repo, removing
9
10 .../dxx-rebirth/dxx-rebirth-0.59.100.ebuild | 126 ---------------------
11 .../files/dxx-rebirth-0.59.100-flags.patch | 10 --
12 .../files/dxx-rebirth-0.59.100-sharepath.patch | 11 --
13 games-action/dxx-rebirth/metadata.xml | 35 ------
14 4 files changed, 182 deletions(-)
15
16 diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
17 deleted file mode 100644
18 index b0dcf95..0000000
19 --- a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
20 +++ /dev/null
21 @@ -1,126 +0,0 @@
22 -# Copyright 1999-2016 Gentoo Foundation
23 -# Distributed under the terms of the GNU General Public License v2
24 -# $Header: $
25 -
26 -EAPI=6
27 -
28 -inherit eutils scons-utils
29 -
30 -MY_P=${PN}_v${PV}-src
31 -DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"
32 -HOMEPAGE="http://www.dxx-rebirth.com/"
33 -SRC_URI="http://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz
34 - opl3-musicpack? (
35 - descent1? ( http://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.dxa )
36 - descent2? ( http://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.dxa ) )
37 - sc55-musicpack? (
38 - descent1? ( http://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa )
39 - descent2? ( http://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa ) )
40 - l10n_de? (
41 - descent1? ( http://www.dxx-rebirth.com/download/dxx/res/d1xr-briefings-ger.dxa )
42 - descent2? ( http://www.dxx-rebirth.com/download/dxx/res/d2xr-briefings-ger.dxa ) )
43 - textures? ( http://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa )"
44 -
45 -RESTRICT=mirror
46 -
47 -LICENSE="D1X GPL-2 public-domain"
48 -SLOT="0"
49 -KEYWORDS="~amd64 ~x86"
50 -IUSE="+data debug +descent1 +descent2 doc ipv6 l10n_de +music +opengl opl3-musicpack sc55-musicpack +textures"
51 -
52 -REQUIRED_USE="|| ( descent1 descent2 )
53 - ?? ( opl3-musicpack sc55-musicpack )
54 - opl3-musicpack? ( music )
55 - sc55-musicpack? ( music )
56 - textures ( descent1 )"
57 -
58 -DEPEND="dev-games/physfs[hog,mvl,zip]
59 - media-libs/libsdl:0[X,sound,joystick,opengl?,video]
60 - music? (
61 - media-libs/sdl-mixer:0[midi,timidity,vorbis] )
62 - opengl? (
63 - virtual/opengl
64 - virtual/glu )"
65 -RDEPEND="${DEPEND}
66 - data? (
67 - descent1? ( || ( games-action/descent1-data games-action/descent1-demodata ) )
68 - descent2? ( || ( games-action/descent2-data games-action/descent2-demodata ) ) )"
69 -
70 -S="${WORKDIR}/${MY_P}"
71 -
72 -src_unpack() {
73 - unpack ${MY_P}.tar.gz
74 -}
75 -
76 -src_prepare() {
77 - # * flags patch -- remove hardcoded '-g -O2'
78 - # * sharepath patch -- change location of games' data from
79 - # /usr/share/games/{d1x,d2x}-rebirth to /usr/share/games/{d1x,d2x}
80 - PATCHES=("${FILESDIR}"/${P}-{flags,sharepath}.patch)
81 - default
82 -}
83 -
84 -src_compile() {
85 - escons \
86 - verbosebuild=1 \
87 - prefix='/usr' \
88 - debug=$(usex debug 1 0) \
89 - ipv6=$(usex ipv6 1 0) \
90 - sdlmixer=$(usex music 1 0) \
91 - opengl=$(usex opengl 1 0)
92 -}
93 -
94 -src_install() {
95 - if use doc; then
96 - docs=({CHANGELOG,INSTALL,README,RELEASE-NOTES}.txt)
97 - dodoc COPYING.txt
98 - fi
99 -
100 - for DV in 1 2; do
101 - if ! use descent${DV}; then
102 - continue
103 - fi
104 -
105 - PROGRAM=d${DV}x-rebirth
106 -
107 - if use doc; then
108 - docinto $PROGRAM
109 - for d in ${docs[@]}; do
110 - edos2unix $PROGRAM/${d}
111 - dodoc $PROGRAM/${d}
112 - done
113 - fi
114 -
115 - insinto "/usr/share/games/d${DV}x"
116 - use opl3-musicpack && doins "${DISTDIR}"/d${DV}xr-opl3-music.dxa
117 - use sc55-musicpack && doins "${DISTDIR}"/d${DV}xr-sc55-music.dxa
118 - use l10n_de && doins "${DISTDIR}"/d${DV}xr-briefings-ger.dxa
119 -
120 - dobin $PROGRAM/$PROGRAM
121 - make_desktop_entry $PROGRAM "Descent ${DV} Rebirth" $PROGRAM
122 - doicon $PROGRAM/$PROGRAM.xpm
123 - done
124 -
125 - insinto "/usr/share/games/d1x"
126 - use textures && doins "${DISTDIR}"/d1xr-hires.dxa
127 -}
128 -
129 -pkg_postinst() {
130 - if ! use data; then
131 - elog
132 - elog "To play the game enable USE=\"data\" or manually "
133 - elog "copy the files to /usr/share/{d1x,d2x}."
134 - elog "See /usr/share/doc/${PF}/INSTALL.txt.bz2 for details."
135 - elog
136 - fi
137 - if use music; then
138 - elog
139 - elog "You need to enable one of alsa/oss/pulseaudio USE flags for"
140 - elog "media-libs/libsdl package according to your sound system choice,"
141 - elog "if this USE flag isn't set globally."
142 - elog
143 - elog "For example:"
144 - elog "echo 'media-libs/libsdl alsa' >> /etc/portage/package.use/alsa"
145 - elog
146 - fi
147 -}
148
149 diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-flags.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-flags.patch
150 deleted file mode 100644
151 index 75c3a64..0000000
152 --- a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-flags.patch
153 +++ /dev/null
154 @@ -1,10 +0,0 @@
155 ---- dxx-rebirth_v0.59.100-src/SConstruct 2016-12-12 02:47:40.000000000 +0300
156 -+++ dxx-rebirth_v0.59.100-src/SConstruct 2016-12-28 02:11:16.657874914 +0300
157 -@@ -3488,7 +3488,6 @@
158 - env = self.env
159 - user_settings = self.user_settings
160 -
161 -- env.Prepend(CXXFLAGS = ['-g', '-O2'])
162 - # Raspberry Pi?
163 - if user_settings.raspberrypi:
164 - rpi_vc_path = user_settings.rpi_vc_path
165
166 diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-sharepath.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-sharepath.patch
167 deleted file mode 100644
168 index ee1b6bb..0000000
169 --- a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-sharepath.patch
170 +++ /dev/null
171 @@ -1,11 +0,0 @@
172 ---- dxx-rebirth_v0.59.100-src/SConstruct 2016-12-12 02:47:40.000000000 +0300
173 -+++ dxx-rebirth_v0.59.100-src/SConstruct 2016-12-29 19:26:58.987760410 +0300
174 -@@ -2875,7 +2875,7 @@
175 - return 'GLESv2'
176 - return self.default_OGLES_LIB
177 - def __default_DATA_DIR(self):
178 -- return '%s/share/games/%s' % (self.prefix, self._program.target)
179 -+ return '%s/share/games/%s' % (self.prefix, self._program.shortname)
180 - def _generic_variable(key,help,default):
181 - return (key, help, default)
182 - def __get_configure_tests(tests,_filter=lambda s: s.name[0] != '_'):
183
184 diff --git a/games-action/dxx-rebirth/metadata.xml b/games-action/dxx-rebirth/metadata.xml
185 deleted file mode 100644
186 index 8d5766f..0000000
187 --- a/games-action/dxx-rebirth/metadata.xml
188 +++ /dev/null
189 @@ -1,35 +0,0 @@
190 -<?xml version="1.0" encoding="UTF-8"?>
191 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
192 -<pkgmetadata>
193 - <maintainer type="person">
194 - <email>totktonada.ru@×××××.com</email>
195 - <name>Alexander Turenko</name>
196 - </maintainer>
197 - <longdescription>
198 - Descent 1 is a classic first-person shooter released in 1995 by Interplay
199 - and Parallax. Descent 2 released for the PC in 1996. It, along with its
200 - predecessor, was one of the first games with true 3-dimensional graphics,
201 - 6 degrees of freedom in movement, light sourcing, and the capability to
202 - join multiplayer games on-the-fly. D1X-Rebirth and DXX-Rebirth are
203 - modifications of the original Descent 1 and 2 sources that was released
204 - by Parallax (and are based on the D1X and D2X sources). It offering
205 - OpenGL graphics, advanced multiplayer, new features, and cross-platform
206 - compatibility. Now code bases of D1X-Rebirth and DXX-Rebirth merged and
207 - released as DXX-Rebirth.
208 - </longdescription>
209 - <use>
210 - <flag name="descent1">Install Descent 1 resources and executable</flag>
211 - <flag name="descent2">Install Descent 2 resources and executable</flag>
212 - <flag name="l10n_de">Provides German translations for the game's
213 - briefings, robot descriptions, and outro of the original campaign</flag>
214 - <flag name="opl3-musicpack">Include alternate version of the game's
215 - music, recorded with the Yamaha YMF262 OPL3 soundchip</flag>
216 - <flag name="sc55-musicpack">Include alternate version of the game's
217 - music, recorded with the Roland Sound Canvas SC-55 MIDI module</flag>
218 - <flag name="textures">Include high resolution (640x480) backgrounds,
219 - briefing images and fonts (Descent 1)</flag>
220 - <flag name="music">Adds music support</flag>
221 - <flag name="data">Install data files</flag>
222 - <flag name="doc">Install documentation files (README.txt, INSTALL.txt, etc)</flag>
223 - </use>
224 -</pkgmetadata>