gentoo auto-resync : 11:05:2023 - 05:45:51

4 files changed, 11 insertions, 13 deletions

diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index e288aa1c35b2..7f911d9633b4 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 d4fbcdc1fc7e..dcea930468d7 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -14,7 +14,7 @@ DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone-soup-0.29.1.tar.gz 17510846 BLAKE2B 65b84797c8d8a268a3ce95de9d928e131bf6e21a1ea6ac3e72263c75f9d6288e9d95f9df6401528c06aefbda9bb642c79bf78065a65224297d33c050abf37056 SHA512 2ca49c4cd228526d47e4ad7e9556b6c26566595458423cd8e6b762298f229eb7ba273770ae1e12939ba66574a5b55e44812d06c4809d4327ed9bfd738501af04
 DIST stone-soup-0.29.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.29.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone-soup-0.30.0_pre20230129.tar.gz 20929296 BLAKE2B 4ca826d5157c3530c3d7a1f36aa10cc8fbf961a33aca06e2dcd3afc1896e12babdc8e2e33fd937397d72cded0f208422f21757d95ad70171f4938237f6d4f034 SHA512 9d27d209eaee58bf33eaf84288e3f48b72bfb701496d8c3ac98f6207ef761d23134270a837194e0f18c9a6e64774949b4668929614db1f9a7334e7abbb5db4ea
+DIST stone-soup-0.30.0.tar.gz 21062127 BLAKE2B 41a06df2e9298cc5ec6ee1e7180dc93691d6414f959f59fea6f309cec859bd2ee7432680ef1b4af795101f056332ac1ccfde05f3ed67751c81f05fce819bdf34 SHA512 bf134484e56c77ed9aeb2300d3d040b4a4c53eabb6bd7b6bb5e1396cb4c290573a4bbdad90fd0553498883e0747cc2e0cfab7505cae092d5504b4a5184765a33
 DIST stone-soup-0.30.0_pre20230408.tar.gz 21062127 BLAKE2B 41a06df2e9298cc5ec6ee1e7180dc93691d6414f959f59fea6f309cec859bd2ee7432680ef1b4af795101f056332ac1ccfde05f3ed67751c81f05fce819bdf34 SHA512 bf134484e56c77ed9aeb2300d3d040b4a4c53eabb6bd7b6bb5e1396cb4c290573a4bbdad90fd0553498883e0747cc2e0cfab7505cae092d5504b4a5184765a33
 DIST stone-soup-0.30.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.30.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
@@ -27,6 +27,6 @@ EBUILD stone-soup-0.26.1-r2.ebuild 5945 BLAKE2B 3badf2dd4f9a556a6a956aa9aac7f41b
 EBUILD stone-soup-0.27.1-r1.ebuild 5732 BLAKE2B 9ae1528fb47c13dcd52ca5d56c5208f5144acd50ca59568993fd4b6dcb748e36e37539d6ca91001329b1ce011dbf6aa40a997b4d8dcce4e4185e8aa5a0694252 SHA512 4ebd380e1ffbd803bd4011dd6fa45b8a6893b89dd50dff76dc7f2c37a80d4328d153b1f57eed65f0e607d12ec3e61cc5013de01d10716aa5dc38fdf51a49768a
 EBUILD stone-soup-0.28.0-r1.ebuild 6329 BLAKE2B 8aae9585ba9d9ec85d7617d3502618027ff2b2f01ae25d7d7660ad37606c2015f490d25644699fe043b5cd27b77b9477246a6877590670e444b83f4867cad3ac SHA512 efcfb66010b5276644f83776b3eb0d47fb2366972a2d2844ed81bfd80e0b5069ee127bfb7566b7d9dfebaddade6f61871ac2bfbae03afcb1f16963e6f4c6bd62
 EBUILD stone-soup-0.29.1.ebuild 6287 BLAKE2B 17da6360011f74cbba5f98e4e49c14f17130be92243cdc2d34396fb2d99342c0958ede8f0c003633cf85b2ced1c20555a5e13373617c85d36aa372f027df37f2 SHA512 90d1276b112f2f8a8f29ab7de60b6389c6fd7781fce33596f055f38a96be10235dcce04a621c22e50ca5671e7bb4669f1fe04c11de5e1ba402348ea0891ef65c
-EBUILD stone-soup-0.30.0_pre20230129.ebuild 6330 BLAKE2B 85786712dea821bc954f5893555f3a5d2b9e6382e5c744e573cfc4fca4250ac1a8e10fa2781af88a144316362154c7d036ff7cf7f5f64fd56dee1af822750c5b SHA512 bdad02e702d05224376ae0d2ea33adf79e8ac2715b486d4f07149bc877c90823361fafe70ef975d525f0146441f4f33175e1515cf141f78c840accdae1204d1c
-EBUILD stone-soup-0.30.0_pre20230408.ebuild 6332 BLAKE2B 11a6412b0e62d0cde6efcb60dad083605c124eb57ac23c7af20677b773d020dc00157c606774781f4bdf9cba1b2f759a090acdcfcfcfb9558d7370a05aab8f9d SHA512 8374015f8559c965e94f10d403f3937ee15e6d50ef431d90b98eb432c3da6739dcae94884fffb02e58fc8ca04e7e9cd87386a3dd23a9453cc0adcca6bd543f07
+EBUILD stone-soup-0.30.0.ebuild 6169 BLAKE2B 81e13f651098429e92fbc58214f893cd96d291cff31b2f6df141a45bae0adbf427a9fb4a14688d20e3cf1f8f72e33f5bcda2b30d3f13632928d51afc746e7f9a SHA512 97389638bbc62beafbbde90371b622fe8ab0a07fc21ce32199b3752556816f1caf71bd0f4da01d5942c5b9221c56c2d340691d9ab9d83b1b36bc273aba92df60
+EBUILD stone-soup-0.30.0_pre20230408.ebuild 6330 BLAKE2B 77929c71942e1f06b258862dbbd11b126df8c6f902c1ce1e94de6ea2ce020065d34cc3275f64bf46b91bfa50a5b0f0bca075b905a635a9295dc6b9d67461fd8d SHA512 7b42383c0c2b111932214da9fd985f00238bfafc8bf4b002ffb72619d16e8ea4e2bd91584b269b703b76d2fac9257552e7fe7bdcd2f9cf6c7e06ed5ba3902e8e
 MISC metadata.xml 1735 BLAKE2B 7c4c4777bbda596e10acf0eafac0b5682a8d3a6e81562b12ca38ad6d09c66a672933a127b9d5c853122ffcd4feb436667149f5e64732053e002b6e1044e7b1ee SHA512 a252f1ffe9b57659d9c7ee25aca3263d6dd79e95399fde3d888aa6d3fceb8f821ccf2a47fc0fa72eb5e1bab4bac4c861d436732818366d81b8cf7df6f0e659aa
diff --git a/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild b/games-roguelike/stone-soup/stone-soup-0.30.0.ebuild
index 61ab7b0bd76c..4f66438c8b87 100644
--- a/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.30.0.ebuild
@@ -24,21 +24,19 @@ DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in
 HOMEPAGE="https://crawl.develz.org"
 SLOT="0.30"
 
-# Leave empty string if not a _pre release
-COMMITSHA="c68057be0a1ad1b17d0337fd8baed0213a428039"
-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
+COMMITSHA="acf32f4bd3330cf0c882ac39c3e11ce40d587b49"
+MY_P="crawl-${COMMITSHA}/crawl-ref"
+IS_RELEASE=true
+
+if [ "${IS_RELEASE}" = true ]; then
 	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
 SRC_URI="
 	${SRC_URI}
@@ -51,7 +49,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="advpng debug ncurses sound test +tiles"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
@@ -101,7 +99,7 @@ BDEPEND="
 	"
 
 PATCHES=(
-	"${FILESDIR}"/make-v2.patch
+	"${FILESDIR}"/make-v3.patch
 	"${FILESDIR}"/rltiles-make.patch
 )
 
diff --git a/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230408.ebuild b/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230408.ebuild
index 353556d7ed6e..f9f297b0b3fb 100644
--- a/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230408.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230408.ebuild
@@ -51,7 +51,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="advpng debug ncurses sound test +tiles"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}"