gentoo resync : 29.01.2021

4 files changed, 3 insertions, 175 deletions

diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index ad6fec9070e2..39b85fbac58f 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 237f260633d9..a4fbfc7b2608 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -9,8 +9,7 @@ DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2
 DIST stone-soup.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220
 DIST stone_soup-0.26.0.zip 95554775 BLAKE2B 03389bae0471efe674b68dd6b99184d77cae50beaa1a82e26afa2b12e0cd06a3bd7b3eecaf5b11a78150cf3eb4694cd07e62f524630b9113fb49ef9cd328d265 SHA512 269b687ce75d8f6e888f1bcc811be2544cb9d82a1a48689187631aa2e6e0a7999bfc3ac7da81cdc44488db5d97bde48b4d6215ebd994f7ebaa6b89bdc2cba281
-EBUILD stone-soup-0.25.1-r1.ebuild 4100 BLAKE2B e4b77576a9e5c602744c61343504c500b9eca4093354934c348555fbf555a8ad547071e386daaa5d40f7030dfb5f0d3533be8d282d81faf59da6d95a6d26a030 SHA512 047f79befe6562b4f6bd05029e612e82e05f468cc1f5b49b9a0b2840d0bcb535b32f4e16aae78dca9c6408352ff94035404d5edc5a8efa0022fd8887468f50b2
-EBUILD stone-soup-0.25.1-r100.ebuild 4092 BLAKE2B 5a3013e65ec362f3c2d2a560c182e3d12ea0146c8b093b932cb9e4f84505e9a568f900236bdd55bd0bcb73e158d1b74d4abc8f1d523052c959b81613a12f27e5 SHA512 66cd9bcb40f3098e911fa5971f4d3bc270f69df59ea4513a006889fcd932d2052c7664a0e3273d58b3a806735e472db91966a9fa9d7e19cab88ce561bc0c269b
+EBUILD stone-soup-0.25.1-r100.ebuild 4090 BLAKE2B f99eb792d728b600d11c85a64d5b0c48c23f9de77a81ad99875354423a9883df5a60fff5e7de10e9d26e73f83a414b3b2f5fc10e4b9e109e05a7b4b591cb9fd8 SHA512 f5d7d70756b076cfca98bbc1a65602ec6407f72ad28f92a1ebd8a43dd227d87ed3a2c872a32747774285367ebd3e6d533ac262147ee28fe5461a6123f9bf0013
 EBUILD stone-soup-0.25.1-r101.ebuild 4917 BLAKE2B a3f7847ce54bedb68edf25c81ebe6cfd5350f9dbfdf2a2d688590103ba4c65c5962b92593182d58eec0d45921271ac8f8d9d24d744a0f82a3e644cd8691160ac SHA512 1cdaeb980c51cb76788fed6e91d21f8082ec4a4e0d59448de2b201030c1db7704d58b93d718c96055fb9ed141b937f924aa7a5b84e47481c9030de23ef8009ef
 EBUILD stone-soup-0.26.0.ebuild 4917 BLAKE2B b05aba60a7dd59084de5666cebc66aefb3328c9d300878630ba5995c655ca608ffd729acd256c2a3b62487c65e3d03dc60ee9e32ad36acab1fdceddf6927f093 SHA512 731223ce3de41995e57be71d5c1fef0635564678531b9e4023bf2a5a9321317e7d090bf2621dae2869d9e9a6e03aef32000d7f5c9003dee0594e92523cec9c4f
 MISC metadata.xml 1619 BLAKE2B 2977dbcb30328109cf2f2c75535175ce089c4ede9d9ce7e550ae715bb8624abffdcf2ba53cb6dc545112dbf1da10b0237a8bffa7719956763955ff81b31554f7 SHA512 711ef0ab70235f7ab3a447bc49508b3e8f53f2dd0e108b4874f6e5a916b3c373decece2d6e4a134971941261315819c31799fd318d0c7be103356ac8e5218137
diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild
deleted file mode 100644
index 0c8a1930f33d..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# 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
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-VIRTUALX_REQUIRED="manual"
-inherit desktop python-any-r1 eutils xdg-utils toolchain-funcs
-
-MY_P="stone_soup-${PV}"
-DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
-HOMEPAGE="https://crawl.develz.org"
-SRC_URI="
-	https://github.com/crawl/crawl/releases/download/${PV}/${PN/-/_}-${PV}.zip
-	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}
-	app-arch/unzip
-	dev-lang/perl
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	sys-devel/flex
-	tiles? (
-		app-arch/advancecomp
-		media-gfx/pngcrush
-		sys-libs/ncurses:0
-	)
-	virtual/pkgconfig
-	virtual/yacc
-	"
-
-S=${WORKDIR}/${MY_P}/source
-S_TEST=${WORKDIR}/${MY_P}_test/source
-PATCHES=(
-	"${FILESDIR}"/fixed-font-path.patch
-	"${FILESDIR}"/gitless-1.patch
-	"${FILESDIR}"/rltiles-ldflags-libs.patch
-)
-
-python_check_deps() {
-	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"
-}
-
-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" "")
-		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
-}
diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild
index fd7baf97c0e4..6c1832ac297d 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO
@@ -26,7 +26,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