gentoo resync : 25.11.2020

9 files changed, 200 insertions, 53 deletions

diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index e69836abe317..e5aa7cf727fc 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 0aec595597d2..0b82d326859a 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,13 +1,11 @@
 AUX gitless-1.patch 639 BLAKE2B 646abd41a65b5744618161bd2a66f3fb43c06e40bd64ae78fdadf01bf5669b07f470be5eb3afc4931889d91f2f7a782036d1f10e1812bd7cfe14fe88c3ef40bf SHA512 b46fc9531c06a1f51b23c35be5f9f751f96d72a66f40a3aef3ffa89e0c9af56bc08f4aa6cad237f208aa789ee8511fec7304135fbe1e271345599f9107c52212
-AUX gitless.patch 552 BLAKE2B 5bf8976ed06979f164d543f5e0b70d072847f6d79bead84d9f90f7bfd2eb4bf95f20b4abe077889d3199c91cda50645711f28950492bfde15ec19119212e64ed SHA512 45b7da032a20b8b50725b8602f9762edb14579556cc9c53863d14358df2154a0fcf2ee7ecb718c970e60c9bac38110c74108472615eb53ea5e08620236f2bf99
-AUX pyyaml-safe-load.patch 460 BLAKE2B 39fdb2753539c7e973afcd23b86b89623c14b37d96776dcb6ceafa755457dc3427943a62f73caa1fa7a166d1579ce987069c28df4142a6c5ceda9ae5546ecc60 SHA512 d9f6404ad363ee739933d3e3ca772401d8f64d868458d795a632d72f8c0d7705fb18faaf5d25e501b9c6fbc3a98b65652c6373f9259828bac88f32e708859c74
 AUX rltiles-ldflags-libs.patch 1373 BLAKE2B 5a5a48bdb6081bb81bd66993bed3a6cfed4951ca059b2bf7069ab512e30c855eb65abc9d552da4e3c15c5156924bf14adc852dbb46248aa9840b8f63d1d33652 SHA512 955b6784f7a2ffbccefff6648de2072391d535f998516f52a7b5681e41aeedb34c47ac6cb6d649519448c23ce7007f08f0b0c36ced976dac0f111f2dae204287
 DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone_soup-0.23.2.tar.xz 30157732 BLAKE2B 5d264fa33abeb2254efbdef461774c987f65ef28160d43d90848b77d46a8f0e63c4e59a9cb7257257551a08c509e53758d72acbb0edf5a0e8b70e5d3ca09ea14 SHA512 61ccb0ac262a798e7c06fdb5e821c9885a690e082c33f6255358561929d6800b272106632279d27320e8ae240d903e2002f59d908d5db4841065a5cfa97bbee8
-DIST stone_soup-0.24.0.tar.xz 29746940 BLAKE2B 429fd9bb5a5bcd36d11f66ac93a96c4d378a50bb9197edcd92d9bd7d7c463ace60c5c59c4bb762fb61555e6612ecca2267b6d68b6bba8afa79861d7b8d4ea6a1 SHA512 d43d3c43551394c0730427a1adf561bc29ac679c13475292908f942aa8b6e077861245536ff3c932c7478f1ec1c72cf51c9aca8b8ce30f3a99c311c292765194
 DIST stone_soup-0.25.0.tar.xz 30247768 BLAKE2B 1e6595ae895beb8a4eede97002d5085e710de93726034a3ab9bd4d44fc9d03fc6cc22ff8878c2e6f825ffd0b28e73bbd1d9a087fc5eae9ffd2bc36403edf5b27 SHA512 387bce2c0491bf88c267af8e37afb1037dfc98d4ba4fb4dd3fe442f3446b6bf6f23c10f32483fb7d27e90c6045033bd70fb9e88e0bbe486489bc38ab71e62529
-EBUILD stone-soup-0.23.2.ebuild 3649 BLAKE2B e82fd68687a6676400622592713ad77787db37ec07db59d1f2b7272c9797b8d5a9bc021b4301a4080da1dc5af66cbb36c09bad9db666d80724c442c4bdb9170f SHA512 d8fcec168ac91676c50016fbb0b695006d783d390214e092fcabed92950a2efef36e7e986fb45303fc562cfd5872a3613429b4c829f243a4032323c58dc03501
-EBUILD stone-soup-0.24.0.ebuild 3764 BLAKE2B 5a2440621427311954b2255e179c566a107828247cb944fb5cb934c6902a07b971b8b07fa3676d7fc59957a34b9994c3459bab1c796ba0dcade7897d7c8b5fb3 SHA512 07310e0357a64822ed907dd2450ad6c81d143d14f68f55812eea6cdad5ad585737b26d6f295ed117b5d583cd3ad8e79b682f6c42e2ee581259b666de340b24bc
-EBUILD stone-soup-0.25.0.ebuild 4299 BLAKE2B 1470101261f04f10b62a53fdcc75d4b81295980563e75474bc983deefadc5c665030a4868c02a2cc12caa7187f87b4139db545bd26506fffdd67421d54bdbb04 SHA512 ad15d79d3996bd13eab844f8f77576a8b64be081e73f5b2d9d300d80ce74f46b01749afc07083e24afe86fee42666315b9170b03cee5408bb692ff362ea7825a
-MISC metadata.xml 1656 BLAKE2B 0d1a508b4e227d63f226e3c6a356274be71f4107d690bb268960a992b69e07541f519dad89ea466bb98dfd6d86837d233d4e1cd66bac059e5122d54e1ed9bc9d SHA512 c482e96fe8d414a29ff9085c71c6c87782e9521bdfeb7118d546ff053ae551966b7cbbe50bc987276c7dfa3337f534b47228f39b83800d307592e780f44ce662
+DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220
+EBUILD stone-soup-0.25.0.ebuild 4408 BLAKE2B f5827388370cdfa7d57dccfbb25f608dba0df11152de77215709725d8238442d19ba131c8ca9e48cb59e0f59a7a229baea60661f87636cf702191ffd1f5be5ab SHA512 c2e1fda2391bd9de5cd110e19d147e423f19de3fc4e4d5bf3ec266eb5611111f8b983a43b4ab25fdb15fbd23c3703cbe22da4a2135c8a467b9cdc174397f31c5
+EBUILD stone-soup-0.25.1-r1.ebuild 3853 BLAKE2B 45fa35c6df8a1786f01219e3676f35bb7d3a53108bff703c5b9bf35de4bd77607581c2d263e0439c248ccfd028a26af33a5413e3afa984590c740689c500c82c SHA512 3b79556ab3ff0d22e9fdd1b764f877c476c5698e1d81c188d0d10ea2a921aecf89d8bd9e8458660e2f48a685178a858a5f9edc5a9f20126302756e99e66da13e
+EBUILD stone-soup-0.25.1-r100.ebuild 3837 BLAKE2B 43b7c40147eb45ee16e2a64c02e13ae2000dbe4f2a536f40597a711b69f5518bdde4d739708938b8fad9b637aad6d6af59aca583a02e5921c44a4fc72b3464b3 SHA512 10454d94c2f55e4003ed32a75ddbfc11a18c88bdfa914d4c4aa93a3684af39bc3e6dfa34711edee35ec68bd5c6cc1d3c4a96a6c752d4f89faf5921adbbf86288
+EBUILD stone-soup-0.25.1.ebuild 3809 BLAKE2B 0ad600c4387b8035eade2b61a2a82626068a647f4d965a290f4cb4b167bc9852a3338ce06bb0b78da6ee636d97e2bbb1cbcbcb27c46395a78024573c7ebad0ea SHA512 71055266b49150f9f2ae9123cc85324a8f21277b54d7ff3c874543fb41945e452118f47bf211251acec55dcc34b0d80a4f867bf3bd6bfeb6dac664420928569e
+MISC metadata.xml 1619 BLAKE2B 2977dbcb30328109cf2f2c75535175ce089c4ede9d9ce7e550ae715bb8624abffdcf2ba53cb6dc545112dbf1da10b0237a8bffa7719956763955ff81b31554f7 SHA512 711ef0ab70235f7ab3a447bc49508b3e8f53f2dd0e108b4874f6e5a916b3c373decece2d6e4a134971941261315819c31799fd318d0c7be103356ac8e5218137
diff --git a/games-roguelike/stone-soup/files/gitless.patch b/games-roguelike/stone-soup/files/gitless.patch
deleted file mode 100644
index 3aaeb7470095..000000000000
--- a/games-roguelike/stone-soup/files/gitless.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- /Makefile	2019-04-15 19:34:40.604288477 -0500
-+++ /Makefile	2019-04-15 19:36:25.249286603 -0500
-@@ -1149,9 +1149,8 @@
- 
- LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
- SRC_PKG_BASE  := stone_soup
--SRC_VERSION   := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat util/release_ver)
-+SRC_VERSION   := $(shell cat util/release_ver)
- MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|sed -r 's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
--RECENT_TAG    := $(shell git describe --abbrev=0 --tags $(MERGE_BASE))
- 
- export SRC_VERSION
- 
diff --git a/games-roguelike/stone-soup/files/pyyaml-safe-load.patch b/games-roguelike/stone-soup/files/pyyaml-safe-load.patch
deleted file mode 100644
index dfbcdc96e1ad..000000000000
--- a/games-roguelike/stone-soup/files/pyyaml-safe-load.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /util/species-gen.py	2019-04-18 23:19:07.444170831 -0500
-+++ /util/species-gen.py	2019-04-18 23:20:19.958169533 -0500
-@@ -417,7 +417,7 @@
-             continue
-         f_path = os.path.join(args.datadir, f_name)
-         try:
--            species_spec = yaml.load(open(f_path))
-+            species_spec = yaml.safe_load(open(f_path))
-         except yaml.YAMLError as e:
-             print("Failed to load %s: %s" % (f_name, e))
-             sys.exit(1)
diff --git a/games-roguelike/stone-soup/metadata.xml b/games-roguelike/stone-soup/metadata.xml
index ec38a399560c..b7229c4a7435 100644
--- a/games-roguelike/stone-soup/metadata.xml
+++ b/games-roguelike/stone-soup/metadata.xml
@@ -10,8 +10,8 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
-		<doc lang="en">http://crawl.develz.org/wordpress/documentation</doc>
-		<bugs-to>https://crawl.develz.org/mantis/main_page.php</bugs-to>
+		<doc lang="en">https://crawl.develz.org</doc>
+		<bugs-to>https://crawl.develz.org/mantis</bugs-to>
 		<remote-id type="sourceforge">crawl-ref</remote-id>
 	</upstream>
 	<use>
diff --git a/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
index a617058863e4..a26fe45f42c7 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
@@ -5,12 +5,14 @@
 # - attempt +test, linked bug claims to be fixed
 
 EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 VIRTUALX_REQUIRED="manual"
-inherit desktop eutils xdg-utils toolchain-funcs
+inherit desktop distutils-r1 eutils xdg-utils toolchain-funcs
 
 MY_P="stone_soup-${PV}"
 DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
-HOMEPAGE="http://crawl.develz.org/wordpress/"
+HOMEPAGE="https://crawl.develz.org"
 SRC_URI="
 	https://crawl.develz.org/release/$(ver_cut 1-2)/${PN/-/_}-${PV}.tar.xz
 	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png
@@ -23,7 +25,7 @@ SRC_URI="
 # 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"
+KEYWORDS="amd64 x86"
 IUSE="debug ncurses sound test +tiles"
 # test is broken
 # see https://crawl.develz.org/mantis/view.php?id=6121
@@ -50,10 +52,12 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}
 	dev-lang/perl
-	dev-python/pyyaml
+	dev-python/pyyaml[${PYTHON_USEDEP}]
 	sys-devel/flex
 	tiles? (
-		sys-libs/ncurses:0
+		   app-arch/advancecomp
+		   media-gfx/pngcrush
+		   sys-libs/ncurses:0
 	)
 	virtual/pkgconfig
 	virtual/yacc
diff --git a/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild
index 2cc1569df21b..d4d2ba19807a 100644
--- a/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild
@@ -5,14 +5,16 @@
 # - attempt +test, linked bug claims to be fixed
 
 EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 VIRTUALX_REQUIRED="manual"
-inherit desktop eutils xdg-utils toolchain-funcs
+inherit desktop distutils-r1 eutils xdg-utils toolchain-funcs
 
 MY_P="stone_soup-${PV}"
 DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
-HOMEPAGE="http://crawl.develz.org/wordpress/"
+HOMEPAGE="https://crawl.develz.org"
 SRC_URI="
-	https://crawl.develz.org/release/$(ver_cut 1-2)/${PN/-/_}-${PV}.tar.xz
+	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
 "
@@ -23,7 +25,7 @@ SRC_URI="
 # 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"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug ncurses sound test +tiles"
 # test is broken
 # see https://crawl.develz.org/mantis/view.php?id=6121
@@ -49,10 +51,13 @@ RDEPEND="
 		virtual/opengl
 	)"
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	dev-lang/perl
-	dev-python/pyyaml
+	dev-python/pyyaml[${PYTHON_USEDEP}]
 	sys-devel/flex
 	tiles? (
+		app-arch/advancecomp
+		media-gfx/pngcrush
 		sys-libs/ncurses:0
 	)
 	virtual/pkgconfig
@@ -62,12 +67,12 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}/source
 S_TEST=${WORKDIR}/${MY_P}_test/source
 PATCHES=(
-	"${FILESDIR}"/gitless.patch
-	"${FILESDIR}"/pyyaml-safe-load.patch
+	"${FILESDIR}"/gitless-1.patch
 	"${FILESDIR}"/rltiles-ldflags-libs.patch
 )
 
 pkg_setup() {
+
 	if use !ncurses && use !tiles ; then
 		ewarn "Neither ncurses nor tiles frontend"
 		ewarn "selected, choosing ncurses only."
@@ -80,6 +85,10 @@ pkg_setup() {
 }
 
 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
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
new file mode 100644
index 000000000000..984eb6860bc9
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2020 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_{6,7,8,9} )
+VIRTUALX_REQUIRED="manual"
+inherit desktop distutils-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
+	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}"/gitless-1.patch
+	"${FILESDIR}"/rltiles-ldflags-libs.patch
+)
+
+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_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.24.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
index 3a7e637f88e7..f478d555a48e 100644
--- a/games-roguelike/stone-soup/stone-soup-0.24.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
@@ -5,14 +5,16 @@
 # - attempt +test, linked bug claims to be fixed
 
 EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 VIRTUALX_REQUIRED="manual"
-inherit desktop eutils xdg-utils toolchain-funcs
+inherit desktop distutils-r1 eutils xdg-utils toolchain-funcs
 
 MY_P="stone_soup-${PV}"
 DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
-HOMEPAGE="http://crawl.develz.org/wordpress/"
+HOMEPAGE="https://crawl.develz.org"
 SRC_URI="
-	https://crawl.develz.org/release/$(ver_cut 1-2)/${PN/-/_}-${PV}.tar.xz
+	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
 "
@@ -23,7 +25,7 @@ SRC_URI="
 # 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"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug ncurses sound test +tiles"
 # test is broken
 # see https://crawl.develz.org/mantis/view.php?id=6121
@@ -49,8 +51,9 @@ RDEPEND="
 		virtual/opengl
 	)"
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	dev-lang/perl
-	dev-python/pyyaml
+	dev-python/pyyaml[${PYTHON_USEDEP}]
 	sys-devel/flex
 	tiles? (
 		sys-libs/ncurses:0
@@ -62,12 +65,12 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}/source
 S_TEST=${WORKDIR}/${MY_P}_test/source
 PATCHES=(
-	"${FILESDIR}"/gitless.patch
-	"${FILESDIR}"/pyyaml-safe-load.patch
+	"${FILESDIR}"/gitless-1.patch
 	"${FILESDIR}"/rltiles-ldflags-libs.patch
 )
 
 pkg_setup() {
+
 	if use !ncurses && use !tiles ; then
 		ewarn "Neither ncurses nor tiles frontend"
 		ewarn "selected, choosing ncurses only."