Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/files/, games-fps/urbanterror/
Date: Sun, 10 Dec 2017 20:42:38
Message-Id: 1512938420.621814eb0f86ad1cecd86f730b48f8db23089a63.chewi@gentoo
1 commit: 621814eb0f86ad1cecd86f730b48f8db23089a63
2 Author: Nils Freydank <holgersson <AT> posteo <DOT> de>
3 AuthorDate: Sat Dec 9 10:54:14 2017 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 10 20:40:20 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=621814eb
7
8 games-fps/urbanterror: Cleanup old versions.
9
10 Package-Manager: Portage-2.3.17, Repoman-2.3.6
11 Closes: https://github.com/gentoo/gentoo/pull/6488
12
13 games-fps/urbanterror/Manifest | 5 -
14 .../files/urbanterror-4.3-respect_CFLAGS.patch | 53 -------
15 .../urbanterror/urbanterror-4.3.2_p20170426.ebuild | 152 -------------------
16 .../urbanterror/urbanterror-4.3.2_p20170713.ebuild | 152 -------------------
17 .../urbanterror/urbanterror-4.3.2_p20170915.ebuild | 152 -------------------
18 .../urbanterror/urbanterror-4.3.2_p20171016.ebuild | 148 -------------------
19 .../urbanterror/urbanterror-4.3.2_p20171105.ebuild | 163 ---------------------
20 7 files changed, 825 deletions(-)
21
22 diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
23 index e6931427297..f49cff1d924 100644
24 --- a/games-fps/urbanterror/Manifest
25 +++ b/games-fps/urbanterror/Manifest
26 @@ -1,6 +1 @@
27 -DIST urbanterror-4.3.2_p20170426.tar.gz 10058308 BLAKE2B 7ce3f2abd00a71194160fcde4185733f1232a232237fb50d8d59ee188b2c40d117cdb3b3a03e0f0f6a9456ccf7e7dea030a96de438fcaa408ea6ff52cd23892c SHA512 e8107ab44fdb40bc14a548239185905a01120bbe960b8713e5959df18330fd845761350c5e8e5efd5fbfec10ad62ff9fef68420406cc4cfbe2af69ee66eff1f3
28 -DIST urbanterror-4.3.2_p20170713.tar.gz 9984763 BLAKE2B 4771e5ecf997334d33ae4b2040e6a2c9e7e2e85990152efef14f071db656e2712fed078dd117c9701ffd1be2e36360cee3d1c7126e10706a12013f5cc8a9625d SHA512 09fd2232c3cbdde001b8d037f2667a55a584378615f2da10c6815797748028f36b75c899ca4fd1d7d97a33f4b3ddbaa4d271b36b5eabf3bf9e81852ef15864a4
29 -DIST urbanterror-4.3.2_p20170915.tar.gz 10061394 BLAKE2B 9e42de663b1ae0ae9e16a279233c88eb419f424c3db0b4d14276cbb9ab59fba3f32b43593f5901e0a6299ef8c2e4fe1d39a789d107a7bd9c15422a3acf553cea SHA512 d22bc3a0d8d191f797f5b1e7a0671424ca6dafbe5a3bd7fbfcd0e7249b9b4b6e790a64cdf7c93690d032b38f92aee703e9e302701084703d7a79d8f60cc2433e
30 -DIST urbanterror-4.3.2_p20171016.tar.gz 10061989 BLAKE2B 12cc4cd40f85c8d15c93fbafa5cc0c5fe2b8c2d35962aa6a24e8878525b262bab47a5f8cfef6e7a4e4d506c47a5d56fb22db99e341efac06cd1b16e1d845027b SHA512 b35bd08f6058d73eecd48304609f7064637e9f1fcad7b22a93a9fdb43f003b93c3c52f3e9a7fc4c468d70fed4ba687bcdcfa0c8749252a12d2eab1cf3ab956ea
31 -DIST urbanterror-4.3.2_p20171105.tar.gz 10067127 BLAKE2B e843623976ad1d2379121bb834eabac634d57185c0b15ee298cf900474a7879ba0d2f45e1e6eb002d963fa83d895f8962110dc7f5dc5a209cde1aee3a9a8234a SHA512 7a9ac15a0508706c17a390a5105badbaaba3b3c0e7e23b3ab9dd16751b1d946c108febba5c2f6af3046d5431fd1c5978a2abc267a740eca1d89d77d7172b41ad
32 DIST urbanterror-4.3.2_p20171208.tar.gz 10072373 BLAKE2B 9934317fb649e652628639f9ea35cdaa0466363b52ea7325198aaaa6360e07e41ec590342cd35fa1bb352ff35ba5994e9152caaf308aa0e0d8c3c2d94ea36a91 SHA512 1dd3affa8fe23f8cca4ee3c90a8d6fc86f5df2122e0121d57263be745d0af13f52cb47802636a22cb09b1bae8a100b491dc8cc0c81c413dd9cbb2ad29a69039a
33
34 diff --git a/games-fps/urbanterror/files/urbanterror-4.3-respect_CFLAGS.patch b/games-fps/urbanterror/files/urbanterror-4.3-respect_CFLAGS.patch
35 deleted file mode 100644
36 index 5ce13342ab5..00000000000
37 --- a/games-fps/urbanterror/files/urbanterror-4.3-respect_CFLAGS.patch
38 +++ /dev/null
39 @@ -1,53 +0,0 @@
40 -Author: holgersson <holgersson@××××××.de>
41 -Date: Fri Mar 31 12:13:00 2017 +0200
42 -
43 -Respect CFLAGS - inspired by hasufell’s patch
44 -
45 ---- a/Makefile 2017-03-31 11:08:58.419210817 +0200
46 -+++ b/Makefile 2017-03-31 12:06:52.559412054 +0200
47 -@@ -290,34 +290,33 @@
48 - CLIENT_EXTRA_FILES=
49 -
50 - ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu"))
51 -- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
52 -- -pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
53 -+ BASE_CFLAGS = -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
54 - CLIENT_CFLAGS += $(SDL_CFLAGS)
55 -
56 -- OPTIMIZEVM = -O3
57 -- OPTIMIZE = $(OPTIMIZEVM) -ffast-math
58 -+ OPTIMIZEVM =
59 -+ OPTIMIZE = $(OPTIMIZEVM)
60 -
61 - ifeq ($(ARCH),x86_64)
62 -- OPTIMIZEVM = -O3
63 -- OPTIMIZE = $(OPTIMIZEVM) -ffast-math
64 -+ OPTIMIZEVM =
65 -+ OPTIMIZE = $(OPTIMIZEVM)
66 - HAVE_VM_COMPILED = true
67 - else
68 - ifeq ($(ARCH),x86)
69 -- OPTIMIZEVM = -O3 -march=i586
70 -- OPTIMIZE = $(OPTIMIZEVM) -ffast-math
71 -+ OPTIMIZEVM =
72 -+ OPTIMIZE = $(OPTIMIZEVM)
73 - HAVE_VM_COMPILED=true
74 - else
75 - ifeq ($(ARCH),ppc)
76 -- BASE_CFLAGS += -maltivec
77 -+ BASE_CFLAGS +=
78 - HAVE_VM_COMPILED=true
79 - endif
80 - ifeq ($(ARCH),ppc64)
81 -- BASE_CFLAGS += -maltivec
82 -+ BASE_CFLAGS +=
83 - HAVE_VM_COMPILED=true
84 - endif
85 - ifeq ($(ARCH),sparc)
86 -- OPTIMIZE += -mtune=ultrasparc3 -mv8plus
87 -- OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus
88 -+ OPTIMIZE +=
89 -+ OPTIMIZEVM +=
90 - HAVE_VM_COMPILED=true
91 - endif
92 - ifeq ($(ARCH),armv7l)
93
94 diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild
95 deleted file mode 100644
96 index 522657485a4..00000000000
97 --- a/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild
98 +++ /dev/null
99 @@ -1,152 +0,0 @@
100 -# Copyright 1999-2017 Gentoo Foundation
101 -# Distributed under the terms of the GNU General Public License v2
102 -
103 -EAPI="6"
104 -inherit flag-o-matic gnome2-utils
105 -
106 -DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
107 -HOMEPAGE="http://urbanterror.info"
108 -
109 -if [[ ${PV} == "9999" ]]; then
110 - inherit git-r3
111 - EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
112 - EGIT_BRANCH="urt"
113 -else
114 - COMMIT_ID="60b17a27ecaa30bffc44114cb94df82af7febfdd"
115 - SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
116 - S="${WORKDIR}/ioq3-${COMMIT_ID}"
117 - KEYWORDS="~amd64 ~x86"
118 -
119 -fi
120 -
121 -LICENSE="GPL-2"
122 -SLOT="0"
123 -IUSE="+altgamma +client +curl debug mumble openal +opus server voip vorbis"
124 -REQUIRED_USE=" || ( client server )"
125 -
126 -PATCHES=( "${FILESDIR}"/${PN}-4.3-respect_CFLAGS.patch )
127 -
128 -RDEPEND="
129 - client? (
130 - media-libs/libsdl2[X,sound,joystick,opengl,video]
131 - mumble? ( media-sound/mumble )
132 - openal? ( media-libs/openal )
133 - opus? ( media-libs/opusfile )
134 - vorbis? (
135 - media-libs/libogg
136 - media-libs/libvorbis
137 - )
138 - )
139 - curl? ( net-misc/curl )
140 - ~games-fps/urbanterror-data-4.3.2
141 - sys-libs/zlib[minizip]
142 - virtual/jpeg:0
143 -"
144 -
145 -DEPEND="${RDEPEND}"
146 -
147 -pkg_pretend() {
148 - if use client; then
149 - if ! use openal && ! use opus && ! use vorbis; then
150 - ewarn
151 - ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
152 - fi
153 - fi
154 -}
155 -
156 -src_compile() {
157 - buildit() { use $1 && echo 1 || echo 0 ; }
158 - nobuildit() { use $1 && echo 0 || echo 1 ; }
159 -
160 - # Workaround for used zlib macro, wrt bug #44951
161 - append-flags "-DOF=_Z_OF"
162 -
163 - emake \
164 - ARCH=$(usex amd64 "x86_64" "i386") \
165 - DEFAULT_BASEDIR="/usr/share/urbanterror" \
166 - BUILD_CLIENT=$(buildit client) \
167 - BUILD_SERVER=$(buildit server) \
168 - BUILD_BASEGAME=1 \
169 - BUILD_MISSIONPACK=0 \
170 - BUILD_GAME_SO=0 \
171 - BUILD_GAME_QVM=0 \
172 - BUILD_STANDALONE=1 \
173 - SERVERBIN="Quake3-UrT-Ded" \
174 - CLIENTBIN="Quake3-UrT" \
175 - USE_RENDERER_DLOPEN=0 \
176 - USE_YACC=0 \
177 - BASEGAME="q3ut4"\
178 - BASEGAME_CFLAGS="${CFLAGS}" \
179 - USE_OPENAL=$(buildit openal) \
180 - USE_OPENAL_DLOPEN=$(buildit openal) \
181 - USE_CURL=$(buildit curl) \
182 - USE_CURL_DLOPEN=$(buildit curl) \
183 - USE_CODEC_VORBIS=$(buildit vorbis) \
184 - USE_CODEC_OPUS=$(buildit opus) \
185 - USE_MUMBLE=$(buildit mumble) \
186 - USE_VOIP=$(buildit voip) \
187 - USE_INTERNAL_LIBS=0 \
188 - USE_LOCAL_HEADERS=0 \
189 - USE_ALTGAMMA=$(buildit altgamma)
190 -}
191 -
192 -src_install() {
193 - local my_arch=$(usex amd64 "x86_64" "i386")
194 -
195 - # docs from ioq3, not from UrbanTerror ZIP file
196 - dodoc ChangeLog README.md README.ioq3.md md4-readme.txt
197 -
198 - if use client; then
199 - newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
200 - # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
201 - make_desktop_entry ${PN} "UrbanTerror" ${PN}
202 - fi
203 -
204 - if use server && ! use client; then
205 - # dedicated server only
206 - newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
207 - fi
208 -}
209 -
210 -pkg_preinst() {
211 - use client && gnome2_icon_savelist
212 -}
213 -
214 -pkg_postinst() {
215 - use client && gnome2_icon_cache_update
216 -
217 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
218 - # This is a new installation
219 - if use openal; then
220 - elog ""
221 - elog "You might need to set:"
222 - elog " seta s_useopenal \"1\""
223 - elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
224 - fi
225 -
226 - if use altgamma; then
227 - elog ""
228 - elog "You might need to set:"
229 - elog " seta r_altgamma \"1\""
230 - elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
231 - fi
232 -
233 - if ! use altgamma; then
234 - elog ""
235 - elog "If you are using a modesetting graphics driver you might"
236 - elog "consider setting USE=\"altgamma\"."
237 - elog "For details take a look at:"
238 - elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
239 - fi
240 - if ! use client; then
241 - elog ""
242 - elog "You disabled client support. You won't be able to connect"
243 - elog "to any servers and play. If you want to do so, enable"
244 - elog "USE=\"client\"."
245 - fi
246 - fi
247 -}
248 -
249 -pkg_postrm() {
250 - use client && gnome2_icon_cache_update
251 -}
252
253 diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20170713.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20170713.ebuild
254 deleted file mode 100644
255 index ba228d05417..00000000000
256 --- a/games-fps/urbanterror/urbanterror-4.3.2_p20170713.ebuild
257 +++ /dev/null
258 @@ -1,152 +0,0 @@
259 -# Copyright 1999-2017 Gentoo Foundation
260 -# Distributed under the terms of the GNU General Public License v2
261 -
262 -EAPI="6"
263 -inherit flag-o-matic gnome2-utils
264 -
265 -DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
266 -HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3"
267 -
268 -if [[ ${PV} == "9999" ]]; then
269 - inherit git-r3
270 - EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
271 - EGIT_BRANCH="urt"
272 -else
273 - COMMIT_ID="8eb3e10163c62331b77171a71ca6102d3d63c3e7"
274 - SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
275 - S="${WORKDIR}/ioq3-${COMMIT_ID}"
276 - KEYWORDS="~amd64 ~x86"
277 -
278 -fi
279 -
280 -LICENSE="GPL-2"
281 -SLOT="0"
282 -IUSE="+altgamma +client +curl debug mumble openal +opus server voip vorbis"
283 -REQUIRED_USE=" || ( client server )"
284 -
285 -PATCHES=( "${FILESDIR}"/${PN}-4.3-respect_CFLAGS.patch )
286 -
287 -RDEPEND="
288 - client? (
289 - media-libs/libsdl2[X,sound,joystick,opengl,video]
290 - mumble? ( media-sound/mumble )
291 - openal? ( media-libs/openal )
292 - opus? ( media-libs/opusfile )
293 - vorbis? (
294 - media-libs/libogg
295 - media-libs/libvorbis
296 - )
297 - )
298 - curl? ( net-misc/curl )
299 - ~games-fps/urbanterror-data-4.3.2
300 - sys-libs/zlib[minizip]
301 - virtual/jpeg:0
302 -"
303 -
304 -DEPEND="${RDEPEND}"
305 -
306 -pkg_pretend() {
307 - if use client; then
308 - if ! use openal && ! use opus && ! use vorbis; then
309 - ewarn
310 - ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
311 - fi
312 - fi
313 -}
314 -
315 -src_compile() {
316 - buildit() { use $1 && echo 1 || echo 0 ; }
317 - nobuildit() { use $1 && echo 0 || echo 1 ; }
318 -
319 - # Workaround for used zlib macro, wrt bug #44951
320 - append-flags "-DOF=_Z_OF"
321 -
322 - emake \
323 - ARCH=$(usex amd64 "x86_64" "i386") \
324 - DEFAULT_BASEDIR="/usr/share/urbanterror" \
325 - BUILD_CLIENT=$(buildit client) \
326 - BUILD_SERVER=$(buildit server) \
327 - BUILD_BASEGAME=1 \
328 - BUILD_MISSIONPACK=0 \
329 - BUILD_GAME_SO=0 \
330 - BUILD_GAME_QVM=0 \
331 - BUILD_STANDALONE=1 \
332 - SERVERBIN="Quake3-UrT-Ded" \
333 - CLIENTBIN="Quake3-UrT" \
334 - USE_RENDERER_DLOPEN=0 \
335 - USE_YACC=0 \
336 - BASEGAME="q3ut4"\
337 - BASEGAME_CFLAGS="${CFLAGS}" \
338 - USE_OPENAL=$(buildit openal) \
339 - USE_OPENAL_DLOPEN=$(buildit openal) \
340 - USE_CURL=$(buildit curl) \
341 - USE_CURL_DLOPEN=$(buildit curl) \
342 - USE_CODEC_VORBIS=$(buildit vorbis) \
343 - USE_CODEC_OPUS=$(buildit opus) \
344 - USE_MUMBLE=$(buildit mumble) \
345 - USE_VOIP=$(buildit voip) \
346 - USE_INTERNAL_LIBS=0 \
347 - USE_LOCAL_HEADERS=0 \
348 - USE_ALTGAMMA=$(buildit altgamma)
349 -}
350 -
351 -src_install() {
352 - local my_arch=$(usex amd64 "x86_64" "i386")
353 -
354 - # docs from ioq3, not from UrbanTerror ZIP file
355 - dodoc ChangeLog README.md README.ioq3.md md4-readme.txt
356 -
357 - if use client; then
358 - newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
359 - # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
360 - make_desktop_entry ${PN} "UrbanTerror" ${PN}
361 - fi
362 -
363 - if use server && ! use client; then
364 - # dedicated server only
365 - newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
366 - fi
367 -}
368 -
369 -pkg_preinst() {
370 - use client && gnome2_icon_savelist
371 -}
372 -
373 -pkg_postinst() {
374 - use client && gnome2_icon_cache_update
375 -
376 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
377 - # This is a new installation
378 - if use openal; then
379 - elog ""
380 - elog "You might need to set:"
381 - elog " seta s_useopenal \"1\""
382 - elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
383 - fi
384 -
385 - if use altgamma; then
386 - elog ""
387 - elog "You might need to set:"
388 - elog " seta r_altgamma \"1\""
389 - elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
390 - fi
391 -
392 - if ! use altgamma; then
393 - elog ""
394 - elog "If you are using a modesetting graphics driver you might"
395 - elog "consider setting USE=\"altgamma\"."
396 - elog "For details take a look at:"
397 - elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
398 - fi
399 - if ! use client; then
400 - elog ""
401 - elog "You disabled client support. You won't be able to connect"
402 - elog "to any servers and play. If you want to do so, enable"
403 - elog "USE=\"client\"."
404 - fi
405 - fi
406 -}
407 -
408 -pkg_postrm() {
409 - use client && gnome2_icon_cache_update
410 -}
411
412 diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20170915.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20170915.ebuild
413 deleted file mode 100644
414 index 6265e8c10cd..00000000000
415 --- a/games-fps/urbanterror/urbanterror-4.3.2_p20170915.ebuild
416 +++ /dev/null
417 @@ -1,152 +0,0 @@
418 -# Copyright 1999-2017 Gentoo Foundation
419 -# Distributed under the terms of the GNU General Public License v2
420 -
421 -EAPI="6"
422 -inherit flag-o-matic gnome2-utils
423 -
424 -DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
425 -HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3"
426 -
427 -if [[ ${PV} == "9999" ]]; then
428 - inherit git-r3
429 - EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
430 - EGIT_BRANCH="urt"
431 -else
432 - COMMIT_ID="0b3e62a00bd05d337f2ab6dad2cdb311a5d76464"
433 - SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
434 - S="${WORKDIR}/ioq3-${COMMIT_ID}"
435 - KEYWORDS="~amd64 ~x86"
436 -
437 -fi
438 -
439 -LICENSE="GPL-2"
440 -SLOT="0"
441 -IUSE="+altgamma +client +curl debug mumble openal +opus server voip vorbis"
442 -REQUIRED_USE=" || ( client server )"
443 -
444 -PATCHES=( "${FILESDIR}"/${PN}-4.3-respect_CFLAGS.patch )
445 -
446 -RDEPEND="
447 - client? (
448 - media-libs/libsdl2[X,sound,joystick,opengl,video]
449 - mumble? ( media-sound/mumble )
450 - openal? ( media-libs/openal )
451 - opus? ( media-libs/opusfile )
452 - vorbis? (
453 - media-libs/libogg
454 - media-libs/libvorbis
455 - )
456 - )
457 - curl? ( net-misc/curl )
458 - ~games-fps/urbanterror-data-4.3.2
459 - sys-libs/zlib[minizip]
460 - virtual/jpeg:0
461 -"
462 -
463 -DEPEND="${RDEPEND}"
464 -
465 -pkg_pretend() {
466 - if use client; then
467 - if ! use openal && ! use opus && ! use vorbis; then
468 - ewarn
469 - ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
470 - fi
471 - fi
472 -}
473 -
474 -src_compile() {
475 - buildit() { use $1 && echo 1 || echo 0 ; }
476 - nobuildit() { use $1 && echo 0 || echo 1 ; }
477 -
478 - # Workaround for used zlib macro, wrt bug #44951
479 - append-flags "-DOF=_Z_OF"
480 -
481 - emake \
482 - ARCH=$(usex amd64 "x86_64" "i386") \
483 - DEFAULT_BASEDIR="/usr/share/urbanterror" \
484 - BUILD_CLIENT=$(buildit client) \
485 - BUILD_SERVER=$(buildit server) \
486 - BUILD_BASEGAME=1 \
487 - BUILD_MISSIONPACK=0 \
488 - BUILD_GAME_SO=0 \
489 - BUILD_GAME_QVM=0 \
490 - BUILD_STANDALONE=1 \
491 - SERVERBIN="Quake3-UrT-Ded" \
492 - CLIENTBIN="Quake3-UrT" \
493 - USE_RENDERER_DLOPEN=0 \
494 - USE_YACC=0 \
495 - BASEGAME="q3ut4"\
496 - BASEGAME_CFLAGS="${CFLAGS}" \
497 - USE_OPENAL=$(buildit openal) \
498 - USE_OPENAL_DLOPEN=$(buildit openal) \
499 - USE_CURL=$(buildit curl) \
500 - USE_CURL_DLOPEN=$(buildit curl) \
501 - USE_CODEC_VORBIS=$(buildit vorbis) \
502 - USE_CODEC_OPUS=$(buildit opus) \
503 - USE_MUMBLE=$(buildit mumble) \
504 - USE_VOIP=$(buildit voip) \
505 - USE_INTERNAL_LIBS=0 \
506 - USE_LOCAL_HEADERS=0 \
507 - USE_ALTGAMMA=$(buildit altgamma)
508 -}
509 -
510 -src_install() {
511 - local my_arch=$(usex amd64 "x86_64" "i386")
512 -
513 - # docs from ioq3, not from UrbanTerror ZIP file
514 - dodoc ChangeLog README.md README.ioq3.md md4-readme.txt
515 -
516 - if use client; then
517 - newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
518 - # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
519 - make_desktop_entry ${PN} "UrbanTerror" ${PN}
520 - fi
521 -
522 - if use server && ! use client; then
523 - # dedicated server only
524 - newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
525 - fi
526 -}
527 -
528 -pkg_preinst() {
529 - use client && gnome2_icon_savelist
530 -}
531 -
532 -pkg_postinst() {
533 - use client && gnome2_icon_cache_update
534 -
535 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
536 - # This is a new installation
537 - if use openal; then
538 - elog ""
539 - elog "You might need to set:"
540 - elog " seta s_useopenal \"1\""
541 - elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
542 - fi
543 -
544 - if use altgamma; then
545 - elog ""
546 - elog "You might need to set:"
547 - elog " seta r_altgamma \"1\""
548 - elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
549 - fi
550 -
551 - if ! use altgamma; then
552 - elog ""
553 - elog "If you are using a modesetting graphics driver you might"
554 - elog "consider setting USE=\"altgamma\"."
555 - elog "For details take a look at:"
556 - elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
557 - fi
558 - if ! use client; then
559 - elog ""
560 - elog "You disabled client support. You won't be able to connect"
561 - elog "to any servers and play. If you want to do so, enable"
562 - elog "USE=\"client\"."
563 - fi
564 - fi
565 -}
566 -
567 -pkg_postrm() {
568 - use client && gnome2_icon_cache_update
569 -}
570
571 diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20171016.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20171016.ebuild
572 deleted file mode 100644
573 index 468e8992705..00000000000
574 --- a/games-fps/urbanterror/urbanterror-4.3.2_p20171016.ebuild
575 +++ /dev/null
576 @@ -1,148 +0,0 @@
577 -# Copyright 1999-2017 Gentoo Foundation
578 -# Distributed under the terms of the GNU General Public License v2
579 -
580 -EAPI="6"
581 -inherit flag-o-matic gnome2-utils
582 -
583 -DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
584 -HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3"
585 -
586 -if [[ ${PV} == "9999" ]]; then
587 - inherit git-r3
588 - EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
589 - EGIT_BRANCH="urt"
590 -else
591 - COMMIT_ID="3e555ab1405c38556cbfcdd42eac23a4af49e633"
592 - SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
593 - S="${WORKDIR}/ioq3-${COMMIT_ID}"
594 - KEYWORDS="~amd64 ~x86"
595 -fi
596 -
597 -LICENSE="GPL-2"
598 -SLOT="0"
599 -IUSE="+altgamma +client +curl debug mumble openal +opus server voip vorbis"
600 -REQUIRED_USE=" || ( client server )"
601 -
602 -PATCHES=( "${FILESDIR}"/${PN}-4.3-respect_CFLAGS.patch )
603 -
604 -RDEPEND="
605 - client? (
606 - media-libs/libsdl2[X,sound,joystick,opengl,video]
607 - mumble? ( media-sound/mumble )
608 - openal? ( media-libs/openal )
609 - opus? ( media-libs/opusfile )
610 - vorbis? (
611 - media-libs/libogg
612 - media-libs/libvorbis
613 - )
614 - )
615 - curl? ( net-misc/curl )
616 - ~games-fps/urbanterror-data-4.3.2
617 - sys-libs/zlib[minizip]
618 - virtual/jpeg:0
619 -"
620 -
621 -DEPEND="${RDEPEND}"
622 -
623 -pkg_pretend() {
624 - if use client; then
625 - if ! use openal && ! use opus && ! use vorbis; then
626 - ewarn
627 - ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
628 - fi
629 - fi
630 -}
631 -
632 -src_compile() {
633 - # Workaround for used zlib macro, wrt bug #449510
634 - append-flags "-DOF=_Z_OF"
635 - local my_arch=$(usex amd64 "x86_64" "i386")
636 -
637 - emake \
638 - ARCH=${my_arch} \
639 - DEFAULT_BASEDIR="/usr/share/urbanterror" \
640 - BUILD_CLIENT=$(usex "client" 1 0) \
641 - BUILD_SERVER=$(usex "server" 1 0) \
642 - BUILD_BASEGAME=1 \
643 - BUILD_MISSIONPACK=0 \
644 - BUILD_GAME_SO=0 \
645 - BUILD_GAME_QVM=0 \
646 - BUILD_STANDALONE=1 \
647 - SERVERBIN="Quake3-UrT-Ded" \
648 - CLIENTBIN="Quake3-UrT" \
649 - USE_RENDERER_DLOPEN=0 \
650 - USE_YACC=0 \
651 - BASEGAME="q3ut4"\
652 - BASEGAME_CFLAGS="${CFLAGS}" \
653 - USE_OPENAL=$(usex "openal" 1 0) \
654 - USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
655 - USE_CURL=$(usex "curl" 1 0) \
656 - USE_CURL_DLOPEN=$(usex "curl" 1 0) \
657 - USE_CODEC_VORBIS=$(usex "vorbis" 1 0) \
658 - USE_CODEC_OPUS=$(usex "opus" 1 0) \
659 - USE_MUMBLE=$(usex "mumble" 1 0) \
660 - USE_VOIP=$(usex "mumble" 1 0) \
661 - USE_INTERNAL_LIBS=0 \
662 - USE_LOCAL_HEADERS=0 \
663 - USE_ALTGAMMA=$(usex "altgamma" 1 0)
664 -}
665 -
666 -src_install() {
667 - local my_arch=$(usex amd64 "x86_64" "i386")
668 - # docs from ioq3, not from UrbanTerror ZIP file
669 - dodoc ChangeLog README.md README.ioq3.md md4-readme.txt
670 -
671 - if use client; then
672 - newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
673 - # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
674 - make_desktop_entry ${PN} "UrbanTerror" ${PN}
675 - fi
676 -
677 - if use server && ! use client; then
678 - # dedicated server only
679 - newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
680 - fi
681 -}
682 -
683 -pkg_preinst() {
684 - use client && gnome2_icon_savelist
685 -}
686 -
687 -pkg_postinst() {
688 - use client && gnome2_icon_cache_update
689 -
690 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
691 - # This is a new installation
692 - if use openal; then
693 - elog ""
694 - elog "You might need to set:"
695 - elog " seta s_useopenal \"1\""
696 - elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
697 - fi
698 -
699 - if use altgamma; then
700 - elog ""
701 - elog "You might need to set:"
702 - elog " seta r_altgamma \"1\""
703 - elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
704 - fi
705 -
706 - if ! use altgamma; then
707 - elog ""
708 - elog "If you are using a modesetting graphics driver you might"
709 - elog "consider setting USE=\"altgamma\"."
710 - elog "For details take a look at:"
711 - elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
712 - fi
713 - if ! use client; then
714 - elog ""
715 - elog "You disabled client support. You won't be able to connect"
716 - elog "to any servers and play. If you want to do so, enable"
717 - elog "USE=\"client\"."
718 - fi
719 - fi
720 -}
721 -
722 -pkg_postrm() {
723 - use client && gnome2_icon_cache_update
724 -}
725
726 diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20171105.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20171105.ebuild
727 deleted file mode 100644
728 index 4bcbbaa4605..00000000000
729 --- a/games-fps/urbanterror/urbanterror-4.3.2_p20171105.ebuild
730 +++ /dev/null
731 @@ -1,163 +0,0 @@
732 -# Copyright 1999-2017 Gentoo Foundation
733 -# Distributed under the terms of the GNU General Public License v2
734 -
735 -EAPI="6"
736 -inherit eapi7-ver flag-o-matic toolchain-funcs xdg-utils
737 -
738 -DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
739 -HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3"
740 -
741 -if [[ ${PV} == "9999" ]]; then
742 - inherit git-r3
743 - EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
744 - EGIT_BRANCH="urt"
745 -else
746 - COMMIT_ID="59594a771796ae3b02e24a23807a808129931d1a"
747 - SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
748 - S="${WORKDIR}/ioq3-${COMMIT_ID}"
749 - KEYWORDS="~amd64 ~x86"
750 -fi
751 -
752 -LICENSE="GPL-2"
753 -SLOT="0"
754 -IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis"
755 -REQUIRED_USE=" || ( client server )"
756 -
757 -PATCHES=( "${FILESDIR}"/${PN}-4.3-fix-build_system.patch )
758 -RDEPEND="
759 - client? (
760 - media-libs/libsdl2:=[X,sound,joystick,opengl,video]
761 - mumble? ( media-sound/mumble:= )
762 - openal? ( media-libs/openal:= )
763 - opus? ( media-libs/opusfile:= )
764 - vorbis? (
765 - media-libs/libogg:=
766 - media-libs/libvorbis:=
767 - )
768 - )
769 - curl? ( net-misc/curl )
770 - ~games-fps/urbanterror-data-4.3.2
771 - sys-libs/zlib:=[minizip]
772 - virtual/jpeg:0
773 -"
774 -
775 -DEPEND="${RDEPEND}"
776 -
777 -pkg_pretend() {
778 - if use client; then
779 - if ! use openal && ! use opus && ! use vorbis; then
780 - ewarn
781 - ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
782 - fi
783 - fi
784 -}
785 -
786 -src_configure() {
787 - default
788 -
789 - tc-export CC
790 -}
791 -
792 -src_compile() {
793 - # Workaround for used zlib macro, which got renamed in Gentoo
794 - # wrt bug #449510
795 - append-cppflags "-DOF=_Z_OF"
796 -
797 - local my_arch=$(usex amd64 "x86_64" "i386")
798 -
799 - emake \
800 - ARCH=${my_arch} \
801 - DEFAULT_BASEDIR="/usr/share/urbanterror" \
802 - BUILD_CLIENT=$(usex "client" 1 0) \
803 - BUILD_SERVER=$(usex "server" 1 0) \
804 - BUILD_BASEGAME=1 \
805 - BUILD_MISSIONPACK=0 \
806 - BUILD_GAME_SO=0 \
807 - BUILD_GAME_QVM=0 \
808 - BUILD_STANDALONE=1 \
809 - SERVERBIN="Quake3-UrT-Ded" \
810 - CLIENTBIN="Quake3-UrT" \
811 - USE_RENDERER_DLOPEN=0 \
812 - USE_YACC=0 \
813 - BASEGAME="q3ut4"\
814 - BASEGAME_CFLAGS="${CFLAGS}" \
815 - USE_OPENAL=$(usex "openal" 1 0) \
816 - USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
817 - USE_CURL=$(usex "curl" 1 0) \
818 - USE_CURL_DLOPEN=$(usex "curl" 1 0) \
819 - USE_CODEC_VORBIS=$(usex "vorbis" 1 0) \
820 - USE_CODEC_OPUS=$(usex "opus" 1 0) \
821 - USE_MUMBLE=$(usex "mumble" 1 0) \
822 - USE_SKEETMOD=$(usex "skeetshootmod" 1 0) \
823 - USE_VOIP=$(usex "mumble" 1 0) \
824 - USE_INTERNAL_LIBS=0 \
825 - USE_LOCAL_HEADERS=0 \
826 - USE_ALTGAMMA=$(usex "altgamma" 1 0)
827 -}
828 -
829 -src_install() {
830 - local my_arch=$(usex amd64 "x86_64" "i386")
831 - # docs from ioq3, not from UrbanTerror ZIP file
832 - dodoc ChangeLog README.md README.ioq3.md md4-readme.txt
833 -
834 - if use client; then
835 - newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
836 - # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
837 - make_desktop_entry ${PN} "UrbanTerror" ${PN}
838 - fi
839 -
840 - if use server && ! use client; then
841 - # dedicated server only
842 - newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
843 - fi
844 -}
845 -
846 -pkg_postinst() {
847 - use client && xdg_desktop_database_update
848 -
849 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
850 - # This is a new installation
851 - if use openal; then
852 - elog ""
853 - elog "You might need to set:"
854 - elog " seta s_useopenal \"1\""
855 - elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
856 - fi
857 -
858 - if use altgamma; then
859 - elog ""
860 - elog "You might need to set:"
861 - elog " seta r_altgamma \"1\""
862 - elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
863 - fi
864 -
865 - if ! use altgamma; then
866 - elog ""
867 - elog "If you are using a modesetting graphics driver you might"
868 - elog "consider setting USE=\"altgamma\"."
869 - elog "For details take a look at:"
870 - elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
871 - fi
872 -
873 - if ! use client; then
874 - elog ""
875 - elog "You disabled client support. You won't be able to connect"
876 - elog "to any servers and play. If you want to do so, enable"
877 - elog "USE=\"client\"."
878 - fi
879 - fi
880 -
881 - if ver_test -ge 4.3.2_p20171105; then
882 - # Yippee, new features!
883 - if use skeetshootmod; then
884 - elog ""
885 - elog "You might need to set:"
886 - elog " seta sv_skeetshoot \"1\""
887 - elog "in your ~/.q3a/q3ut4/q3config.cfg to use the skeetshoot mod."
888 - fi
889 - fi
890 -}
891 -
892 -pkg_postrm() {
893 - use client && xdg_desktop_database_update
894 -}