gentoo resync : 21.06.2020

6 files changed, 193 insertions, 6 deletions

diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 07412de356db..d90d9151a236 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 70120abf6650..0aec595597d2 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,3 +1,4 @@
+AUX gitless-1.patch 639 BLAKE2B 646abd41a65b5744618161bd2a66f3fb43c06e40bd64ae78fdadf01bf5669b07f470be5eb3afc4931889d91f2f7a782036d1f10e1812bd7cfe14fe88c3ef40bf SHA512 b46fc9531c06a1f51b23c35be5f9f751f96d72a66f40a3aef3ffa89e0c9af56bc08f4aa6cad237f208aa789ee8511fec7304135fbe1e271345599f9107c52212
 AUX gitless.patch 552 BLAKE2B 5bf8976ed06979f164d543f5e0b70d072847f6d79bead84d9f90f7bfd2eb4bf95f20b4abe077889d3199c91cda50645711f28950492bfde15ec19119212e64ed SHA512 45b7da032a20b8b50725b8602f9762edb14579556cc9c53863d14358df2154a0fcf2ee7ecb718c970e60c9bac38110c74108472615eb53ea5e08620236f2bf99
 AUX pyyaml-safe-load.patch 460 BLAKE2B 39fdb2753539c7e973afcd23b86b89623c14b37d96776dcb6ceafa755457dc3427943a62f73caa1fa7a166d1579ce987069c28df4142a6c5ceda9ae5546ecc60 SHA512 d9f6404ad363ee739933d3e3ca772401d8f64d868458d795a632d72f8c0d7705fb18faaf5d25e501b9c6fbc3a98b65652c6373f9259828bac88f32e708859c74
 AUX rltiles-ldflags-libs.patch 1373 BLAKE2B 5a5a48bdb6081bb81bd66993bed3a6cfed4951ca059b2bf7069ab512e30c855eb65abc9d552da4e3c15c5156924bf14adc852dbb46248aa9840b8f63d1d33652 SHA512 955b6784f7a2ffbccefff6648de2072391d535f998516f52a7b5681e41aeedb34c47ac6cb6d649519448c23ce7007f08f0b0c36ced976dac0f111f2dae204287
@@ -5,6 +6,8 @@ DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2
 DIST stone-soup.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.23.2.tar.xz 30157732 BLAKE2B 5d264fa33abeb2254efbdef461774c987f65ef28160d43d90848b77d46a8f0e63c4e59a9cb7257257551a08c509e53758d72acbb0edf5a0e8b70e5d3ca09ea14 SHA512 61ccb0ac262a798e7c06fdb5e821c9885a690e082c33f6255358561929d6800b272106632279d27320e8ae240d903e2002f59d908d5db4841065a5cfa97bbee8
 DIST stone_soup-0.24.0.tar.xz 29746940 BLAKE2B 429fd9bb5a5bcd36d11f66ac93a96c4d378a50bb9197edcd92d9bd7d7c463ace60c5c59c4bb762fb61555e6612ecca2267b6d68b6bba8afa79861d7b8d4ea6a1 SHA512 d43d3c43551394c0730427a1adf561bc29ac679c13475292908f942aa8b6e077861245536ff3c932c7478f1ec1c72cf51c9aca8b8ce30f3a99c311c292765194
-EBUILD stone-soup-0.23.2.ebuild 3651 BLAKE2B cc9ac0829b1742a8bd42b6f7aae9701aa5311e0feda0a9d18ae2b8aeec12ea87f6b84fe4e5012d72664ae434b535fbe7dd9e8fcebad17b87a014be4cfa5e0978 SHA512 2c8e937342edfe3014a24df89d78dd40d617ef92118c99a8702670a4660100f572b387f3d8967512d094fb0cd1007a6b519e649ed255a14cd90a62cbcce0ca38
-EBUILD stone-soup-0.24.0.ebuild 3766 BLAKE2B 3c816efe81b2b58dca42f1979a09368928d4bce09204292fadccf0ec80e0bf61bfc54fbceac7653ef30f472fd45c469a36a6fee86f2acfc4e1d94e6e3813e1b0 SHA512 a092272c639da0dede65afd80e956edd783e637eda828ec40bfd67b5d8dee48a7e43297ac41367e3add95e33a10a3ebd3e71194177cc901f99b04962bf9a5233
+DIST stone_soup-0.25.0.tar.xz 30247768 BLAKE2B 1e6595ae895beb8a4eede97002d5085e710de93726034a3ab9bd4d44fc9d03fc6cc22ff8878c2e6f825ffd0b28e73bbd1d9a087fc5eae9ffd2bc36403edf5b27 SHA512 387bce2c0491bf88c267af8e37afb1037dfc98d4ba4fb4dd3fe442f3446b6bf6f23c10f32483fb7d27e90c6045033bd70fb9e88e0bbe486489bc38ab71e62529
+EBUILD stone-soup-0.23.2.ebuild 3649 BLAKE2B e82fd68687a6676400622592713ad77787db37ec07db59d1f2b7272c9797b8d5a9bc021b4301a4080da1dc5af66cbb36c09bad9db666d80724c442c4bdb9170f SHA512 d8fcec168ac91676c50016fbb0b695006d783d390214e092fcabed92950a2efef36e7e986fb45303fc562cfd5872a3613429b4c829f243a4032323c58dc03501
+EBUILD stone-soup-0.24.0.ebuild 3764 BLAKE2B 5a2440621427311954b2255e179c566a107828247cb944fb5cb934c6902a07b971b8b07fa3676d7fc59957a34b9994c3459bab1c796ba0dcade7897d7c8b5fb3 SHA512 07310e0357a64822ed907dd2450ad6c81d143d14f68f55812eea6cdad5ad585737b26d6f295ed117b5d583cd3ad8e79b682f6c42e2ee581259b666de340b24bc
+EBUILD stone-soup-0.25.0.ebuild 4299 BLAKE2B 1470101261f04f10b62a53fdcc75d4b81295980563e75474bc983deefadc5c665030a4868c02a2cc12caa7187f87b4139db545bd26506fffdd67421d54bdbb04 SHA512 ad15d79d3996bd13eab844f8f77576a8b64be081e73f5b2d9d300d80ce74f46b01749afc07083e24afe86fee42666315b9170b03cee5408bb692ff362ea7825a
 MISC metadata.xml 1656 BLAKE2B 0d1a508b4e227d63f226e3c6a356274be71f4107d690bb268960a992b69e07541f519dad89ea466bb98dfd6d86837d233d4e1cd66bac059e5122d54e1ed9bc9d SHA512 c482e96fe8d414a29ff9085c71c6c87782e9521bdfeb7118d546ff053ae551966b7cbbe50bc987276c7dfa3337f534b47228f39b83800d307592e780f44ce662
diff --git a/games-roguelike/stone-soup/files/gitless-1.patch b/games-roguelike/stone-soup/files/gitless-1.patch
new file mode 100644
index 000000000000..a7118dc13fce
--- /dev/null
+++ b/games-roguelike/stone-soup/files/gitless-1.patch
@@ -0,0 +1,13 @@
+--- /Makefile	2020-06-18 17:49:19.339016246 -0500
++++ /Makefile	2020-06-18 17:55:11.200700094 -0500
+@@ -1181,9 +1181,8 @@
+ 
+ LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
+ SRC_PKG_BASE  := stone_soup
+-SRC_VERSION   := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat util/release_ver)
++SRC_VERSION   := $(shell cat util/release_ver)
+ MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|$(SED) -r 's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
+-RECENT_TAG    := $(shell git describe --abbrev=0 --tags $(MERGE_BASE))
+ WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo win32)
+ 
+ export SRC_VERSION
diff --git a/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild b/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild
index a587c1998687..2cc1569df21b 100644
--- a/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO
@@ -23,7 +23,7 @@ SRC_URI="
 # 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="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug ncurses sound test +tiles"
 # test is broken
 # see https://crawl.develz.org/mantis/view.php?id=6121
diff --git a/games-roguelike/stone-soup/stone-soup-0.24.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.24.0.ebuild
index 54a9c6ff5a38..3a7e637f88e7 100644
--- a/games-roguelike/stone-soup/stone-soup-0.24.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO
@@ -23,7 +23,7 @@ SRC_URI="
 # 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="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug ncurses sound test +tiles"
 # test is broken
 # see https://crawl.develz.org/mantis/view.php?id=6121
diff --git a/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
new file mode 100644
index 000000000000..a617058863e4
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO
+# - attempt +test, linked bug claims to be fixed
+
+EAPI=7
+VIRTUALX_REQUIRED="manual"
+inherit desktop eutils xdg-utils toolchain-funcs
+
+MY_P="stone_soup-${PV}"
+DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
+HOMEPAGE="http://crawl.develz.org/wordpress/"
+SRC_URI="
+	https://crawl.develz.org/release/$(ver_cut 1-2)/${PN/-/_}-${PV}.tar.xz
+	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png
+	https://dev.gentoo.org/~hasufell/distfiles/${PN}.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"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ncurses sound test +tiles"
+# test is broken
+# see https://crawl.develz.org/mantis/view.php?id=6121
+RESTRICT="test"
+
+RDEPEND="
+	dev-db/sqlite:3
+	=dev-lang/lua-5.1*:0=
+	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}
+	dev-lang/perl
+	dev-python/pyyaml
+	sys-devel/flex
+	tiles? (
+		sys-libs/ncurses:0
+	)
+	virtual/pkgconfig
+	virtual/yacc
+	"
+
+S=${WORKDIR}/${MY_P}/source
+S_TEST=${WORKDIR}/${MY_P}_test/source
+PATCHES=(
+	"${FILESDIR}"/gitless-1.patch
+	"${FILESDIR}"/rltiles-ldflags-libs.patch
+)
+
+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_compile() {
+
+	# Insurance that we're not using bundled lib sources
+	rm -rf contrib || die "Couldn't delete contrib directory"
+
+	rm \
+		dat/des/arrival/._simple.des \
+		dat/des/branches/._crypt.des \
+		dat/des/branches/._lair.des \
+		dat/des/branches/._pan.des \
+		dat/des/branches/._slime.des \
+		dat/des/branches/._temple.des \
+		dat/des/builder/._layout_halls.des \
+		dat/des/builder/._shops.des \
+		dat/des/portals/._bazaar.des \
+		dat/des/portals/._gauntlet.des \
+		dat/des/portals/._ossuary.des \
+		dat/des/sprint/._menkaure.des \
+		dat/des/sprint/._red_sonja.des \
+		dat/des/sprint/._sprint_mu.des \
+		dat/des/variable/._the_grid.des \
+		|| die "Can't remove bogus Apple Macintosh files"
+
+	export HOSTCXX=$(tc-getBUILD_CXX)
+
+	# leave DATADIR at the top
+	myemakeargs=(
+		$(usex debug "FULLDEBUG=y DEBUG=y" "")
+		BUILD_LUA=
+		AR="$(tc-getAR)"
+		CFOPTIMIZE=''
+		CFOTHERS="${CXXFLAGS}"
+		CONTRIBS=
+		DATADIR="/usr/share/${PN}"
+		GCC="$(tc-getCC)"
+		GXX="$(tc-getCXX)"
+		LDFLAGS="${LDFLAGS}"
+		MAKEOPTS="${MAKEOPTS}"
+		PKGCONFIG="$(tc-getPKG_CONFIG)"
+		RANLIB="$(tc-getRANLIB)"
+		SAVEDIR="~/.crawl"
+		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 "${WORKDIR}"/crawl-ncurses || die ;}
+	fi
+
+	if use tiles ; then
+		emake clean
+		emake "${myemakeargs[@]}" "TILES=y"
+	fi
+}
+
+src_install() {
+	emake "${myemakeargs[@]}" $(usex tiles "TILES=y" "") DESTDIR="${D}" prefix_fp="" bin_prefix="${D}/usr/bin" install
+	[[ -e "${WORKDIR}"/crawl-ncurses ]] && dobin "${WORKDIR}"/crawl-ncurses
+
+	# don't relocate docs, needed at runtime
+	rm -rf "${D}/usr/share/${PN}"/docs/license
+
+	doman "${WORKDIR}/${MY_P}"/docs/crawl.6
+
+	# icons and menu for graphical build
+	if use tiles ; then
+		doicon -s 48 "${DISTDIR}"/${PN}.png
+		doicon -s scalable "${DISTDIR}"/${PN}.svg
+		make_desktop_entry crawl
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	if use tiles && use ncurses ; then
+		elog "Since you have enabled both tiles and ncurses frontends"
+		elog "the ncurses binary is called 'crawl-ncurses' and the"
+		elog "tiles binary is called 'crawl'."
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}