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: Fri, 23 Sep 2022 13:50:13
Message-Id: 1663940983.6111c9b135bf37d63a5126e0ef276f463d648e8e.stasibear@gentoo
1 commit: 6111c9b135bf37d63a5126e0ef276f463d648e8e
2 Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 23 13:04:51 2022 +0000
4 Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 23 13:49:43 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6111c9b1
7
8 games-roguelike/stone-soup: drop 0.29.0_pre20220701
9
10 Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
11
12 games-roguelike/stone-soup/Manifest | 1 -
13 .../stone-soup-0.29.0_pre20220701.ebuild | 222 ---------------------
14 2 files changed, 223 deletions(-)
15
16 diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
17 index 3d086c2bb47b..f4568e5195a4 100644
18 --- a/games-roguelike/stone-soup/Manifest
19 +++ b/games-roguelike/stone-soup/Manifest
20 @@ -6,7 +6,6 @@ DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b6
21 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
22 DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
23 DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
24 -DIST stone-soup-0.29.0_pre20220701.tar.gz 16490746 BLAKE2B dfc4251a3c4eda66867833ac2a97178c24ebd03ce23b63d067143d7c8046821bb9f658bc53242ad56053aa117b09a5ffb7dcf499035bf5ee1aff6c8bd06b64c8 SHA512 66e95e32067e281adb3195823d34e9a13fdc8089c4bc747e35844718a29657674a0c89d2c9823a60c2bc479caa5b6eb8b4cc7e7ade990c8f14bbc34ed11555ed
25 DIST stone-soup-0.29.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
26 DIST stone-soup-0.29.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
27 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220
28
29 diff --git a/games-roguelike/stone-soup/stone-soup-0.29.0_pre20220701.ebuild b/games-roguelike/stone-soup/stone-soup-0.29.0_pre20220701.ebuild
30 deleted file mode 100644
31 index 60e009774b02..000000000000
32 --- a/games-roguelike/stone-soup/stone-soup-0.29.0_pre20220701.ebuild
33 +++ /dev/null
34 @@ -1,222 +0,0 @@
35 -# Copyright 1999-2022 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=8
39 -
40 -LUA_COMPAT=( lua5-1 )
41 -PYTHON_COMPAT=( python3_{8,9,10,11} )
42 -VIRTUALX_REQUIRED="manual"
43 -inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
44 -
45 -DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
46 -HOMEPAGE="https://crawl.develz.org"
47 -SLOT="0.29"
48 -
49 -# Leave empty string if not a _pre release
50 -COMMITSHA="40bbea3e7347d6647ea791ba38964496f292cc81"
51 -if [ -z "${COMMITSHA}" ]; then
52 - # This is a proper release
53 - SRC_URI="
54 - https://github.com/crawl/crawl/releases/download/${PV}/${PN/-/_}-${PV}.zip
55 - https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
56 - https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg
57 - "
58 - MY_P="stone_soup-${PV}"
59 -else
60 - # This is a _pre release
61 - SRC_URI="
62 - https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
63 - https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
64 - https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg
65 - "
66 - MY_P="crawl-${COMMITSHA}/crawl-ref"
67 -fi
68 -
69 -# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h
70 -# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
71 -# Public Domain|CC0: most of tiles
72 -# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
73 -LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
74 -KEYWORDS="amd64 x86"
75 -IUSE="advpng debug ncurses sound test +tiles"
76 -RESTRICT="!test? ( test )"
77 -REQUIRED_USE="${LUA_REQUIRED_USE}"
78 -
79 -S=${WORKDIR}/${MY_P}/source
80 -RDEPEND="
81 - ${LUA_DEPS}
82 - dev-db/sqlite:3
83 - sys-libs/zlib
84 - !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
85 - ncurses? ( sys-libs/ncurses:0 )
86 - tiles? (
87 - media-fonts/dejavu
88 - media-libs/freetype:2
89 - media-libs/libpng:0
90 - sound? (
91 - media-libs/libsdl2[X,opengl,sound,video]
92 - media-libs/sdl2-mixer
93 - )
94 - !sound? ( media-libs/libsdl2[X,opengl,video] )
95 - media-libs/sdl2-image[png]
96 - virtual/glu
97 - virtual/opengl
98 - )"
99 -DEPEND="${RDEPEND}
100 - test? ( <dev-cpp/catch-3.0.0:0 )
101 - tiles? (
102 - sys-libs/ncurses:0
103 - )
104 - "
105 -BDEPEND="
106 - app-arch/unzip
107 - dev-lang/perl
108 - ${PYTHON_DEPS}
109 - $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
110 - sys-devel/flex
111 - tiles? (
112 - advpng? (
113 - app-arch/advancecomp
114 - )
115 - !advpng? (
116 - media-gfx/pngcrush
117 - )
118 - )
119 - virtual/pkgconfig
120 - virtual/yacc
121 - "
122 -
123 -PATCHES=(
124 - "${FILESDIR}"/make.patch
125 - "${FILESDIR}"/rltiles-make.patch
126 -)
127 -
128 -python_check_deps() {
129 - python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
130 -}
131 -
132 -pkg_setup() {
133 - python-any-r1_pkg_setup
134 -
135 - if use !ncurses && use !tiles ; then
136 - ewarn "Neither ncurses nor tiles frontend"
137 - ewarn "selected, choosing ncurses only."
138 - ewarn "Note that you can also enable both."
139 - fi
140 -
141 - if use sound && use !tiles ; then
142 - ewarn "Sound support is only available with tiles."
143 - fi
144 -}
145 -
146 -src_prepare() {
147 - default
148 - python_fix_shebang "${S}/util/species-gen.py"
149 -
150 - if use advpng; then
151 - eapply "${FILESDIR}/make-advpng.patch"
152 - fi
153 -
154 - sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
155 - || die "Couldn't append slot to executable name"
156 -
157 - # File required for a _pre build
158 - if ! [ -f "${S}/util/release_ver" ]; then
159 - echo "${SLOT}" >"${S}/util/release_ver" || die "Couldn't write release_ver"
160 - fi
161 -
162 - # Replace bundled catch2 package with system implementation
163 - # https://bugs.gentoo.org/829950
164 - if use test; then
165 - cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" || die "Couldn't substitute system catch2"
166 - fi
167 -}
168 -
169 -src_compile() {
170 -
171 - # Insurance that we're not using bundled lib sources
172 - rm -rf contrib || die "Couldn't delete contrib directory"
173 -
174 - myemakeargs=(
175 - $(usex debug "FULLDEBUG=y DEBUG=y" "")
176 - BUILD_LUA=
177 - AR="$(tc-getAR)"
178 - CFOPTIMIZE=''
179 - CFOTHERS="${CXXFLAGS}"
180 - CONTRIBS=
181 - DATADIR="/usr/share/${PN}-${SLOT}"
182 - FORCE_CC="$(tc-getCC)"
183 - FORCE_CXX="$(tc-getCXX)"
184 - LDFLAGS="${LDFLAGS}"
185 - MAKEOPTS="${MAKEOPTS}"
186 - PKGCONFIG="$(tc-getPKG_CONFIG)"
187 - RANLIB="$(tc-getRANLIB)"
188 - SAVEDIR="~/.crawl-${SLOT}"
189 - SOUND=$(usex sound "y" "")
190 - STRIP=touch
191 - USE_LUAJIT=
192 - V=1
193 - prefix="/usr"
194 - )
195 -
196 - if use ncurses || (use !ncurses && use !tiles) ; then
197 - emake "${myemakeargs[@]}"
198 - # move it in case we build both variants
199 - use tiles && { mv "crawl-${SLOT}" "${WORKDIR}"/crawl-ncurses-${SLOT} || die ;}
200 - fi
201 -
202 - if use tiles ; then
203 - emake "${myemakeargs[@]}" clean
204 - emake "${myemakeargs[@]}" "TILES=y"
205 - fi
206 -}
207 -
208 -src_test() {
209 - emake "${myemakeargs[@]}" \
210 - $(usex tiles "TILES=y" "") \
211 - catch2-tests
212 -}
213 -
214 -src_install() {
215 - emake "${myemakeargs[@]}" \
216 - $(usex tiles "TILES=y" "") \
217 - DESTDIR="${D}" \
218 - prefix_fp="" \
219 - bin_prefix="${D}/usr/bin" \
220 - install
221 -
222 - [[ -e "${WORKDIR}/crawl-ncurses-${SLOT}" ]] && dobin "${WORKDIR}/crawl-ncurses-${SLOT}"
223 -
224 - # don't relocate docs, needed at runtime
225 - rm -rf "${D}/usr/share/${PN}-${SLOT}"/docs/license
226 -
227 - mv "${WORKDIR}/${MY_P}"/docs/crawl.6 "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" \
228 - || die "Couldn't append slot to man page name"
229 - doman "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6"
230 -
231 - # icons and menu for graphical build
232 - if use tiles ; then
233 - doicon -s 48 "${DISTDIR}"/${PN}-${SLOT}.png
234 - doicon -s scalable "${DISTDIR}"/${PN}-${SLOT}.svg
235 - make_desktop_entry "crawl-${SLOT}" "crawl-${SLOT}" "crawl-${SLOT}"
236 - fi
237 -}
238 -
239 -pkg_postinst() {
240 - xdg_icon_cache_update
241 -
242 - elog "crawl is a slotted install that supports having"
243 - elog "multiple versions installed. The binary has the"
244 - elog "slot appended, e.g. 'crawl-"${SLOT}"'."
245 -
246 - if use tiles && use ncurses ; then
247 - elog
248 - elog "Since you have enabled both tiles and ncurses frontends"
249 - elog "the ncurses binary is called 'crawl-ncurses-"${SLOT}"' and the"
250 - elog "tiles binary is called 'crawl-"${SLOT}"'."
251 - fi
252 -}
253 -
254 -pkg_postrm() {
255 - xdg_icon_cache_update
256 -}