Gentoo Archives: gentoo-commits

From: Stefan Strogin <steils@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: Mon, 03 Jun 2019 15:54:40
Message-Id: 1559577259.e5ad96c31f184961949a1793aca53f91bdbb038a.steils@gentoo
1 commit: e5ad96c31f184961949a1793aca53f91bdbb038a
2 Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 3 15:52:25 2019 +0000
4 Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 3 15:54:19 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5ad96c3
7
8 games-fps/yamagi-quake2: remove old
9
10 Package-Manager: Portage-2.3.67, Repoman-2.3.13
11 Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
12
13 games-fps/yamagi-quake2/Manifest | 4 -
14 .../files/yamagi-quake2-addon-respect-flags.patch | 30 -----
15 games-fps/yamagi-quake2/yamagi-quake2-7.30.ebuild | 149 ---------------------
16 3 files changed, 183 deletions(-)
17
18 diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
19 index bc7206ff191..dbc41660ecf 100644
20 --- a/games-fps/yamagi-quake2/Manifest
21 +++ b/games-fps/yamagi-quake2/Manifest
22 @@ -1,9 +1,5 @@
23 -DIST quake2-7.30.tar.xz 1939836 BLAKE2B 3e952c65cc535f8e1cbe69953c302e681d15f4227fce8bf4a2a0fdadefc8ceb7137e5427cd969ad55b9c2aa994131a0dec71611957f71dbcc9559b9cbc9f4322 SHA512 ea352353c8d6f2c396534208c2f287a06cd6c9d9e60248a6a7f26a84c0cc8b21ab890e06591e470ceea09a1234f5c2dbc1b171f4dbca62d91b2ac33812fdf2e7
24 DIST quake2-7.40.tar.xz 1972020 BLAKE2B be5c01dbcb226f343d18f9d318022edff56bac6f953a0b85cbe3c108451c51020339a12b63fd82803cb9cfbbc26f5dfc230b4cad870ab116cb0333baa0160173 SHA512 23ac94b3b5aa28ad7d36e585f00af4aa285db3f93044175c9f65169fb2f89f5d721a3833a386146cf278c4db47846a442ebd8acd98c97ffa6f149d5949dcd5b1
25 DIST quake2-7.41.tar.xz 1978952 BLAKE2B 9d3626f102b652c443caea294f7f66dc46869612b64d16c5f2e9b7f28a83800a0653450f8fc44ebaa83e01ddfaf2b2cd5dd9c6feb8001b5cabd7df32171e035b SHA512 fd2c991274415eb38cf3deb7562f7c51c7f8e935cf7215eba7e8ae088f25cddf95e86221fcbbb5fcc8bd97e264b147951bf5f4aecb8ee54973d46af7ef39d3af
26 -DIST quake2-ctf-1.05.tar.xz 134872 BLAKE2B eb987004b1c1b1743ec532b6bea96a257957377cbdb0571d6c6e7b2dae6c1b7abc154233d4f9d3af6fb546d7810e5c041b8e9293de2e409a7cace88aa455f526 SHA512 9eb951f4a9d7abc5f9a2ca53d886f68b745c1efdf3fea14db2e071b8d1592d33579c5fa56326aa583269a4810e16a7eda8dcd8930e36782cb4fcb8578c44951b
27 DIST quake2-ctf-1.06.tar.xz 135464 BLAKE2B 457ab883ba9ecfb723d890f5c9e3da710aae4ed5fa4e530c8028b0fa93186350e6ed1b483b89ddf98cbb3f3b1992a15c33af5d181073395b61e5b9a7c9987d88 SHA512 24c58f895d4056127e6f714c618d53b80bd75968758d8aa729deba750297efd5d6c40bd69afd98ebbf0d231bd59909e6438ec64b258883d8cfd33d33e928b2f9
28 -DIST quake2-rogue-2.04.tar.xz 240436 BLAKE2B e7c3660378fe40b3f514b6e1de8714e3d3550baa244897b98bb81f362fa2b0aa57e3abceb5a38ea77cfec7621e2fcfab342a45bf9b66ccd0e44cc70292888fc2 SHA512 546deb74175c60ed7e5600a3d4b1c983fc0b1fae5922ebdb8fc3cdc5584931a0a5e34914ec2cd4ef9815323ba82cb56d427986d5c91dc040d6b68baff68ca5a8
29 DIST quake2-rogue-2.05.tar.xz 241120 BLAKE2B 58be655bfcba9c6ee66616dbedaf01c4329d656c205ad99910dccb095981a8f29b09d557e76f9e43df21f36eebeb5ad0c0f2788d2bee2bc1cfe68dda824df5d1 SHA512 521860cc3c46e8679f0dee2b9bc6c3a643439f560ad2437e2961e746285a95fa118201d516eefefdd8b5fe7da8ec5ea0c9fae8910751256a0d986300497631ff
30 -DIST quake2-xatrix-2.05.tar.xz 189888 BLAKE2B 9d884af6033d529ce8cca7a70a36608e45db47dab74ab0d88c04f4d928425cf22901b1299a69330bfa83810034c9f1eff2d9618b222db68564d81d569f0596cd SHA512 f7e14bb870eaf4515405f5f1162057669351a334993410101973b75e52d6d576c35c91112911f961ad122ebe664b294649e94e88a2f62b79f51e28d02f50487a
31 DIST quake2-xatrix-2.06.tar.xz 190560 BLAKE2B 945e80159cd7630280290f6930e1343fdf9dccdbd44d14cd5b36eccae9499d2cd6eddb1a3967721b61349fa60e48c720e4db66fdc1d8930628864c7fe2cd4ada SHA512 98557ed3fc4fddcd36d47dab207b8101b82f40bd976b11195b229a1073ec04216c06dc119269f287fbd9da0418671521ab6393008f2486ab113940d5fec6bfdc
32
33 diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags.patch
34 deleted file mode 100644
35 index d767f04d4b0..00000000000
36 --- a/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags.patch
37 +++ /dev/null
38 @@ -1,30 +0,0 @@
39 ---- a/Makefile 2017-05-25 12:45:51.000000000 +0300
40 -+++ b/Makefile 2018-01-14 17:38:34.540167879 +0300
41 -@@ -64,11 +64,11 @@
42 - #
43 - # -MMD to generate header dependencies.
44 - ifeq ($(OSTYPE), Darwin)
45 --CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
46 -- -Wall -pipe -g -fwrapv -arch i386 -arch x86_64
47 -+CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
48 -+ -Wall -fwrapv -arch i386 -arch x86_64
49 - else
50 --CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
51 -- -Wall -pipe -g -MMD -fwrapv
52 -+CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
53 -+ -Wall -MMD -fwrapv
54 - endif
55 -
56 - # ----------
57 -@@ -80,9 +80,9 @@
58 -
59 - # Base LDFLAGS.
60 - ifeq ($(OSTYPE), Darwin)
61 --LDFLAGS := -shared -arch i386 -arch x86_64
62 -+LDFLAGS += -shared -arch i386 -arch x86_64
63 - else
64 --LDFLAGS := -shared
65 -+LDFLAGS += -shared
66 - endif
67 -
68 - # ----------
69
70 diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.30.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.30.ebuild
71 deleted file mode 100644
72 index f8c0f14af23..00000000000
73 --- a/games-fps/yamagi-quake2/yamagi-quake2-7.30.ebuild
74 +++ /dev/null
75 @@ -1,149 +0,0 @@
76 -# Copyright 1999-2018 Gentoo Foundation
77 -# Distributed under the terms of the GNU General Public License v2
78 -
79 -EAPI=6
80 -
81 -inherit desktop eutils
82 -
83 -CTF_V=1.05
84 -ROGUE_V=2.04
85 -XATRIX_V=2.05
86 -
87 -DESCRIPTION="Quake 2 engine focused on single player"
88 -HOMEPAGE="https://www.yamagi.org/quake2/"
89 -SRC_URI="https://deponie.yamagi.org/quake2/quake2-${PV}.tar.xz
90 - ctf? ( https://deponie.yamagi.org/quake2/quake2-ctf-${CTF_V}.tar.xz )
91 - rogue? ( https://deponie.yamagi.org/quake2/quake2-rogue-${ROGUE_V}.tar.xz )
92 - xatrix? ( https://deponie.yamagi.org/quake2/quake2-xatrix-${XATRIX_V}.tar.xz )"
93 -
94 -LICENSE="GPL-2"
95 -SLOT="0"
96 -KEYWORDS="~amd64 ~x86"
97 -IUSE="+client ctf dedicated openal +opengl rogue softrender xatrix"
98 -REQUIRED_USE="|| ( client dedicated ) client? ( || ( opengl softrender ) )"
99 -
100 -COMMON_DEPEND="
101 - client? (
102 - media-libs/libsdl2[video]
103 - openal? ( media-libs/openal )
104 - !openal? ( media-libs/libsdl2[sound] )
105 - opengl? (
106 - media-libs/libsdl2[opengl]
107 - virtual/opengl
108 - )
109 - )
110 -"
111 -RDEPEND="${COMMON_DEPEND}
112 - client? ( openal? ( media-libs/openal ) )
113 -"
114 -
115 -DEPEND="${COMMON_DEPEND}"
116 -
117 -S="${WORKDIR}/quake2-${PV}"
118 -
119 -PATCHES=(
120 - "${FILESDIR}"/${PN}-respect-flags.patch
121 -)
122 -DOCS=( CHANGELOG CONTRIBUTE README.md )
123 -
124 -mymake() {
125 - emake \
126 - VERBOSE=1 \
127 - WITH_SYSTEMWIDE=yes \
128 - WITH_SYSTEMDIR="${EPREFIX}"/usr/share/games/quake2 \
129 - WITH_OPENAL=$(usex openal) \
130 - "$@"
131 -}
132 -
133 -src_prepare() {
134 - local addon
135 - for addon in ctf rogue xatrix; do
136 - use ${addon} || continue
137 -
138 - pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
139 - eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags.patch
140 - popd >/dev/null || die
141 - done
142 -
143 - default
144 -}
145 -
146 -src_compile() {
147 - local targets=( game )
148 - if use client; then
149 - targets+=( client )
150 - use opengl && targets+=( ref_gl1 ref_gl3 )
151 - use softrender && targets+=( ref_soft )
152 - fi
153 - use dedicated && targets+=( server )
154 -
155 - mymake config
156 - mymake "${targets[@]}"
157 -
158 - local addon
159 - for addon in ctf rogue xatrix; do
160 - use ${addon} || continue
161 - emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
162 - done
163 -}
164 -
165 -src_install() {
166 - insinto /usr/lib/yamagi-quake2
167 - # Yamagi Quake II expects all binaries to be in the same directory
168 - # See stuff/packaging.md for more info
169 - exeinto /usr/lib/yamagi-quake2
170 - doins -r release/.
171 -
172 - if use client; then
173 - doexe release/quake2
174 - dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
175 -
176 - newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
177 - make_desktop_entry "yquake2" "Yamagi Quake II"
178 - fi
179 -
180 - if use dedicated; then
181 - doexe release/q2ded
182 - dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
183 - fi
184 -
185 - insinto /usr/lib/yamagi-quake2/baseq2
186 - doins stuff/yq2.cfg
187 -
188 - local addon
189 - for addon in ctf rogue xatrix; do
190 - use ${addon} || continue
191 -
192 - insinto /usr/lib/yamagi-quake2/${addon}
193 - doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
194 -
195 - if use client; then
196 - local addon_name
197 - case ${addon} in
198 - ctf) addon_name="CTF" ;;
199 - rogue) addon_name="Ground Zero" ;;
200 - xatrix) addon_name="The Reckoning" ;;
201 - esac
202 -
203 - make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
204 - make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
205 - fi
206 - done
207 -
208 - einstalldocs
209 - if use client; then
210 - docinto examples
211 - dodoc stuff/cdripper.sh
212 - fi
213 -}
214 -
215 -pkg_postinst() {
216 - if [[ -z ${REPLACING_VERSIONS} ]]; then
217 - elog
218 - elog "In order to play, you must at least install:"
219 - elog "games-fps/quake2-data or games-fps/quake2-demodata or copy game"
220 - elog "data files to ~/.yq2/ or ${EPREFIX}/usr/share/games/quake2/ manually."
221 - elog "Read ${EPREFIX}/usr/share/doc/${PF}/README.md* for more information."
222 - elog
223 - fi
224 -}