gentoo resync : 12.03.2021

5 files changed, 4 insertions, 177 deletions

diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 470673622be3..955d25c2b99e 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 6d0a667df896..e5d899898ac4 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -5,13 +5,10 @@ DIST stone-soup-0.25.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b6
 DIST stone-soup-0.25.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.26.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
-DIST stone-soup.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220
 DIST stone_soup-0.26.0.zip 95554775 BLAKE2B 03389bae0471efe674b68dd6b99184d77cae50beaa1a82e26afa2b12e0cd06a3bd7b3eecaf5b11a78150cf3eb4694cd07e62f524630b9113fb49ef9cd328d265 SHA512 269b687ce75d8f6e888f1bcc811be2544cb9d82a1a48689187631aa2e6e0a7999bfc3ac7da81cdc44488db5d97bde48b4d6215ebd994f7ebaa6b89bdc2cba281
 DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d
-EBUILD stone-soup-0.25.1-r100.ebuild 4088 BLAKE2B b804eeb89bf8cf8653c42218ab64c092c7ba0d40f78698cd9a17c501aeff4449689cb2db72b47274739ca5d9e86f9d6812e83f163501e20150d015cfac3ba7e5 SHA512 18f0d2754f5fa851a259c7b72dce80ea9fe4ba63d3cdac7092ee0bca25a7b2a68db79dc4fe3ca3afa093fe4bdd8277d3254d901a117cb7d89763c5c78d4e5167
-EBUILD stone-soup-0.25.1-r101.ebuild 4915 BLAKE2B 68748449f52abcaf860c5ca6547598700f2cd992a96f09ae5d785be394307c1a197bd77c6bb8b43e7a673d2e0019ddbf6ce2f25560801e39fb77decdebb7dd4e SHA512 cf4ac21865817082e2d4027895fe084d2edce21236ff81b8c654a2feaf4a46cf20a596068ee1957b25f26bec1ec94768a67b6bed5691afe508f24d51e3196dc2
-EBUILD stone-soup-0.26.0.ebuild 4915 BLAKE2B 338c41288dbd99824749b62bbf6a1f0614b84afbe6862db4a658f02b5f10efb76d53385dd6e26645a7241aa77a300ede66ffb55b1027f5417f99c94bd38651c1 SHA512 b4084a0e59f9b94015b8900454cd54d78dffb674df7e34c96ed83ba6c7745e0674ed86f30158680bc122ae832e1040a22f3f1f16ccfad3ac9e94fe2b11b556db
+EBUILD stone-soup-0.25.1-r101.ebuild 4913 BLAKE2B 746e685f9c68c7036e89c419ceec512e5db7a4c262290091b1f47af4c59d279dd09d4c5ca0b2654fe71b62e8f9f9aa7580247e4957a6637a1796f56a1711ba1d SHA512 8c9a3ffa232efdc0889fd1ae4b222569223d085001940def16011f0cd6222e17c692272e743463e7cd0b4eb34f53d8c275b527ae09d5a23898253bf222c891b1
+EBUILD stone-soup-0.26.0.ebuild 4913 BLAKE2B b68717066973fcce0d34d02c0e427ac0a170c8eeecb26629f575566c9f2094c9fe1b4ef3f69fe588d75fa790c4668d9598896a8b413bebb4ce7a7d3d6179fe43 SHA512 d477fdf4717c2e2dce7882ebaa6bc7a388432b3875ffbbc0d2504c99a69438d22f087868458ab169eb83d2617b0beb09dee4016a3c08b58f79572a13b84a461f
 EBUILD stone-soup-0.26.1.ebuild 4915 BLAKE2B 338c41288dbd99824749b62bbf6a1f0614b84afbe6862db4a658f02b5f10efb76d53385dd6e26645a7241aa77a300ede66ffb55b1027f5417f99c94bd38651c1 SHA512 b4084a0e59f9b94015b8900454cd54d78dffb674df7e34c96ed83ba6c7745e0674ed86f30158680bc122ae832e1040a22f3f1f16ccfad3ac9e94fe2b11b556db
 MISC metadata.xml 1619 BLAKE2B 2977dbcb30328109cf2f2c75535175ce089c4ede9d9ce7e550ae715bb8624abffdcf2ba53cb6dc545112dbf1da10b0237a8bffa7719956763955ff81b31554f7 SHA512 711ef0ab70235f7ab3a447bc49508b3e8f53f2dd0e108b4874f6e5a916b3c373decece2d6e4a134971941261315819c31799fd318d0c7be103356ac8e5218137
diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild
deleted file mode 100644
index d77c97044319..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO
-# - attempt +test, linked bug claims to be fixed
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9} )
-VIRTUALX_REQUIRED="manual"
-inherit desktop python-any-r1 eutils 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"
-SRC_URI="
-	https://github.com/crawl/crawl/releases/download/${PV}/${PN/-/_}-${PV}.zip
-	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png
-	https://dev.gentoo.org/~hasufell/distfiles/${PN}.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"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug ncurses sound test +tiles"
-# test is broken
-# see https://crawl.develz.org/mantis/view.php?id=6121
-RESTRICT="test"
-
-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? (
-		sys-libs/ncurses:0
-	)
-	virtual/pkgconfig
-	virtual/yacc
-	"
-
-S=${WORKDIR}/${MY_P}/source
-S_TEST=${WORKDIR}/${MY_P}_test/source
-PATCHES=(
-	"${FILESDIR}"/fixed-font-path.patch
-	"${FILESDIR}"/gitless-1.patch
-	"${FILESDIR}"/rltiles-ldflags-libs.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"
-}
-
-src_compile() {
-
-	# Insurance that we're not using bundled lib sources
-	rm -rf contrib || die "Couldn't delete contrib directory"
-
-	export HOSTCXX=$(tc-getBUILD_CXX)
-
-	# leave DATADIR at the top
-	myemakeargs=(
-		$(usex debug "FULLDEBUG=y DEBUG=y" "")
-		BUILD_LUA=
-		AR="$(tc-getAR)"
-		CFOPTIMIZE=''
-		CFOTHERS="${CXXFLAGS}"
-		CONTRIBS=
-		DATADIR="/usr/share/${PN}"
-		GCC="$(tc-getCC)"
-		GXX="$(tc-getCXX)"
-		LDFLAGS="${LDFLAGS}"
-		MAKEOPTS="${MAKEOPTS}"
-		PKGCONFIG="$(tc-getPKG_CONFIG)"
-		RANLIB="$(tc-getRANLIB)"
-		SAVEDIR="~/.crawl"
-		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 "${WORKDIR}"/crawl-ncurses || die ;}
-	fi
-
-	if use tiles ; then
-		emake clean
-		emake "${myemakeargs[@]}" "TILES=y"
-	fi
-}
-
-src_install() {
-	emake "${myemakeargs[@]}" $(usex tiles "TILES=y" "") DESTDIR="${D}" prefix_fp="" bin_prefix="${D}/usr/bin" install
-	[[ -e "${WORKDIR}"/crawl-ncurses ]] && dobin "${WORKDIR}"/crawl-ncurses
-
-	# don't relocate docs, needed at runtime
-	rm -rf "${D}/usr/share/${PN}"/docs/license
-
-	doman "${WORKDIR}/${MY_P}"/docs/crawl.6
-
-	# icons and menu for graphical build
-	if use tiles ; then
-		doicon -s 48 "${DISTDIR}"/${PN}.png
-		doicon -s scalable "${DISTDIR}"/${PN}.svg
-		make_desktop_entry crawl
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	if use tiles && use ncurses ; then
-		elog "Since you have enabled both tiles and ncurses frontends"
-		elog "the ncurses binary is called 'crawl-ncurses' and the"
-		elog "tiles binary is called 'crawl'."
-	fi
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r101.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r101.ebuild
index 53fd2d82601a..2b1eac8003bd 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r101.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r101.ebuild
@@ -26,7 +26,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 test +tiles"
 # test is broken
 # see https://crawl.develz.org/mantis/view.php?id=6121
diff --git a/games-roguelike/stone-soup/stone-soup-0.26.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.0.ebuild
index 87030f3939cb..160cc20606b1 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.0.ebuild
@@ -26,7 +26,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 test +tiles"
 # test is broken
 # see https://crawl.develz.org/mantis/view.php?id=6121