Gentoo Archives: gentoo-commits

From: Erik Mackdanz <stasibear@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
Date: Thu, 30 Sep 2021 14:05:31
Message-Id: 1633010339.ed2b9cdef9862166089ad780bae56d7c7a70460b.stasibear@gentoo
1 commit: ed2b9cdef9862166089ad780bae56d7c7a70460b
2 Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 30 13:57:32 2021 +0000
4 Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 30 13:58:59 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed2b9cde
7
8 games-roguelike/stone-soup: remove old
9
10 Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
11 Package-Manager: Portage-3.0.23, Repoman-3.0.3
12
13 games-roguelike/stone-soup/Manifest | 2 -
14 .../stone-soup/stone-soup-0.27.0-r1.ebuild | 182 -------------------
15 .../stone-soup-0.28.0_pre20210831.ebuild | 201 ---------------------
16 3 files changed, 385 deletions(-)
17
18 diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
19 index 1294929f0e7..3a3b7feb1ab 100644
20 --- a/games-roguelike/stone-soup/Manifest
21 +++ b/games-roguelike/stone-soup/Manifest
22 @@ -4,11 +4,9 @@ DIST stone-soup-0.26.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b6
23 DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
24 DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
25 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
26 -DIST stone-soup-0.28.0_pre20210831.tar.gz 14699285 BLAKE2B 1902f6dbdde812850363b1bd3915f8a42a5288d00b890c07cea33d93eeaee2d4d581bdd4ba41444883c753e5cdacb52591d94ddb2db6c280de97887ea42e0d3a SHA512 5bcbbd07fba3ad05f719a4a6bb6cfd93087e7e7ab536c9b1f78e47eef329f124b52e411b98edb32a03dd8d034a060bcedbcf1ece9fea12bec6c4c855d60e40f8
27 DIST stone-soup-0.28.0_pre20210930.tar.gz 15993960 BLAKE2B bec39024527068afb9d63efcb147dbb09fe6940e23c1f2fc5c2a78b5b4da131d7f3275cceb2160ffe4028ca38fe034a4a70b5b42698772764b0b47cf6bdb3417 SHA512 2b32e543c388b7cf1394abf5eac35f347fe27e60039372771c1c9c873c7fad2011762269d08166f7df77e85914a325c597e0151211739df32a5597f084a6ca7b
28 DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
29 DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
30 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220
31 DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d
32 -DIST stone_soup-0.27.0.zip 96917949 BLAKE2B 1da7d54e4f3ec98514630eeb8c69c7dca02f96cdfe16974856406da0a057011f17a388669ec29844f3657cd4c7c4ef977f522578cbe0dec02ce497063c25ac83 SHA512 e3f79ce8837056c0a34847857b058e055ed23cc0987ab1d862b60739b8b7ec1e955746fa49c339f449603ce9d0707e64e564592b0798310c7c6bdc1a9edc3e70
33 DIST stone_soup-0.27.1.zip 96934633 BLAKE2B 8821920a4faad9474f08a34ae3c272cb9dcd3ddeb9029e033c22eb8e6650ef20bbc30e0c0ca1556d08c1b7b898fdbdd3667a3ac9a8527e0c322cd8c78ab391bb SHA512 845dafc9895ada3712903de63b95cca9eeb66160e4a04ba21193d916447fca8e7248b851f1e938f43b8d3937cf4f4437443bdc4fe2da893fe3918fed4e0b5204
34
35 diff --git a/games-roguelike/stone-soup/stone-soup-0.27.0-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.0-r1.ebuild
36 deleted file mode 100644
37 index 67dac56203f..00000000000
38 --- a/games-roguelike/stone-soup/stone-soup-0.27.0-r1.ebuild
39 +++ /dev/null
40 @@ -1,182 +0,0 @@
41 -# Copyright 1999-2021 Gentoo Authors
42 -# Distributed under the terms of the GNU General Public License v2
43 -
44 -EAPI=8
45 -
46 -LUA_COMPAT=( lua5-{1..3} )
47 -PYTHON_COMPAT=( python3_{7,8,9} )
48 -VIRTUALX_REQUIRED="manual"
49 -inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
50 -
51 -MY_P="stone_soup-${PV}"
52 -DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
53 -HOMEPAGE="https://crawl.develz.org"
54 -SLOT="0.27"
55 -SRC_URI="
56 - https://github.com/crawl/crawl/releases/download/${PV}/${PN/-/_}-${PV}.zip
57 - https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
58 - https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg
59 -"
60 -
61 -# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h
62 -# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
63 -# Public Domain|CC0: most of tiles
64 -# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
65 -LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
66 -KEYWORDS="amd64 x86"
67 -IUSE="debug ncurses sound +tiles"
68 -
69 -RDEPEND="
70 - ${LUA_DEPS}
71 - dev-db/sqlite:3
72 - sys-libs/zlib
73 - !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
74 - ncurses? ( sys-libs/ncurses:0 )
75 - tiles? (
76 - media-fonts/dejavu
77 - media-libs/freetype:2
78 - media-libs/libpng:0
79 - sound? (
80 - media-libs/libsdl2[X,opengl,sound,video]
81 - media-libs/sdl2-mixer
82 - )
83 - !sound? ( media-libs/libsdl2[X,opengl,video] )
84 - media-libs/sdl2-image[png]
85 - virtual/glu
86 - virtual/opengl
87 - )"
88 -DEPEND="${RDEPEND}
89 - app-arch/unzip
90 - dev-lang/perl
91 - ${PYTHON_DEPS}
92 - $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
93 - sys-devel/flex
94 - tiles? (
95 - media-gfx/pngcrush
96 - sys-libs/ncurses:0
97 - )
98 - virtual/pkgconfig
99 - virtual/yacc
100 - "
101 -
102 -S=${WORKDIR}/${MY_P}/source
103 -PATCHES=(
104 - "${FILESDIR}"/make.patch
105 - "${FILESDIR}"/rltiles-make.patch
106 -)
107 -
108 -python_check_deps() {
109 - has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
110 -}
111 -
112 -pkg_setup() {
113 -
114 - python-any-r1_pkg_setup
115 -
116 - if use !ncurses && use !tiles ; then
117 - ewarn "Neither ncurses nor tiles frontend"
118 - ewarn "selected, choosing ncurses only."
119 - ewarn "Note that you can also enable both."
120 - fi
121 -
122 - if use sound && use !tiles ; then
123 - ewarn "Sound support is only available with tiles."
124 - fi
125 -}
126 -
127 -src_prepare() {
128 - default
129 - python_fix_shebang "${S}/util/species-gen.py"
130 -
131 - sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
132 - || die "Couldn't append slot to executable name"
133 -}
134 -
135 -src_compile() {
136 -
137 - # Insurance that we're not using bundled lib sources
138 - rm -rf contrib || die "Couldn't delete contrib directory"
139 -
140 - myemakeargs=(
141 - $(usex debug "FULLDEBUG=y DEBUG=y" "")
142 - BUILD_LUA=
143 - AR="$(tc-getAR)"
144 - CFOPTIMIZE=''
145 - CFOTHERS="${CXXFLAGS}"
146 - CONTRIBS=
147 - DATADIR="/usr/share/${PN}-${SLOT}"
148 - FORCE_CC="$(tc-getCC)"
149 - FORCE_CXX="$(tc-getCXX)"
150 - LDFLAGS="${LDFLAGS}"
151 - MAKEOPTS="${MAKEOPTS}"
152 - PKGCONFIG="$(tc-getPKG_CONFIG)"
153 - RANLIB="$(tc-getRANLIB)"
154 - SAVEDIR="~/.crawl-${SLOT}"
155 - SOUND=$(usex sound "y" "")
156 - STRIP=touch
157 - USE_LUAJIT=
158 - V=1
159 - prefix="/usr"
160 - )
161 -
162 - if use ncurses || (use !ncurses && use !tiles) ; then
163 - emake "${myemakeargs[@]}"
164 - # move it in case we build both variants
165 - use tiles && { mv "crawl-${SLOT}" "${WORKDIR}"/crawl-ncurses-${SLOT} || die ;}
166 - fi
167 -
168 - if use tiles ; then
169 - emake "${myemakeargs[@]}" clean
170 - emake "${myemakeargs[@]}" "TILES=y"
171 - fi
172 -}
173 -
174 -src_test() {
175 - emake "${myemakeargs[@]}" \
176 - $(usex tiles "TILES=y" "") \
177 - catch2-tests
178 -}
179 -
180 -src_install() {
181 - emake "${myemakeargs[@]}" \
182 - $(usex tiles "TILES=y" "") \
183 - DESTDIR="${D}" \
184 - prefix_fp="" \
185 - bin_prefix="${D}/usr/bin" \
186 - install
187 -
188 - [[ -e "${WORKDIR}/crawl-ncurses-${SLOT}" ]] && dobin "${WORKDIR}/crawl-ncurses-${SLOT}"
189 -
190 - # don't relocate docs, needed at runtime
191 - rm -rf "${D}/usr/share/${PN}-${SLOT}"/docs/license
192 -
193 - mv "${WORKDIR}/${MY_P}"/docs/crawl.6 "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" \
194 - || die "Couldn't append slot to man page name"
195 - doman "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6"
196 -
197 - # icons and menu for graphical build
198 - if use tiles ; then
199 - doicon -s 48 "${DISTDIR}"/${PN}-${SLOT}.png
200 - doicon -s scalable "${DISTDIR}"/${PN}-${SLOT}.svg
201 - make_desktop_entry "crawl-${SLOT}" "crawl-${SLOT}" "crawl-${SLOT}"
202 - fi
203 -}
204 -
205 -pkg_postinst() {
206 - xdg_icon_cache_update
207 -
208 - elog "crawl is a slotted install that supports having"
209 - elog "multiple versions installed. The binary has the"
210 - elog "slot appened, e.g. 'crawl-"${SLOT}"'."
211 -
212 - if use tiles && use ncurses ; then
213 - elog
214 - elog "Since you have enabled both tiles and ncurses frontends"
215 - elog "the ncurses binary is called 'crawl-ncurses-"${SLOT}"' and the"
216 - elog "tiles binary is called 'crawl-"${SLOT}"'."
217 - fi
218 -}
219 -
220 -pkg_postrm() {
221 - xdg_icon_cache_update
222 -}
223
224 diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210831.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210831.ebuild
225 deleted file mode 100644
226 index 51d928f03e9..00000000000
227 --- a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210831.ebuild
228 +++ /dev/null
229 @@ -1,201 +0,0 @@
230 -# Copyright 1999-2021 Gentoo Authors
231 -# Distributed under the terms of the GNU General Public License v2
232 -
233 -EAPI=8
234 -
235 -LUA_COMPAT=( lua5-{1..3} )
236 -PYTHON_COMPAT=( python3_{7,8,9,10} )
237 -VIRTUALX_REQUIRED="manual"
238 -inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
239 -
240 -DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
241 -HOMEPAGE="https://crawl.develz.org"
242 -SLOT="0.28"
243 -
244 -# Leave empty string if not a _pre release
245 -COMMITSHA="46f4d3c3461b2012140bb15563a19ef027b1fc69"
246 -if [ -z "${COMMITSHA}" ]; then
247 - # This is a proper release
248 - SRC_URI="
249 - https://github.com/crawl/crawl/releases/download/${PV}/${PN/-/_}-${PV}.zip
250 - https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
251 - https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg
252 - "
253 - MY_P="stone_soup-${PV}"
254 -else
255 - # This is a _pre release
256 - SRC_URI="
257 - https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
258 - https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
259 - https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg
260 - "
261 - MY_P="crawl-${COMMITSHA}/crawl-ref"
262 -fi
263 -
264 -# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h
265 -# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
266 -# Public Domain|CC0: most of tiles
267 -# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
268 -LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
269 -KEYWORDS="~amd64 ~x86"
270 -IUSE="debug ncurses sound +tiles"
271 -
272 -S=${WORKDIR}/${MY_P}/source
273 -RDEPEND="
274 - ${LUA_DEPS}
275 - dev-db/sqlite:3
276 - sys-libs/zlib
277 - !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
278 - ncurses? ( sys-libs/ncurses:0 )
279 - tiles? (
280 - media-fonts/dejavu
281 - media-libs/freetype:2
282 - media-libs/libpng:0
283 - sound? (
284 - media-libs/libsdl2[X,opengl,sound,video]
285 - media-libs/sdl2-mixer
286 - )
287 - !sound? ( media-libs/libsdl2[X,opengl,video] )
288 - media-libs/sdl2-image[png]
289 - virtual/glu
290 - virtual/opengl
291 - )"
292 -DEPEND="${RDEPEND}
293 - app-arch/unzip
294 - dev-lang/perl
295 - ${PYTHON_DEPS}
296 - $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
297 - sys-devel/flex
298 - tiles? (
299 - media-gfx/pngcrush
300 - sys-libs/ncurses:0
301 - )
302 - virtual/pkgconfig
303 - virtual/yacc
304 - "
305 -
306 -PATCHES=(
307 - "${FILESDIR}"/make.patch
308 - "${FILESDIR}"/rltiles-make.patch
309 -)
310 -
311 -python_check_deps() {
312 - has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
313 -}
314 -
315 -pkg_setup() {
316 -
317 - python-any-r1_pkg_setup
318 -
319 - if use !ncurses && use !tiles ; then
320 - ewarn "Neither ncurses nor tiles frontend"
321 - ewarn "selected, choosing ncurses only."
322 - ewarn "Note that you can also enable both."
323 - fi
324 -
325 - if use sound && use !tiles ; then
326 - ewarn "Sound support is only available with tiles."
327 - fi
328 -}
329 -
330 -src_prepare() {
331 - default
332 - python_fix_shebang "${S}/util/species-gen.py"
333 -
334 - sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
335 - || die "Couldn't append slot to executable name"
336 -
337 - # File required for a _pre build
338 - if ! [ -f "${S}/util/release_ver" ]; then
339 - echo "${SLOT}" >"${S}/util/release_ver" || die "Couldn't write release_ver"
340 - fi
341 -}
342 -
343 -src_compile() {
344 -
345 - # Insurance that we're not using bundled lib sources
346 - rm -rf contrib || die "Couldn't delete contrib directory"
347 -
348 - myemakeargs=(
349 - $(usex debug "FULLDEBUG=y DEBUG=y" "")
350 - BUILD_LUA=
351 - AR="$(tc-getAR)"
352 - CFOPTIMIZE=''
353 - CFOTHERS="${CXXFLAGS}"
354 - CONTRIBS=
355 - DATADIR="/usr/share/${PN}-${SLOT}"
356 - FORCE_CC="$(tc-getCC)"
357 - FORCE_CXX="$(tc-getCXX)"
358 - LDFLAGS="${LDFLAGS}"
359 - MAKEOPTS="${MAKEOPTS}"
360 - PKGCONFIG="$(tc-getPKG_CONFIG)"
361 - RANLIB="$(tc-getRANLIB)"
362 - SAVEDIR="~/.crawl-${SLOT}"
363 - SOUND=$(usex sound "y" "")
364 - STRIP=touch
365 - USE_LUAJIT=
366 - V=1
367 - prefix="/usr"
368 - )
369 -
370 - if use ncurses || (use !ncurses && use !tiles) ; then
371 - emake "${myemakeargs[@]}"
372 - # move it in case we build both variants
373 - use tiles && { mv "crawl-${SLOT}" "${WORKDIR}"/crawl-ncurses-${SLOT} || die ;}
374 - fi
375 -
376 - if use tiles ; then
377 - emake "${myemakeargs[@]}" clean
378 - emake "${myemakeargs[@]}" "TILES=y"
379 - fi
380 -}
381 -
382 -src_test() {
383 - emake "${myemakeargs[@]}" \
384 - $(usex tiles "TILES=y" "") \
385 - catch2-tests
386 -}
387 -
388 -src_install() {
389 - emake "${myemakeargs[@]}" \
390 - $(usex tiles "TILES=y" "") \
391 - DESTDIR="${D}" \
392 - prefix_fp="" \
393 - bin_prefix="${D}/usr/bin" \
394 - install
395 -
396 - [[ -e "${WORKDIR}/crawl-ncurses-${SLOT}" ]] && dobin "${WORKDIR}/crawl-ncurses-${SLOT}"
397 -
398 - # don't relocate docs, needed at runtime
399 - rm -rf "${D}/usr/share/${PN}-${SLOT}"/docs/license
400 -
401 - mv "${WORKDIR}/${MY_P}"/docs/crawl.6 "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" \
402 - || die "Couldn't append slot to man page name"
403 - doman "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6"
404 -
405 - # icons and menu for graphical build
406 - if use tiles ; then
407 - doicon -s 48 "${DISTDIR}"/${PN}-${SLOT}.png
408 - doicon -s scalable "${DISTDIR}"/${PN}-${SLOT}.svg
409 - make_desktop_entry "crawl-${SLOT}" "crawl-${SLOT}" "crawl-${SLOT}"
410 - fi
411 -}
412 -
413 -pkg_postinst() {
414 - xdg_icon_cache_update
415 -
416 - elog "crawl is a slotted install that supports having"
417 - elog "multiple versions installed. The binary has the"
418 - elog "slot appened, e.g. 'crawl-"${SLOT}"'."
419 -
420 - if use tiles && use ncurses ; then
421 - elog
422 - elog "Since you have enabled both tiles and ncurses frontends"
423 - elog "the ncurses binary is called 'crawl-ncurses-"${SLOT}"' and the"
424 - elog "tiles binary is called 'crawl-"${SLOT}"'."
425 - fi
426 -}
427 -
428 -pkg_postrm() {
429 - xdg_icon_cache_update
430 -}