gentoo auto-resync : 14:07:2024 - 12:27:13

3 files changed, 2 insertions, 245 deletions

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}"