gentoo auto-resync : 27:08:2022 - 08:53:43

4 files changed, 226 insertions, 2 deletions

diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index c0c94e7cc738..ea9ffd00c64c 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 8f8f045c8fb0..bf645a736d42 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -16,9 +16,11 @@ DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b
 DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d
 DIST stone_soup-0.27.1.zip 96934633 BLAKE2B 8821920a4faad9474f08a34ae3c272cb9dcd3ddeb9029e033c22eb8e6650ef20bbc30e0c0ca1556d08c1b7b898fdbdd3667a3ac9a8527e0c322cd8c78ab391bb SHA512 845dafc9895ada3712903de63b95cca9eeb66160e4a04ba21193d916447fca8e7248b851f1e938f43b8d3937cf4f4437443bdc4fe2da893fe3918fed4e0b5204
 DIST stone_soup-0.28.0.zip 98876317 BLAKE2B 10f554ea004778b6a2537caa2f994c8e7b12e190ddaaf55f9fb5d2499b91ee6d15d63a9d50167528c1625058bc262c5cba8ba08235fc377e83329ba5f80158be SHA512 7316175ccf6efea376a8a9157f9c4d1786f59c544af39e5ff28a9fcd889e23ef58c2a3680df46807c84b2ce0feb347e661c929195e8affb3d3f98c24832b17e0
+DIST stone_soup-0.29.0.zip 100424389 BLAKE2B 8b8b72a01519984dad1ee7915572e65d7578e5163a9eaf3ce5d6c1a31196b369d9417fdc255a48951f2e23c732f50e934e5edab5cb2f82e7582dcf86d7712254 SHA512 a84c8bcd6d4d50a74144068462b3b4c14d3ce40e7cf857b31516617273ee4ad2330f6591c671862c9b69a6f4812ee6e8bebee1cc9117f3570b40f0d5bec4c074
 EBUILD stone-soup-0.25.1-r103.ebuild 5051 BLAKE2B 893477dcb97c3c347236cf057a3d081758bbfceae5fbdc0fb5ae2b921378eb9c1d0b8220bb77a16d8b63602ac0b30367d33e94ace5c69554a0f82e3955055a9f SHA512 8716388a2a2f3cf2232308cabab54e9cc4f226370ee6f92353fefd797ce73ae7e48d1b42c74e31a26d393024e4c9b39c5b995418266c12d83f3190011312be07
 EBUILD stone-soup-0.26.1-r2.ebuild 5264 BLAKE2B 14d01ff96467b7c7545a0e355425394ee575861202bce96cd646f7b9f648124ec9d9e3bd9f9d2d678beb43753d9fcc3a4fe726d0b6216896e688805f1af41421 SHA512 681397aaba48190bd37b84cef5c1b775d72611e1d07ff72fda5454a654c5edd134be509b268501dd1d74b644ec68905e49aa397e543442b54cde9ac60f75862d
 EBUILD stone-soup-0.27.1-r1.ebuild 5051 BLAKE2B ee032542c1e20a2b8c64e7f82b0a380020879f70b4ebaf1031b19b88b4ee9ac47b72dd2ad863c20a2089e651e794dc3eeafab7248b9efc43f9eb8959885f19f7 SHA512 398c9d87367d531c4f8a4dc92eedcc32847f7e729f2fe989c3d48e8f26112e27659f1ae573e027932b8233579e1ccac0603e1e50066f2cb4716fa6dfe140d585
 EBUILD stone-soup-0.28.0-r1.ebuild 5648 BLAKE2B 4e8c8e6fb8ab801b76e151ca346059c1405b5132b0f61808430800ac872f087e65967704e4b3275ab9096bbbb76e75267b32d1cabf36699e217db57fa4f12250 SHA512 59c228c7a7dcbd518f486c1f2e5c3806f06ecf404a7f9727bce4da5c1644eb62a9b41992d4aec38a0521ebdee38c0b4de9869830b8b57380a0915a28d3d8b61a
-EBUILD stone-soup-0.29.0_pre20220701.ebuild 5690 BLAKE2B 09e08386b49c1c0e8127f948c1a54c0755717e8801976f7b2774d181c39b37f7182ff4bcbcd7251ddcdcf256631914d281097dd82862ec4cc042406e17f31aef SHA512 34f2c3faa936b93192860ed3e19e4fcd93047a6fbd4996b171c1cd7a60a19d123cb012f0d91cbe3b84ec0da5cae6393bd20bc7f2ea2018c7e5c822365d685773
+EBUILD stone-soup-0.29.0.ebuild 5650 BLAKE2B 9bdaf6cadb0277caa0364b296973590bec2237fa7bdfbb62041632e395fe966078f3ac9d6f5927f7d5309f662decf043e25aed50f0cf86675925d3bedf9c1313 SHA512 9f596689d4c2b1427a3c611d18ce83506fccc3e13a5f6ced0f63e8b84b2ae53dd43c937613318e988a3a7f7696228bc14aa10d5aec8f5980b3b2183ef8533c4f
+EBUILD stone-soup-0.29.0_pre20220701.ebuild 5688 BLAKE2B 2a209842bc8586e195e0529bfd43118e959ad0fc5fe67f4b5e9db8e6d0f100cacc71fa236db87a5bce886e204f82e67ec02153a601ccb8e347403aba53471bee SHA512 16517c1f55c6fbb17b68a38470551d10dddc936909101896aa31dfce1e713fa2877742de58149b778f72313d4ee9814478a5ab5a51da0bb63b449eaa8e8cbdaf
 MISC metadata.xml 1684 BLAKE2B 4d3fe12186ce860f5b049b5b2cdb626f9ab095d688163739a972e0f53a7d835c191dbec0ee4868bb575648cbd3c818ed2fdec44b75730855ea5d8bc3eaf4996c SHA512 9dbe6b3c720b81887c74b0a5e81a0ba5e410d947a6560f66cbb4605c090dfa46a897f8550191e6c6ce7ec06a7460d0e3c625afe7f5ee41e32ab3b800887463cd
diff --git a/games-roguelike/stone-soup/stone-soup-0.29.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.29.0.ebuild
new file mode 100644
index 000000000000..82b2a07eb9c3
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.29.0.ebuild
@@ -0,0 +1,222 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
+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.29"
+
+# Leave empty string if not a _pre release
+COMMITSHA=""
+if [ -z "${COMMITSHA}" ]; then
+	# This is a proper release
+	SRC_URI="
+		https://github.com/crawl/crawl/releases/download/${PV}/${PN/-/_}-${PV}.zip
+		https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
+		https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg
+	"
+	MY_P="stone_soup-${PV}"
+else
+	# This is a _pre release
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
+		https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg
+	"
+	MY_P="crawl-${COMMITSHA}/crawl-ref"
+fi
+
+# 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
+	virtual/yacc
+	"
+
+PATCHES=(
+	"${FILESDIR}"/make.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=''
+		CFOTHERS="${CXXFLAGS}"
+		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.29.0_pre20220701.ebuild b/games-roguelike/stone-soup/stone-soup-0.29.0_pre20220701.ebuild
index a7d13cd0dd2c..60e009774b02 100644
--- a/games-roguelike/stone-soup/stone-soup-0.29.0_pre20220701.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.29.0_pre20220701.ebuild
@@ -37,7 +37,7 @@ fi
 # 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}"