gentoo resync : 10.02.2019

6 files changed, 11 insertions, 198 deletions

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 2da5d2a776c3..0fa48acff66f 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,10 +1,7 @@
-AUX stone-soup-0.20.1-rltiles-ldflags-libs.patch 1376 BLAKE2B 86c9408973b1f0f8684281e60f891b3597f4cfa6521e5599243628a15acb5a264f2138712e0ccb71f2ed4ece3e2d2f22f357e866e575c7fd40387c0414f4a68c SHA512 ad139978d67df1d824a772f70d331779ed56cf2cce30c4022804740afd77b6d8b22badd9d20af47b4df0a60499a914f749a3520a5ea76ae3e14795d2bf07affa
 DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone_soup-0.20.1.tar.xz 28372712 BLAKE2B c12a76afcaf1691a74f23bc2b2927ac2573cb83c602a50aab1567b9e2077c6f12f0847c8c27f17c45941660ab0fac1c28b2531c176c1fc0d4e946b84456d4e75 SHA512 420ccc3c66977da8ae15f9c0465b01a6260ad5db450efced3041455674922e714d9aaed226e1bc32fa3c22bca1ec06bd91979a9378c6ab08fbe1d2bfc3f0da4a
-DIST stone_soup-0.21.1.tar.xz 29091300 BLAKE2B 0ce29554483eb244eb74ef08c3e2a7d253037cec141e90fba0bf5f59eebb30dad0668c997eba0d6ea12a354d515fe770cc7fcf6a2afb8c968a09cb9a337bcde4 SHA512 1fa50e5b434391b6f3abad62931318f28dd2af3d3148a72c1f2ff80142f3ce9128b8fe6e5b8fbcc502a3d7e79b777bd9f345f8cca06d7e3dbe7575a42f8bd9e7
 DIST stone_soup-0.22.0.tar.xz 29263688 BLAKE2B e0a4d6953677583fafe1fce037d4d484c821b4d8782c63fa90b6b4f5db3df7b8fd4c5e843740517a7c2321f864df2a346fcd9bc69a1446c74685afc239d1fc55 SHA512 e8daa0f66a5212b116ce997b30b8f0f9ef01cef7e1213a1b6fe17c800d44fa7e318624902ce638dee79027ffaa3a4af8a10f6552de756a2045b5919d817498bd
-EBUILD stone-soup-0.20.1.ebuild 3565 BLAKE2B d5c043296b4f25253b86ae253ffaeb62618871109ababfccd556d0859a9be1e444e990c2a583abc1fd9cc311ee8a37742e5c55e0de15732be7ff11895e421799 SHA512 16f15a1543e8645a4ce6e1c61b5d465294dd44343f248256f946c45aacf0bcf2f97bdb4884356131aa32cfa194c09056a8d5adaf41e3be84ed444eea838e35d6
-EBUILD stone-soup-0.21.1.ebuild 3545 BLAKE2B 235c2657c91f27eb6f6e1fe40fd4c23fdaab854b074dc3b4750749f35ece35b2864d70533bcf8a9c6a240e5518bc278b3b2a192637b41b57be3041b1955f6681 SHA512 65464f308b336390f6ea21aa916124a3ba6bcabf0336db44694796c86aef7569c495259b543cbeaccf40f0e8bd7a03d3a9ca2f4692973e3c50db181acd99c9ec
-EBUILD stone-soup-0.22.0.ebuild 3545 BLAKE2B 235c2657c91f27eb6f6e1fe40fd4c23fdaab854b074dc3b4750749f35ece35b2864d70533bcf8a9c6a240e5518bc278b3b2a192637b41b57be3041b1955f6681 SHA512 65464f308b336390f6ea21aa916124a3ba6bcabf0336db44694796c86aef7569c495259b543cbeaccf40f0e8bd7a03d3a9ca2f4692973e3c50db181acd99c9ec
-MISC metadata.xml 1546 BLAKE2B f7af831bd9db76d5d95e88db7651c81fc2838f010daa6ff473ea55f82797fb989f2a99e640fea915da87be7255e112f9e4f5766195ad74ec807118908840690e SHA512 7531275c7d11591b8eb8ba4b490a5357bb65d12369b504639b54d3681c364ead0bce2356549028d3a02d06934a3c04ccc57204ee17702b1e7a8866e7960c768b
+DIST stone_soup-0.23.0.tar.xz 29899848 BLAKE2B 138f3c9fe1ad395d05d0654ea42788c6312e92839c6b92edfa538123b8b566f62d263862b05c6da64d589938c820b876e12475b0eeb16af7dd2e3f62c441eecb SHA512 6b53b5d670130aac451d09fe842e7654f61c131d126b34ed729d4542e9d2cbe2beaa6cd5f0b2bb78744ae6c643040996e39db8b0b3840c8946e442aaff54ff58
+EBUILD stone-soup-0.22.0.ebuild 3540 BLAKE2B 1b814527316af1be0ae6883be67155d2b8e85af626a2207da4ddda73d837d394f945bccb9da12b0bf810412b4320dae313cb506b1123caaa63747b3bf0249ebf SHA512 16d3e98a2534542b1e9f09055cfecba854546ba80fbb083abc46cc785f3df6bd0970fcfcb1451b556bc43e0bca50e94b28467286d679491ec54383bf941dd80a
+EBUILD stone-soup-0.23.0.ebuild 3542 BLAKE2B c309df2f75de5a418fe171d86c71ca9d252b348ba9dba7277c1a700cda3afa9055602740cc27263b64caf1403c9e396b5cc0a891c512ee73874f7c414c68ff97 SHA512 c721f780c2cbba456e99d06d3e3825f522cbaa4bd9f759276e20f1782456e3035383b815cf16091d790584426dd99cb6b4109d64936b5bc521bd10b15e8edf49
+MISC metadata.xml 1656 BLAKE2B 0d1a508b4e227d63f226e3c6a356274be71f4107d690bb268960a992b69e07541f519dad89ea466bb98dfd6d86837d233d4e1cd66bac059e5122d54e1ed9bc9d SHA512 c482e96fe8d414a29ff9085c71c6c87782e9521bdfeb7118d546ff053ae551966b7cbbe50bc987276c7dfa3337f534b47228f39b83800d307592e780f44ce662
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch b/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch
deleted file mode 100644
index 010c729b92eb..000000000000
--- a/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/rltiles/Makefile
-+++ b/rltiles/Makefile
-@@ -1,7 +1,7 @@
- uname_S := $(shell uname -s)
- 
- ifneq (,$(findstring MINGW,$(uname_S)))
--LDFLAGS += -lmingw32
-+LIBS += -lmingw32
- endif
- 
- # Note: since generation of tiles is done on the host, we don't care about
-@@ -29,7 +29,7 @@
-   endif
- 
-   CFLAGS += $(PNG_INCLUDE)
--  LDFLAGS += $(PNG_LIB)
-+  LIBS += $(PNG_LIB)
- 
-   CFLAGS += -DUSE_TILE
- endif
-@@ -39,13 +39,13 @@
- endif
- 
- ifneq (,$(findstring MINGW,$(uname_S)))
--LDFLAGS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid
-+LIBS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid
- endif
- ifeq ($(uname_S),Darwin)
--LDFLAGS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
-+LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
- endif
- ifeq ($(uname_S),Linux)
--LDFLAGS += -ldl -lpthread
-+LIBS += -ldl -lpthread
- endif
- 
- # Attempt to use a full compiler name, to make
-@@ -134,6 +134,6 @@
- 	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
- 
- $(TILEGEN): $(OBJECTS)
--	$(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS)
-+	$(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS)
- 
- .PHONY: all clean distclean
diff --git a/games-roguelike/stone-soup/metadata.xml b/games-roguelike/stone-soup/metadata.xml
index 68e84b34cc48..ec38a399560c 100644
--- a/games-roguelike/stone-soup/metadata.xml
+++ b/games-roguelike/stone-soup/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>stasibear@gentoo.org</email>
+		<name>Erik Mackdanz</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
diff --git a/games-roguelike/stone-soup/stone-soup-0.20.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.20.1.ebuild
deleted file mode 100644
index 3b31a1d1f7c0..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.20.1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-## TODO
-# add sound support (no sound files)
-
-EAPI=6
-VIRTUALX_REQUIRED="manual"
-inherit eutils gnome2-utils toolchain-funcs versionator
-
-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/$(get_version_component_range 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 luajit ncurses 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 )
-	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
-		media-libs/libsdl2[X,opengl,video]
-		media-libs/sdl2-image[png]
-		virtual/glu
-		virtual/opengl
-	)"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc
-	tiles? (
-		sys-libs/ncurses:0
-	)"
-
-S=${WORKDIR}/${MY_P}/source
-S_TEST=${WORKDIR}/${MY_P}_test/source
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.20.1-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
-}
-
-src_prepare() {
-	default
-
-	rm -r contrib/{fonts,freetype,libpng,pcre,sdl2,sdl2-image,sdl2-mixer,sqlite,zlib} || die
-}
-
-src_compile() {
-	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
-		AR="$(tc-getAR)"
-		CFOPTIMIZE=''
-		CFOTHERS="${CXXFLAGS}"
-		DATADIR="/usr/share/${PN}"
-		GCC="$(tc-getCC)"
-		GXX="$(tc-getCXX)"
-		LDFLAGS="${LDFLAGS}"
-		MAKEOPTS="${MAKEOPTS}"
-		PKGCONFIG="$(tc-getPKG_CONFIG)"
-		RANLIB="$(tc-getRANLIB)"
-		SAVEDIR="~/.crawl"
-		STRIP=touch
-		USE_LUAJIT=$(usex luajit "yes" "")
-		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
-
-	# 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_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_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() {
-	gnome2_icon_cache_update
-}
diff --git a/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild
index 14ea7d7dbe86..742c2c56bd9e 100644
--- a/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 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 luajit ncurses 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.21.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild
index 14ea7d7dbe86..876c7001d735 100644
--- a/games-roguelike/stone-soup/stone-soup-0.21.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ## TODO