gentoo resync : 01.10.2021

5 files changed, 5 insertions, 189 deletions

diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 9bd48a6cb7b8..763a15300441 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 96d81a418011..79b1d4bb2e2f 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -6,16 +6,14 @@ DIST stone-soup-0.26.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b6
 DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone-soup-0.28.0_pre20210831.tar.gz 14699285 BLAKE2B 1902f6dbdde812850363b1bd3915f8a42a5288d00b890c07cea33d93eeaee2d4d581bdd4ba41444883c753e5cdacb52591d94ddb2db6c280de97887ea42e0d3a SHA512 5bcbbd07fba3ad05f719a4a6bb6cfd93087e7e7ab536c9b1f78e47eef329f124b52e411b98edb32a03dd8d034a060bcedbcf1ece9fea12bec6c4c855d60e40f8
+DIST stone-soup-0.28.0_pre20210930.tar.gz 15993960 BLAKE2B bec39024527068afb9d63efcb147dbb09fe6940e23c1f2fc5c2a78b5b4da131d7f3275cceb2160ffe4028ca38fe034a4a70b5b42698772764b0b47cf6bdb3417 SHA512 2b32e543c388b7cf1394abf5eac35f347fe27e60039372771c1c9c873c7fad2011762269d08166f7df77e85914a325c597e0151211739df32a5597f084a6ca7b
 DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220
 DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d
-DIST stone_soup-0.27.0.zip 96917949 BLAKE2B 1da7d54e4f3ec98514630eeb8c69c7dca02f96cdfe16974856406da0a057011f17a388669ec29844f3657cd4c7c4ef977f522578cbe0dec02ce497063c25ac83 SHA512 e3f79ce8837056c0a34847857b058e055ed23cc0987ab1d862b60739b8b7ec1e955746fa49c339f449603ce9d0707e64e564592b0798310c7c6bdc1a9edc3e70
 DIST stone_soup-0.27.1.zip 96934633 BLAKE2B 8821920a4faad9474f08a34ae3c272cb9dcd3ddeb9029e033c22eb8e6650ef20bbc30e0c0ca1556d08c1b7b898fdbdd3667a3ac9a8527e0c322cd8c78ab391bb SHA512 845dafc9895ada3712903de63b95cca9eeb66160e4a04ba21193d916447fca8e7248b851f1e938f43b8d3937cf4f4437443bdc4fe2da893fe3918fed4e0b5204
 EBUILD stone-soup-0.25.1-r102.ebuild 4572 BLAKE2B a08ac78bc30c445017649647f1e68492e948a6161d36dc97ca28e18866f70e0b3865a2436dbc7619207fe07e4d6fe9b2d9b3825890304857e665065bc7be15ae SHA512 5a373cfab1c38c81f17c59d7498eb743064f726ef6a8962abdd4d5a3d1af382c2fedec2d0f9640739f2f1e90aae52fe12c583ddf7fcdf7e96ec8737d17c5017d
 EBUILD stone-soup-0.26.1-r1.ebuild 4785 BLAKE2B 65800f751c38b6005bd0645907a16e88d58a6c9e5a67dc750184bf5272fe5cfc99f86683e3d21446b2352d3d44d9ccb47c916abc6df9ae1f03220fe0c35afe63 SHA512 e232b2878c412d712d2b749879988806f653dd1db3348e03cfd5301e797b32d991a0c34e61934260587a24d374bac6400455798b01abbddc8e68ced02c09faa5
-EBUILD stone-soup-0.27.0-r1.ebuild 4569 BLAKE2B cf84cebf42c71fd922ca133500130c87946c9d9fcdae35451e046a82155c0abb0988e92b5d2a6a555786ad596d654ee05afee1dc177504c3965f77c63c5e100d SHA512 4346e417f7ddc1ddc668e0115495e15728d7eea9e4bfeedfd9209bd500d207d8ec2cf5e7dad0b6dff40e62c88942808c441ebb77c5f2acfe777dceda7a4191dd
-EBUILD stone-soup-0.27.1.ebuild 4574 BLAKE2B 8b8c51b716175396119543b9e6ba16227aaa7a2b8f669afc58d2e06664fce6df95a7c24b5396819eac05c45a81477176e21989abe12a4d1a940d51b4816d0a64 SHA512 96b59509f23e9fe327b350312c5e0bfd985f72867b67b3e6bf866674ef60af8a9d2cc7ae4fceaf50d472b80f911cce7c85c65b8cd8560f181cc5ebcc5d53b2a1
-EBUILD stone-soup-0.28.0_pre20210831.ebuild 5211 BLAKE2B eb3250f7db4879e128872cbef162c8bc2816e001a65644ec3e4ad665ce6f43f694b127212098c103fb33ba771f3c8ad7d3a84a179fc1d6ac77462fdd606cbc50 SHA512 34cb82917441e07bad89e4c5384832267e44da033c4c316f7745b91eda66dc1f2d877c184180aeced660b1f74bbf5c148a54fb8c83b31509ac67b89567a4e407
+EBUILD stone-soup-0.27.1.ebuild 4572 BLAKE2B f914cf80deb946dfbc482985fcb7cde8eebd4e7b870f7c03af980ceeae2be9a390ffee4ca5894be07916d86b86fbc46b506fbdd6c0e262d404b42cce197169ec SHA512 7674f939ecae0112453f2236708011a33c1be0d86d3886229d62c99df688dc228ee9099bfef779e49c6536bff05ddeac42310f79648920278f21ddd203c2d187
+EBUILD stone-soup-0.28.0_pre20210930.ebuild 5211 BLAKE2B b88b19281cc240bdd37776145df6eb656d650deddd14abf4e5e34a5213927fc8e9b13e261d326548af378271b92dd3e6167cbd72ba48f709024c0e1980a4ec4a SHA512 b6e5dcbb09ce6094104ab04bb53e2a34b68b527ceb4c8df105fdf99121f31c5a5a6e67a736a4b301febfcc8610d7a4e8ba440a9566731fa3a278fbbeaa9bd3a4
 MISC metadata.xml 1620 BLAKE2B c010b68c8a3287ab8015f4111ecdf32cf49801b133e31c782d3c72f74e5805e7929cd169ef21a247a484d7398ce688e3e1196ecaa265f6740261e95592d30e1d SHA512 e2c62e86f83eb9be7badd06573b2ad142dffba70924a5aa4fcde847ce141edf2f9a767285ff8aa263c90e1963611e07664e4d9de06d2d7c89a4a9a0df1c42615
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
deleted file mode 100644
index 67dac56203fc..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.27.0-r1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9} )
-VIRTUALX_REQUIRED="manual"
-inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
-
-MY_P="stone_soup-${PV}"
-DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
-HOMEPAGE="https://crawl.develz.org"
-SLOT="0.27"
-SRC_URI="
-	https://github.com/crawl/crawl/releases/download/${PV}/${PN/-/_}-${PV}.zip
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg
-"
-
-# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h
-# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
-# Public Domain|CC0: most of tiles
-# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
-LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
-KEYWORDS="amd64 x86"
-IUSE="debug ncurses sound +tiles"
-
-RDEPEND="
-	${LUA_DEPS}
-	dev-db/sqlite:3
-	sys-libs/zlib
-	!ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
-	ncurses? ( sys-libs/ncurses:0 )
-	tiles? (
-		media-fonts/dejavu
-		media-libs/freetype:2
-		media-libs/libpng:0
-		sound? (
-			   media-libs/libsdl2[X,opengl,sound,video]
-			   media-libs/sdl2-mixer
-		)
-		!sound? ( media-libs/libsdl2[X,opengl,video] )
-		media-libs/sdl2-image[png]
-		virtual/glu
-		virtual/opengl
-	)"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-lang/perl
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	sys-devel/flex
-	tiles? (
-		media-gfx/pngcrush
-		sys-libs/ncurses:0
-	)
-	virtual/pkgconfig
-	virtual/yacc
-	"
-
-S=${WORKDIR}/${MY_P}/source
-PATCHES=(
-	"${FILESDIR}"/make.patch
-	"${FILESDIR}"/rltiles-make.patch
-)
-
-python_check_deps() {
-	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-
-	python-any-r1_pkg_setup
-
-	if use !ncurses && use !tiles ; then
-		ewarn "Neither ncurses nor tiles frontend"
-		ewarn "selected, choosing ncurses only."
-		ewarn "Note that you can also enable both."
-	fi
-
-	if use sound && use !tiles ; then
-		ewarn "Sound support is only available with tiles."
-	fi
-}
-
-src_prepare() {
-	default
-	python_fix_shebang "${S}/util/species-gen.py"
-
-	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
-		|| die "Couldn't append slot to executable name"
-}
-
-src_compile() {
-
-	# Insurance that we're not using bundled lib sources
-	rm -rf contrib || die "Couldn't delete contrib directory"
-
-	myemakeargs=(
-		$(usex debug "FULLDEBUG=y DEBUG=y" "")
-		BUILD_LUA=
-		AR="$(tc-getAR)"
-		CFOPTIMIZE=''
-		CFOTHERS="${CXXFLAGS}"
-		CONTRIBS=
-		DATADIR="/usr/share/${PN}-${SLOT}"
-		FORCE_CC="$(tc-getCC)"
-		FORCE_CXX="$(tc-getCXX)"
-		LDFLAGS="${LDFLAGS}"
-		MAKEOPTS="${MAKEOPTS}"
-		PKGCONFIG="$(tc-getPKG_CONFIG)"
-		RANLIB="$(tc-getRANLIB)"
-		SAVEDIR="~/.crawl-${SLOT}"
-		SOUND=$(usex sound "y" "")
-		STRIP=touch
-		USE_LUAJIT=
-		V=1
-		prefix="/usr"
-	)
-
-	if use ncurses || (use !ncurses && use !tiles) ; then
-		emake "${myemakeargs[@]}"
-		# move it in case we build both variants
-		use tiles && { mv "crawl-${SLOT}" "${WORKDIR}"/crawl-ncurses-${SLOT} || die ;}
-	fi
-
-	if use tiles ; then
-		emake "${myemakeargs[@]}" clean
-		emake "${myemakeargs[@]}" "TILES=y"
-	fi
-}
-
-src_test() {
-	emake "${myemakeargs[@]}" \
-		  $(usex tiles "TILES=y" "") \
-		  catch2-tests
-}
-
-src_install() {
-	emake "${myemakeargs[@]}" \
-		  $(usex tiles "TILES=y" "") \
-		  DESTDIR="${D}" \
-		  prefix_fp="" \
-		  bin_prefix="${D}/usr/bin" \
-		  install
-
-	[[ -e "${WORKDIR}/crawl-ncurses-${SLOT}" ]] && dobin "${WORKDIR}/crawl-ncurses-${SLOT}"
-
-	# don't relocate docs, needed at runtime
-	rm -rf "${D}/usr/share/${PN}-${SLOT}"/docs/license
-
-	mv "${WORKDIR}/${MY_P}"/docs/crawl.6 "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" \
-	   || die "Couldn't append slot to man page name"
-	doman "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6"
-
-	# icons and menu for graphical build
-	if use tiles ; then
-		doicon -s 48 "${DISTDIR}"/${PN}-${SLOT}.png
-		doicon -s scalable "${DISTDIR}"/${PN}-${SLOT}.svg
-		make_desktop_entry "crawl-${SLOT}" "crawl-${SLOT}" "crawl-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	elog "crawl is a slotted install that supports having"
-	elog "multiple versions installed.  The binary has the"
-	elog "slot appened, e.g. 'crawl-"${SLOT}"'."
-
-	if use tiles && use ncurses ; then
-		elog
-		elog "Since you have enabled both tiles and ncurses frontends"
-		elog "the ncurses binary is called 'crawl-ncurses-"${SLOT}"' and the"
-		elog "tiles binary is called 'crawl-"${SLOT}"'."
-	fi
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
index 5a1ef5231382..cc70aa3e58dc 100644
--- a/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 # Public Domain|CC0: most of tiles
 # MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
 LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug ncurses sound +tiles"
 
 RDEPEND="
diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210831.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210930.ebuild
index 51d928f03e91..670b13e391ae 100644
--- a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210831.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210930.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://crawl.develz.org"
 SLOT="0.28"
 
 # Leave empty string if not a _pre release
-COMMITSHA="46f4d3c3461b2012140bb15563a19ef027b1fc69"
+COMMITSHA="f77a47075d75ed93d74dc37d5dd92497f3a30001"
 if [ -z "${COMMITSHA}" ]; then
 	# This is a proper release
 	SRC_URI="