9 files changed, 22 insertions, 260 deletions
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 44ab00160a49..0d3e26e5b6ab 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 97def973a953..47edc86d6a42 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,4 +1,4 @@
-DIST angband-4.2.4-man.tar.gz 116832 BLAKE2B 1ae72aa88b38e4f13b6f2c1131dc53367a28d60440b03f9eb655ba5d06e1bc41e0ec9575194b7ab7892727268a11800d65175bedd73ae296f8babd3174bdf127 SHA512 92391b32cb619dae8f5274b9390593530c0138c250ddfe5642a450d35f810b0fa5c24c0e888c836975eba3981346469a43b3ba15ff36b750d4ced8bdf2377385
-DIST angband-4.2.4.tar.gz 25271611 BLAKE2B 97c19f23aff3aa1e9aedcbe33da0e9806f923c251e80dde54492d62dc5d54c58943483ea3b0da1913043deef9d3d52f89bdc3dced0870142f06c6ab6edc33615 SHA512 5b47cfa95f779aa3f1e89f02f203b8eafd2dc1376b7aab1b62e37122fb83640d1de25f39817863a74c246d7de35bb3f26868f5f5e8906e92788a6dd74a85a4c5
-EBUILD angband-4.2.4.ebuild 2221 BLAKE2B 37a083a41a26e1c7729efcab512f3c72fe75824a46b462299d2f89ea66dfce2e424bad72186fad87ccaee92e17e9440a5cc19a6f25772607e0e118dd96e90be1 SHA512 6a7f5184fed1a76e7d737c794987cb7a8a60cc405f98d2561c698a273d5039b760ebb98d323d875842656c171c4abebf8b167058792e7f586e5e0cbc5be8d6d8
-MISC metadata.xml 431 BLAKE2B 5b6bb43490c97c194a1f2bb5da7e6f215659778811ba52ba5b8351bffd14eacfeec96a48ebc029b799617d4a3216803518a2d3b4710cdac923feaf57c5a74ef8 SHA512 ef75f9e354f3f11219c64c8d35ba5a12ef30b0a4b77f4399287883990e6675e4160f58b43a3fc46822a363a8a8b63c67c06de6474a293d15c666e60dc2c90847
+DIST angband-4.2.5-man.tar.gz 120256 BLAKE2B 76846be139835d5979e777d9e02b2232f36457eff4555ceb40b8ec271804829f3b4fd83c00dff2cd7853e071296e39b617f192383cc0f1c4dd7a3d33eb3f5baf SHA512 18ab4cfa3cf2cb9273cc9e5abc7c2059382b8ca3c7934498333dd200f91ec38a9486905adcc8751274eb6e229aa78faf43c389e4abe1e471015d6964bb56c05f
+DIST angband-4.2.5.tar.gz 25801900 BLAKE2B 00bfc6a23f785ca524807cee595c71cb64dc642263092270338f1e39ff6fe00e53e27a8df7f66bd200afd949e91f2026bac0557b602e4b5825c76604b732ac4d SHA512 4bd92f583cbebe5b0159ef9af9cd1df2ddf136e226b0560408d1409ac57a84c49302983ca44b0bc25b749b8c6120c892a557d0021b015b405cc8f17143f08119
+EBUILD angband-4.2.5.ebuild 2357 BLAKE2B 6cab35187a056ae4a9d98f2ee1ff4fb56ff5489c1d1b61b8ba7276848754f048bde34cd188d850b74b8d40fdca35e1c11e8702b06be4d9f780b9de0f4e5df5ff SHA512 7df30441d905f742eba24a660d783bfd86b76af92a999a0336c8cd6c032c6e814a81fcb4dc5c0024831880142b9582f8f1ed2f105149117d12f5b4ea1531c399
+MISC metadata.xml 511 BLAKE2B 0bae1152a18813a6e9d297874e8048af438f7c897dc8b99823892160d70575939989a475d3ead66412b4fef9a81807bd3b48c4dc298337fd02f9b876d1be4e66 SHA512 d3561576c8c34848cc68e11c01d14ad5c36b0aea22f086cced2b4b86790b7dd35fb7b15c134956454d251cfe266ae73e42de438e14f79fc02abde432c002dc8a
diff --git a/games-roguelike/angband/angband-4.2.4.ebuild b/games-roguelike/angband/angband-4.2.5.ebuild
index 95c89f792a68..8e5d46e4301e 100644
--- a/games-roguelike/angband/angband-4.2.4.ebuild
+++ b/games-roguelike/angband/angband-4.2.5.ebuild
@@ -1,14 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+# Generate the man page from the source tree with:
+# sudo emerge -u dev-python/sphinx
+# DOC_HTML_THEME=classic sphinx-build -b man docs .
+
 inherit autotools desktop xdg-utils
 
-DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. Tolkien"
+DESCRIPTION="Roguelike dungeon exploration game based on the books of J.R.R. Tolkien"
 HOMEPAGE="https://rephial.org/"
 SRC_URI="https://github.com/angband/angband/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~steils/distfiles/${P}-man.tar.gz"
+	https://dev.gentoo.org/~chewi/distfiles/${P}-man.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/games-roguelike/angband/metadata.xml b/games-roguelike/angband/metadata.xml
index 29b7d95473a1..6e5d6f0e6e82 100644
--- a/games-roguelike/angband/metadata.xml
+++ b/games-roguelike/angband/metadata.xml
@@ -12,4 +12,7 @@
 	<use>
 		<flag name="sound">Enable and install sounds</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">angband/angband</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-roguelike/moria/Manifest b/games-roguelike/moria/Manifest
index 41662aaf2420..e27ce4dc2b84 100644
--- a/games-roguelike/moria/Manifest
+++ b/games-roguelike/moria/Manifest
@@ -1,5 +1,5 @@
 AUX moria-5.7.12-gentoo-paths.patch 1842 BLAKE2B bb5460110dd86feff51ab50a66cf54c6ae2b98c81af590205da9c361278396da109dc9443ee14f6697944b59b9b17f404bf904d91e84dc46ac1b9a8e7196f041 SHA512 cdd4e7161799204c9d99e7c52f69430aae0e8b96aa9622f89bdfe6288899133cd836af04ed0a5593a01539c4762e527630f2d8ffa9081deb7df991a5c3d82c7d
 AUX moria.6 2996 BLAKE2B ee20dc08b849eccf3860736b401a500f50598c340c0098d6cd820eb65ecbe13467b09ef23ab4982204b394ca8e0ef644bfbff4c8dd9df07ff15cb2b635d6af5e SHA512 54d4914f4c9bf364ef8539079d0a3cf91257309a479818e106c5ee41bbf2dab608074988d12529fd726e4cafd5c48baed4793f32a2a254593a928c5b6d1b9bd5
-DIST moria-5.7.14.tar.gz 395191 BLAKE2B dfa8481c51009fba3d692d8f5a667a85904149a7756822b435ae8fe30a8ad9c5bb901f6efb21dfe17e1155e49c080ca7b3de154bcd2a5df055a17b3a81b5b6b0 SHA512 5c99ed314a29684d2fc18a1429fb7609553a78fd053eac8d61189e0af8c72777d481910153514dfe544a8939be24ed9725fc2b31e89e5d6e26f0b1df5ad4c3e0
-EBUILD moria-5.7.14-r1.ebuild 1189 BLAKE2B eb18b46531de97572737f930aeb4c0afbc4fbadc0e21d7962b39f4fb049bba41d6be79fc29128e6064d455b64148717bc3159703a1cb4001091822267196705e SHA512 fd92f13e24e0b7ea4ec24f6798436a5eb2674fc2a2117969e76801c301b22c612332634f191f765f02007c20ffb90f00f830fbbec303363d6f0e4964d0c9b1ea
+DIST moria-5.7.15.tar.gz 400424 BLAKE2B 779eaeb50eb2c0310beb1a02ebae355dadecfa29d519f8614e602172d3969d939abf9b86e0809f813b944eb72abaecb28e730ef9259a648c1dad179a6e8e4f96 SHA512 9ef9723eb120e5180640d8aa52073df638e506e0c842dac7173643bebfd84c51ec1fe6e2b1fa84ad1dcef29dc6607639e6a19ac4fd47000c6ba241691c1c720c
+EBUILD moria-5.7.15.ebuild 1181 BLAKE2B f48cd514968046d5286a416bc92c6a4c69ad60bf8b6f2a4ea17d3fa167d4c57e7717184b538f4473981b4e29c0828d698c0733c54e19fa7793bacccac6a19e30 SHA512 bcc7e80c00593b3dc2f8208a555e39b4455bc927979a84e741dc06b64eef4227101c16d11da696960efbba9d9e782272d0d94cd90e243c9cb33fddeba6f0c4d8
 MISC metadata.xml 343 BLAKE2B 1c25d62c0eaaa8296b1bc05bd6231acdba2c0e3b52c6f76d0ede8e861461962941c9b682b56ed0b7a9a41f9062f5d9e8d7aa974d90b106ed17e668a3d6253ea2 SHA512 e059f4b3f2338d4299df7cfc4b682234bf33f20c30e28d96d4731103c9fa8ec1c7aa0d256c89eaaa55352cda2b5a654284779d3dd413d3c43457021fbc7bfcec
diff --git a/games-roguelike/moria/moria-5.7.14-r1.ebuild b/games-roguelike/moria/moria-5.7.15.ebuild
index 590754b6a2c7..9b36761da632 100644
--- a/games-roguelike/moria/moria-5.7.14-r1.ebuild
+++ b/games-roguelike/moria/moria-5.7.15.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CMAKE_IN_SOURCE_BUILD="yes"
 inherit cmake prefix
@@ -9,19 +9,17 @@ inherit cmake prefix
 DESCRIPTION="The Dungeons of Moria, a single player roguelike game, also known as Umoria"
 HOMEPAGE="https://umoria.org/"
 SRC_URI="https://github.com/dungeons-of-moria/umoria/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/umoria-${PV}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~m68k ~x86"
-IUSE=""
 
 RDEPEND="acct-group/gamestat
 	>=sys-libs/ncurses-6.0:0="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/umoria-${PV}"
-
 PATCHES=( "${FILESDIR}/${PN}-5.7.12-gentoo-paths.patch" )
 
 src_prepare() {
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 705d4e9db7aa..14ed96d06a52 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -20,7 +20,6 @@ DIST stone-soup-0.30.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone-soup-0.31.0.tar.gz 22432560 BLAKE2B f3e696915458674e3f7ce2a47d19c740c53de897ab40227efc9c127be42dcfbb4b3ee93258ea4094fb1a18aceb37c4341aac86c1174c42ab1ce300bca3281fc6 SHA512 ad354d57a39d07ad8a1a89a7fd20b33a4cd88fcbf1f2276cdefe8890c223272b7a34969a373f6b1f39cff72499c1e2773592ce368e887307908acd59ca00ca4b
 DIST stone-soup-0.31.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.31.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone-soup-0.32.0_pre20240409.tar.gz 23206591 BLAKE2B 7d5f44adc4aaa1c7f881e4fddf2bd83240c126987168c8ef2e15681f83790b6f5ff5ca840ea46091c24a2dbaf80fe456c6919a09665519d71c6430d6ac9f09ad SHA512 81992f69fb7d70c968bc82f91131a55753d4323c15a12a1fd095cb4b75b77dc9645c4b5d9eb1106227d81d31d705bdc5ecc0e2ad3a63ba6562ee3730545a6c2a
 DIST stone-soup-0.32.0_pre20240626.tar.gz 23577520 BLAKE2B 43a7d9db8037cb1f37ff821da95106d77fa46b0bf34a6b0ef02b66023e1e77a76cc906d2f34d66d6bdea4e9b3859728e2e93909f2c9e1898caab52955d218de2 SHA512 f7a3c58a9f266f354e01175fcc9e2978f4afc5d4e1fc7b5f84979e36213057f2e3bb15f600d40988135e06dc01b65540a4342b16c82edf1c3cfb41421ea92285
 DIST stone-soup-0.32.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.32.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
@@ -35,6 +34,5 @@ EBUILD stone-soup-0.28.0-r1.ebuild 6467 BLAKE2B cc8374aedcb5bcda53932d12533e2e25
 EBUILD stone-soup-0.29.1.ebuild 6419 BLAKE2B 108cd8a40ead709a8c87fbc6ada1a8d5f4079483d54907a206b78333c1dd51a8e62b10a36f346cf3730e0f19c6dfaf755b90511ca18c9c6610fc0a2ce9aa62c3 SHA512 7eb9c238fb908966b599836d189e6ef5e19c3fbc63a5759ead5696ff3d788b64d090722b1bc841e9c983e6695d7ea63c47cb86a07c5f20ef3ef7fe7708fc38b4
 EBUILD stone-soup-0.30.1.ebuild 6422 BLAKE2B 6e2ef0c1404b05c73834dfbdb0cd579b37609c3ab0563442dbd00afe0b58a1698abdddde4eca8d3840af42eb5756c7abef39b8d5886021013a7caf7b9d0e75f2 SHA512 cb95b93e760007374d2617ab42baaaacc1712cea2d4a7b3a083357711b792b355239fcb5c0149d462247fc2df0499298a7dd9f40d3b520658295a92e59ad3bb2
 EBUILD stone-soup-0.31.0.ebuild 6422 BLAKE2B a524e779c680eefcfea799957d90fab631a62a028fd7c2336b3726491e0a38892799e35c0133f84c9927507ce071771dce50efe5b2d0250e5990e53c755aab8e SHA512 f8ad0683334ff8432a28b586d8f65de3ae37ffe42159d4282ca3fe97ba3be3d2cae9ac1180cf2df7d23e13bea6c310d454a15391166343831266aa5122f1e079
-EBUILD stone-soup-0.32.0_pre20240409.ebuild 6462 BLAKE2B 56032e2cb9ef35a8f4b49a7f8b5f9c3f2372c259aa5f00aaa261b5d3ba05f49c082fba751a8d318f44fc7a33c79821c6869360da32d388ea1005f70190c3b0e2 SHA512 7fac3deaa6121eec5ba3767afca3247f39caf34b02510f3f1290f44a1167dbe542abd6898fd066816ead100a70bcbf9c38f51aeaeb173356f5834a49483027a8
-EBUILD stone-soup-0.32.0_pre20240626.ebuild 6464 BLAKE2B 01c1c247755657d080b92d8bbc7a368dbfd1e5d24170afec82697ba2817128543231021e9c6bc2831ece3a9d81ea5b3100c3bf3b96e39964b3f42cf44c0a1cdb SHA512 f4101c2d2f86d1217289e2d080a93256def3ec68d3b8618e817152c49bd0f5c4e1cd13fd446f9aa05fd131eff09f54e788c666f919b2ab627ba830d303de62ba
+EBUILD stone-soup-0.32.0_pre20240626.ebuild 6462 BLAKE2B ca6105b136dc655a4772a038513c02910d829218a7902651357a86a62e3302614d10fe05cbcec36444156a6a88e835d6d1bc6a77f41468c2b3c290fdd93f1e29 SHA512 115b8f92d599468c6c238ae70b51064b67a6cbe52c87b821b4e51407a3bb3953b9afdbf54da2dc7dea5d00492d6f36a418ac4bdc9a07cd30016c608a7833aed7
 MISC metadata.xml 1735 BLAKE2B 7c4c4777bbda596e10acf0eafac0b5682a8d3a6e81562b12ca38ad6d09c66a672933a127b9d5c853122ffcd4feb436667149f5e64732053e002b6e1044e7b1ee SHA512 a252f1ffe9b57659d9c7ee25aca3263d6dd79e95399fde3d888aa6d3fceb8f821ccf2a47fc0fa72eb5e1bab4bac4c861d436732818366d81b8cf7df6f0e659aa
diff --git a/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild b/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild
deleted file mode 100644
index 79c93c7aa401..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# There are many slots for this package because people in the community
-# like to play old versions.  Every release includes content changes
-# where species/spells/monsters are added or removed.  The public
-# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
-# versions back to 0.11.
-
-# It's not necessary for Gentoo to support these old version but it's
-# something nice that our distro can offer that others don't.  If the
-# maintenance burden becomes excessive than we can revisit that
-# position.
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 )
-LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{10,11,12,13} )
-VIRTUALX_REQUIRED="manual"
-inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
-
-DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
-HOMEPAGE="https://crawl.develz.org"
-
-# Leave empty string if not a _pre release
-COMMITSHA="0f22ef8d6127abe4e43dc0a93299003b0dfbec3f"
-if [ -z "${COMMITSHA}" ]; then
-	# This is a tagged release
-	# Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1
-	SRC_URI="
-		https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	MY_P="crawl-${PV}/crawl-ref"
-else
-	# This is a _pre release
-	SRC_URI="
-		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
-	"
-	MY_P="crawl-${COMMITSHA}/crawl-ref"
-fi
-# MY_SLOT to satisfy pkgcheck variable order checking
-MY_SLOT="0.32"
-SRC_URI="
-	${SRC_URI}
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${MY_SLOT}.png
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${MY_SLOT}.svg
-"
-
-S=${WORKDIR}/${MY_P}/source
-# 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="${MY_SLOT}"
-KEYWORDS="amd64 x86"
-IUSE="advpng debug ncurses sound test +tiles"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-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}
-	test? ( <dev-cpp/catch-3.0.0:0 )
-	tiles? (
-		sys-libs/ncurses:0
-	)
-	"
-BDEPEND="
-	app-arch/unzip
-	dev-lang/perl
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	app-alternatives/lex
-	tiles? (
-		advpng? (
-			app-arch/advancecomp
-		)
-		!advpng? (
-			media-gfx/pngcrush
-		)
-	)
-	virtual/pkgconfig
-	app-alternatives/yacc
-	"
-
-PATCHES=(
-	"${FILESDIR}"/make-v3.patch
-	"${FILESDIR}"/rltiles-make.patch
-	"${FILESDIR}"/avoid-musl-execinfo.patch
-)
-
-python_check_deps() {
-	python_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"
-
-	if use advpng; then
-		eapply "${FILESDIR}/make-advpng.patch"
-	fi
-
-	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
-		|| die "Couldn't append slot to executable name"
-
-	# File required for a _pre build
-	if ! [ -f "${S}/util/release_ver" ]; then
-		echo "${SLOT}" >"${S}/util/release_ver" || die "Couldn't write release_ver"
-	fi
-
-	# Replace bundled catch2 package with system implementation
-	# https://bugs.gentoo.org/829950
-	if use test; then
-		cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" || die "Couldn't substitute system catch2"
-	fi
-}
-
-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=''
-		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
-		# deprecated (in 5.1) luaL_openlib API (#869671)
-		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
-		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 appended, 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.32.0_pre20240626.ebuild b/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild
index 3341d6b83dad..482e21df35ca 100644
--- a/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild
@@ -54,7 +54,7 @@ S=${WORKDIR}/${MY_P}/source
 # 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="${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="advpng debug ncurses sound test +tiles"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}"