gentoo resync : 03.11.2019

2 files changed, 35 insertions, 25 deletions

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index b1b7f87e25e2..70120abf6650 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -3,8 +3,8 @@ AUX pyyaml-safe-load.patch 460 BLAKE2B 39fdb2753539c7e973afcd23b86b89623c14b37d9
 AUX rltiles-ldflags-libs.patch 1373 BLAKE2B 5a5a48bdb6081bb81bd66993bed3a6cfed4951ca059b2bf7069ab512e30c855eb65abc9d552da4e3c15c5156924bf14adc852dbb46248aa9840b8f63d1d33652 SHA512 955b6784f7a2ffbccefff6648de2072391d535f998516f52a7b5681e41aeedb34c47ac6cb6d649519448c23ce7007f08f0b0c36ced976dac0f111f2dae204287
 DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone_soup-0.23.0.tar.xz 29899848 BLAKE2B 138f3c9fe1ad395d05d0654ea42788c6312e92839c6b92edfa538123b8b566f62d263862b05c6da64d589938c820b876e12475b0eeb16af7dd2e3f62c441eecb SHA512 6b53b5d670130aac451d09fe842e7654f61c131d126b34ed729d4542e9d2cbe2beaa6cd5f0b2bb78744ae6c643040996e39db8b0b3840c8946e442aaff54ff58
 DIST stone_soup-0.23.2.tar.xz 30157732 BLAKE2B 5d264fa33abeb2254efbdef461774c987f65ef28160d43d90848b77d46a8f0e63c4e59a9cb7257257551a08c509e53758d72acbb0edf5a0e8b70e5d3ca09ea14 SHA512 61ccb0ac262a798e7c06fdb5e821c9885a690e082c33f6255358561929d6800b272106632279d27320e8ae240d903e2002f59d908d5db4841065a5cfa97bbee8
-EBUILD stone-soup-0.23.0.ebuild 3529 BLAKE2B 61d6110b871d0ac57bf1215368fbe6874b4ca8623d709311ef20f526f0ce148211c1f73a1a0a9c2ebbbc9dd2b3651d9324d3217b524bf083fd485343ee75163f SHA512 41e34f3b5857afd720ddd527b05e24e3a3a48427624a8f9b8604bb6bed44d2dbfbad7e7edd16b62a147f7969a3cda1b1cf2e797dceacbf867c1b4919388c89dc
+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
 MISC metadata.xml 1656 BLAKE2B 0d1a508b4e227d63f226e3c6a356274be71f4107d690bb268960a992b69e07541f519dad89ea466bb98dfd6d86837d233d4e1cd66bac059e5122d54e1ed9bc9d SHA512 c482e96fe8d414a29ff9085c71c6c87782e9521bdfeb7118d546ff053ae551966b7cbbe50bc987276c7dfa3337f534b47228f39b83800d307592e780f44ce662
diff --git a/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.24.0.ebuild
index 92ce93f41ce3..54a9c6ff5a38 100644
--- a/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.24.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-## TODO
-# add sound support (no sound files)
+# TODO
+# - attempt +test, linked bug claims to be fixed
 
-EAPI=6
+EAPI=7
 VIRTUALX_REQUIRED="manual"
-inherit eutils gnome2-utils toolchain-funcs eapi7-ver
+inherit desktop eutils xdg-utils toolchain-funcs
 
 MY_P="stone_soup-${PV}"
 DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
@@ -24,14 +24,14 @@ SRC_URI="
 LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug luajit ncurses test +tiles"
+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
-	luajit? ( >=dev-lang/luajit-2.0.0 )
+	=dev-lang/lua-5.1*:0=
 	sys-libs/zlib
 	!ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
 	ncurses? ( sys-libs/ncurses:0 )
@@ -39,23 +39,31 @@ RDEPEND="
 		media-fonts/dejavu
 		media-libs/freetype:2
 		media-libs/libpng:0
-		media-libs/libsdl2[X,opengl,video]
+		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
-	virtual/pkgconfig
-	virtual/yacc
 	tiles? (
 		sys-libs/ncurses:0
-	)"
+	)
+	virtual/pkgconfig
+	virtual/yacc
+	"
 
 S=${WORKDIR}/${MY_P}/source
 S_TEST=${WORKDIR}/${MY_P}_test/source
 PATCHES=(
+	"${FILESDIR}"/gitless.patch
+	"${FILESDIR}"/pyyaml-safe-load.patch
 	"${FILESDIR}"/rltiles-ldflags-libs.patch
 )
 
@@ -65,24 +73,27 @@ pkg_setup() {
 		ewarn "selected, choosing ncurses only."
 		ewarn "Note that you can also enable both."
 	fi
-}
 
-src_prepare() {
-	default
-
-	rm -r contrib/{fonts,freetype,libpng,pcre,sdl2,sdl2-image,sdl2-mixer,sqlite,zlib} || die
+	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"
+
 	export HOSTCXX=$(tc-getBUILD_CXX)
 
 	# leave DATADIR at the top
 	myemakeargs=(
 		$(usex debug "FULLDEBUG=y DEBUG=y" "")
-		$(usex luajit "" "BUILD_LUA=yes") # luajit is not bundled
+		BUILD_LUA=
 		AR="$(tc-getAR)"
 		CFOPTIMIZE=''
 		CFOTHERS="${CXXFLAGS}"
+		CONTRIBS=
 		DATADIR="/usr/share/${PN}"
 		GCC="$(tc-getCC)"
 		GXX="$(tc-getCXX)"
@@ -91,8 +102,9 @@ src_compile() {
 		PKGCONFIG="$(tc-getPKG_CONFIG)"
 		RANLIB="$(tc-getRANLIB)"
 		SAVEDIR="~/.crawl"
+		SOUND=$(usex sound "y" "")
 		STRIP=touch
-		USE_LUAJIT=$(usex luajit "yes" "")
+		USE_LUAJIT=
 		V=1
 		prefix="/usr"
 	)
@@ -116,6 +128,8 @@ src_install() {
 	# 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
@@ -124,12 +138,8 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 
 	if use tiles && use ncurses ; then
 		elog "Since you have enabled both tiles and ncurses frontends"
@@ -139,5 +149,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }