gentoo auto-resync : 13:07:2023 - 10:34:32

3 files changed, 243 insertions, 10 deletions

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index d172c83d75be..4902dca602b2 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,5 +1,5 @@
 AUX make-advpng.patch 501 BLAKE2B 06ea1fdc6f9fa9c26f39493c074213c517434e376934faff2231a5600715af9122fb7cbdc00a6c1c8b1301e5a22f11493bd72de42d94c8d802f680f0de338ae4 SHA512 28f6bfcdc14c92ce6ff041a93d156af7a0e45609a6c97af0e3ec749e86d9b33e9a2aa46f664c69173ad08c1cc0985c4121d452954b8ffe7f56558fd529f503be
-AUX make-v3.patch 3386 BLAKE2B d9956c02aed7da7eb66f0e4aa96a2821aee0f536484bb5de365135691ab469048cd903018f2c2452d035ce39e89ad4517a4d6569d35a965bd53fedcb6ddd7bc4 SHA512 fc0e27f348f1fbda3344fafd8674f1d6b0085b584973c53ef1ce3564d82e507dcf0ac3baa3f7d2547dc293a7c6d4714b4bffd6b10f25ec5a821c5b4bda0362fe
+AUX make-v3.patch 3077 BLAKE2B 7be9ca43f9e382ca3a4503a7820d865ea28835f9c3735d98fbf3b6139611aaf60d85b32015d16b715fb6d4ea0a6f4758322c4049b1d579787c07dc9197966734 SHA512 57591b1d6eb1360c338da9439a7d7974ad6586b62ac6f485e3b695d5b800aec8c3298d564d4228a9c6dde73e9b8c9ae8d48effeb4da55538c69c05a3bcbe37dc
 AUX make.patch 3190 BLAKE2B 82322638290720242d1bfbf9995dce61e2ba857716cb233297ec4e5f32ef1cf9c88730a17b8dbf78897c635660a5beea9f88da51d0dcdf10f2490609bc7e4b62 SHA512 15fc91a939997b67249638c87071a1c7e6d7b5ed2625e14ca48cc7721ca0216d6b4590da40070077b31d9380ed96626ec7c80c780b1f9a8bba74a2d4800fb1ed
 AUX rltiles-make.patch 1704 BLAKE2B b740e8b305e9071a9b024589e4ef6cb4fd088d4424e35ab164f920ec0cf06b94a46b19ac7d223d5eac3ca92bb2565efea00731a556e429056041cddb5658988a SHA512 378bea1e53477c881b93f824e45231b13c34318e34cf1413325a642d2d4f7f16c654b00584bec552238e1e2ec6e8046b67ea7cbd5aa4cb6ecf9fb6a70d600dd9
 DIST stone-soup-0.25.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
@@ -17,6 +17,9 @@ DIST stone-soup-0.30.0.tar.gz 21498124 BLAKE2B 18a615d7a882d900d3c7f6523590c7506
 DIST stone-soup-0.30.1.tar.gz 21502317 BLAKE2B 5fc39bb83c5d6b96a00d55c4bf18ee0e6051dd8513ee397dda7b2a55c730c31a4582860c2077e78fed3fda24b5e51c52ae037c603c7dec3376deb93402e2aa72 SHA512 069c9f9d8115f4865daa277a3621534839e3bd9bd5811ae2a9d1486d25abd66461b8e49f6ef4a4265b261be73c6c66c118c49b97c3f6e05087abde7064bf0d5f
 DIST stone-soup-0.30.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.30.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
+DIST stone-soup-0.31.0_pre20230712.tar.gz 21654476 BLAKE2B c58e59eee09996d109aeb2ef21334497b18b665cfef42c77857446bf8108fe0e50064a29e662eb7c513026fba4f9f1b8ebe2122d5fc317223f61037ac31bee68 SHA512 bad8ba6a4479ed34f1a5b081062db11eb73f8a6cd7637a44c8c7da7013b0a0b943ef921345f5071be245eb7a575bffaef1c04973d634b6c5092a09211126f46a
+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.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220
 DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d
 DIST stone_soup-0.27.1.zip 96934633 BLAKE2B 8821920a4faad9474f08a34ae3c272cb9dcd3ddeb9029e033c22eb8e6650ef20bbc30e0c0ca1556d08c1b7b898fdbdd3667a3ac9a8527e0c322cd8c78ab391bb SHA512 845dafc9895ada3712903de63b95cca9eeb66160e4a04ba21193d916447fca8e7248b851f1e938f43b8d3937cf4f4437443bdc4fe2da893fe3918fed4e0b5204
@@ -28,4 +31,5 @@ EBUILD stone-soup-0.28.0-r1.ebuild 6332 BLAKE2B 6e87dfd9eaf0347ea6420f8536180fe3
 EBUILD stone-soup-0.29.1.ebuild 6290 BLAKE2B 6ada0b9263c2b0c5c762b1b917d38fdc9474695e26bde2fa6b2e0f237999c17f2815e27d7074176dfe254be2bb09c28be13e04145fdbf97c09b5e6750f97f90a SHA512 86e445c5e2c0a2b09b9a2c0d7fa1c74f255026c58d1b4e0f690fcb93dc594ce87b9115c4d8b3b8c1135525f5b2986e972d4d629068f5aefe0a4b311c6954dab6
 EBUILD stone-soup-0.30.0.ebuild 6293 BLAKE2B 41e5f3f3b438d932e96044d88ffb279c1fec82eeeea11066546cd9416af9f59f2c862eb09159553876b9f5b5598f0b24020af949ca1c071a50ea8d434afa470e SHA512 1e5d440fc78c6cca09def82ba7eb33ba1831ed2059b35dabc2009b008753c45389e0ae606cbe7f5c49b2728413a465bb9f9aa1f5f0c456aba1ef8882e594d30d
 EBUILD stone-soup-0.30.1.ebuild 6295 BLAKE2B 1b1fc7e9f53afc625e70a1429ce6283e57afd0983b43a94637d4067751b932fd23d16a73d4ba29fa02e8242b8466b55110281c5896c987a105e4c5e5b8e06e85 SHA512 9a76be1479a8e6f09807be44ed265d3bee2283652628069202c3d193f593f0c00f8d90f44f0455eca97c165b92f5a20e2a506a1c1c2eddc5a3e8dd7891a40501
+EBUILD stone-soup-0.31.0_pre20230712.ebuild 6333 BLAKE2B 6bdd8b08e88d3360e4d15f3409aa70d20ceef715393c5d57fc6f002ba3d6c539a9c8e40dc5e0302ba9a81b55d6ca06f82df8b3c310e11175504f51b65fff296c SHA512 beb405c65c9575f8d12667fb07abbea2cc50ddfc4702d578a8e454d1e8713978b60ac39aa002047635fe94a96f4aeb94879b96d1fbd876a9f92f7d77d5714fbe
 MISC metadata.xml 1735 BLAKE2B 7c4c4777bbda596e10acf0eafac0b5682a8d3a6e81562b12ca38ad6d09c66a672933a127b9d5c853122ffcd4feb436667149f5e64732053e002b6e1044e7b1ee SHA512 a252f1ffe9b57659d9c7ee25aca3263d6dd79e95399fde3d888aa6d3fceb8f821ccf2a47fc0fa72eb5e1bab4bac4c861d436732818366d81b8cf7df6f0e659aa
diff --git a/games-roguelike/stone-soup/files/make-v3.patch b/games-roguelike/stone-soup/files/make-v3.patch
index 9d1235e3c604..7a1308b36bd6 100644
--- a/games-roguelike/stone-soup/files/make-v3.patch
+++ b/games-roguelike/stone-soup/files/make-v3.patch
@@ -1,14 +1,5 @@
 --- a/Makefile	2023-04-08 18:39:09.818483802 -0500
 +++ b/Makefile	2023-04-08 18:44:54.509321177 -0500
-@@ -92,7 +92,7 @@
- # processes. Not supported for MSYS2/cygwin builds, and will be overridden for
- # mac universal builds. This does not count as a change in build flags.
- ifndef GAME
--	GAME = crawl
-+	GAME = crawl-0.30
- endif
- 
- # Disable GNU Make implicit rules and variables. Leaving them enabled will slow
 @@ -206,7 +206,7 @@
  uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
  uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
diff --git a/games-roguelike/stone-soup/stone-soup-0.31.0_pre20230712.ebuild b/games-roguelike/stone-soup/stone-soup-0.31.0_pre20230712.ebuild
new file mode 100644
index 000000000000..9ea0126c9a43
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.31.0_pre20230712.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2023 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} )
+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"
+SLOT="0.31"
+
+# Leave empty string if not a _pre release
+COMMITSHA="771a54ca4b33d56804086cbf34083023ac7d748c"
+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
+SRC_URI="
+	${SRC_URI}
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.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"
+KEYWORDS="~amd64 ~x86"
+IUSE="advpng debug ncurses sound test +tiles"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+S=${WORKDIR}/${MY_P}/source
+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}]')
+	sys-devel/flex
+	tiles? (
+		advpng? (
+			app-arch/advancecomp
+		)
+		!advpng? (
+			media-gfx/pngcrush
+		)
+	)
+	virtual/pkgconfig
+	app-alternatives/yacc
+	"
+
+PATCHES=(
+	"${FILESDIR}"/make-v3.patch
+	"${FILESDIR}"/rltiles-make.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
+}