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-fps/yamagi-quake2/, games-fps/yamagi-quake2/files/
Date: Sat, 20 Apr 2019 23:27:10
Message-Id: 1555743120.a558d682eaa5d62018c226152f7476e741a34900.mgorny@gentoo
1 commit: a558d682eaa5d62018c226152f7476e741a34900
2 Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
3 AuthorDate: Sun Apr 7 22:58:03 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 20 06:52:00 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a558d682
7
8 games-fps/yamagi-quake2: remove old
9
10 Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
11 Package-Manager: Portage-2.3.62, Repoman-2.3.11
12 Closes: https://github.com/gentoo/gentoo/pull/11634
13 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
14
15 games-fps/yamagi-quake2/Manifest | 1 -
16 .../yamagi-quake2/files/yamagi-quake2-zlib.patch | 17 ---
17 .../yamagi-quake2/yamagi-quake2-7.21-r1.ebuild | 155 ---------------------
18 3 files changed, 173 deletions(-)
19
20 diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
21 index 8a129d523fa..efdd4db13ee 100644
22 --- a/games-fps/yamagi-quake2/Manifest
23 +++ b/games-fps/yamagi-quake2/Manifest
24 @@ -1,4 +1,3 @@
25 -DIST quake2-7.21.tar.xz 1854928 BLAKE2B c8a97503b5304d6f02d562495970e49b7cb7db41ff4a5c726f69c3f6df145e9dccd4d66e217176ae9bcc31fed16c8d595bc969b4bf32e3e12aced2875c857847 SHA512 ddd0811b9c3b55dd5df9fa028951882d5aa40769ba518f42c8f37643bb7a397c125a8897d9dc10306d466d4aeb927ea685b29470cbde29e6fbd6d2d0aafa7c1a
26 DIST quake2-7.30.tar.xz 1939836 BLAKE2B 3e952c65cc535f8e1cbe69953c302e681d15f4227fce8bf4a2a0fdadefc8ceb7137e5427cd969ad55b9c2aa994131a0dec71611957f71dbcc9559b9cbc9f4322 SHA512 ea352353c8d6f2c396534208c2f287a06cd6c9d9e60248a6a7f26a84c0cc8b21ab890e06591e470ceea09a1234f5c2dbc1b171f4dbca62d91b2ac33812fdf2e7
27 DIST quake2-7.40.tar.xz 1972020 BLAKE2B be5c01dbcb226f343d18f9d318022edff56bac6f953a0b85cbe3c108451c51020339a12b63fd82803cb9cfbbc26f5dfc230b4cad870ab116cb0333baa0160173 SHA512 23ac94b3b5aa28ad7d36e585f00af4aa285db3f93044175c9f65169fb2f89f5d721a3833a386146cf278c4db47846a442ebd8acd98c97ffa6f149d5949dcd5b1
28 DIST quake2-ctf-1.05.tar.xz 134872 BLAKE2B eb987004b1c1b1743ec532b6bea96a257957377cbdb0571d6c6e7b2dae6c1b7abc154233d4f9d3af6fb546d7810e5c041b8e9293de2e409a7cace88aa455f526 SHA512 9eb951f4a9d7abc5f9a2ca53d886f68b745c1efdf3fea14db2e071b8d1592d33579c5fa56326aa583269a4810e16a7eda8dcd8930e36782cb4fcb8578c44951b
29
30 diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-zlib.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-zlib.patch
31 deleted file mode 100644
32 index 1de79c98690..00000000000
33 --- a/games-fps/yamagi-quake2/files/yamagi-quake2-zlib.patch
34 +++ /dev/null
35 @@ -1,17 +0,0 @@
36 -https://bugs.gentoo.org/383179
37 -
38 -Upstream removed OF macro definition:
39 -https://github.com/yquake2/yquake2/commit/716d72a295c9247b3c88ccd180bb7a517ed99e13
40 -
41 ---- a/src/common/unzip/ioapi.h 2018-03-10 20:24:21.000000000 +0300
42 -+++ b/src/common/unzip/ioapi.h 2018-04-10 00:34:08.688675097 +0300
43 -@@ -120,6 +120,9 @@
44 - #define ZLIB_FILEFUNC_MODE_EXISTING (4)
45 - #define ZLIB_FILEFUNC_MODE_CREATE (8)
46 -
47 -+#ifdef _Z_OF
48 -+#define OF _Z_OF
49 -+#endif
50 -
51 - #ifndef ZCALLBACK
52 - #if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
53
54 diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.21-r1.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.21-r1.ebuild
55 deleted file mode 100644
56 index 843343c0aca..00000000000
57 --- a/games-fps/yamagi-quake2/yamagi-quake2-7.21-r1.ebuild
58 +++ /dev/null
59 @@ -1,155 +0,0 @@
60 -# Copyright 1999-2018 Gentoo Foundation
61 -# Distributed under the terms of the GNU General Public License v2
62 -
63 -EAPI=6
64 -
65 -inherit desktop eutils
66 -
67 -CTF_V=1.05
68 -ROGUE_V=2.04
69 -XATRIX_V=2.05
70 -
71 -DESCRIPTION="Quake 2 engine focused on single player"
72 -HOMEPAGE="https://www.yamagi.org/quake2/"
73 -SRC_URI="https://deponie.yamagi.org/quake2/quake2-${PV}.tar.xz
74 - ctf? ( https://deponie.yamagi.org/quake2/quake2-ctf-${CTF_V}.tar.xz )
75 - rogue? ( https://deponie.yamagi.org/quake2/quake2-rogue-${ROGUE_V}.tar.xz )
76 - xatrix? ( https://deponie.yamagi.org/quake2/quake2-xatrix-${XATRIX_V}.tar.xz )"
77 -
78 -LICENSE="GPL-2"
79 -SLOT="0"
80 -KEYWORDS="~amd64 ~x86"
81 -IUSE="+client ctf dedicated ogg openal +opengl rogue softrender xatrix"
82 -REQUIRED_USE="|| ( client dedicated ) client? ( || ( opengl softrender ) )"
83 -
84 -RDEPEND="sys-libs/zlib:0=
85 - client? (
86 - media-libs/libsdl2[video]
87 - ogg? (
88 - media-libs/libogg
89 - media-libs/libvorbis
90 - )
91 - openal? ( media-libs/openal )
92 - !openal? ( media-libs/libsdl2[sound] )
93 - opengl? (
94 - media-libs/libsdl2[opengl]
95 - virtual/opengl
96 - )
97 - )
98 -"
99 -
100 -DEPEND="${RDEPEND}"
101 -
102 -S="${WORKDIR}/quake2-${PV}"
103 -
104 -PATCHES=(
105 - "${FILESDIR}"/${PN}-respect-flags.patch
106 - "${FILESDIR}"/${PN}-zlib.patch
107 -)
108 -DOCS=( CHANGELOG CONTRIBUTE README.md )
109 -
110 -mymake() {
111 - emake \
112 - VERBOSE=1 \
113 - DLOPEN_OPENAL=no \
114 - WITH_CDA=no \
115 - WITH_SYSTEMWIDE=yes \
116 - WITH_SYSTEMDIR="${EPREFIX}"/usr/share/games/quake2 \
117 - WITH_ZIP=yes \
118 - WITH_OGG=$(usex ogg) \
119 - WITH_OPENAL=$(usex openal) \
120 - "$@"
121 -}
122 -
123 -src_prepare() {
124 - local addon
125 - for addon in ctf rogue xatrix; do
126 - use ${addon} || continue
127 -
128 - pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
129 - eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags.patch
130 - popd >/dev/null || die
131 - done
132 -
133 - default
134 -}
135 -
136 -src_compile() {
137 - local targets=( game )
138 - if use client; then
139 - targets+=( client )
140 - use opengl && targets+=( ref_gl1 ref_gl3 )
141 - use softrender && targets+=( ref_soft )
142 - fi
143 - use dedicated && targets+=( server )
144 -
145 - mymake config
146 - mymake "${targets[@]}"
147 -
148 - local addon
149 - for addon in ctf rogue xatrix; do
150 - use ${addon} || continue
151 - emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
152 - done
153 -}
154 -
155 -src_install() {
156 - insinto /usr/lib/yamagi-quake2
157 - # Yamagi Quake II expects all binaries to be in the same directory
158 - # See stuff/packaging.md for more info
159 - exeinto /usr/lib/yamagi-quake2
160 - doins -r release/.
161 -
162 - if use client; then
163 - doexe release/quake2
164 - dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
165 -
166 - newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
167 - make_desktop_entry "yquake2" "Yamagi Quake II"
168 - fi
169 -
170 - if use dedicated; then
171 - doexe release/q2ded
172 - dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
173 - fi
174 -
175 - insinto /usr/lib/yamagi-quake2/baseq2
176 - doins stuff/yq2.cfg
177 -
178 - local addon
179 - for addon in ctf rogue xatrix; do
180 - use ${addon} || continue
181 -
182 - insinto /usr/lib/yamagi-quake2/${addon}
183 - doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
184 -
185 - if use client; then
186 - local addon_name
187 - case ${addon} in
188 - ctf) addon_name="CTF" ;;
189 - rogue) addon_name="Ground Zero" ;;
190 - xatrix) addon_name="The Reckoning" ;;
191 - esac
192 -
193 - make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
194 - make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
195 - fi
196 - done
197 -
198 - einstalldocs
199 - if use client; then
200 - docinto examples
201 - dodoc stuff/cdripper.sh
202 - fi
203 -}
204 -
205 -pkg_postinst() {
206 - if [[ -z ${REPLACING_VERSIONS} ]]; then
207 - elog
208 - elog "In order to play, you must at least install:"
209 - elog "games-fps/quake2-data or games-fps/quake2-demodata or copy game"
210 - elog "data files to ~/.yq2/ or ${EPREFIX}/usr/share/games/quake2/ manually."
211 - elog "Read ${EPREFIX}/usr/share/doc/${PF}/README.md* for more information."
212 - elog
213 - fi
214 -}