Gentoo Archives: gentoo-commits

From: Ralph Seichter <gentoo@××××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/4.1.1/, games-fps/gzdoom/files/4.1.2/
Date: Mon, 03 Jun 2019 14:10:03
Message-Id: 1559551961.556708d30e281f2abcb923ab75ff263ea668c846.ralph-seichter@gentoo
1 commit: 556708d30e281f2abcb923ab75ff263ea668c846
2 Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
3 AuthorDate: Mon Jun 3 08:52:41 2019 +0000
4 Commit: Ralph Seichter <gentoo <AT> seichter <DOT> de>
5 CommitDate: Mon Jun 3 08:52:41 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=556708d3
7
8 games-fps/gzdoom: Remove gzdoom package
9
10 The gzdoom ebuild has been merged to the Gentoo ebuild repository.
11
12 Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
13
14 games-fps/gzdoom/Manifest | 2 -
15 .../0001-made-DUMB-library-always-static.patch | 26 ----
16 ...orce-STATIC-for-internal-GZDoom-libraries.patch | 139 ---------------------
17 ...orce-STATIC-for-internal-GZDoom-libraries.patch | 139 ---------------------
18 games-fps/gzdoom/gzdoom-4.1.1.ebuild | 65 ----------
19 games-fps/gzdoom/gzdoom-4.1.2.ebuild | 65 ----------
20 games-fps/gzdoom/metadata.xml | 19 ---
21 7 files changed, 455 deletions(-)
22
23 diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
24 deleted file mode 100644
25 index 829f134..0000000
26 --- a/games-fps/gzdoom/Manifest
27 +++ /dev/null
28 @@ -1,2 +0,0 @@
29 -DIST gzdoom-4.1.1.tar.gz 13008847 BLAKE2B ac2bddbcc618148ed9de15dfe9105d1f3b9f319496b995d2af06834eb1349415ab3ee48beaa3e1acac04c81152e32bc89b71ac53576cf7789c1471a29a0a5339 SHA512 649e8bbf7f7f669d1bda13f1ab654428b69fa3e03a97eefb2ff1e996dbf62c66df72dddee9b8c139664ce5374ffbcdd8a10d1c4e3d0e6e65848ed5660b547d34
30 -DIST gzdoom-4.1.2.tar.gz 13045742 BLAKE2B 38c70eb82ba266e5b41bf62f28f4cee77ba17c0cc1e4186bf11be9021386511346c111874b695ef56a4ed3c93668bb64a71ba4169183646e49d0ab60a1c0793a SHA512 915029e676b17dd330aeee17fa8a9e07bb8e7a16e8ebce9fcdcd24e5b2f0cc48fd8f6914314029b332112ad4215a0f0d45d8e448e9025ac3c2a708a5e0bbd399
31
32 diff --git a/games-fps/gzdoom/files/4.1.1/0001-made-DUMB-library-always-static.patch b/games-fps/gzdoom/files/4.1.1/0001-made-DUMB-library-always-static.patch
33 deleted file mode 100644
34 index b6e0829..0000000
35 --- a/games-fps/gzdoom/files/4.1.1/0001-made-DUMB-library-always-static.patch
36 +++ /dev/null
37 @@ -1,26 +0,0 @@
38 -From c96d8c198e95876cb27b7cf9d0ec8d510d7a643d Mon Sep 17 00:00:00 2001
39 -From: "alexey.lysiuk" <alexey.lysiuk@×××××.com>
40 -Date: Fri, 10 May 2019 15:35:57 +0300
41 -Subject: [PATCH] - made DUMB library always static
42 -
43 -DUMB uses dumb_decode_vorbis() function from the main executable, so it failed to link as a dynamic library
44 ----
45 - dumb/CMakeLists.txt | 2 +-
46 - 1 file changed, 1 insertion(+), 1 deletion(-)
47 -
48 -diff --git a/dumb/CMakeLists.txt b/dumb/CMakeLists.txt
49 -index 85e052209..904ca75c3 100644
50 ---- a/dumb/CMakeLists.txt
51 -+++ b/dumb/CMakeLists.txt
52 -@@ -24,7 +24,7 @@ endif()
53 -
54 - include_directories( include )
55 -
56 --add_library( dumb
57 -+add_library( dumb STATIC
58 - src/core/unload.c
59 - src/core/rendsig.c
60 - src/core/rendduh.c
61 ---
62 -2.21.0
63 -
64
65 diff --git a/games-fps/gzdoom/files/4.1.1/0002-Force-STATIC-for-internal-GZDoom-libraries.patch b/games-fps/gzdoom/files/4.1.1/0002-Force-STATIC-for-internal-GZDoom-libraries.patch
66 deleted file mode 100644
67 index f05a5f5..0000000
68 --- a/games-fps/gzdoom/files/4.1.1/0002-Force-STATIC-for-internal-GZDoom-libraries.patch
69 +++ /dev/null
70 @@ -1,139 +0,0 @@
71 -From 4a899ecb9c85d39d49a1d477c0fcdca5fb96c6c0 Mon Sep 17 00:00:00 2001
72 -From: William Breathitt Gray <vilhelm.gray@×××××.com>
73 -Date: Wed, 15 May 2019 23:58:28 +0900
74 -Subject: [PATCH] Force STATIC for internal GZDoom libraries
75 -
76 -This makes sure the internal versions of these libraries bundled with
77 -the GZDoom source code is used. This prevents the system from building
78 -GZDoom for dynamic linking with incompatible external libraries (see
79 -<https://forum.zdoom.org/viewtopic.php?f=2&t=64633>).
80 ----
81 - asmjit/CMakeLists.txt | 2 +-
82 - bzip2/CMakeLists.txt | 2 +-
83 - game-music-emu/gme/CMakeLists.txt | 2 +-
84 - gdtoa/CMakeLists.txt | 2 +-
85 - glslang/glslang/CMakeLists.txt | 2 +-
86 - glslang/spirv/CMakeLists.txt | 2 +-
87 - jpeg/CMakeLists.txt | 2 +-
88 - lzma/CMakeLists.txt | 2 +-
89 - zlib/CMakeLists.txt | 2 +-
90 - 9 files changed, 9 insertions(+), 9 deletions(-)
91 -
92 -diff --git a/asmjit/CMakeLists.txt b/asmjit/CMakeLists.txt
93 -index ab5c2fb4f..6b7636ebe 100644
94 ---- a/asmjit/CMakeLists.txt
95 -+++ b/asmjit/CMakeLists.txt
96 -@@ -97,7 +97,7 @@ set(ASMJIT_SRCS
97 - asmjit/x86/x86regalloc.cpp
98 - )
99 -
100 --add_library(${ASMJITNAME} ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
101 -+add_library(${ASMJITNAME} STATIC ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
102 -
103 - set_target_properties(${ASMJITNAME} PROPERTIES OUTPUT_NAME asmjit)
104 -
105 -diff --git a/bzip2/CMakeLists.txt b/bzip2/CMakeLists.txt
106 -index 6ff9a2172..7fefb2bf2 100644
107 ---- a/bzip2/CMakeLists.txt
108 -+++ b/bzip2/CMakeLists.txt
109 -@@ -7,7 +7,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
110 - endif()
111 -
112 - add_definitions( -DBZ_NO_STDIO )
113 --add_library( bz2
114 -+add_library( bz2 STATIC
115 - blocksort.c
116 - bzlib.c
117 - compress.c
118 -diff --git a/game-music-emu/gme/CMakeLists.txt b/game-music-emu/gme/CMakeLists.txt
119 -index a5e06bc8a..5c37ebd29 100644
120 ---- a/game-music-emu/gme/CMakeLists.txt
121 -+++ b/game-music-emu/gme/CMakeLists.txt
122 -@@ -163,7 +163,7 @@ set (EXPORTED_HEADERS gme.h)
123 - include_directories(${CMAKE_CURRENT_BINARY_DIR})
124 -
125 - # Add library to be compiled.
126 --add_library(gme ${libgme_SRCS})
127 -+add_library(gme STATIC ${libgme_SRCS})
128 -
129 - if(ZLIB_FOUND)
130 - message(" ** ZLib library located, compressed file formats will be supported")
131 -diff --git a/gdtoa/CMakeLists.txt b/gdtoa/CMakeLists.txt
132 -index a0b76e0c3..485f3778b 100644
133 ---- a/gdtoa/CMakeLists.txt
134 -+++ b/gdtoa/CMakeLists.txt
135 -@@ -35,7 +35,7 @@ if( NOT MSVC AND NOT APPLE )
136 - set( GEN_FP_DEPS ${CMAKE_CURRENT_BINARY_DIR}/arith.h ${CMAKE_CURRENT_BINARY_DIR}/gd_qnan.h )
137 - endif()
138 -
139 --add_library( gdtoa
140 -+add_library( gdtoa STATIC
141 - ${GEN_FP_FILES}
142 - dmisc.c
143 - dtoa.c
144 -diff --git a/glslang/glslang/CMakeLists.txt b/glslang/glslang/CMakeLists.txt
145 -index c86eccb6e..e376a9178 100644
146 ---- a/glslang/glslang/CMakeLists.txt
147 -+++ b/glslang/glslang/CMakeLists.txt
148 -@@ -120,7 +120,7 @@ endmacro(glslang_pch)
149 -
150 - glslang_pch(SOURCES MachineIndependent/pch.cpp)
151 -
152 --add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
153 -+add_library(glslang STATIC ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
154 - set_property(TARGET glslang PROPERTY FOLDER glslang)
155 - set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON)
156 - target_link_libraries(glslang OGLCompiler OSDependent)
157 -diff --git a/glslang/spirv/CMakeLists.txt b/glslang/spirv/CMakeLists.txt
158 -index 8062f8067..03d34d8f4 100644
159 ---- a/glslang/spirv/CMakeLists.txt
160 -+++ b/glslang/spirv/CMakeLists.txt
161 -@@ -59,7 +59,7 @@ if(ENABLE_NV_EXTENSIONS)
162 - GLSL.ext.NV.h)
163 - endif(ENABLE_NV_EXTENSIONS)
164 -
165 --add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
166 -+add_library(SPIRV STATIC ${LIB_TYPE} ${SOURCES} ${HEADERS})
167 - set_property(TARGET SPIRV PROPERTY FOLDER glslang)
168 - set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
169 - target_include_directories(SPIRV PUBLIC ..)
170 -diff --git a/jpeg/CMakeLists.txt b/jpeg/CMakeLists.txt
171 -index 81834c742..33a3938cf 100644
172 ---- a/jpeg/CMakeLists.txt
173 -+++ b/jpeg/CMakeLists.txt
174 -@@ -6,7 +6,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
175 - set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -fomit-frame-pointer" )
176 - endif()
177 -
178 --add_library( jpeg
179 -+add_library( jpeg STATIC
180 - jaricom.c
181 - jcomapi.c
182 - jdapimin.c
183 -diff --git a/lzma/CMakeLists.txt b/lzma/CMakeLists.txt
184 -index 3948ea2ee..4246a34f8 100644
185 ---- a/lzma/CMakeLists.txt
186 -+++ b/lzma/CMakeLists.txt
187 -@@ -34,5 +34,5 @@ else()
188 - set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_7ZIP_ST" )
189 - endif()
190 -
191 --add_library( lzma ${LZMA_FILES} )
192 -+add_library( lzma STATIC ${LZMA_FILES} )
193 - target_link_libraries( lzma )
194 -diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt
195 -index 52542bbaa..a1d6637a9 100644
196 ---- a/zlib/CMakeLists.txt
197 -+++ b/zlib/CMakeLists.txt
198 -@@ -137,7 +137,7 @@ if(MINGW)
199 - set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
200 - endif()
201 -
202 --add_library(${ZLIBNAME} ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
203 -+add_library(${ZLIBNAME} STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
204 - set_target_properties(${ZLIBNAME} PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
205 -
206 - set_target_properties(${ZLIBNAME} PROPERTIES SOVERSION 1)
207 ---
208 -2.21.0
209 -
210
211 diff --git a/games-fps/gzdoom/files/4.1.2/0001-Force-STATIC-for-internal-GZDoom-libraries.patch b/games-fps/gzdoom/files/4.1.2/0001-Force-STATIC-for-internal-GZDoom-libraries.patch
212 deleted file mode 100644
213 index 344fc01..0000000
214 --- a/games-fps/gzdoom/files/4.1.2/0001-Force-STATIC-for-internal-GZDoom-libraries.patch
215 +++ /dev/null
216 @@ -1,139 +0,0 @@
217 -From 6fafa297bfe0f82696d898d66e39c50f4f5eef16 Mon Sep 17 00:00:00 2001
218 -From: William Breathitt Gray <vilhelm.gray@×××××.com>
219 -Date: Wed, 15 May 2019 23:58:28 +0900
220 -Subject: [PATCH] Force STATIC for internal GZDoom libraries
221 -
222 -This makes sure the internal versions of these libraries bundled with
223 -the GZDoom source code is used. This prevents the system from building
224 -GZDoom for dynamic linking with incompatible external libraries (see
225 -<https://forum.zdoom.org/viewtopic.php?f=2&t=64633>).
226 ----
227 - asmjit/CMakeLists.txt | 2 +-
228 - bzip2/CMakeLists.txt | 2 +-
229 - game-music-emu/gme/CMakeLists.txt | 2 +-
230 - gdtoa/CMakeLists.txt | 2 +-
231 - glslang/glslang/CMakeLists.txt | 2 +-
232 - glslang/spirv/CMakeLists.txt | 2 +-
233 - jpeg/CMakeLists.txt | 2 +-
234 - lzma/CMakeLists.txt | 2 +-
235 - zlib/CMakeLists.txt | 2 +-
236 - 9 files changed, 9 insertions(+), 9 deletions(-)
237 -
238 -diff --git a/asmjit/CMakeLists.txt b/asmjit/CMakeLists.txt
239 -index ab5c2fb4f..6b7636ebe 100644
240 ---- a/asmjit/CMakeLists.txt
241 -+++ b/asmjit/CMakeLists.txt
242 -@@ -97,7 +97,7 @@ set(ASMJIT_SRCS
243 - asmjit/x86/x86regalloc.cpp
244 - )
245 -
246 --add_library(${ASMJITNAME} ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
247 -+add_library(${ASMJITNAME} STATIC ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
248 -
249 - set_target_properties(${ASMJITNAME} PROPERTIES OUTPUT_NAME asmjit)
250 -
251 -diff --git a/bzip2/CMakeLists.txt b/bzip2/CMakeLists.txt
252 -index 6ff9a2172..7fefb2bf2 100644
253 ---- a/bzip2/CMakeLists.txt
254 -+++ b/bzip2/CMakeLists.txt
255 -@@ -7,7 +7,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
256 - endif()
257 -
258 - add_definitions( -DBZ_NO_STDIO )
259 --add_library( bz2
260 -+add_library( bz2 STATIC
261 - blocksort.c
262 - bzlib.c
263 - compress.c
264 -diff --git a/game-music-emu/gme/CMakeLists.txt b/game-music-emu/gme/CMakeLists.txt
265 -index a5e06bc8a..5c37ebd29 100644
266 ---- a/game-music-emu/gme/CMakeLists.txt
267 -+++ b/game-music-emu/gme/CMakeLists.txt
268 -@@ -163,7 +163,7 @@ set (EXPORTED_HEADERS gme.h)
269 - include_directories(${CMAKE_CURRENT_BINARY_DIR})
270 -
271 - # Add library to be compiled.
272 --add_library(gme ${libgme_SRCS})
273 -+add_library(gme STATIC ${libgme_SRCS})
274 -
275 - if(ZLIB_FOUND)
276 - message(" ** ZLib library located, compressed file formats will be supported")
277 -diff --git a/gdtoa/CMakeLists.txt b/gdtoa/CMakeLists.txt
278 -index a0b76e0c3..485f3778b 100644
279 ---- a/gdtoa/CMakeLists.txt
280 -+++ b/gdtoa/CMakeLists.txt
281 -@@ -35,7 +35,7 @@ if( NOT MSVC AND NOT APPLE )
282 - set( GEN_FP_DEPS ${CMAKE_CURRENT_BINARY_DIR}/arith.h ${CMAKE_CURRENT_BINARY_DIR}/gd_qnan.h )
283 - endif()
284 -
285 --add_library( gdtoa
286 -+add_library( gdtoa STATIC
287 - ${GEN_FP_FILES}
288 - dmisc.c
289 - dtoa.c
290 -diff --git a/glslang/glslang/CMakeLists.txt b/glslang/glslang/CMakeLists.txt
291 -index c86eccb6e..e376a9178 100644
292 ---- a/glslang/glslang/CMakeLists.txt
293 -+++ b/glslang/glslang/CMakeLists.txt
294 -@@ -120,7 +120,7 @@ endmacro(glslang_pch)
295 -
296 - glslang_pch(SOURCES MachineIndependent/pch.cpp)
297 -
298 --add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
299 -+add_library(glslang STATIC ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
300 - set_property(TARGET glslang PROPERTY FOLDER glslang)
301 - set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON)
302 - target_link_libraries(glslang OGLCompiler OSDependent)
303 -diff --git a/glslang/spirv/CMakeLists.txt b/glslang/spirv/CMakeLists.txt
304 -index 8062f8067..03d34d8f4 100644
305 ---- a/glslang/spirv/CMakeLists.txt
306 -+++ b/glslang/spirv/CMakeLists.txt
307 -@@ -59,7 +59,7 @@ if(ENABLE_NV_EXTENSIONS)
308 - GLSL.ext.NV.h)
309 - endif(ENABLE_NV_EXTENSIONS)
310 -
311 --add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
312 -+add_library(SPIRV STATIC ${LIB_TYPE} ${SOURCES} ${HEADERS})
313 - set_property(TARGET SPIRV PROPERTY FOLDER glslang)
314 - set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
315 - target_include_directories(SPIRV PUBLIC ..)
316 -diff --git a/jpeg/CMakeLists.txt b/jpeg/CMakeLists.txt
317 -index 81834c742..33a3938cf 100644
318 ---- a/jpeg/CMakeLists.txt
319 -+++ b/jpeg/CMakeLists.txt
320 -@@ -6,7 +6,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
321 - set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -fomit-frame-pointer" )
322 - endif()
323 -
324 --add_library( jpeg
325 -+add_library( jpeg STATIC
326 - jaricom.c
327 - jcomapi.c
328 - jdapimin.c
329 -diff --git a/lzma/CMakeLists.txt b/lzma/CMakeLists.txt
330 -index 3948ea2ee..4246a34f8 100644
331 ---- a/lzma/CMakeLists.txt
332 -+++ b/lzma/CMakeLists.txt
333 -@@ -34,5 +34,5 @@ else()
334 - set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_7ZIP_ST" )
335 - endif()
336 -
337 --add_library( lzma ${LZMA_FILES} )
338 -+add_library( lzma STATIC ${LZMA_FILES} )
339 - target_link_libraries( lzma )
340 -diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt
341 -index 52542bbaa..a1d6637a9 100644
342 ---- a/zlib/CMakeLists.txt
343 -+++ b/zlib/CMakeLists.txt
344 -@@ -137,7 +137,7 @@ if(MINGW)
345 - set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
346 - endif()
347 -
348 --add_library(${ZLIBNAME} ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
349 -+add_library(${ZLIBNAME} STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
350 - set_target_properties(${ZLIBNAME} PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
351 -
352 - set_target_properties(${ZLIBNAME} PROPERTIES SOVERSION 1)
353 ---
354 -2.21.0
355 -
356
357 diff --git a/games-fps/gzdoom/gzdoom-4.1.1.ebuild b/games-fps/gzdoom/gzdoom-4.1.1.ebuild
358 deleted file mode 100644
359 index 61490ac..0000000
360 --- a/games-fps/gzdoom/gzdoom-4.1.1.ebuild
361 +++ /dev/null
362 @@ -1,65 +0,0 @@
363 -# Copyright 1999-2019 Gentoo Authors
364 -# Distributed under the terms of the GNU General Public License v2
365 -
366 -EAPI=7
367 -
368 -inherit cmake-utils desktop xdg
369 -
370 -DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
371 -HOMEPAGE="https://zdoom.org"
372 -SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz"
373 -
374 -LICENSE="BSD BZIP2 DUMB-0.9.2 GPL-3 LGPL-3 MIT"
375 -SLOT="0"
376 -KEYWORDS="~amd64 ~x86"
377 -IUSE="fluidsynth gtk openal openmp"
378 -
379 -DEPEND="
380 - media-libs/libsdl2[opengl]
381 - sys-libs/zlib
382 - virtual/jpeg:0
383 - gtk? ( <x11-libs/gtk+-4:= )"
384 -RDEPEND="
385 - ${DEPEND}
386 - fluidsynth? ( media-sound/fluidsynth )
387 - openal? (
388 - media-libs/libsndfile
389 - media-libs/openal
390 - media-sound/mpg123
391 - )"
392 -
393 -S="${WORKDIR}/${PN}-g${PV}"
394 -
395 -PATCHES="${FILESDIR}/${PV}"
396 -
397 -src_prepare() {
398 - cmake-utils_src_prepare
399 -}
400 -
401 -src_configure() {
402 - local mycmakeargs=(
403 - -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${P}/docs"
404 - -DNO_GTK="$(usex !gtk)"
405 - -DNO_OPENAL="$(usex !openal)"
406 - -DNO_OPENMP="$(usex !openmp)"
407 - )
408 - cmake-utils_src_configure
409 -}
410 -
411 -src_install() {
412 - newicon src/posix/zdoom.xpm "${PN}.xpm"
413 - make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
414 - cmake-utils_src_install
415 -}
416 -
417 -pkg_preinst() {
418 - xdg_pkg_preinst
419 -}
420 -
421 -pkg_postinst() {
422 - xdg_pkg_postinst
423 -}
424 -
425 -pkg_postrm() {
426 - xdg_pkg_postrm
427 -}
428
429 diff --git a/games-fps/gzdoom/gzdoom-4.1.2.ebuild b/games-fps/gzdoom/gzdoom-4.1.2.ebuild
430 deleted file mode 100644
431 index 61490ac..0000000
432 --- a/games-fps/gzdoom/gzdoom-4.1.2.ebuild
433 +++ /dev/null
434 @@ -1,65 +0,0 @@
435 -# Copyright 1999-2019 Gentoo Authors
436 -# Distributed under the terms of the GNU General Public License v2
437 -
438 -EAPI=7
439 -
440 -inherit cmake-utils desktop xdg
441 -
442 -DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
443 -HOMEPAGE="https://zdoom.org"
444 -SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz"
445 -
446 -LICENSE="BSD BZIP2 DUMB-0.9.2 GPL-3 LGPL-3 MIT"
447 -SLOT="0"
448 -KEYWORDS="~amd64 ~x86"
449 -IUSE="fluidsynth gtk openal openmp"
450 -
451 -DEPEND="
452 - media-libs/libsdl2[opengl]
453 - sys-libs/zlib
454 - virtual/jpeg:0
455 - gtk? ( <x11-libs/gtk+-4:= )"
456 -RDEPEND="
457 - ${DEPEND}
458 - fluidsynth? ( media-sound/fluidsynth )
459 - openal? (
460 - media-libs/libsndfile
461 - media-libs/openal
462 - media-sound/mpg123
463 - )"
464 -
465 -S="${WORKDIR}/${PN}-g${PV}"
466 -
467 -PATCHES="${FILESDIR}/${PV}"
468 -
469 -src_prepare() {
470 - cmake-utils_src_prepare
471 -}
472 -
473 -src_configure() {
474 - local mycmakeargs=(
475 - -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${P}/docs"
476 - -DNO_GTK="$(usex !gtk)"
477 - -DNO_OPENAL="$(usex !openal)"
478 - -DNO_OPENMP="$(usex !openmp)"
479 - )
480 - cmake-utils_src_configure
481 -}
482 -
483 -src_install() {
484 - newicon src/posix/zdoom.xpm "${PN}.xpm"
485 - make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
486 - cmake-utils_src_install
487 -}
488 -
489 -pkg_preinst() {
490 - xdg_pkg_preinst
491 -}
492 -
493 -pkg_postinst() {
494 - xdg_pkg_postinst
495 -}
496 -
497 -pkg_postrm() {
498 - xdg_pkg_postrm
499 -}
500
501 diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
502 deleted file mode 100644
503 index 53026d9..0000000
504 --- a/games-fps/gzdoom/metadata.xml
505 +++ /dev/null
506 @@ -1,19 +0,0 @@
507 -<?xml version="1.0" encoding="UTF-8"?>
508 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
509 -<pkgmetadata>
510 - <longdescription lang="en">
511 - GZDoom is a modder-friendly OpenGL source port based on the DOOM engine
512 - </longdescription>
513 - <maintainer type="person">
514 - <email>vilhelm.gray@×××××.com</email>
515 - <name>William Breathitt Gray</name>
516 - </maintainer>
517 - <use>
518 - <flag name="fluidsynth">Use <pkg>media-sound/fluidsynth</pkg> for MIDI support</flag>
519 - </use>
520 - <upstream>
521 - <bugs-to>https://forum.zdoom.org/viewforum.php?f=2</bugs-to>
522 - <doc lang="en">https://zdoom.org</doc>
523 - <remote-id type="github">coelckers/gzdoom</remote-id>
524 - </upstream>
525 -</pkgmetadata>