public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2015-08-14 22:32 Julian Ospald
  0 siblings, 0 replies; 111+ messages in thread
From: Julian Ospald @ 2015-08-14 22:32 UTC (permalink / raw
  To: gentoo-commits

commit:     6518fe63f9236fc0fc1793dcf0e26fd2816e204b
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 22:30:42 2015 +0000
Commit:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 22:30:42 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6518fe63

games-roguelike/stone-soup: revbump to fix slot on dev-lang/lua

 .../{stone-soup-0.14.2.ebuild => stone-soup-0.14.2-r1.ebuild}       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.14.2.ebuild b/games-roguelike/stone-soup/stone-soup-0.14.2-r1.ebuild
similarity index 97%
rename from games-roguelike/stone-soup/stone-soup-0.14.2.ebuild
rename to games-roguelike/stone-soup/stone-soup-0.14.2-r1.ebuild
index 3046fa3..78531c9 100644
--- a/games-roguelike/stone-soup/stone-soup-0.14.2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.14.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,7 +26,7 @@ SRC_URI="mirror://sourceforge/crawl-ref/Stone%20Soup/${PV}/${MY_P}-nodeps.tar.xz
 # 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
@@ -36,7 +36,7 @@ RESTRICT="test"
 RDEPEND="
 	dev-db/sqlite:3
 	luajit? ( >=dev-lang/luajit-2.0.0 )
-	!luajit? ( >=dev-lang/lua-5.1.0[deprecated] )
+	!luajit? ( >=dev-lang/lua-5.1.0:0[deprecated] )
 	sys-libs/zlib
 	!ncurses? ( !tiles? ( sys-libs/ncurses ) )
 	ncurses? ( sys-libs/ncurses )


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2015-08-14 22:32 Julian Ospald
  0 siblings, 0 replies; 111+ messages in thread
From: Julian Ospald @ 2015-08-14 22:32 UTC (permalink / raw
  To: gentoo-commits

commit:     695ace04bc356b785579c823e567cfb5441adf94
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 22:32:33 2015 +0000
Commit:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 22:32:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=695ace04

games-roguelike/stone-soup: because repoman is stupid...

...and complains about "added with stable keywords". Yes, that was on
purpose, because you don't fix dependencies in-place.

 games-roguelike/stone-soup/stone-soup-0.14.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.14.2-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.14.2-r1.ebuild
index 78531c9..e005136 100644
--- a/games-roguelike/stone-soup/stone-soup-0.14.2-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.14.2-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="mirror://sourceforge/crawl-ref/Stone%20Soup/${PV}/${MY_P}-nodeps.tar.xz
 # 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


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2016-05-26 20:35 Michael Sterrett
  0 siblings, 0 replies; 111+ messages in thread
From: Michael Sterrett @ 2016-05-26 20:35 UTC (permalink / raw
  To: gentoo-commits

commit:     51330c1302621fcc78661062f69c7d1720904c0d
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 20:35:05 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Thu May 26 20:35:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51330c13

games-roguelike/stone-soup: add slot to sys-libs/ncurses

Package-Manager: portage-2.2.28

 games-roguelike/stone-soup/stone-soup-0.16.2.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild b/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild
index 9defe6a..9712a83 100644
--- a/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -32,8 +32,8 @@ RDEPEND="
 	dev-db/sqlite:3
 	luajit? ( >=dev-lang/luajit-2.0.0 )
 	sys-libs/zlib
-	!ncurses? ( !tiles? ( sys-libs/ncurses ) )
-	ncurses? ( sys-libs/ncurses )
+	!ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
+	ncurses? ( sys-libs/ncurses:0 )
 	tiles? (
 		media-fonts/dejavu
 		media-libs/freetype:2
@@ -49,7 +49,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	virtual/yacc
 	tiles? (
-		sys-libs/ncurses
+		sys-libs/ncurses:0
 	)"
 
 S=${WORKDIR}/${MY_P}/source


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2016-06-06 14:31 Agostino Sarubbo
  0 siblings, 0 replies; 111+ messages in thread
From: Agostino Sarubbo @ 2016-06-06 14:31 UTC (permalink / raw
  To: gentoo-commits

commit:     89455c1682900b260a4af8f0b1e2880250183645
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 14:31:25 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 14:31:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89455c16

games-roguelike/stone-soup: amd64 stable wrt bug #584282

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.16.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild b/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild
index 9712a83..759856c 100644
--- a/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://crawl.develz.org/release/stone_soup-${PV}.tar.xz
 # 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


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2017-12-01 19:31 David Seifert
  0 siblings, 0 replies; 111+ messages in thread
From: David Seifert @ 2017-12-01 19:31 UTC (permalink / raw
  To: gentoo-commits

commit:     bac7848dd84603846b48c5cf357b1161833bf4c2
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  1 18:57:45 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Dec  1 19:30:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bac7848d

games-roguelike/stone-soup: [QA] Fix DESCRIPTION.toolong

 games-roguelike/stone-soup/stone-soup-0.16.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild b/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild
index b7128188ed4..a1e92354258 100644
--- a/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="manual"
 inherit eutils gnome2-utils toolchain-funcs games
 
 MY_P="stone_soup-${PV}"
-DESCRIPTION="Dungeon Crawl Stone Soup is a role-playing roguelike game of exploration and treasure-hunting in dungeons"
+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/stone_soup-${PV}.tar.xz
 	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2018-08-03  0:04 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2018-08-03  0:04 UTC (permalink / raw
  To: gentoo-commits

commit:     466c72428cd595b9d9b35f16bdaa307c13592256
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  3 00:01:56 2018 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Fri Aug  3 00:01:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=466c7242

games-roguelike/stone-soup: Bump to 0.21.1

Closes: https://bugs.gentoo.org/659200
Package-Manager: Portage-2.3.43, Repoman-2.3.10

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup/stone-soup-0.21.1.ebuild            | 143 +++++++++++++++++++++
 2 files changed, 144 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 2df6df8fb5b..2f7f184949e 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,3 +1,4 @@
 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

diff --git a/games-roguelike/stone-soup/stone-soup-0.21.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.21.1.ebuild
new file mode 100644
index 00000000000..14ea7d7dbe8
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.21.1.ebuild
@@ -0,0 +1,143 @@
+# 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 eapi7-ver
+
+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 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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2018-08-10  3:32 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2018-08-10  3:32 UTC (permalink / raw
  To: gentoo-commits

commit:     8c185f588e6b7e89952a0fe5cb717a9cf1eb53a9
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 10 03:31:26 2018 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Fri Aug 10 03:31:26 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c185f58

games-roguelike/stone-soup: stabilize 0.20.1

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 games-roguelike/stone-soup/stone-soup-0.20.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.20.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.20.1.ebuild
index 6046f53ae7e..3b31a1d1f7c 100644
--- a/games-roguelike/stone-soup/stone-soup-0.20.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2018-08-10  3:37 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2018-08-10  3:37 UTC (permalink / raw
  To: gentoo-commits

commit:     b3b6e337cdcdf0d056c1795c9897d1a72ca2df8d
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 10 03:36:57 2018 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Fri Aug 10 03:36:57 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b6e337

games-roguelike/stone-soup: bump to 0.22.0

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup/stone-soup-0.22.0.ebuild            | 143 +++++++++++++++++++++
 2 files changed, 144 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 2f7f184949e..86ea079c416 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -2,3 +2,4 @@ DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2
 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

diff --git a/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild
new file mode 100644
index 00000000000..14ea7d7dbe8
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild
@@ -0,0 +1,143 @@
+# 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 eapi7-ver
+
+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 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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2019-02-09 22:40 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2019-02-09 22:40 UTC (permalink / raw
  To: gentoo-commits

commit:     77c1cb9782017a36006e27f5ea864353550153ca
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  9 22:39:56 2019 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Feb  9 22:39:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77c1cb97

games-roguelike/stone-soup: Stabilize 0.22.0, add maintainership

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-2.3.59, Repoman-2.3.12

 games-roguelike/stone-soup/metadata.xml             | 4 ++++
 games-roguelike/stone-soup/stone-soup-0.22.0.ebuild | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/games-roguelike/stone-soup/metadata.xml b/games-roguelike/stone-soup/metadata.xml
index 68e84b34cc4..ec38a399560 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.22.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild
index 14ea7d7dbe8..742c2c56bd9 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


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2019-02-10  0:09 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2019-02-10  0:09 UTC (permalink / raw
  To: gentoo-commits

commit:     ac4e6381cf4a5f131254926b177ab665d161997e
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  9 22:41:19 2019 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Feb 10 00:06:31 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac4e6381

games-roguelike/stone-soup: Remove old versions

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-2.3.59, Repoman-2.3.12

 games-roguelike/stone-soup/Manifest                |   2 -
 .../stone-soup/stone-soup-0.20.1.ebuild            | 143 ---------------------
 .../stone-soup/stone-soup-0.21.1.ebuild            | 143 ---------------------
 3 files changed, 288 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 86ea079c416..36ddd33178a 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,5 +1,3 @@
 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

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 3b31a1d1f7c..00000000000
--- 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.21.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.21.1.ebuild
deleted file mode 100644
index 14ea7d7dbe8..00000000000
--- a/games-roguelike/stone-soup/stone-soup-0.21.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 eapi7-ver
-
-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 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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2019-04-14  2:16 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2019-04-14  2:16 UTC (permalink / raw
  To: gentoo-commits

commit:     40ed64c18186c8a8ac63d9e92ef51914de4a3caa
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 02:16:04 2019 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 02:16:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40ed64c1

games-roguelike/stone-soup: Bump to 0.23.2, many ebuild updates

- Use system lua (unbundle)
- Add USE sound
- Remove broken USE luajit
- EAPI=7
- Fix missing pyyaml dep
- Install man page

Closes: https://bugs.gentoo.org/682312
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.12

 games-roguelike/stone-soup/Manifest                |   1 +
 games-roguelike/stone-soup/metadata.xml            |   4 +
 .../stone-soup/stone-soup-0.23.2.ebuild            | 147 +++++++++++++++++++++
 3 files changed, 152 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index ce8d9856e02..c460cc8cf0e 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -2,3 +2,4 @@ DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2
 DIST stone-soup.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.22.0.tar.xz 29263688 BLAKE2B e0a4d6953677583fafe1fce037d4d484c821b4d8782c63fa90b6b4f5db3df7b8fd4c5e843740517a7c2321f864df2a346fcd9bc69a1446c74685afc239d1fc55 SHA512 e8daa0f66a5212b116ce997b30b8f0f9ef01cef7e1213a1b6fe17c800d44fa7e318624902ce638dee79027ffaa3a4af8a10f6552de756a2045b5919d817498bd
 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

diff --git a/games-roguelike/stone-soup/metadata.xml b/games-roguelike/stone-soup/metadata.xml
index 68e84b34cc4..ec38a399560 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.23.2.ebuild b/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild
new file mode 100644
index 00000000000..9ac6df9654a
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2019 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}"/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() {
+	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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2019-04-14  2:21 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2019-04-14  2:21 UTC (permalink / raw
  To: gentoo-commits

commit:     6ca81be5af50c34eb8edd62e9a019c8f8d3dbec5
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 02:20:14 2019 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 02:21:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ca81be5

games-roguelike/stone-soup: Remove old

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.12

 games-roguelike/stone-soup/Manifest                |   1 -
 .../stone-soup/stone-soup-0.22.0.ebuild            | 143 ---------------------
 2 files changed, 144 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index c460cc8cf0e..ca086346f8d 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,5 +1,4 @@
 DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone_soup-0.22.0.tar.xz 29263688 BLAKE2B e0a4d6953677583fafe1fce037d4d484c821b4d8782c63fa90b6b4f5db3df7b8fd4c5e843740517a7c2321f864df2a346fcd9bc69a1446c74685afc239d1fc55 SHA512 e8daa0f66a5212b116ce997b30b8f0f9ef01cef7e1213a1b6fe17c800d44fa7e318624902ce638dee79027ffaa3a4af8a10f6552de756a2045b5919d817498bd
 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

diff --git a/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild
deleted file mode 100644
index 92ce93f41ce..00000000000
--- a/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 eapi7-ver
-
-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 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}"/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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2019-11-02  0:05 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2019-11-02  0:05 UTC (permalink / raw
  To: gentoo-commits

commit:     5112a5c18b976cb722a18dc9b2f969a7b89c995e
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  2 00:04:38 2019 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Nov  2 00:04:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5112a5c1

games-roguelike/stone-soup: Bump to 0.24.0

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-2.3.78, Repoman-2.3.17

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup/stone-soup-0.24.0.ebuild            | 153 +++++++++++++++++++++
 2 files changed, 154 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index ca086346f8d..38495e024f3 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -2,3 +2,4 @@ DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2
 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
+DIST stone_soup-0.24.0.tar.xz 29746940 BLAKE2B 429fd9bb5a5bcd36d11f66ac93a96c4d378a50bb9197edcd92d9bd7d7c463ace60c5c59c4bb762fb61555e6612ecca2267b6d68b6bba8afa79861d7b8d4ea6a1 SHA512 d43d3c43551394c0730427a1adf561bc29ac679c13475292908f942aa8b6e077861245536ff3c932c7478f1ec1c72cf51c9aca8b8ce30f3a99c311c292765194

diff --git a/games-roguelike/stone-soup/stone-soup-0.24.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.24.0.ebuild
new file mode 100644
index 00000000000..54a9c6ff5a3
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.24.0.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2019 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.patch
+	"${FILESDIR}"/pyyaml-safe-load.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"
+
+	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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2019-11-02  0:07 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2019-11-02  0:07 UTC (permalink / raw
  To: gentoo-commits

commit:     ee55466cb1e36bc5a8dd9eff8c86ba08f879501d
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  2 00:07:17 2019 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Nov  2 00:07:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee55466c

games-roguelike/stone-soup: Remove old

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-2.3.78, Repoman-2.3.17

 games-roguelike/stone-soup/Manifest                |   1 -
 .../stone-soup/stone-soup-0.23.0.ebuild            | 143 ---------------------
 2 files changed, 144 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 38495e024f3..a428119bdb6 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,5 +1,4 @@
 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
 DIST stone_soup-0.24.0.tar.xz 29746940 BLAKE2B 429fd9bb5a5bcd36d11f66ac93a96c4d378a50bb9197edcd92d9bd7d7c463ace60c5c59c4bb762fb61555e6612ecca2267b6d68b6bba8afa79861d7b8d4ea6a1 SHA512 d43d3c43551394c0730427a1adf561bc29ac679c13475292908f942aa8b6e077861245536ff3c932c7478f1ec1c72cf51c9aca8b8ce30f3a99c311c292765194

diff --git a/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild
deleted file mode 100644
index 92ce93f41ce..00000000000
--- a/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 eapi7-ver
-
-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 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}"/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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2020-06-19  1:19 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2020-06-19  1:19 UTC (permalink / raw
  To: gentoo-commits

commit:     c0c21d1e319b805544dd7bbecedb5288eafcce75
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 19 01:19:19 2020 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 01:19:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0c21d1e

games-roguelike/stone-soup: Stabilize 0.23.2 and 0.24.0

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-2.3.100, Repoman-2.3.22

 games-roguelike/stone-soup/stone-soup-0.23.2.ebuild | 4 ++--
 games-roguelike/stone-soup/stone-soup-0.24.0.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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 a587c199868..2cc1569df21 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 54a9c6ff5a3..3a7e637f88e 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


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2020-10-10 14:57 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2020-10-10 14:57 UTC (permalink / raw
  To: gentoo-commits

commit:     ef2975f27a2959a3c0ca9da683693a2f95b68c16
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 14:56:22 2020 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 14:56:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef2975f2

games-roguelike/stone-soup: Bump to 0.25.1

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.8, Repoman-3.0.1

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup/stone-soup-0.25.1.ebuild            | 153 +++++++++++++++++++++
 2 files changed, 154 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 26b98ec5817..d0060514d4c 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -3,3 +3,4 @@ DIST stone-soup.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3f
 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
 DIST stone_soup-0.25.0.tar.xz 30247768 BLAKE2B 1e6595ae895beb8a4eede97002d5085e710de93726034a3ab9bd4d44fc9d03fc6cc22ff8878c2e6f825ffd0b28e73bbd1d9a087fc5eae9ffd2bc36403edf5b27 SHA512 387bce2c0491bf88c267af8e37afb1037dfc98d4ba4fb4dd3fe442f3446b6bf6f23c10f32483fb7d27e90c6045033bd70fb9e88e0bbe486489bc38ab71e62529
+DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
new file mode 100644
index 00000000000..58ccb08b806
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
@@ -0,0 +1,153 @@
+# 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://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}
+	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"
+
+	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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2020-10-10 15:02 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2020-10-10 15:02 UTC (permalink / raw
  To: gentoo-commits

commit:     c9c3e269b0ad9a0f4333056b9f671a6fc389caed
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 15:01:01 2020 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 15:01:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9c3e269

games-roguelike/stone-soup: Stabilize 0.25.0

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.8, Repoman-3.0.1

 games-roguelike/stone-soup/stone-soup-0.25.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
index a617058863e..1f9ee28db56 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
@@ -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


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2020-10-10 15:03 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2020-10-10 15:03 UTC (permalink / raw
  To: gentoo-commits

commit:     304f2ade10fb6eff307e9ea52ccb9b5ad1083680
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 15:03:43 2020 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 15:03:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=304f2ade

games-roguelike/stone-soup: Remove old versions

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.8, Repoman-3.0.1

 games-roguelike/stone-soup/Manifest                |   2 -
 .../stone-soup/stone-soup-0.23.2.ebuild            | 149 --------------------
 .../stone-soup/stone-soup-0.24.0.ebuild            | 153 ---------------------
 3 files changed, 304 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index d0060514d4c..aa90c7e2f70 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,6 +1,4 @@
 DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 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
 DIST stone_soup-0.25.0.tar.xz 30247768 BLAKE2B 1e6595ae895beb8a4eede97002d5085e710de93726034a3ab9bd4d44fc9d03fc6cc22ff8878c2e6f825ffd0b28e73bbd1d9a087fc5eae9ffd2bc36403edf5b27 SHA512 387bce2c0491bf88c267af8e37afb1037dfc98d4ba4fb4dd3fe442f3446b6bf6f23c10f32483fb7d27e90c6045033bd70fb9e88e0bbe486489bc38ab71e62529
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220

diff --git a/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild b/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild
deleted file mode 100644
index 2cc1569df21..00000000000
--- a/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild
+++ /dev/null
@@ -1,149 +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
-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.patch
-	"${FILESDIR}"/pyyaml-safe-load.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() {
-	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.24.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.24.0.ebuild
deleted file mode 100644
index 3a7e637f88e..00000000000
--- a/games-roguelike/stone-soup/stone-soup-0.24.0.ebuild
+++ /dev/null
@@ -1,153 +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
-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.patch
-	"${FILESDIR}"/pyyaml-safe-load.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"
-
-	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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2020-11-14 20:56 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2020-11-14 20:56 UTC (permalink / raw
  To: gentoo-commits

commit:     83a9b99be74a50b93743b9cdd709d40832a67243
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 20:55:53 2020 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 20:55:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83a9b99b

games-roguelike/stone-soup: Implement lua-single eclass

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Closes: https://bugs.gentoo.org/752696
Package-Manager: Portage-3.0.9, Repoman-3.0.2

 .../stone-soup/stone-soup-0.25.1-r100.ebuild       | 155 +++++++++++++++++++++
 1 file changed, 155 insertions(+)

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
new file mode 100644
index 00000000000..025725f07f5
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild
@@ -0,0 +1,155 @@
+# 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
+
+LUA_COMPAT=( lua5-{1..3} )
+VIRTUALX_REQUIRED="manual"
+inherit desktop eutils lua-single 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://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="
+	${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}
+	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"
+
+	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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2020-11-15  0:39 Marek Szuba
  0 siblings, 0 replies; 111+ messages in thread
From: Marek Szuba @ 2020-11-15  0:39 UTC (permalink / raw
  To: gentoo-commits

commit:     e3fcffd86854963f4897b4300bce35e9de24c34f
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 00:35:32 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 00:35:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3fcffd8

games-roguelike/stone-soup-0.25.1-r100: 2 changes to lua-single migration

1. Must have ${LUA_REQUIRED_USE} in REQUIRED_USE so that when the
   package is emerged, emerge enforces having only 1 LUA_SINGLE_TARGET
   set;

2. There is a pkg_setup() in this ebuild so it is necessary to call
   lua-single_pkg_setup() explicitly.

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild | 3 +++
 1 file changed, 3 insertions(+)

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 025725f07f5..449552e96b5 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
@@ -31,6 +31,8 @@ IUSE="debug ncurses sound test +tiles"
 # see https://crawl.develz.org/mantis/view.php?id=6121
 RESTRICT="test"
 
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
 RDEPEND="
 	${LUA_DEPS}
 	dev-db/sqlite:3
@@ -69,6 +71,7 @@ PATCHES=(
 )
 
 pkg_setup() {
+	lua-single_pkg_setup
 
 	if use !ncurses && use !tiles ; then
 		ewarn "Neither ncurses nor tiles frontend"


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2020-11-16 16:55 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2020-11-16 16:55 UTC (permalink / raw
  To: gentoo-commits

commit:     7f4de71f7e2b01a1f6ac2ab383a16d7f4f74495b
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 16:54:44 2020 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 16:54:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f4de71f

games-roguelike/stone-soup: Add missing bdeps pngcrush+advpng

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.9, Repoman-3.0.2

 ...ne-soup-0.25.1-r100.ebuild => stone-soup-0.25.1-r1.ebuild} | 11 ++++-------
 games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild      |  4 +++-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild
similarity index 95%
copy from games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild
copy to games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild
index 449552e96b5..d6a5b273ce1 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild
@@ -5,10 +5,8 @@
 # - attempt +test, linked bug claims to be fixed
 
 EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
 VIRTUALX_REQUIRED="manual"
-inherit desktop eutils lua-single xdg-utils toolchain-funcs
+inherit desktop eutils xdg-utils toolchain-funcs
 
 MY_P="stone_soup-${PV}"
 DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
@@ -31,11 +29,9 @@ IUSE="debug ncurses sound test +tiles"
 # see https://crawl.develz.org/mantis/view.php?id=6121
 RESTRICT="test"
 
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
 RDEPEND="
-	${LUA_DEPS}
 	dev-db/sqlite:3
+	=dev-lang/lua-5.1*:0=
 	sys-libs/zlib
 	!ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
 	ncurses? ( sys-libs/ncurses:0 )
@@ -57,6 +53,8 @@ DEPEND="${RDEPEND}
 	dev-python/pyyaml
 	sys-devel/flex
 	tiles? (
+		app-arch/advancecomp
+		media-gfx/pngcrush
 		sys-libs/ncurses:0
 	)
 	virtual/pkgconfig
@@ -71,7 +69,6 @@ PATCHES=(
 )
 
 pkg_setup() {
-	lua-single_pkg_setup
 
 	if use !ncurses && use !tiles ; then
 		ewarn "Neither ncurses nor tiles frontend"

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 449552e96b5..2c2317541d2 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
@@ -6,7 +6,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} )
+LUA_COMPAT=( lua5-1 )
 VIRTUALX_REQUIRED="manual"
 inherit desktop eutils lua-single xdg-utils toolchain-funcs
 
@@ -57,6 +57,8 @@ DEPEND="${RDEPEND}
 	dev-python/pyyaml
 	sys-devel/flex
 	tiles? (
+		app-arch/advancecomp
+		media-gfx/pngcrush
 		sys-libs/ncurses:0
 	)
 	virtual/pkgconfig


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2020-11-16 17:35 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2020-11-16 17:35 UTC (permalink / raw
  To: gentoo-commits

commit:     b17c24c3ffa4c11dcae518c63567e14e9d02da2d
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 17:35:14 2020 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 17:35:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b17c24c3

games-roguelike/stone-soup: Properly specify pyyaml dep

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Closes: https://bugs.gentoo.org/693012
Package-Manager: Portage-3.0.9, Repoman-3.0.2

 games-roguelike/stone-soup/stone-soup-0.25.0.ebuild      | 10 +++++++---
 games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild   |  6 ++++--
 games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild | 12 ++++--------
 games-roguelike/stone-soup/stone-soup-0.25.1.ebuild      |  6 ++++--
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
index 1f9ee28db56..ae90a75c427 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
@@ -5,8 +5,10 @@
 # - attempt +test, linked bug claims to be fixed
 
 EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 VIRTUALX_REQUIRED="manual"
-inherit desktop eutils xdg-utils toolchain-funcs
+inherit desktop distutils-r1 eutils xdg-utils toolchain-funcs
 
 MY_P="stone_soup-${PV}"
 DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
@@ -50,10 +52,12 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}
 	dev-lang/perl
-	dev-python/pyyaml
+	dev-python/pyyaml[${PYTHON_USEDEP}]
 	sys-devel/flex
 	tiles? (
-		sys-libs/ncurses:0
+		   app-arch/advancecomp
+		   media-gfx/pngcrush
+		   sys-libs/ncurses:0
 	)
 	virtual/pkgconfig
 	virtual/yacc

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
index d6a5b273ce1..5c81a6b83ce 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild
@@ -5,8 +5,10 @@
 # - attempt +test, linked bug claims to be fixed
 
 EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 VIRTUALX_REQUIRED="manual"
-inherit desktop eutils xdg-utils toolchain-funcs
+inherit desktop distutils-r1 eutils xdg-utils toolchain-funcs
 
 MY_P="stone_soup-${PV}"
 DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
@@ -50,7 +52,7 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}
 	dev-lang/perl
-	dev-python/pyyaml
+	dev-python/pyyaml[${PYTHON_USEDEP}]
 	sys-devel/flex
 	tiles? (
 		app-arch/advancecomp

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 2c2317541d2..50ad1d62d18 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
@@ -6,9 +6,10 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-1 )
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 VIRTUALX_REQUIRED="manual"
-inherit desktop eutils lua-single xdg-utils toolchain-funcs
+inherit desktop distutils-r1 eutils lua-single xdg-utils toolchain-funcs
 
 MY_P="stone_soup-${PV}"
 DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
@@ -31,8 +32,6 @@ IUSE="debug ncurses sound test +tiles"
 # see https://crawl.develz.org/mantis/view.php?id=6121
 RESTRICT="test"
 
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
 RDEPEND="
 	${LUA_DEPS}
 	dev-db/sqlite:3
@@ -54,11 +53,9 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}
 	dev-lang/perl
-	dev-python/pyyaml
+	dev-python/pyyaml[${PYTHON_USEDEP}]
 	sys-devel/flex
 	tiles? (
-		app-arch/advancecomp
-		media-gfx/pngcrush
 		sys-libs/ncurses:0
 	)
 	virtual/pkgconfig
@@ -73,7 +70,6 @@ PATCHES=(
 )
 
 pkg_setup() {
-	lua-single_pkg_setup
 
 	if use !ncurses && use !tiles ; then
 		ewarn "Neither ncurses nor tiles frontend"

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
index 58ccb08b806..912373c3348 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
@@ -5,8 +5,10 @@
 # - attempt +test, linked bug claims to be fixed
 
 EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 VIRTUALX_REQUIRED="manual"
-inherit desktop eutils xdg-utils toolchain-funcs
+inherit desktop distutils-r1 eutils xdg-utils toolchain-funcs
 
 MY_P="stone_soup-${PV}"
 DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
@@ -50,7 +52,7 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}
 	dev-lang/perl
-	dev-python/pyyaml
+	dev-python/pyyaml[${PYTHON_USEDEP}]
 	sys-devel/flex
 	tiles? (
 		sys-libs/ncurses:0


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2020-11-16 21:24 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2020-11-16 21:24 UTC (permalink / raw
  To: gentoo-commits

commit:     3e46cefd20867824685ddedd52bc9cb63e0c1b53
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 21:24:35 2020 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 21:24:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e46cefd

games-roguelike/stone-soup: misc CI fixes

Use HTTPS for homepage, add unzip bdep

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Closes: https://bugs.gentoo.org/754705
Package-Manager: Portage-3.0.9, Repoman-3.0.2

 games-roguelike/stone-soup/metadata.xml                  | 4 ++--
 games-roguelike/stone-soup/stone-soup-0.25.0.ebuild      | 2 +-
 games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild   | 3 ++-
 games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild | 3 ++-
 games-roguelike/stone-soup/stone-soup-0.25.1.ebuild      | 3 ++-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/games-roguelike/stone-soup/metadata.xml b/games-roguelike/stone-soup/metadata.xml
index ec38a399560..b7229c4a743 100644
--- a/games-roguelike/stone-soup/metadata.xml
+++ b/games-roguelike/stone-soup/metadata.xml
@@ -10,8 +10,8 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
-		<doc lang="en">http://crawl.develz.org/wordpress/documentation</doc>
-		<bugs-to>https://crawl.develz.org/mantis/main_page.php</bugs-to>
+		<doc lang="en">https://crawl.develz.org</doc>
+		<bugs-to>https://crawl.develz.org/mantis</bugs-to>
 		<remote-id type="sourceforge">crawl-ref</remote-id>
 	</upstream>
 	<use>

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
index ae90a75c427..a26fe45f42c 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
@@ -12,7 +12,7 @@ inherit desktop distutils-r1 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/"
+HOMEPAGE="https://crawl.develz.org"
 SRC_URI="
 	https://crawl.develz.org/release/$(ver_cut 1-2)/${PN/-/_}-${PV}.tar.xz
 	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png

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
index 5c81a6b83ce..d4d2ba19807 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild
@@ -12,7 +12,7 @@ inherit desktop distutils-r1 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/"
+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
@@ -51,6 +51,7 @@ RDEPEND="
 		virtual/opengl
 	)"
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	dev-lang/perl
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	sys-devel/flex

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 50ad1d62d18..984eb6860bc 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
@@ -13,7 +13,7 @@ inherit desktop distutils-r1 eutils lua-single 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/"
+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
@@ -52,6 +52,7 @@ RDEPEND="
 		virtual/opengl
 	)"
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	dev-lang/perl
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	sys-devel/flex

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
index 912373c3348..f478d555a48 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
@@ -12,7 +12,7 @@ inherit desktop distutils-r1 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/"
+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
@@ -51,6 +51,7 @@ RDEPEND="
 		virtual/opengl
 	)"
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	dev-lang/perl
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	sys-devel/flex


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2020-12-12  4:56 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2020-12-12  4:56 UTC (permalink / raw
  To: gentoo-commits

commit:     7ef595770692be0d1d14d48bcf68b8c662fdc013
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 12 04:54:49 2020 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Dec 12 04:55:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ef59577

games-roguelike/stone-soup: Correctly use python eclasses for bdeps

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.12, Repoman-3.0.2

 games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild | 16 ++++++++++++++--
 games-roguelike/stone-soup/stone-soup-0.25.1.ebuild      | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

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 984eb6860bc..58a9e530e1a 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
@@ -9,7 +9,7 @@ EAPI=7
 LUA_COMPAT=( lua5-{1..3} )
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 VIRTUALX_REQUIRED="manual"
-inherit desktop distutils-r1 eutils lua-single xdg-utils toolchain-funcs
+inherit desktop python-any-r1 eutils lua-single xdg-utils toolchain-funcs
 
 MY_P="stone_soup-${PV}"
 DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
@@ -54,7 +54,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-lang/perl
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
 	sys-devel/flex
 	tiles? (
 		sys-libs/ncurses:0
@@ -70,8 +71,14 @@ PATCHES=(
 	"${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."
@@ -83,6 +90,11 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	default
+	python_fix_shebang "${S}/util/species-gen.py"
+}
+
 src_compile() {
 
 	# Insurance that we're not using bundled lib sources

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
index f478d555a48..69379b34c52 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
@@ -8,7 +8,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 VIRTUALX_REQUIRED="manual"
-inherit desktop distutils-r1 eutils xdg-utils toolchain-funcs
+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"
@@ -53,7 +53,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-lang/perl
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
 	sys-devel/flex
 	tiles? (
 		sys-libs/ncurses:0
@@ -69,8 +70,14 @@ PATCHES=(
 	"${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."
@@ -82,6 +89,11 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	default
+	python_fix_shebang "${S}/util/species-gen.py"
+}
+
 src_compile() {
 
 	# Insurance that we're not using bundled lib sources


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2020-12-12 13:51 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2020-12-12 13:51 UTC (permalink / raw
  To: gentoo-commits

commit:     7542a3cf9697be8b69c850961d644e6d52954dae
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 12 13:51:11 2020 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Dec 12 13:51:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7542a3cf

games-roguelike/stone-soup: Correctly use python eclasses for bdeps

Had omitted this version in previous fix.

Closes: https://bugs.gentoo.org/759583
Closes: https://bugs.gentoo.org/693012
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.12, Repoman-3.0.2

 .../stone-soup/stone-soup-0.25.1-r1.ebuild           | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

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
index d4d2ba19807..8a4d1201dc1 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild
@@ -8,7 +8,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 VIRTUALX_REQUIRED="manual"
-inherit desktop distutils-r1 eutils xdg-utils toolchain-funcs
+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"
@@ -42,8 +42,8 @@ RDEPEND="
 		media-libs/freetype:2
 		media-libs/libpng:0
 		sound? (
-			   media-libs/libsdl2[X,opengl,sound,video]
-			   media-libs/sdl2-mixer
+			media-libs/libsdl2[X,opengl,sound,video]
+			media-libs/sdl2-mixer
 		)
 		!sound? ( media-libs/libsdl2[X,opengl,video] )
 		media-libs/sdl2-image[png]
@@ -53,7 +53,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-lang/perl
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
 	sys-devel/flex
 	tiles? (
 		app-arch/advancecomp
@@ -71,8 +72,14 @@ PATCHES=(
 	"${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."
@@ -84,6 +91,11 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	default
+	python_fix_shebang "${S}/util/species-gen.py"
+}
+
 src_compile() {
 
 	# Insurance that we're not using bundled lib sources


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2020-12-12 14:05 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2020-12-12 14:05 UTC (permalink / raw
  To: gentoo-commits

commit:     c1e4b2f507ce1097aab13dceb99efd0cc1b3a4b8
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 12 14:04:03 2020 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Dec 12 14:05:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1e4b2f5

games-roguelike/stone-soup: Stabilize 0.25.1-r1

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.12, Repoman-3.0.2

 games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 64d7340db24..0c8a1930f33 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild
@@ -25,7 +25,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


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2020-12-12 14:07 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2020-12-12 14:07 UTC (permalink / raw
  To: gentoo-commits

commit:     dad9d43f6b491448b59e914ad266b63d7f20c091
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 12 14:07:48 2020 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Dec 12 14:07:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dad9d43f

games-roguelike/stone-soup: Remove old

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.12, Repoman-3.0.2

 games-roguelike/stone-soup/Manifest                |   1 -
 .../stone-soup/stone-soup-0.25.0.ebuild            | 176 ---------------------
 .../stone-soup/stone-soup-0.25.1.ebuild            | 169 --------------------
 3 files changed, 346 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index aa90c7e2f70..2afbffc332e 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,4 +1,3 @@
 DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone_soup-0.25.0.tar.xz 30247768 BLAKE2B 1e6595ae895beb8a4eede97002d5085e710de93726034a3ab9bd4d44fc9d03fc6cc22ff8878c2e6f825ffd0b28e73bbd1d9a087fc5eae9ffd2bc36403edf5b27 SHA512 387bce2c0491bf88c267af8e37afb1037dfc98d4ba4fb4dd3fe442f3446b6bf6f23c10f32483fb7d27e90c6045033bd70fb9e88e0bbe486489bc38ab71e62529
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
deleted file mode 100644
index 48a422a661c..00000000000
--- a/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
+++ /dev/null
@@ -1,176 +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 distutils-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://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[${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
-)
-
-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
-}

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
deleted file mode 100644
index 254ea797341..00000000000
--- a/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
+++ /dev/null
@@ -1,169 +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? (
-		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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-01-10 23:12 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-01-10 23:12 UTC (permalink / raw
  To: gentoo-commits

commit:     3b80de6ee58f529844712762496055e98609dfbd
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 10 22:35:52 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 23:11:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b80de6e

games-roguelike/stone-soup: Implement slotting for major releases

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.12, Repoman-3.0.2

 games-roguelike/stone-soup/Manifest                |   2 +
 .../stone-soup/stone-soup-0.25.1-r101.ebuild       | 184 +++++++++++++++++++++
 2 files changed, 186 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 2afbffc332e..cd8a61e8ec3 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,3 +1,5 @@
+DIST stone-soup-0.25.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
+DIST stone-soup-0.25.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r101.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r101.ebuild
new file mode 100644
index 00000000000..c843b3c00e0
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r101.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO
+# - attempt +test, linked bug claims to be fixed
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+VIRTUALX_REQUIRED="manual"
+inherit desktop python-any-r1 eutils lua-single 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"
+SLOT="0.25"
+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
+"
+
+# 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="debug ncurses sound test +tiles"
+# test is broken
+# see https://crawl.develz.org/mantis/view.php?id=6121
+RESTRICT="test"
+
+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}
+	app-arch/unzip
+	dev-lang/perl
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	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}"/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"
+
+	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
+		|| die "Couldn't append slot to executable name"
+}
+
+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}-${SLOT}"
+		GCC="$(tc-getCC)"
+		GXX="$(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 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-${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 "Since version 0.25.1-r101, crawl is a slotted install"
+	elog "that supports having multiple versions installed.  The"
+	elog "binary has the slot appened, e.g. 'crawl-"${SLOT}"'."
+	elog
+	elog "The local save directory also has the slot appended."
+	elog "If you have saved games from 0.25 but before 0.25.1-r101"
+	elog "you can 'mv ~/.crawl ~/.crawl-0.25' to fix it"
+
+	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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-01-10 23:16 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-01-10 23:16 UTC (permalink / raw
  To: gentoo-commits

commit:     8a8cfc611e1ad99ade3214d6f049d697c29f6332
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 10 23:15:48 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 23:15:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a8cfc61

games-roguelike/stone-soup: Add 0.26.0 in new slot

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.12, Repoman-3.0.2

 games-roguelike/stone-soup/Manifest                |   3 +
 .../stone-soup/stone-soup-0.26.0.ebuild            | 184 +++++++++++++++++++++
 2 files changed, 187 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index cd8a61e8ec3..7c05efbbac2 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,5 +1,8 @@
 DIST stone-soup-0.25.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.25.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
+DIST stone-soup-0.26.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
+DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 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

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.0.ebuild
new file mode 100644
index 00000000000..323ca22ba71
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.26.0.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO
+# - attempt +test, linked bug claims to be fixed
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+VIRTUALX_REQUIRED="manual"
+inherit desktop python-any-r1 eutils lua-single 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"
+SLOT="0.26"
+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
+"
+
+# 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="debug ncurses sound test +tiles"
+# test is broken
+# see https://crawl.develz.org/mantis/view.php?id=6121
+RESTRICT="test"
+
+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}
+	app-arch/unzip
+	dev-lang/perl
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	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}"/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"
+
+	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
+		|| die "Couldn't append slot to executable name"
+}
+
+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}-${SLOT}"
+		GCC="$(tc-getCC)"
+		GXX="$(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 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-${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 "Since version 0.25.1-r101, crawl is a slotted install"
+	elog "that supports having multiple versions installed.  The"
+	elog "binary has the slot appened, e.g. 'crawl-"${SLOT}"'."
+	elog
+	elog "The local save directory also has the slot appended."
+	elog "If you have saved games from 0.25 but before 0.25.1-r101"
+	elog "you can 'mv ~/.crawl ~/.crawl-0.25' to fix it"
+
+	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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-01-23 20:12 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-01-23 20:12 UTC (permalink / raw
  To: gentoo-commits

commit:     073312720b5ea3d16c49a0d50525885bc253748f
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 20:11:51 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 20:11:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07331272

games-roguelike/stone-soup: stabilize 0.25.1-r100

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.12, Repoman-3.0.2

 games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 fd7baf97c0e..6c1832ac297 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


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-01-23 20:13 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-01-23 20:13 UTC (permalink / raw
  To: gentoo-commits

commit:     5e1cd675290b5987631bfd1e2d28e418fcf0fc0f
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 20:13:27 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 20:13:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e1cd675

games-roguelike/stone-soup: remove old

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.12, Repoman-3.0.2

 .../stone-soup/stone-soup-0.25.1-r1.ebuild         | 171 ---------------------
 1 file changed, 171 deletions(-)

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 0c8a1930f33..00000000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-02-07  4:37 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-02-07  4:37 UTC (permalink / raw
  To: gentoo-commits

commit:     86324186f7bb334aeb86b68535a9951ddd75f5e4
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  7 04:36:56 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Feb  7 04:36:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86324186

games-roguelike/stone-soup: Bump to 0.26.1

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.14, Repoman-3.0.2

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup/stone-soup-0.26.1.ebuild            | 184 +++++++++++++++++++++
 2 files changed, 185 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 7c05efbbac2..5e9c7c9f98e 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -6,3 +6,4 @@ 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
+DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1.ebuild
new file mode 100644
index 00000000000..87030f3939c
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO
+# - attempt +test, linked bug claims to be fixed
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{7,8,9} )
+VIRTUALX_REQUIRED="manual"
+inherit desktop python-any-r1 eutils lua-single 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"
+SLOT="0.26"
+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
+"
+
+# 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="debug ncurses sound test +tiles"
+# test is broken
+# see https://crawl.develz.org/mantis/view.php?id=6121
+RESTRICT="test"
+
+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}
+	app-arch/unzip
+	dev-lang/perl
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	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}"/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"
+
+	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
+		|| die "Couldn't append slot to executable name"
+}
+
+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}-${SLOT}"
+		GCC="$(tc-getCC)"
+		GXX="$(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 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-${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 "Since version 0.25.1-r101, crawl is a slotted install"
+	elog "that supports having multiple versions installed.  The"
+	elog "binary has the slot appened, e.g. 'crawl-"${SLOT}"'."
+	elog
+	elog "The local save directory also has the slot appended."
+	elog "If you have saved games from 0.25 but before 0.25.1-r101"
+	elog "you can 'mv ~/.crawl ~/.crawl-0.25' to fix it"
+
+	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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-03-06 15:41 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-03-06 15:41 UTC (permalink / raw
  To: gentoo-commits

commit:     3a18643eb250694f2c08ea3cae2575950337627d
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  6 15:41:13 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Mar  6 15:41:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a18643e

games-roguelike/stone-soup: Remove old

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.16, Repoman-3.0.2

 games-roguelike/stone-soup/Manifest                |   2 -
 .../stone-soup/stone-soup-0.25.1-r100.ebuild       | 170 ---------------------
 2 files changed, 172 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 5e9c7c9f98e..0b709c69217 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -2,8 +2,6 @@ DIST stone-soup-0.25.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b6
 DIST stone-soup-0.25.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.26.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
-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
 DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d

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
deleted file mode 100644
index d77c9704431..00000000000
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO
-# - attempt +test, linked bug claims to be fixed
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9} )
-VIRTUALX_REQUIRED="manual"
-inherit desktop python-any-r1 eutils lua-single 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="
-	${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}
-	app-arch/unzip
-	dev-lang/perl
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	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}"/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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-03-06 15:41 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-03-06 15:41 UTC (permalink / raw
  To: gentoo-commits

commit:     30e9806ee5f6d845151e7b18e85adb77dd702307
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  6 15:39:04 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Mar  6 15:39:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30e9806e

games-roguelike/stone-soup: stabilizations in 0.25 and 0.26 slots

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.16, Repoman-3.0.2

 games-roguelike/stone-soup/stone-soup-0.25.1-r101.ebuild | 2 +-
 games-roguelike/stone-soup/stone-soup-0.26.0.ebuild      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r101.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r101.ebuild
index 53fd2d82601..2b1eac8003b 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r101.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r101.ebuild
@@ -26,7 +26,7 @@ SRC_URI="
 # 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="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.26.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.0.ebuild
index 87030f3939c..160cc20606b 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.0.ebuild
@@ -26,7 +26,7 @@ SRC_URI="
 # 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="debug ncurses sound test +tiles"
 # test is broken
 # see https://crawl.develz.org/mantis/view.php?id=6121


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-04-27 19:38 Sam James
  0 siblings, 0 replies; 111+ messages in thread
From: Sam James @ 2021-04-27 19:38 UTC (permalink / raw
  To: gentoo-commits

commit:     a3d6092d60c674d679258a0613bbe75bfee7a3e5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 27 19:37:00 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 27 19:37:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3d6092d

games-roguelike/stone-soup: Stabilize 0.26.1 amd64, #783558

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.26.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1.ebuild
index eb6604e8411..da43734cbb8 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="
 # 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="debug ncurses sound test +tiles"
 # test is broken
 # see https://crawl.develz.org/mantis/view.php?id=6121


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-04-28 17:00 Sam James
  0 siblings, 0 replies; 111+ messages in thread
From: Sam James @ 2021-04-28 17:00 UTC (permalink / raw
  To: gentoo-commits

commit:     5d07d06e5a62bcc13d22a6af12d8d0c9f1f6f5d7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 28 02:43:05 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 28 02:46:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d07d06e

games-roguelike/stone-soup: Stabilize 0.26.1 x86, #783558

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.26.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1.ebuild
index da43734cbb8..cc9cc94cf89 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="
 # 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="debug ncurses sound test +tiles"
 # test is broken
 # see https://crawl.develz.org/mantis/view.php?id=6121


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-08-01 17:47 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-08-01 17:47 UTC (permalink / raw
  To: gentoo-commits

commit:     4a1c0bf36412ba050ea0a51341f16c8bc2434b82
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  1 17:47:43 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Aug  1 17:47:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a1c0bf3

games-roguelike/stone-soup: remove old

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.20, Repoman-3.0.3

 games-roguelike/stone-soup/Manifest                |   1 -
 .../stone-soup/stone-soup-0.26.0.ebuild            | 184 ---------------------
 2 files changed, 185 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 0b709c69217..2e1ed3d0615 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -3,5 +3,4 @@ DIST stone-soup-0.25.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone-soup-0.26.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.26.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
 DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.0.ebuild
deleted file mode 100644
index cc9cc94cf89..00000000000
--- a/games-roguelike/stone-soup/stone-soup-0.26.0.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO
-# - attempt +test, linked bug claims to be fixed
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9} )
-VIRTUALX_REQUIRED="manual"
-inherit desktop python-any-r1 lua-single 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"
-SLOT="0.26"
-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
-"
-
-# 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="debug ncurses sound test +tiles"
-# test is broken
-# see https://crawl.develz.org/mantis/view.php?id=6121
-RESTRICT="test"
-
-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}
-	app-arch/unzip
-	dev-lang/perl
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	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}"/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"
-
-	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
-		|| die "Couldn't append slot to executable name"
-}
-
-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}-${SLOT}"
-		GCC="$(tc-getCC)"
-		GXX="$(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 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-${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 "Since version 0.25.1-r101, crawl is a slotted install"
-	elog "that supports having multiple versions installed.  The"
-	elog "binary has the slot appened, e.g. 'crawl-"${SLOT}"'."
-	elog
-	elog "The local save directory also has the slot appended."
-	elog "If you have saved games from 0.25 but before 0.25.1-r101"
-	elog "you can 'mv ~/.crawl ~/.crawl-0.25' to fix it"
-
-	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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-08-01 18:46 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-08-01 18:46 UTC (permalink / raw
  To: gentoo-commits

commit:     1c88c7dae819db4ee9d62fa55d12e2d6e64d1328
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  1 18:46:08 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Aug  1 18:46:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c88c7da

games-roguelike/stone-soup: add 0.27.0

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.20, Repoman-3.0.3

 games-roguelike/stone-soup/Manifest                |   3 +
 .../stone-soup/stone-soup-0.27.0.ebuild            | 184 +++++++++++++++++++++
 2 files changed, 187 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 2e1ed3d0615..f57da772b84 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -2,5 +2,8 @@ DIST stone-soup-0.25.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b6
 DIST stone-soup-0.25.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.26.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
+DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
+DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220
 DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d
+DIST stone_soup-0.27.0.zip 96917949 BLAKE2B 1da7d54e4f3ec98514630eeb8c69c7dca02f96cdfe16974856406da0a057011f17a388669ec29844f3657cd4c7c4ef977f522578cbe0dec02ce497063c25ac83 SHA512 e3f79ce8837056c0a34847857b058e055ed23cc0987ab1d862b60739b8b7ec1e955746fa49c339f449603ce9d0707e64e564592b0798310c7c6bdc1a9edc3e70

diff --git a/games-roguelike/stone-soup/stone-soup-0.27.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.0.ebuild
new file mode 100644
index 00000000000..2d3e1336eab
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.27.0.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO
+# - attempt +test, linked bug claims to be fixed
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{7,8,9} )
+VIRTUALX_REQUIRED="manual"
+inherit desktop python-any-r1 lua-single 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"
+SLOT="0.27"
+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
+"
+
+# 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="debug ncurses sound test +tiles"
+# test is broken
+# see https://crawl.develz.org/mantis/view.php?id=6121
+RESTRICT="test"
+
+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}
+	app-arch/unzip
+	dev-lang/perl
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	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}"/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"
+
+	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
+		|| die "Couldn't append slot to executable name"
+}
+
+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}-${SLOT}"
+		GCC="$(tc-getCC)"
+		GXX="$(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 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-${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 "Since version 0.25.1-r101, crawl is a slotted install"
+	elog "that supports having multiple versions installed.  The"
+	elog "binary has the slot appened, e.g. 'crawl-"${SLOT}"'."
+	elog
+	elog "The local save directory also has the slot appended."
+	elog "If you have saved games from 0.25 but before 0.25.1-r101"
+	elog "you can 'mv ~/.crawl ~/.crawl-0.25' to fix it"
+
+	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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-08-26  4:13 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-08-26  4:13 UTC (permalink / raw
  To: gentoo-commits

commit:     d84c680a601bc8115a2e9270372dcbe5bb9ca6bc
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 26 04:13:44 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Thu Aug 26 04:13:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d84c680a

games-roguelike/stone-soup: Bump to 0.27.1

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.22, Repoman-3.0.3

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup/stone-soup-0.27.1.ebuild            | 182 +++++++++++++++++++++
 2 files changed, 183 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index f57da772b84..f229acc14dc 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -7,3 +7,4 @@ DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220
 DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d
 DIST stone_soup-0.27.0.zip 96917949 BLAKE2B 1da7d54e4f3ec98514630eeb8c69c7dca02f96cdfe16974856406da0a057011f17a388669ec29844f3657cd4c7c4ef977f522578cbe0dec02ce497063c25ac83 SHA512 e3f79ce8837056c0a34847857b058e055ed23cc0987ab1d862b60739b8b7ec1e955746fa49c339f449603ce9d0707e64e564592b0798310c7c6bdc1a9edc3e70
+DIST stone_soup-0.27.1.zip 96934633 BLAKE2B 8821920a4faad9474f08a34ae3c272cb9dcd3ddeb9029e033c22eb8e6650ef20bbc30e0c0ca1556d08c1b7b898fdbdd3667a3ac9a8527e0c322cd8c78ab391bb SHA512 845dafc9895ada3712903de63b95cca9eeb66160e4a04ba21193d916447fca8e7248b851f1e938f43b8d3937cf4f4437443bdc4fe2da893fe3918fed4e0b5204

diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
new file mode 100644
index 00000000000..5a1ef523138
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+VIRTUALX_REQUIRED="manual"
+inherit desktop python-any-r1 lua-single 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"
+SLOT="0.27"
+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
+"
+
+# 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="debug ncurses sound +tiles"
+
+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}
+	app-arch/unzip
+	dev-lang/perl
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	sys-devel/flex
+	tiles? (
+		media-gfx/pngcrush
+		sys-libs/ncurses:0
+	)
+	virtual/pkgconfig
+	virtual/yacc
+	"
+
+S=${WORKDIR}/${MY_P}/source
+PATCHES=(
+	"${FILESDIR}"/make.patch
+	"${FILESDIR}"/rltiles-make.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"
+
+	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
+		|| die "Couldn't append slot to executable name"
+}
+
+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 appened, 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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-08-26  4:18 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-08-26  4:18 UTC (permalink / raw
  To: gentoo-commits

commit:     96a0d8aff450a73ce481d00cd6ab2114bf269e08
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 26 04:18:12 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Thu Aug 26 04:18:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96a0d8af

games-roguelike/stone-soup: Add python-compat 10

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.22, Repoman-3.0.3

 games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild | 2 +-
 games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
index 6b3620cceb2..278bacf9e0c 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
index 71060b04b35..ce26f1ef8e1 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-08-26  4:23 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-08-26  4:23 UTC (permalink / raw
  To: gentoo-commits

commit:     f2fd657de101777678ab3810109ee8d9d04cf57b
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 26 04:23:30 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Thu Aug 26 04:23:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2fd657d

games-roguelike/stone-soup: stabilize all slots

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.22, Repoman-3.0.3

 games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild | 2 +-
 games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild   | 2 +-
 games-roguelike/stone-soup/stone-soup-0.27.0-r1.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
index 278bacf9e0c..421efe576cf 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 # 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="debug ncurses sound +tiles"
 
 RDEPEND="

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
index ce26f1ef8e1..0a694cacba9 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 # 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="debug ncurses sound +tiles"
 
 RDEPEND="

diff --git a/games-roguelike/stone-soup/stone-soup-0.27.0-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.0-r1.ebuild
index 8c3f2a14c8c..67dac56203f 100644
--- a/games-roguelike/stone-soup/stone-soup-0.27.0-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.27.0-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 # 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="debug ncurses sound +tiles"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-08-26  4:25 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-08-26  4:25 UTC (permalink / raw
  To: gentoo-commits

commit:     6b49090b0af58ee51857fcee2c3e312e39f4469e
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 26 04:25:29 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Thu Aug 26 04:25:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b49090b

games-roguelike/stone-soup: remove old

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.22, Repoman-3.0.3

 .../stone-soup/stone-soup-0.25.1-r101.ebuild       | 184 ---------------------
 .../stone-soup/stone-soup-0.26.1.ebuild            | 184 ---------------------
 .../stone-soup/stone-soup-0.27.0.ebuild            | 184 ---------------------
 3 files changed, 552 deletions(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r101.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r101.ebuild
deleted file mode 100644
index 36719da120e..00000000000
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r101.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO
-# - attempt +test, linked bug claims to be fixed
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9} )
-VIRTUALX_REQUIRED="manual"
-inherit desktop python-any-r1 lua-single 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"
-SLOT="0.25"
-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
-"
-
-# 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="debug ncurses sound test +tiles"
-# test is broken
-# see https://crawl.develz.org/mantis/view.php?id=6121
-RESTRICT="test"
-
-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}
-	app-arch/unzip
-	dev-lang/perl
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	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}"/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"
-
-	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
-		|| die "Couldn't append slot to executable name"
-}
-
-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}-${SLOT}"
-		GCC="$(tc-getCC)"
-		GXX="$(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 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-${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 "Since version 0.25.1-r101, crawl is a slotted install"
-	elog "that supports having multiple versions installed.  The"
-	elog "binary has the slot appened, e.g. 'crawl-"${SLOT}"'."
-	elog
-	elog "The local save directory also has the slot appended."
-	elog "If you have saved games from 0.25 but before 0.25.1-r101"
-	elog "you can 'mv ~/.crawl ~/.crawl-0.25' to fix it"
-
-	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.26.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1.ebuild
deleted file mode 100644
index cc9cc94cf89..00000000000
--- a/games-roguelike/stone-soup/stone-soup-0.26.1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO
-# - attempt +test, linked bug claims to be fixed
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9} )
-VIRTUALX_REQUIRED="manual"
-inherit desktop python-any-r1 lua-single 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"
-SLOT="0.26"
-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
-"
-
-# 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="debug ncurses sound test +tiles"
-# test is broken
-# see https://crawl.develz.org/mantis/view.php?id=6121
-RESTRICT="test"
-
-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}
-	app-arch/unzip
-	dev-lang/perl
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	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}"/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"
-
-	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
-		|| die "Couldn't append slot to executable name"
-}
-
-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}-${SLOT}"
-		GCC="$(tc-getCC)"
-		GXX="$(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 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-${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 "Since version 0.25.1-r101, crawl is a slotted install"
-	elog "that supports having multiple versions installed.  The"
-	elog "binary has the slot appened, e.g. 'crawl-"${SLOT}"'."
-	elog
-	elog "The local save directory also has the slot appended."
-	elog "If you have saved games from 0.25 but before 0.25.1-r101"
-	elog "you can 'mv ~/.crawl ~/.crawl-0.25' to fix it"
-
-	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.27.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.0.ebuild
deleted file mode 100644
index 2d3e1336eab..00000000000
--- a/games-roguelike/stone-soup/stone-soup-0.27.0.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO
-# - attempt +test, linked bug claims to be fixed
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9} )
-VIRTUALX_REQUIRED="manual"
-inherit desktop python-any-r1 lua-single 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"
-SLOT="0.27"
-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
-"
-
-# 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="debug ncurses sound test +tiles"
-# test is broken
-# see https://crawl.develz.org/mantis/view.php?id=6121
-RESTRICT="test"
-
-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}
-	app-arch/unzip
-	dev-lang/perl
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	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}"/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"
-
-	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
-		|| die "Couldn't append slot to executable name"
-}
-
-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}-${SLOT}"
-		GCC="$(tc-getCC)"
-		GXX="$(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 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-${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 "Since version 0.25.1-r101, crawl is a slotted install"
-	elog "that supports having multiple versions installed.  The"
-	elog "binary has the slot appened, e.g. 'crawl-"${SLOT}"'."
-	elog
-	elog "The local save directory also has the slot appended."
-	elog "If you have saved games from 0.25 but before 0.25.1-r101"
-	elog "you can 'mv ~/.crawl ~/.crawl-0.25' to fix it"
-
-	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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-09-01  2:59 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-09-01  2:59 UTC (permalink / raw
  To: gentoo-commits

commit:     bd0056b8f1ae7779a0671b04f2ec6e9e44eb9faa
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  1 02:59:47 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Wed Sep  1 02:59:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd0056b8

games-roguelike/stone-soup: Add _pre build for 0.28 slot

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.22, Repoman-3.0.3

 games-roguelike/stone-soup/Manifest                |   3 +
 .../stone-soup-0.28.0_pre20210831.ebuild           | 201 +++++++++++++++++++++
 2 files changed, 204 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index f229acc14dc..1d5c290ada8 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,9 +1,12 @@
+DIST 46f4d3c3461b2012140bb15563a19ef027b1fc69.zip 17966337 BLAKE2B 149cc0505c2f146d6aaa035d464f7d8b11eff6973cb391283f89e378915af7d61c604916f978aa6727cbee5f0b8c4d29333776992931166b2d70a266afc11744 SHA512 e8af9057ea82e8cffd4319a4eb82e63b4f49287bc001828de09e023df6939ed18303727213146ffc428ecf876bd5e02bd85849446665217753cedf9d74464ccd
 DIST stone-soup-0.25.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.25.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.26.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
+DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
+DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220
 DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d
 DIST stone_soup-0.27.0.zip 96917949 BLAKE2B 1da7d54e4f3ec98514630eeb8c69c7dca02f96cdfe16974856406da0a057011f17a388669ec29844f3657cd4c7c4ef977f522578cbe0dec02ce497063c25ac83 SHA512 e3f79ce8837056c0a34847857b058e055ed23cc0987ab1d862b60739b8b7ec1e955746fa49c339f449603ce9d0707e64e564592b0798310c7c6bdc1a9edc3e70

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210831.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210831.ebuild
new file mode 100644
index 00000000000..22fa3f94801
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210831.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+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.28"
+
+# Leave empty string if not a _pre release
+COMMITSHA="46f4d3c3461b2012140bb15563a19ef027b1fc69"
+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}.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="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="debug ncurses sound +tiles"
+
+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}
+	app-arch/unzip
+	dev-lang/perl
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	sys-devel/flex
+	tiles? (
+		media-gfx/pngcrush
+		sys-libs/ncurses:0
+	)
+	virtual/pkgconfig
+	virtual/yacc
+	"
+
+PATCHES=(
+	"${FILESDIR}"/make.patch
+	"${FILESDIR}"/rltiles-make.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"
+
+	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
+}
+
+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 appened, 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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-09-05  3:14 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-09-05  3:14 UTC (permalink / raw
  To: gentoo-commits

commit:     cd12f6ad54f5e3f05b7c6f6b48f019bbf40e1638
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  5 03:14:01 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Sep  5 03:14:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd12f6ad

games-roguelike/stone-soup: Better distfile name for _pre

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.22, Repoman-3.0.3

 games-roguelike/stone-soup/Manifest                             | 2 +-
 games-roguelike/stone-soup/stone-soup-0.28.0_pre20210831.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 1d5c290ada8..3a3bc32ba3c 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,10 +1,10 @@
-DIST 46f4d3c3461b2012140bb15563a19ef027b1fc69.zip 17966337 BLAKE2B 149cc0505c2f146d6aaa035d464f7d8b11eff6973cb391283f89e378915af7d61c604916f978aa6727cbee5f0b8c4d29333776992931166b2d70a266afc11744 SHA512 e8af9057ea82e8cffd4319a4eb82e63b4f49287bc001828de09e023df6939ed18303727213146ffc428ecf876bd5e02bd85849446665217753cedf9d74464ccd
 DIST stone-soup-0.25.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.25.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.26.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
+DIST stone-soup-0.28.0_pre20210831.tar.gz 14699285 BLAKE2B 1902f6dbdde812850363b1bd3915f8a42a5288d00b890c07cea33d93eeaee2d4d581bdd4ba41444883c753e5cdacb52591d94ddb2db6c280de97887ea42e0d3a SHA512 5bcbbd07fba3ad05f719a4a6bb6cfd93087e7e7ab536c9b1f78e47eef329f124b52e411b98edb32a03dd8d034a060bcedbcf1ece9fea12bec6c4c855d60e40f8
 DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210831.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210831.ebuild
index 22fa3f94801..51d928f03e9 100644
--- a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210831.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210831.ebuild
@@ -25,7 +25,7 @@ if [ -z "${COMMITSHA}" ]; then
 else
 	# This is a _pre release
 	SRC_URI="
-		https://github.com/crawl/crawl/archive/${COMMITSHA}.zip
+		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
 	"


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-09-30 14:05 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-09-30 14:05 UTC (permalink / raw
  To: gentoo-commits

commit:     ed2b9cdef9862166089ad780bae56d7c7a70460b
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 30 13:57:32 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Thu Sep 30 13:58:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed2b9cde

games-roguelike/stone-soup: remove old

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.23, Repoman-3.0.3

 games-roguelike/stone-soup/Manifest                |   2 -
 .../stone-soup/stone-soup-0.27.0-r1.ebuild         | 182 -------------------
 .../stone-soup-0.28.0_pre20210831.ebuild           | 201 ---------------------
 3 files changed, 385 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 1294929f0e7..3a3b7feb1ab 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -4,11 +4,9 @@ DIST stone-soup-0.26.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b6
 DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone-soup-0.28.0_pre20210831.tar.gz 14699285 BLAKE2B 1902f6dbdde812850363b1bd3915f8a42a5288d00b890c07cea33d93eeaee2d4d581bdd4ba41444883c753e5cdacb52591d94ddb2db6c280de97887ea42e0d3a SHA512 5bcbbd07fba3ad05f719a4a6bb6cfd93087e7e7ab536c9b1f78e47eef329f124b52e411b98edb32a03dd8d034a060bcedbcf1ece9fea12bec6c4c855d60e40f8
 DIST stone-soup-0.28.0_pre20210930.tar.gz 15993960 BLAKE2B bec39024527068afb9d63efcb147dbb09fe6940e23c1f2fc5c2a78b5b4da131d7f3275cceb2160ffe4028ca38fe034a4a70b5b42698772764b0b47cf6bdb3417 SHA512 2b32e543c388b7cf1394abf5eac35f347fe27e60039372771c1c9c873c7fad2011762269d08166f7df77e85914a325c597e0151211739df32a5597f084a6ca7b
 DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220
 DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d
-DIST stone_soup-0.27.0.zip 96917949 BLAKE2B 1da7d54e4f3ec98514630eeb8c69c7dca02f96cdfe16974856406da0a057011f17a388669ec29844f3657cd4c7c4ef977f522578cbe0dec02ce497063c25ac83 SHA512 e3f79ce8837056c0a34847857b058e055ed23cc0987ab1d862b60739b8b7ec1e955746fa49c339f449603ce9d0707e64e564592b0798310c7c6bdc1a9edc3e70
 DIST stone_soup-0.27.1.zip 96934633 BLAKE2B 8821920a4faad9474f08a34ae3c272cb9dcd3ddeb9029e033c22eb8e6650ef20bbc30e0c0ca1556d08c1b7b898fdbdd3667a3ac9a8527e0c322cd8c78ab391bb SHA512 845dafc9895ada3712903de63b95cca9eeb66160e4a04ba21193d916447fca8e7248b851f1e938f43b8d3937cf4f4437443bdc4fe2da893fe3918fed4e0b5204

diff --git a/games-roguelike/stone-soup/stone-soup-0.27.0-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.0-r1.ebuild
deleted file mode 100644
index 67dac56203f..00000000000
--- a/games-roguelike/stone-soup/stone-soup-0.27.0-r1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9} )
-VIRTUALX_REQUIRED="manual"
-inherit desktop python-any-r1 lua-single 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"
-SLOT="0.27"
-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
-"
-
-# 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="debug ncurses sound +tiles"
-
-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}
-	app-arch/unzip
-	dev-lang/perl
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	sys-devel/flex
-	tiles? (
-		media-gfx/pngcrush
-		sys-libs/ncurses:0
-	)
-	virtual/pkgconfig
-	virtual/yacc
-	"
-
-S=${WORKDIR}/${MY_P}/source
-PATCHES=(
-	"${FILESDIR}"/make.patch
-	"${FILESDIR}"/rltiles-make.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"
-
-	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
-		|| die "Couldn't append slot to executable name"
-}
-
-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 appened, 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.28.0_pre20210831.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210831.ebuild
deleted file mode 100644
index 51d928f03e9..00000000000
--- a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210831.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-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.28"
-
-# Leave empty string if not a _pre release
-COMMITSHA="46f4d3c3461b2012140bb15563a19ef027b1fc69"
-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="debug ncurses sound +tiles"
-
-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}
-	app-arch/unzip
-	dev-lang/perl
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	sys-devel/flex
-	tiles? (
-		media-gfx/pngcrush
-		sys-libs/ncurses:0
-	)
-	virtual/pkgconfig
-	virtual/yacc
-	"
-
-PATCHES=(
-	"${FILESDIR}"/make.patch
-	"${FILESDIR}"/rltiles-make.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"
-
-	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
-}
-
-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 appened, 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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-09-30 14:05 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-09-30 14:05 UTC (permalink / raw
  To: gentoo-commits

commit:     a0c3d4c5bf057c037c995e360ff6b9c46fd648a7
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 30 13:55:57 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Thu Sep 30 13:58:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0c3d4c5

games-roguelike/stone-soup: stabilize 0.27.1

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.23, Repoman-3.0.3

 games-roguelike/stone-soup/stone-soup-0.27.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
index 5a1ef523138..cc70aa3e58d 100644
--- a/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 # 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="debug ncurses sound +tiles"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-09-30 14:05 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-09-30 14:05 UTC (permalink / raw
  To: gentoo-commits

commit:     3013738a0f168963d0a5fb10a2084c0b0f3c5011
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 30 13:53:39 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Thu Sep 30 13:58:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3013738a

games-roguelike/stone-soup: add latest trunk snapshot

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.23, Repoman-3.0.3

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup-0.28.0_pre20210930.ebuild           | 201 +++++++++++++++++++++
 2 files changed, 202 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 3a3bc32ba3c..1294929f0e7 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -5,6 +5,7 @@ DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.28.0_pre20210831.tar.gz 14699285 BLAKE2B 1902f6dbdde812850363b1bd3915f8a42a5288d00b890c07cea33d93eeaee2d4d581bdd4ba41444883c753e5cdacb52591d94ddb2db6c280de97887ea42e0d3a SHA512 5bcbbd07fba3ad05f719a4a6bb6cfd93087e7e7ab536c9b1f78e47eef329f124b52e411b98edb32a03dd8d034a060bcedbcf1ece9fea12bec6c4c855d60e40f8
+DIST stone-soup-0.28.0_pre20210930.tar.gz 15993960 BLAKE2B bec39024527068afb9d63efcb147dbb09fe6940e23c1f2fc5c2a78b5b4da131d7f3275cceb2160ffe4028ca38fe034a4a70b5b42698772764b0b47cf6bdb3417 SHA512 2b32e543c388b7cf1394abf5eac35f347fe27e60039372771c1c9c873c7fad2011762269d08166f7df77e85914a325c597e0151211739df32a5597f084a6ca7b
 DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210930.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210930.ebuild
new file mode 100644
index 00000000000..670b13e391a
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210930.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+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.28"
+
+# Leave empty string if not a _pre release
+COMMITSHA="f77a47075d75ed93d74dc37d5dd92497f3a30001"
+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="debug ncurses sound +tiles"
+
+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}
+	app-arch/unzip
+	dev-lang/perl
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	sys-devel/flex
+	tiles? (
+		media-gfx/pngcrush
+		sys-libs/ncurses:0
+	)
+	virtual/pkgconfig
+	virtual/yacc
+	"
+
+PATCHES=(
+	"${FILESDIR}"/make.patch
+	"${FILESDIR}"/rltiles-make.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"
+
+	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
+}
+
+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 appened, 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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-10-02 11:31 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-10-02 11:31 UTC (permalink / raw
  To: gentoo-commits

commit:     edf3c21385b832b86e91cb0d01a2895bafc5771a
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  2 11:29:55 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Oct  2 11:30:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edf3c213

games-roguelike/stone-soup: Fix messaging typo

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild        | 2 +-
 games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild          | 2 +-
 games-roguelike/stone-soup/stone-soup-0.27.1.ebuild             | 2 +-
 games-roguelike/stone-soup/stone-soup-0.28.0_pre20210930.ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
index 421efe576cf..de7a56e16ee 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
@@ -167,7 +167,7 @@ pkg_postinst() {
 
 	elog "crawl is a slotted install that supports having"
 	elog "multiple versions installed.  The binary has the"
-	elog "slot appened, e.g. 'crawl-"${SLOT}"'."
+	elog "slot appended, e.g. 'crawl-"${SLOT}"'."
 
 	if use tiles && use ncurses ; then
 		elog

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
index 0a694cacba9..89e1c7c44b5 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
@@ -167,7 +167,7 @@ pkg_postinst() {
 
 	elog "Since version 0.25.1-r101, crawl is a slotted install"
 	elog "that supports having multiple versions installed.  The"
-	elog "binary has the slot appened, e.g. 'crawl-"${SLOT}"'."
+	elog "binary has the slot appended, e.g. 'crawl-"${SLOT}"'."
 	elog
 	elog "The local save directory also has the slot appended."
 	elog "If you have saved games from 0.25 but before 0.25.1-r101"

diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
index cc70aa3e58d..2c294df13db 100644
--- a/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
@@ -167,7 +167,7 @@ pkg_postinst() {
 
 	elog "crawl is a slotted install that supports having"
 	elog "multiple versions installed.  The binary has the"
-	elog "slot appened, e.g. 'crawl-"${SLOT}"'."
+	elog "slot appended, e.g. 'crawl-"${SLOT}"'."
 
 	if use tiles && use ncurses ; then
 		elog

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210930.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210930.ebuild
index 670b13e391a..d99078ac26a 100644
--- a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210930.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210930.ebuild
@@ -186,7 +186,7 @@ pkg_postinst() {
 
 	elog "crawl is a slotted install that supports having"
 	elog "multiple versions installed.  The binary has the"
-	elog "slot appened, e.g. 'crawl-"${SLOT}"'."
+	elog "slot appended, e.g. 'crawl-"${SLOT}"'."
 
 	if use tiles && use ncurses ; then
 		elog


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-11-01  4:01 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-11-01  4:01 UTC (permalink / raw
  To: gentoo-commits

commit:     d7b2f04e2ea84e2a3826076d7d4a352c4d03cfb1
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  1 04:00:04 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon Nov  1 04:00:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7b2f04e

games-roguelike/stone-soup: bump trunk build

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.28, Repoman-3.0.3

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup-0.28.0_pre20211031.ebuild           | 201 +++++++++++++++++++++
 2 files changed, 202 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 3a3b7feb1ab..0cc79b3fa50 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -5,6 +5,7 @@ DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.28.0_pre20210930.tar.gz 15993960 BLAKE2B bec39024527068afb9d63efcb147dbb09fe6940e23c1f2fc5c2a78b5b4da131d7f3275cceb2160ffe4028ca38fe034a4a70b5b42698772764b0b47cf6bdb3417 SHA512 2b32e543c388b7cf1394abf5eac35f347fe27e60039372771c1c9c873c7fad2011762269d08166f7df77e85914a325c597e0151211739df32a5597f084a6ca7b
+DIST stone-soup-0.28.0_pre20211031.tar.gz 16109495 BLAKE2B 0312c407f396c25e1698230ec3920d89b39fcdd5c1b8ed6dae2c35d410ec87f66b4fa232fe1a9cfb0628c60f3ed6f0b42dcb51480e54b384a5e0649733a8a61f SHA512 e24c33f9792a7d6a334112e68cf4b307dda66d39c73c55b3f2707396d8d508f3209c14658aacd0fa6c50c6ccbb5d8580ba26b5c06391284a2530c29212010f6b
 DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211031.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211031.ebuild
new file mode 100644
index 00000000000..9a6dd0a48f5
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211031.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+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.28"
+
+# Leave empty string if not a _pre release
+COMMITSHA="91a516d0e768b6e4232327f2d9d008fc577132f3"
+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="debug ncurses sound +tiles"
+
+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}
+	app-arch/unzip
+	dev-lang/perl
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	sys-devel/flex
+	tiles? (
+		media-gfx/pngcrush
+		sys-libs/ncurses:0
+	)
+	virtual/pkgconfig
+	virtual/yacc
+	"
+
+PATCHES=(
+	"${FILESDIR}"/make.patch
+	"${FILESDIR}"/rltiles-make.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"
+
+	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
+}
+
+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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-11-01  4:02 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-11-01  4:02 UTC (permalink / raw
  To: gentoo-commits

commit:     f55ac9c192515f748617b651378b83ffc5643033
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  1 04:02:41 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon Nov  1 04:02:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f55ac9c1

games-roguelike/stone-soup: remove previous 0.28 trunk build

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.28, Repoman-3.0.3

 games-roguelike/stone-soup/Manifest                |   1 -
 .../stone-soup-0.28.0_pre20210930.ebuild           | 201 ---------------------
 2 files changed, 202 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 0cc79b3fa50..726e548a6a4 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -4,7 +4,6 @@ DIST stone-soup-0.26.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b6
 DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone-soup-0.28.0_pre20210930.tar.gz 15993960 BLAKE2B bec39024527068afb9d63efcb147dbb09fe6940e23c1f2fc5c2a78b5b4da131d7f3275cceb2160ffe4028ca38fe034a4a70b5b42698772764b0b47cf6bdb3417 SHA512 2b32e543c388b7cf1394abf5eac35f347fe27e60039372771c1c9c873c7fad2011762269d08166f7df77e85914a325c597e0151211739df32a5597f084a6ca7b
 DIST stone-soup-0.28.0_pre20211031.tar.gz 16109495 BLAKE2B 0312c407f396c25e1698230ec3920d89b39fcdd5c1b8ed6dae2c35d410ec87f66b4fa232fe1a9cfb0628c60f3ed6f0b42dcb51480e54b384a5e0649733a8a61f SHA512 e24c33f9792a7d6a334112e68cf4b307dda66d39c73c55b3f2707396d8d508f3209c14658aacd0fa6c50c6ccbb5d8580ba26b5c06391284a2530c29212010f6b
 DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210930.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210930.ebuild
deleted file mode 100644
index d99078ac26a..00000000000
--- a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210930.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-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.28"
-
-# Leave empty string if not a _pre release
-COMMITSHA="f77a47075d75ed93d74dc37d5dd92497f3a30001"
-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="debug ncurses sound +tiles"
-
-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}
-	app-arch/unzip
-	dev-lang/perl
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	sys-devel/flex
-	tiles? (
-		media-gfx/pngcrush
-		sys-libs/ncurses:0
-	)
-	virtual/pkgconfig
-	virtual/yacc
-	"
-
-PATCHES=(
-	"${FILESDIR}"/make.patch
-	"${FILESDIR}"/rltiles-make.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"
-
-	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
-}
-
-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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-11-27 23:00 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-11-27 23:00 UTC (permalink / raw
  To: gentoo-commits

commit:     1695d00ca6f46d90c3ae6a49f3c52ccf4ee80f6d
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 27 22:59:40 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Nov 27 22:59:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1695d00c

games-roguelike/stone-soup: bump unstable to 11/27 commit

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup-0.28.0_pre20211128.ebuild           | 201 +++++++++++++++++++++
 2 files changed, 202 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 726e548a6a46..f953139af965 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -5,6 +5,7 @@ DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.28.0_pre20211031.tar.gz 16109495 BLAKE2B 0312c407f396c25e1698230ec3920d89b39fcdd5c1b8ed6dae2c35d410ec87f66b4fa232fe1a9cfb0628c60f3ed6f0b42dcb51480e54b384a5e0649733a8a61f SHA512 e24c33f9792a7d6a334112e68cf4b307dda66d39c73c55b3f2707396d8d508f3209c14658aacd0fa6c50c6ccbb5d8580ba26b5c06391284a2530c29212010f6b
+DIST stone-soup-0.28.0_pre20211128.tar.gz 16160462 BLAKE2B 91409e7e72a3024400aaa98645f374cae33955171fbc2311cae38df9099037e83bf92de6985ec9b9e7de5fe2e80f8a9f29471ff9a308888dca2624f3a42334c6 SHA512 6fd73326af7b17dcfe0874732551820b6b15f0f5124094d8dfced14ec2a7fa0dd9090dd4089f583310fe8f7cc4ab4377c812fc85ad3df05b32438c812acdcc8f
 DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211128.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211128.ebuild
new file mode 100644
index 000000000000..fe3f221a7170
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211128.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+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.28"
+
+# Leave empty string if not a _pre release
+COMMITSHA="bc3f381ebcfc7bc390c3495e054d1fb84b63bb7e"
+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="debug ncurses sound +tiles"
+
+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}
+	app-arch/unzip
+	dev-lang/perl
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	sys-devel/flex
+	tiles? (
+		media-gfx/pngcrush
+		sys-libs/ncurses:0
+	)
+	virtual/pkgconfig
+	virtual/yacc
+	"
+
+PATCHES=(
+	"${FILESDIR}"/make.patch
+	"${FILESDIR}"/rltiles-make.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"
+
+	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
+}
+
+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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-11-27 23:01 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-11-27 23:01 UTC (permalink / raw
  To: gentoo-commits

commit:     98107aff0c07a5b06e02e7a2675b06a01cce8bee
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 27 23:01:05 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Nov 27 23:01:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98107aff

games-roguelike/stone-soup: remove old

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.28, Repoman-3.0.3

 games-roguelike/stone-soup/Manifest                |   1 -
 .../stone-soup-0.28.0_pre20211031.ebuild           | 201 ---------------------
 2 files changed, 202 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index f953139af965..197c243bbcd3 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -4,7 +4,6 @@ DIST stone-soup-0.26.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b6
 DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone-soup-0.28.0_pre20211031.tar.gz 16109495 BLAKE2B 0312c407f396c25e1698230ec3920d89b39fcdd5c1b8ed6dae2c35d410ec87f66b4fa232fe1a9cfb0628c60f3ed6f0b42dcb51480e54b384a5e0649733a8a61f SHA512 e24c33f9792a7d6a334112e68cf4b307dda66d39c73c55b3f2707396d8d508f3209c14658aacd0fa6c50c6ccbb5d8580ba26b5c06391284a2530c29212010f6b
 DIST stone-soup-0.28.0_pre20211128.tar.gz 16160462 BLAKE2B 91409e7e72a3024400aaa98645f374cae33955171fbc2311cae38df9099037e83bf92de6985ec9b9e7de5fe2e80f8a9f29471ff9a308888dca2624f3a42334c6 SHA512 6fd73326af7b17dcfe0874732551820b6b15f0f5124094d8dfced14ec2a7fa0dd9090dd4089f583310fe8f7cc4ab4377c812fc85ad3df05b32438c812acdcc8f
 DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211031.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211031.ebuild
deleted file mode 100644
index 9a6dd0a48f58..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211031.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-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.28"
-
-# Leave empty string if not a _pre release
-COMMITSHA="91a516d0e768b6e4232327f2d9d008fc577132f3"
-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="debug ncurses sound +tiles"
-
-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}
-	app-arch/unzip
-	dev-lang/perl
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	sys-devel/flex
-	tiles? (
-		media-gfx/pngcrush
-		sys-libs/ncurses:0
-	)
-	virtual/pkgconfig
-	virtual/yacc
-	"
-
-PATCHES=(
-	"${FILESDIR}"/make.patch
-	"${FILESDIR}"/rltiles-make.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"
-
-	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
-}
-
-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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-12-24 22:44 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-12-24 22:44 UTC (permalink / raw
  To: gentoo-commits

commit:     fe55d9118190006817fa88a0740db1ea7b9e8841
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 24 22:40:03 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Fri Dec 24 22:40:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe55d911

games-roguelike/stone-soup: Bump to 0.28-20211224

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.28, Repoman-3.0.3

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup-0.28.0_pre20211224.ebuild           | 201 +++++++++++++++++++++
 2 files changed, 202 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 197c243bbcd3..947355c01a2e 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -5,6 +5,7 @@ DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.28.0_pre20211128.tar.gz 16160462 BLAKE2B 91409e7e72a3024400aaa98645f374cae33955171fbc2311cae38df9099037e83bf92de6985ec9b9e7de5fe2e80f8a9f29471ff9a308888dca2624f3a42334c6 SHA512 6fd73326af7b17dcfe0874732551820b6b15f0f5124094d8dfced14ec2a7fa0dd9090dd4089f583310fe8f7cc4ab4377c812fc85ad3df05b32438c812acdcc8f
+DIST stone-soup-0.28.0_pre20211224.tar.gz 16229115 BLAKE2B 3c6ddbd667b05c56bfd4389091ce7d83ebf7c97dbcd0724b800fa0c409c21fd0e017ddf5e5a8776658a19125128af72a6edb35739b7b82a95ff05c0607ee4886 SHA512 8ace7a1269e4920841465cd26308730c04c4896cb8ecd0b8f031f47ccb8babd908b9617f79e6e336f1938b73ae8863244ae5eea7c25f16373b859eaea232b821
 DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild
new file mode 100644
index 000000000000..8a19eb39dc41
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+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.28"
+
+# Leave empty string if not a _pre release
+COMMITSHA="7c8fac35f0b01e22b201139b07a684fa7d8e6760"
+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="debug ncurses sound +tiles"
+
+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}
+	app-arch/unzip
+	dev-lang/perl
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	sys-devel/flex
+	tiles? (
+		media-gfx/pngcrush
+		sys-libs/ncurses:0
+	)
+	virtual/pkgconfig
+	virtual/yacc
+	"
+
+PATCHES=(
+	"${FILESDIR}"/make.patch
+	"${FILESDIR}"/rltiles-make.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"
+
+	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
+}
+
+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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-12-24 22:44 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-12-24 22:44 UTC (permalink / raw
  To: gentoo-commits

commit:     fc2bd059c3c85bc4f4b48ad736232263f9870fee
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 24 22:41:04 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Fri Dec 24 22:41:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc2bd059

games-roguelike/stone-soup: remove old

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.28, Repoman-3.0.3

 games-roguelike/stone-soup/Manifest                |   1 -
 .../stone-soup-0.28.0_pre20211128.ebuild           | 201 ---------------------
 2 files changed, 202 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 947355c01a2e..219fc18a5881 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -4,7 +4,6 @@ DIST stone-soup-0.26.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b6
 DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone-soup-0.28.0_pre20211128.tar.gz 16160462 BLAKE2B 91409e7e72a3024400aaa98645f374cae33955171fbc2311cae38df9099037e83bf92de6985ec9b9e7de5fe2e80f8a9f29471ff9a308888dca2624f3a42334c6 SHA512 6fd73326af7b17dcfe0874732551820b6b15f0f5124094d8dfced14ec2a7fa0dd9090dd4089f583310fe8f7cc4ab4377c812fc85ad3df05b32438c812acdcc8f
 DIST stone-soup-0.28.0_pre20211224.tar.gz 16229115 BLAKE2B 3c6ddbd667b05c56bfd4389091ce7d83ebf7c97dbcd0724b800fa0c409c21fd0e017ddf5e5a8776658a19125128af72a6edb35739b7b82a95ff05c0607ee4886 SHA512 8ace7a1269e4920841465cd26308730c04c4896cb8ecd0b8f031f47ccb8babd908b9617f79e6e336f1938b73ae8863244ae5eea7c25f16373b859eaea232b821
 DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211128.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211128.ebuild
deleted file mode 100644
index fe3f221a7170..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211128.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-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.28"
-
-# Leave empty string if not a _pre release
-COMMITSHA="bc3f381ebcfc7bc390c3495e054d1fb84b63bb7e"
-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="debug ncurses sound +tiles"
-
-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}
-	app-arch/unzip
-	dev-lang/perl
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	sys-devel/flex
-	tiles? (
-		media-gfx/pngcrush
-		sys-libs/ncurses:0
-	)
-	virtual/pkgconfig
-	virtual/yacc
-	"
-
-PATCHES=(
-	"${FILESDIR}"/make.patch
-	"${FILESDIR}"/rltiles-make.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"
-
-	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
-}
-
-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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2021-12-30 15:43 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2021-12-30 15:43 UTC (permalink / raw
  To: gentoo-commits

commit:     2aa8bfe8b2baece61b41e2b3b14798b41b6fbe6b
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 30 15:43:31 2021 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Thu Dec 30 15:43:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aa8bfe8

games-roguelike/stone-soup: use system dev-cpp/catch for tests

... not the bundled one

Closes: https://bugs.gentoo.org/829950
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.28, Repoman-3.0.3

 games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild        | 9 ++++++++-
 games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild          | 9 ++++++++-
 games-roguelike/stone-soup/stone-soup-0.27.1.ebuild             | 9 ++++++++-
 games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild | 9 ++++++++-
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
index de7a56e16eed..1d7ea744c044 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
@@ -24,7 +24,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"
 KEYWORDS="amd64 x86"
-IUSE="debug ncurses sound +tiles"
+IUSE="debug ncurses sound test +tiles"
 
 RDEPEND="
 	${LUA_DEPS}
@@ -51,6 +51,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
 	sys-devel/flex
+	test? ( dev-cpp/catch:0 )
 	tiles? (
 		media-gfx/pngcrush
 		sys-libs/ncurses:0
@@ -90,6 +91,12 @@ src_prepare() {
 
 	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
 		|| die "Couldn't append slot to executable name"
+
+	# 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() {

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
index 89e1c7c44b5b..dc9525094429 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
@@ -24,7 +24,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"
 KEYWORDS="amd64 x86"
-IUSE="debug ncurses sound +tiles"
+IUSE="debug ncurses sound test +tiles"
 
 RDEPEND="
 	${LUA_DEPS}
@@ -51,6 +51,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
 	sys-devel/flex
+	test? ( dev-cpp/catch:0 )
 	tiles? (
 		media-gfx/pngcrush
 		sys-libs/ncurses:0
@@ -90,6 +91,12 @@ src_prepare() {
 
 	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
 		|| die "Couldn't append slot to executable name"
+
+	# 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() {

diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
index 2c294df13dba..29c7f43de73a 100644
--- a/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
@@ -24,7 +24,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"
 KEYWORDS="amd64 x86"
-IUSE="debug ncurses sound +tiles"
+IUSE="debug ncurses sound test +tiles"
 
 RDEPEND="
 	${LUA_DEPS}
@@ -51,6 +51,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
 	sys-devel/flex
+	test? ( dev-cpp/catch:0 )
 	tiles? (
 		media-gfx/pngcrush
 		sys-libs/ncurses:0
@@ -90,6 +91,12 @@ src_prepare() {
 
 	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
 		|| die "Couldn't append slot to executable name"
+
+	# 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() {

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild
index 8a19eb39dc41..76eb66818392 100644
--- a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild
@@ -38,7 +38,7 @@ fi
 # 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="debug ncurses sound +tiles"
+IUSE="debug ncurses sound test +tiles"
 
 S=${WORKDIR}/${MY_P}/source
 RDEPEND="
@@ -66,6 +66,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
 	sys-devel/flex
+	test? ( dev-cpp/catch:0 )
 	tiles? (
 		media-gfx/pngcrush
 		sys-libs/ncurses:0
@@ -109,6 +110,12 @@ src_prepare() {
 	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() {


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-01-01 10:03 Sam James
  0 siblings, 0 replies; 111+ messages in thread
From: Sam James @ 2022-01-01 10:03 UTC (permalink / raw
  To: gentoo-commits

commit:     bf0c0ec277474b7e36657badad2009780220450d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  1 09:57:37 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan  1 09:57:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf0c0ec2

games-roguelike/stone-soup: fix MissingTestRestrict

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild        | 3 ++-
 games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild          | 3 ++-
 games-roguelike/stone-soup/stone-soup-0.27.1.ebuild             | 3 ++-
 games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
index 1d7ea744c044..c78e6a378ad4 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,6 +25,7 @@ SRC_URI="
 LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
 KEYWORDS="amd64 x86"
 IUSE="debug ncurses sound test +tiles"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	${LUA_DEPS}

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
index dc9525094429..5d766d8353bb 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,6 +25,7 @@ SRC_URI="
 LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
 KEYWORDS="amd64 x86"
 IUSE="debug ncurses sound test +tiles"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	${LUA_DEPS}

diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
index 29c7f43de73a..5edf90bf5aa1 100644
--- a/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,6 +25,7 @@ SRC_URI="
 LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
 KEYWORDS="amd64 x86"
 IUSE="debug ncurses sound test +tiles"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	${LUA_DEPS}

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild
index 76eb66818392..92c16fd4481e 100644
--- a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -39,6 +39,7 @@ fi
 LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug ncurses sound test +tiles"
+RESTRICT="!test? ( test )"
 
 S=${WORKDIR}/${MY_P}/source
 RDEPEND="


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-01-08  4:06 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2022-01-08  4:06 UTC (permalink / raw
  To: gentoo-commits

commit:     71a1f34481c274830cc74d32a08bb10723caec28
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  8 04:04:44 2022 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Jan  8 04:04:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71a1f344

games-roguelike/stone-soup: bump for trunk updates

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.28, Repoman-3.0.3

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup-0.28.0_pre20220107.ebuild           | 209 +++++++++++++++++++++
 2 files changed, 210 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 219fc18a5881..4f34ccb09d49 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -5,6 +5,7 @@ DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.28.0_pre20211224.tar.gz 16229115 BLAKE2B 3c6ddbd667b05c56bfd4389091ce7d83ebf7c97dbcd0724b800fa0c409c21fd0e017ddf5e5a8776658a19125128af72a6edb35739b7b82a95ff05c0607ee4886 SHA512 8ace7a1269e4920841465cd26308730c04c4896cb8ecd0b8f031f47ccb8babd908b9617f79e6e336f1938b73ae8863244ae5eea7c25f16373b859eaea232b821
+DIST stone-soup-0.28.0_pre20220107.tar.gz 16263257 BLAKE2B 9a1b9127460aad8722cd0a538937897976f15fa08de9043a109cc47fd8b831ad3c788ba91d1b84f15e102a2a7976c060c4bc99bb8fef0410eaa6def0c608ef26 SHA512 f90c8849640c9a1c8f59f4c1204064e830527f68118d65452040dfd46def1512025f1e51ed9aa108ab1cf27bf8cebc5725d3d9605033a9349b907ba290db3472
 DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20220107.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20220107.ebuild
new file mode 100644
index 000000000000..b2a25a40c786
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20220107.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+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.28"
+
+# Leave empty string if not a _pre release
+COMMITSHA="f3d713df7a6deafd7ba73dbf2eb6319aedc5b6dc"
+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="debug ncurses sound test +tiles"
+RESTRICT="!test? ( test )"
+
+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}
+	app-arch/unzip
+	dev-lang/perl
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	sys-devel/flex
+	test? ( dev-cpp/catch:0 )
+	tiles? (
+		media-gfx/pngcrush
+		sys-libs/ncurses:0
+	)
+	virtual/pkgconfig
+	virtual/yacc
+	"
+
+PATCHES=(
+	"${FILESDIR}"/make.patch
+	"${FILESDIR}"/rltiles-make.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"
+
+	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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-01-08  4:06 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2022-01-08  4:06 UTC (permalink / raw
  To: gentoo-commits

commit:     8f8c4ef0967e0c4fb143b00db6b27fa3935fb8f4
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  8 04:05:32 2022 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Jan  8 04:05:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f8c4ef0

games-roguelike/stone-soup: remove old trunk version

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.28, Repoman-3.0.3

 games-roguelike/stone-soup/Manifest                |   1 -
 .../stone-soup-0.28.0_pre20211224.ebuild           | 209 ---------------------
 2 files changed, 210 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 4f34ccb09d49..7ed31c6e9858 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -4,7 +4,6 @@ DIST stone-soup-0.26.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b6
 DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone-soup-0.28.0_pre20211224.tar.gz 16229115 BLAKE2B 3c6ddbd667b05c56bfd4389091ce7d83ebf7c97dbcd0724b800fa0c409c21fd0e017ddf5e5a8776658a19125128af72a6edb35739b7b82a95ff05c0607ee4886 SHA512 8ace7a1269e4920841465cd26308730c04c4896cb8ecd0b8f031f47ccb8babd908b9617f79e6e336f1938b73ae8863244ae5eea7c25f16373b859eaea232b821
 DIST stone-soup-0.28.0_pre20220107.tar.gz 16263257 BLAKE2B 9a1b9127460aad8722cd0a538937897976f15fa08de9043a109cc47fd8b831ad3c788ba91d1b84f15e102a2a7976c060c4bc99bb8fef0410eaa6def0c608ef26 SHA512 f90c8849640c9a1c8f59f4c1204064e830527f68118d65452040dfd46def1512025f1e51ed9aa108ab1cf27bf8cebc5725d3d9605033a9349b907ba290db3472
 DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild
deleted file mode 100644
index 92c16fd4481e..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-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.28"
-
-# Leave empty string if not a _pre release
-COMMITSHA="7c8fac35f0b01e22b201139b07a684fa7d8e6760"
-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="debug ncurses sound test +tiles"
-RESTRICT="!test? ( test )"
-
-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}
-	app-arch/unzip
-	dev-lang/perl
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	sys-devel/flex
-	test? ( dev-cpp/catch:0 )
-	tiles? (
-		media-gfx/pngcrush
-		sys-libs/ncurses:0
-	)
-	virtual/pkgconfig
-	virtual/yacc
-	"
-
-PATCHES=(
-	"${FILESDIR}"/make.patch
-	"${FILESDIR}"/rltiles-make.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"
-
-	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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-02-05  3:39 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2022-02-05  3:39 UTC (permalink / raw
  To: gentoo-commits

commit:     dbed0eaa1ac004744c95b1059f17e712b1289a82
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  5 03:38:30 2022 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Feb  5 03:38:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbed0eaa

games-roguelike/stone-soup: bump to 0.28 release

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup/stone-soup-0.28.0.ebuild            | 209 +++++++++++++++++++++
 2 files changed, 210 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 7ed31c6e9858..22f34da02b59 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -10,3 +10,4 @@ DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220
 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

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0.ebuild
new file mode 100644
index 000000000000..c821aec84277
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+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.28"
+
+# 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="debug ncurses sound test +tiles"
+RESTRICT="!test? ( test )"
+
+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}
+	app-arch/unzip
+	dev-lang/perl
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	sys-devel/flex
+	test? ( dev-cpp/catch:0 )
+	tiles? (
+		media-gfx/pngcrush
+		sys-libs/ncurses:0
+	)
+	virtual/pkgconfig
+	virtual/yacc
+	"
+
+PATCHES=(
+	"${FILESDIR}"/make.patch
+	"${FILESDIR}"/rltiles-make.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"
+
+	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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-02-05  3:39 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2022-02-05  3:39 UTC (permalink / raw
  To: gentoo-commits

commit:     99de4ad734964d95697be554652ea2fca12f4841
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  5 03:39:30 2022 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Feb  5 03:39:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99de4ad7

games-roguelike/stone-soup: remove 0.28 pre-release

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3

 games-roguelike/stone-soup/Manifest                |   1 -
 .../stone-soup-0.28.0_pre20220107.ebuild           | 209 ---------------------
 2 files changed, 210 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 22f34da02b59..87183395a3d8 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -4,7 +4,6 @@ DIST stone-soup-0.26.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b6
 DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone-soup-0.28.0_pre20220107.tar.gz 16263257 BLAKE2B 9a1b9127460aad8722cd0a538937897976f15fa08de9043a109cc47fd8b831ad3c788ba91d1b84f15e102a2a7976c060c4bc99bb8fef0410eaa6def0c608ef26 SHA512 f90c8849640c9a1c8f59f4c1204064e830527f68118d65452040dfd46def1512025f1e51ed9aa108ab1cf27bf8cebc5725d3d9605033a9349b907ba290db3472
 DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20220107.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20220107.ebuild
deleted file mode 100644
index b2a25a40c786..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20220107.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-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.28"
-
-# Leave empty string if not a _pre release
-COMMITSHA="f3d713df7a6deafd7ba73dbf2eb6319aedc5b6dc"
-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="debug ncurses sound test +tiles"
-RESTRICT="!test? ( test )"
-
-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}
-	app-arch/unzip
-	dev-lang/perl
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	sys-devel/flex
-	test? ( dev-cpp/catch:0 )
-	tiles? (
-		media-gfx/pngcrush
-		sys-libs/ncurses:0
-	)
-	virtual/pkgconfig
-	virtual/yacc
-	"
-
-PATCHES=(
-	"${FILESDIR}"/make.patch
-	"${FILESDIR}"/rltiles-make.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"
-
-	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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-03-13 14:18 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2022-03-13 14:18 UTC (permalink / raw
  To: gentoo-commits

commit:     b14d32b6aebe588ca4dafcff307217878b8bf8fe
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 14:18:18 2022 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 14:18:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b14d32b6

games-roguelike/stone-soup: stabilize 0.28

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3

 games-roguelike/stone-soup/stone-soup-0.28.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0.ebuild
index c821aec84277..f02ffe30abd0 100644
--- a/games-roguelike/stone-soup/stone-soup-0.28.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0.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="debug ncurses sound test +tiles"
 RESTRICT="!test? ( test )"
 


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-05-23  0:04 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2022-05-23  0:04 UTC (permalink / raw
  To: gentoo-commits

commit:     2027be27a0a03fb44e06c0702a438ff7aae27a4a
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Mon May 23 00:03:52 2022 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon May 23 00:04:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2027be27

games-roguelike/stone-soup: add 0.29 pre-release 5/22/22

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3

 games-roguelike/stone-soup/Manifest                |   3 +
 .../stone-soup-0.29.0_pre20220522.ebuild           | 222 +++++++++++++++++++++
 2 files changed, 225 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 87183395a3d8..f77faf6a707f 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -6,6 +6,9 @@ DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b6
 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
+DIST stone-soup-0.29.0_pre20220522.tar.gz 16361027 BLAKE2B 6155ce9a56a99b5845ae9ab1747adaed5c3b0e6155eeb42a3a7cba026819701e9b8de72a7e83996f8a3892bfc8119c446feffeb639831be76c626e130ccd8cda SHA512 e026b314d94c45bb91ca41d0ab52003902718dadd16c536fbef6a49348b837a04d48d7eccf43d3e6b810ab4b38d11fe5ede3cd88b6925762b6a7fcadfdf8f936
+DIST stone-soup-0.29.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
+DIST stone-soup-0.29.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220
 DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d
 DIST stone_soup-0.27.1.zip 96934633 BLAKE2B 8821920a4faad9474f08a34ae3c272cb9dcd3ddeb9029e033c22eb8e6650ef20bbc30e0c0ca1556d08c1b7b898fdbdd3667a3ac9a8527e0c322cd8c78ab391bb SHA512 845dafc9895ada3712903de63b95cca9eeb66160e4a04ba21193d916447fca8e7248b851f1e938f43b8d3937cf4f4437443bdc4fe2da893fe3918fed4e0b5204

diff --git a/games-roguelike/stone-soup/stone-soup-0.29.0_pre20220522.ebuild b/games-roguelike/stone-soup/stone-soup-0.29.0_pre20220522.ebuild
new file mode 100644
index 000000000000..581562af2424
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.29.0_pre20220522.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..3} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+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="acb4ef3bc58aea425821c9a58552bf662dc29f07"
+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 )"
+
+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: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() {
+	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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-07-02  4:30 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2022-07-02  4:30 UTC (permalink / raw
  To: gentoo-commits

commit:     6de4c3903c62b7a4a489171c38ca2fc6fe4bfc72
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 03:54:19 2022 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 04:29:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6de4c390

games-roguelike/stone-soup: stabilize latest slot revisions

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild | 6 +++---
 games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild   | 6 +++---
 games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild   | 6 +++---
 games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild   | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
index 67a30f696915..8f8ec82355bc 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 
@@ -23,7 +23,7 @@ SRC_URI="
 # 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 )"
 
@@ -47,7 +47,7 @@ RDEPEND="
 		virtual/opengl
 	)"
 DEPEND="${RDEPEND}
-	test? ( dev-cpp/catch:0 )
+	test? ( <dev-cpp/catch-3.0.0:0 )
 	tiles? (
 		sys-libs/ncurses:0
 	)

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
index 0d4c15a1cafe..3e8e54bfbce4 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 
@@ -23,7 +23,7 @@ SRC_URI="
 # 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 )"
 
@@ -47,7 +47,7 @@ RDEPEND="
 		virtual/opengl
 	)"
 DEPEND="${RDEPEND}
-	test? ( dev-cpp/catch:0 )
+	test? ( <dev-cpp/catch-3.0.0:0 )
 	tiles? (
 		sys-libs/ncurses:0
 	)

diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
index b4a89576bda6..d15d90582fcd 100644
--- a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 
@@ -23,7 +23,7 @@ SRC_URI="
 # 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 )"
 
@@ -47,7 +47,7 @@ RDEPEND="
 		virtual/opengl
 	)"
 DEPEND="${RDEPEND}
-	test? ( dev-cpp/catch:0 )
+	test? ( <dev-cpp/catch-3.0.0:0 )
 	tiles? (
 		sys-libs/ncurses:0
 	)

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
index c75e955a01e0..2b42b74a72c3 100644
--- a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 
@@ -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 )"
 
@@ -62,7 +62,7 @@ RDEPEND="
 		virtual/opengl
 	)"
 DEPEND="${RDEPEND}
-	test? ( dev-cpp/catch:0 )
+	test? ( <dev-cpp/catch-3.0.0:0 )
 	tiles? (
 		sys-libs/ncurses:0
 	)


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-07-02  4:30 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2022-07-02  4:30 UTC (permalink / raw
  To: gentoo-commits

commit:     af1a7a0d81ab4c056b6965d99ee8ed74eec44323
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 04:27:15 2022 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 04:29:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af1a7a0d

games-roguelike/stone-soup: bump 0.29 git version

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup-0.29.0_pre20220701.ebuild           | 222 +++++++++++++++++++++
 2 files changed, 223 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index f77faf6a707f..f604c412b47b 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -7,6 +7,7 @@ DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.29.0_pre20220522.tar.gz 16361027 BLAKE2B 6155ce9a56a99b5845ae9ab1747adaed5c3b0e6155eeb42a3a7cba026819701e9b8de72a7e83996f8a3892bfc8119c446feffeb639831be76c626e130ccd8cda SHA512 e026b314d94c45bb91ca41d0ab52003902718dadd16c536fbef6a49348b837a04d48d7eccf43d3e6b810ab4b38d11fe5ede3cd88b6925762b6a7fcadfdf8f936
+DIST stone-soup-0.29.0_pre20220701.tar.gz 16490746 BLAKE2B dfc4251a3c4eda66867833ac2a97178c24ebd03ce23b63d067143d7c8046821bb9f658bc53242ad56053aa117b09a5ffb7dcf499035bf5ee1aff6c8bd06b64c8 SHA512 66e95e32067e281adb3195823d34e9a13fdc8089c4bc747e35844718a29657674a0c89d2c9823a60c2bc479caa5b6eb8b4cc7e7ade990c8f14bbc34ed11555ed
 DIST stone-soup-0.29.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.29.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220

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
new file mode 100644
index 000000000000..30c43189325e
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.29.0_pre20220701.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..3} )
+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="40bbea3e7347d6647ea791ba38964496f292cc81"
+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 )"
+
+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() {
+	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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-07-02  4:30 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2022-07-02  4:30 UTC (permalink / raw
  To: gentoo-commits

commit:     dcb79f89e4bf45be86971d99ede5db5e1565457c
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 04:29:02 2022 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 04:29:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcb79f89

games-roguelike/stone-soup: remove old versions

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 -
 .../stone-soup/stone-soup-0.25.1-r102.ebuild       | 190 ------------------
 .../stone-soup/stone-soup-0.26.1-r1.ebuild         | 194 ------------------
 .../stone-soup/stone-soup-0.27.1.ebuild            | 190 ------------------
 .../stone-soup/stone-soup-0.28.0.ebuild            | 209 -------------------
 .../stone-soup-0.29.0_pre20220522.ebuild           | 222 ---------------------
 6 files changed, 1006 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index f604c412b47b..e6830d96ca62 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -6,7 +6,6 @@ DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b6
 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone-soup-0.29.0_pre20220522.tar.gz 16361027 BLAKE2B 6155ce9a56a99b5845ae9ab1747adaed5c3b0e6155eeb42a3a7cba026819701e9b8de72a7e83996f8a3892bfc8119c446feffeb639831be76c626e130ccd8cda SHA512 e026b314d94c45bb91ca41d0ab52003902718dadd16c536fbef6a49348b837a04d48d7eccf43d3e6b810ab4b38d11fe5ede3cd88b6925762b6a7fcadfdf8f936
 DIST stone-soup-0.29.0_pre20220701.tar.gz 16490746 BLAKE2B dfc4251a3c4eda66867833ac2a97178c24ebd03ce23b63d067143d7c8046821bb9f658bc53242ad56053aa117b09a5ffb7dcf499035bf5ee1aff6c8bd06b64c8 SHA512 66e95e32067e281adb3195823d34e9a13fdc8089c4bc747e35844718a29657674a0c89d2c9823a60c2bc479caa5b6eb8b4cc7e7ade990c8f14bbc34ed11555ed
 DIST stone-soup-0.29.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.29.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
deleted file mode 100644
index caf09a0a1313..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-VIRTUALX_REQUIRED="manual"
-inherit desktop python-any-r1 lua-single 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"
-SLOT="0.25"
-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
-"
-
-# 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="debug ncurses sound test +tiles"
-RESTRICT="!test? ( test )"
-
-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}
-	app-arch/unzip
-	dev-lang/perl
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	sys-devel/flex
-	test? ( dev-cpp/catch:0 )
-	tiles? (
-		media-gfx/pngcrush
-		sys-libs/ncurses:0
-	)
-	virtual/pkgconfig
-	virtual/yacc
-	"
-
-S=${WORKDIR}/${MY_P}/source
-PATCHES=(
-	"${FILESDIR}"/make-no-png-dep-fix.patch
-	"${FILESDIR}"/rltiles-make.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"
-
-	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
-		|| die "Couldn't append slot to executable name"
-
-	# 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.26.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
deleted file mode 100644
index 21a11669794b..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-VIRTUALX_REQUIRED="manual"
-inherit desktop python-any-r1 lua-single 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"
-SLOT="0.26"
-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
-"
-
-# 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="debug ncurses sound test +tiles"
-RESTRICT="!test? ( test )"
-
-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}
-	app-arch/unzip
-	dev-lang/perl
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	sys-devel/flex
-	test? ( dev-cpp/catch:0 )
-	tiles? (
-		media-gfx/pngcrush
-		sys-libs/ncurses:0
-	)
-	virtual/pkgconfig
-	virtual/yacc
-	"
-
-S=${WORKDIR}/${MY_P}/source
-PATCHES=(
-	"${FILESDIR}"/make-no-png-dep-fix.patch
-	"${FILESDIR}"/rltiles-make.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"
-
-	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
-		|| die "Couldn't append slot to executable name"
-
-	# 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 "Since version 0.25.1-r101, crawl is a slotted install"
-	elog "that supports having multiple versions installed.  The"
-	elog "binary has the slot appended, e.g. 'crawl-"${SLOT}"'."
-	elog
-	elog "The local save directory also has the slot appended."
-	elog "If you have saved games from 0.25 but before 0.25.1-r101"
-	elog "you can 'mv ~/.crawl ~/.crawl-0.25' to fix it"
-
-	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.27.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
deleted file mode 100644
index 8c7c910c42ba..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-VIRTUALX_REQUIRED="manual"
-inherit desktop python-any-r1 lua-single 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"
-SLOT="0.27"
-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
-"
-
-# 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="debug ncurses sound test +tiles"
-RESTRICT="!test? ( test )"
-
-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}
-	app-arch/unzip
-	dev-lang/perl
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	sys-devel/flex
-	test? ( dev-cpp/catch:0 )
-	tiles? (
-		media-gfx/pngcrush
-		sys-libs/ncurses:0
-	)
-	virtual/pkgconfig
-	virtual/yacc
-	"
-
-S=${WORKDIR}/${MY_P}/source
-PATCHES=(
-	"${FILESDIR}"/make-no-png-dep-fix.patch
-	"${FILESDIR}"/rltiles-make.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"
-
-	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
-		|| die "Couldn't append slot to executable name"
-
-	# 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.28.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0.ebuild
deleted file mode 100644
index 9922b64db97c..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.28.0.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-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.28"
-
-# 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="debug ncurses sound test +tiles"
-RESTRICT="!test? ( test )"
-
-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}
-	app-arch/unzip
-	dev-lang/perl
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	sys-devel/flex
-	test? ( dev-cpp/catch:0 )
-	tiles? (
-		media-gfx/pngcrush
-		sys-libs/ncurses:0
-	)
-	virtual/pkgconfig
-	virtual/yacc
-	"
-
-PATCHES=(
-	"${FILESDIR}"/make-no-png-dep-fix.patch
-	"${FILESDIR}"/rltiles-make.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"
-
-	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_pre20220522.ebuild b/games-roguelike/stone-soup/stone-soup-0.29.0_pre20220522.ebuild
deleted file mode 100644
index 581562af2424..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.29.0_pre20220522.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-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="acb4ef3bc58aea425821c9a58552bf662dc29f07"
-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 )"
-
-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: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() {
-	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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-07-02 14:53 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2022-07-02 14:53 UTC (permalink / raw
  To: gentoo-commits

commit:     3fe0c7d487aa32ab3a3a54c9b6cbc6f258b30474
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 14:50:23 2022 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 14:52:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fe0c7d4

games-roguelike/stone-soup: lua 5.1 only

Upstream is explicit:
https://github.com/crawl/crawl/blob/master/crawl-ref/INSTALL.md#other-linux--unix

Closes: https://bugs.gentoo.org/855635
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild        | 2 +-
 games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild          | 2 +-
 games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild          | 2 +-
 games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild          | 2 +-
 games-roguelike/stone-soup/stone-soup-0.29.0_pre20220701.ebuild | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
index 8f8ec82355bc..028bae8a5f72 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LUA_COMPAT=( lua5-{1..3} )
+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

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
index 3e8e54bfbce4..6d5cee86591e 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LUA_COMPAT=( lua5-{1..3} )
+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

diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
index d15d90582fcd..de9768d1748f 100644
--- a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LUA_COMPAT=( lua5-{1..3} )
+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

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
index 2b42b74a72c3..fa6afff79a90 100644
--- a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LUA_COMPAT=( lua5-{1..3} )
+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

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 30c43189325e..de804af631a4 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
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LUA_COMPAT=( lua5-{1..3} )
+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


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-07-02 18:10 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2022-07-02 18:10 UTC (permalink / raw
  To: gentoo-commits

commit:     dcae922e107cd769bf541c2f2c510d7fa2ee14fd
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 18:09:13 2022 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 18:10:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcae922e

games-roguelike/stone-soup: include LUA_REQUIRED_USE

Closes: https://bugs.gentoo.org/855938
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild        | 1 +
 games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild          | 1 +
 games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild          | 1 +
 games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild          | 1 +
 games-roguelike/stone-soup/stone-soup-0.29.0_pre20220701.ebuild | 1 +
 5 files changed, 5 insertions(+)

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
index 028bae8a5f72..4c0c3c29ddd9 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
@@ -26,6 +26,7 @@ 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}"
 
 RDEPEND="
 	${LUA_DEPS}

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
index 6d5cee86591e..4c2d6d1cfdc7 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
@@ -26,6 +26,7 @@ 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}"
 
 RDEPEND="
 	${LUA_DEPS}

diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
index de9768d1748f..92a8dd503ef3 100644
--- a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
@@ -26,6 +26,7 @@ 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}"
 
 RDEPEND="
 	${LUA_DEPS}

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
index fa6afff79a90..f0bb11286771 100644
--- a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
@@ -40,6 +40,7 @@ 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="

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 de804af631a4..a78e930788f1 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
@@ -40,6 +40,7 @@ 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="


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-08-11 10:38 Sam James
  0 siblings, 0 replies; 111+ messages in thread
From: Sam James @ 2022-08-11 10:38 UTC (permalink / raw
  To: gentoo-commits

commit:     8bf92bcce55ba1661eeb09dc7d3882472bd89bac
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 10:15:48 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 10:20:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bf92bcc

games-roguelike/stone-soup: fix PythonAnyMismatchedDepHasVersionCheck

has_version was checking DEPEND, not BDEPEND, so change to python_has_version for
better defaults (defaults to BDEPEND) but also nicer output.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild        | 3 +--
 games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild          | 3 +--
 games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild          | 3 +--
 games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild          | 3 +--
 games-roguelike/stone-soup/stone-soup-0.29.0_pre20220701.ebuild | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
index 4c0c3c29ddd9..4e70392680ef 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
@@ -78,11 +78,10 @@ PATCHES=(
 )
 
 python_check_deps() {
-	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
-
 	python-any-r1_pkg_setup
 
 	if use !ncurses && use !tiles ; then

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
index 4c2d6d1cfdc7..a99ba5143943 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
@@ -78,11 +78,10 @@ PATCHES=(
 )
 
 python_check_deps() {
-	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
-
 	python-any-r1_pkg_setup
 
 	if use !ncurses && use !tiles ; then

diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
index 92a8dd503ef3..c9995c1ead92 100644
--- a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
@@ -78,11 +78,10 @@ PATCHES=(
 )
 
 python_check_deps() {
-	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
-
 	python-any-r1_pkg_setup
 
 	if use !ncurses && use !tiles ; then

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
index f0bb11286771..503a00a72353 100644
--- a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
@@ -92,11 +92,10 @@ PATCHES=(
 )
 
 python_check_deps() {
-	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
-
 	python-any-r1_pkg_setup
 
 	if use !ncurses && use !tiles ; then

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 a78e930788f1..a7d13cd0dd2c 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
@@ -92,11 +92,10 @@ PATCHES=(
 )
 
 python_check_deps() {
-	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
-
 	python-any-r1_pkg_setup
 
 	if use !ncurses && use !tiles ; then


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-08-27  1:39 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2022-08-27  1:39 UTC (permalink / raw
  To: gentoo-commits

commit:     ff07241ea7cfa845ed765fd7eb8bae6d11e37447
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 27 01:33:59 2022 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 01:38:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff07241e

games-roguelike/stone-soup: stabilize 0.29.0_pre20220701 for amd64, x86

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.29.0_pre20220701.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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}"


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-08-27  1:39 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2022-08-27  1:39 UTC (permalink / raw
  To: gentoo-commits

commit:     c86259b9f5a1790d7e9ba54280a2f9f047d47deb
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 27 01:37:35 2022 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 01:38:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c86259b9

games-roguelike/stone-soup: add 0.29.0

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup/stone-soup-0.29.0.ebuild            | 222 +++++++++++++++++++++
 2 files changed, 223 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index e6830d96ca62..3d086c2bb47b 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -13,3 +13,4 @@ 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

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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-09-11 13:16 David Seifert
  0 siblings, 0 replies; 111+ messages in thread
From: David Seifert @ 2022-09-11 13:16 UTC (permalink / raw
  To: gentoo-commits

commit:     f33e6f006040c0657b30fd18185201cff3dc8063
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 13:15:58 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 13:15:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f33e6f00

games-roguelike/stone-soup: request deprecated lua-5.1 API

Closes: https://bugs.gentoo.org/869671
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.29.0.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.29.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.29.0.ebuild
index 82b2a07eb9c3..dfe12e5420ae 100644
--- a/games-roguelike/stone-soup/stone-soup-0.29.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.29.0.ebuild
@@ -142,7 +142,9 @@ src_compile() {
 		BUILD_LUA=
 		AR="$(tc-getAR)"
 		CFOPTIMIZE=''
-		CFOTHERS="${CXXFLAGS}"
+		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+		# deprecated (in 5.1) luaL_openlib API (#869671)
+		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
 		CONTRIBS=
 		DATADIR="/usr/share/${PN}-${SLOT}"
 		FORCE_CC="$(tc-getCC)"


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-09-23 13:50 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2022-09-23 13:50 UTC (permalink / raw
  To: gentoo-commits

commit:     a99b5692d2621edc478933abf1d586fc04e27e68
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 13:43:43 2022 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 13:49:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a99b5692

games-roguelike/stone-soup: add 0.29.1

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup/stone-soup-0.29.1.ebuild            | 226 +++++++++++++++++++++
 2 files changed, 227 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index f4568e5195a4..4c327f7988b4 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -6,6 +6,7 @@ DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b6
 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
+DIST stone-soup-0.29.1.tar.gz 17510846 BLAKE2B 65b84797c8d8a268a3ce95de9d928e131bf6e21a1ea6ac3e72263c75f9d6288e9d95f9df6401528c06aefbda9bb642c79bf78065a65224297d33c050abf37056 SHA512 2ca49c4cd228526d47e4ad7e9556b6c26566595458423cd8e6b762298f229eb7ba273770ae1e12939ba66574a5b55e44812d06c4809d4327ed9bfd738501af04
 DIST stone-soup-0.29.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.29.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220

diff --git a/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
new file mode 100644
index 000000000000..455921a656d5
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
@@ -0,0 +1,226 @@
+# 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 tagged release
+	# Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	MY_P="crawl-${PV}/crawl-ref"
+else
+	# This is a _pre release
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
+	"
+	MY_P="crawl-${COMMITSHA}/crawl-ref"
+fi
+SRC_URI="
+	${SRC_URI}
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.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"
+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=''
+		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+		# deprecated (in 5.1) luaL_openlib API (#869671)
+		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
+		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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-09-23 13:50 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2022-09-23 13:50 UTC (permalink / raw
  To: gentoo-commits

commit:     592717e0fd8cbae3367e4f2cb1cfdc7142fe9d78
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 13:47:49 2022 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 13:49:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=592717e0

games-roguelike/stone-soup: request deprecated lua-5.1 API

Bug: https://bugs.gentoo.org/869671
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild | 4 +++-
 games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild   | 4 +++-
 games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild   | 4 +++-
 games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild   | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
index 4e70392680ef..c031e7ff924e 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
@@ -123,7 +123,9 @@ src_compile() {
 		BUILD_LUA=
 		AR="$(tc-getAR)"
 		CFOPTIMIZE=''
-		CFOTHERS="${CXXFLAGS}"
+		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+		# deprecated (in 5.1) luaL_openlib API (#869671)
+		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
 		CONTRIBS=
 		DATADIR="/usr/share/${PN}-${SLOT}"
 		FORCE_CC="$(tc-getCC)"

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
index a99ba5143943..6647e4a8ac92 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
@@ -123,7 +123,9 @@ src_compile() {
 		BUILD_LUA=
 		AR="$(tc-getAR)"
 		CFOPTIMIZE=''
-		CFOTHERS="${CXXFLAGS}"
+		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+		# deprecated (in 5.1) luaL_openlib API (#869671)
+		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
 		CONTRIBS=
 		DATADIR="/usr/share/${PN}-${SLOT}"
 		FORCE_CC="$(tc-getCC)"

diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
index c9995c1ead92..9c6b0d903512 100644
--- a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
@@ -123,7 +123,9 @@ src_compile() {
 		BUILD_LUA=
 		AR="$(tc-getAR)"
 		CFOPTIMIZE=''
-		CFOTHERS="${CXXFLAGS}"
+		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+		# deprecated (in 5.1) luaL_openlib API (#869671)
+		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
 		CONTRIBS=
 		DATADIR="/usr/share/${PN}-${SLOT}"
 		FORCE_CC="$(tc-getCC)"

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
index 503a00a72353..1d0513573630 100644
--- a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
@@ -142,7 +142,9 @@ src_compile() {
 		BUILD_LUA=
 		AR="$(tc-getAR)"
 		CFOPTIMIZE=''
-		CFOTHERS="${CXXFLAGS}"
+		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+		# deprecated (in 5.1) luaL_openlib API (#869671)
+		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
 		CONTRIBS=
 		DATADIR="/usr/share/${PN}-${SLOT}"
 		FORCE_CC="$(tc-getCC)"


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-09-23 13:50 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2022-09-23 13:50 UTC (permalink / raw
  To: gentoo-commits

commit:     6fa65a2b1dfd7bffbc71a748fe237609aaf96dee
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 13:03:14 2022 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 13:49:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fa65a2b

games-roguelike/stone-soup: stabilize 0.29.0 for amd64, x86

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.29.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.29.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.29.0.ebuild
index dfe12e5420ae..641b2c72a9f8 100644
--- a/games-roguelike/stone-soup/stone-soup-0.29.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.29.0.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}"


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-09-23 13:50 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2022-09-23 13:50 UTC (permalink / raw
  To: gentoo-commits

commit:     6111c9b135bf37d63a5126e0ef276f463d648e8e
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 13:04:51 2022 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 13:49:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6111c9b1

games-roguelike/stone-soup: drop 0.29.0_pre20220701

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 -
 .../stone-soup-0.29.0_pre20220701.ebuild           | 222 ---------------------
 2 files changed, 223 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 3d086c2bb47b..f4568e5195a4 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -6,7 +6,6 @@ DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b6
 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone-soup-0.29.0_pre20220701.tar.gz 16490746 BLAKE2B dfc4251a3c4eda66867833ac2a97178c24ebd03ce23b63d067143d7c8046821bb9f658bc53242ad56053aa117b09a5ffb7dcf499035bf5ee1aff6c8bd06b64c8 SHA512 66e95e32067e281adb3195823d34e9a13fdc8089c4bc747e35844718a29657674a0c89d2c9823a60c2bc479caa5b6eb8b4cc7e7ade990c8f14bbc34ed11555ed
 DIST stone-soup-0.29.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.29.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220

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
deleted file mode 100644
index 60e009774b02..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.29.0_pre20220701.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# 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="40bbea3e7347d6647ea791ba38964496f292cc81"
-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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-10-28 15:43 Sam James
  0 siblings, 0 replies; 111+ messages in thread
From: Sam James @ 2022-10-28 15:43 UTC (permalink / raw
  To: gentoo-commits

commit:     b36358e1928da44760de899c49ef80fa2fd05871
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 14:09:44 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 15:43:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b36358e1

games-roguelike/stone-soup: add github upstream metadata

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-roguelike/stone-soup/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-roguelike/stone-soup/metadata.xml b/games-roguelike/stone-soup/metadata.xml
index 1893130c23a1..3aca5487231d 100644
--- a/games-roguelike/stone-soup/metadata.xml
+++ b/games-roguelike/stone-soup/metadata.xml
@@ -13,6 +13,7 @@
 		<doc lang="en">https://crawl.develz.org</doc>
 		<bugs-to>https://crawl.develz.org/mantis</bugs-to>
 		<remote-id type="sourceforge">crawl-ref</remote-id>
+		<remote-id type="github">crawl/crawl</remote-id>
 	</upstream>
 	<use>
 		<flag name="advpng">Use alternate png optimization.


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2022-10-29 13:30 David Seifert
  0 siblings, 0 replies; 111+ messages in thread
From: David Seifert @ 2022-10-29 13:30 UTC (permalink / raw
  To: gentoo-commits

commit:     382506089ce33b464cee7498b0cab8dc4d4cf7c0
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 13:29:51 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 13:29:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38250608

games-roguelike/stone-soup: depend on deprecated lua APIs

Closes: https://bugs.gentoo.org/878439
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild | 1 +
 games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild   | 1 +
 games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild   | 1 +
 games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild   | 1 +
 games-roguelike/stone-soup/stone-soup-0.29.0.ebuild      | 1 +
 games-roguelike/stone-soup/stone-soup-0.29.1.ebuild      | 1 +
 6 files changed, 6 insertions(+)

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
index c031e7ff924e..a95eccfae8d3 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-1 )
+LUA_REQ_USE="deprecated"
 PYTHON_COMPAT=( python3_{8,9,10,11} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
index 6647e4a8ac92..da45cd97b64d 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-1 )
+LUA_REQ_USE="deprecated"
 PYTHON_COMPAT=( python3_{8,9,10,11} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs

diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
index 9c6b0d903512..a635964ac993 100644
--- a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-1 )
+LUA_REQ_USE="deprecated"
 PYTHON_COMPAT=( python3_{8,9,10,11} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
index 1d0513573630..122c0d07f1ba 100644
--- a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-1 )
+LUA_REQ_USE="deprecated"
 PYTHON_COMPAT=( python3_{8,9,10,11} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs

diff --git a/games-roguelike/stone-soup/stone-soup-0.29.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.29.0.ebuild
index 641b2c72a9f8..58d0a361967b 100644
--- a/games-roguelike/stone-soup/stone-soup-0.29.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.29.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-1 )
+LUA_REQ_USE="deprecated"
 PYTHON_COMPAT=( python3_{8,9,10,11} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs

diff --git a/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
index 455921a656d5..e3d2b6f33cbb 100644
--- a/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-1 )
+LUA_REQ_USE="deprecated"
 PYTHON_COMPAT=( python3_{8,9,10,11} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2023-01-15 21:37 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2023-01-15 21:37 UTC (permalink / raw
  To: gentoo-commits

commit:     8ca21470303b6591dae6124ff88f92cb6a62cba7
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 21:29:02 2023 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 21:36:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ca21470

games-roguelike/stone-soup: drop 0.29.0

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 -
 .../stone-soup/stone-soup-0.29.0.ebuild            | 225 ---------------------
 2 files changed, 226 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 4c327f7988b4..6935f1e8d89e 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -13,4 +13,3 @@ 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

diff --git a/games-roguelike/stone-soup/stone-soup-0.29.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.29.0.ebuild
deleted file mode 100644
index 5e98debbd3fa..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.29.0.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 )
-LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{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
-	app-alternatives/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=''
-		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
-		# deprecated (in 5.1) luaL_openlib API (#869671)
-		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
-		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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2023-01-15 21:37 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2023-01-15 21:37 UTC (permalink / raw
  To: gentoo-commits

commit:     4a2f76ed8d18d76ab6835d95277b8b62bccf2a3b
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 21:27:49 2023 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 21:36:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a2f76ed

games-roguelike/stone-soup: stabilize 0.29.1 for amd64, x86

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.29.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
index 46207c02a59e..95f813f887ab 100644
--- a/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
@@ -40,7 +40,7 @@ SRC_URI="
 # 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}"


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2023-01-15 21:37 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2023-01-15 21:37 UTC (permalink / raw
  To: gentoo-commits

commit:     fc9df50fb7be2e571b76079757546c5c29ae9c16
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 21:35:11 2023 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 21:36:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc9df50f

games-roguelike/stone-soup: explain why so many slots are maintained

Closes: https://bugs.gentoo.org/878535
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild | 11 +++++++++++
 games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild   | 11 +++++++++++
 games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild   | 11 +++++++++++
 games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild   | 11 +++++++++++
 games-roguelike/stone-soup/stone-soup-0.29.1.ebuild      | 11 +++++++++++
 5 files changed, 55 insertions(+)

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
index cd2d967e423b..bb46296e7328 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
@@ -1,6 +1,17 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# There are many slots for this package because people in the community
+# like to play old versions.  Every release includes content changes
+# where species/spells/monsters are added or removed.  The public
+# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
+# versions back to 0.11.
+
+# It's not necessary for Gentoo to support these old version but it's
+# something nice that our distro can offer that others don't.  If the
+# maintenance burden becomes excessive than we can revisit that
+# position.
+
 EAPI=8
 
 LUA_COMPAT=( lua5-1 )

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
index 76e44f85900a..4108daba0ebf 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
@@ -1,6 +1,17 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# There are many slots for this package because people in the community
+# like to play old versions.  Every release includes content changes
+# where species/spells/monsters are added or removed.  The public
+# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
+# versions back to 0.11.
+
+# It's not necessary for Gentoo to support these old version but it's
+# something nice that our distro can offer that others don't.  If the
+# maintenance burden becomes excessive than we can revisit that
+# position.
+
 EAPI=8
 
 LUA_COMPAT=( lua5-1 )

diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
index 60968ed55f17..96b13258933b 100644
--- a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
@@ -1,6 +1,17 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# There are many slots for this package because people in the community
+# like to play old versions.  Every release includes content changes
+# where species/spells/monsters are added or removed.  The public
+# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
+# versions back to 0.11.
+
+# It's not necessary for Gentoo to support these old version but it's
+# something nice that our distro can offer that others don't.  If the
+# maintenance burden becomes excessive than we can revisit that
+# position.
+
 EAPI=8
 
 LUA_COMPAT=( lua5-1 )

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
index 86c062d4a981..138d4f637a0f 100644
--- a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
@@ -1,6 +1,17 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# There are many slots for this package because people in the community
+# like to play old versions.  Every release includes content changes
+# where species/spells/monsters are added or removed.  The public
+# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
+# versions back to 0.11.
+
+# It's not necessary for Gentoo to support these old version but it's
+# something nice that our distro can offer that others don't.  If the
+# maintenance burden becomes excessive than we can revisit that
+# position.
+
 EAPI=8
 
 LUA_COMPAT=( lua5-1 )

diff --git a/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
index 95f813f887ab..16d449839711 100644
--- a/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
@@ -1,6 +1,17 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# There are many slots for this package because people in the community
+# like to play old versions.  Every release includes content changes
+# where species/spells/monsters are added or removed.  The public
+# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
+# versions back to 0.11.
+
+# It's not necessary for Gentoo to support these old version but it's
+# something nice that our distro can offer that others don't.  If the
+# maintenance burden becomes excessive than we can revisit that
+# position.
+
 EAPI=8
 
 LUA_COMPAT=( lua5-1 )


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2023-03-05 15:23 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2023-03-05 15:23 UTC (permalink / raw
  To: gentoo-commits

commit:     4195e0f3924bbc740034e8325373b63150f45b73
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  5 15:19:08 2023 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Mar  5 15:22:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4195e0f3

games-roguelike/stone-soup: stabilize 0.30.0_pre20230129 for amd64, x86

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild b/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild
index 7d2e05402a44..61ab7b0bd76c 100644
--- a/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild
@@ -51,7 +51,7 @@ SRC_URI="
 # 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}"


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2023-05-11  3:13 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2023-05-11  3:13 UTC (permalink / raw
  To: gentoo-commits

commit:     c43204dff42729d98061dae291756912fdc4b054
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Thu May 11 03:13:04 2023 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Thu May 11 03:13:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c43204df

games-roguelike/stone-soup: add 0.30.0

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup/stone-soup-0.30.0.ebuild            | 236 +++++++++++++++++++++
 2 files changed, 237 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 8329b932bf9d..7d7a9a528f64 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -9,6 +9,7 @@ DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone-soup-0.29.1.tar.gz 17510846 BLAKE2B 65b84797c8d8a268a3ce95de9d928e131bf6e21a1ea6ac3e72263c75f9d6288e9d95f9df6401528c06aefbda9bb642c79bf78065a65224297d33c050abf37056 SHA512 2ca49c4cd228526d47e4ad7e9556b6c26566595458423cd8e6b762298f229eb7ba273770ae1e12939ba66574a5b55e44812d06c4809d4327ed9bfd738501af04
 DIST stone-soup-0.29.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.29.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
+DIST stone-soup-0.30.0.tar.gz 21062127 BLAKE2B 41a06df2e9298cc5ec6ee1e7180dc93691d6414f959f59fea6f309cec859bd2ee7432680ef1b4af795101f056332ac1ccfde05f3ed67751c81f05fce819bdf34 SHA512 bf134484e56c77ed9aeb2300d3d040b4a4c53eabb6bd7b6bb5e1396cb4c290573a4bbdad90fd0553498883e0747cc2e0cfab7505cae092d5504b4a5184765a33
 DIST stone-soup-0.30.0_pre20230408.tar.gz 21062127 BLAKE2B 41a06df2e9298cc5ec6ee1e7180dc93691d6414f959f59fea6f309cec859bd2ee7432680ef1b4af795101f056332ac1ccfde05f3ed67751c81f05fce819bdf34 SHA512 bf134484e56c77ed9aeb2300d3d040b4a4c53eabb6bd7b6bb5e1396cb4c290573a4bbdad90fd0553498883e0747cc2e0cfab7505cae092d5504b4a5184765a33
 DIST stone-soup-0.30.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.30.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f

diff --git a/games-roguelike/stone-soup/stone-soup-0.30.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.30.0.ebuild
new file mode 100644
index 000000000000..4f66438c8b87
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.30.0.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# There are many slots for this package because people in the community
+# like to play old versions.  Every release includes content changes
+# where species/spells/monsters are added or removed.  The public
+# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
+# versions back to 0.11.
+
+# It's not necessary for Gentoo to support these old version but it's
+# something nice that our distro can offer that others don't.  If the
+# maintenance burden becomes excessive than we can revisit that
+# position.
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 )
+LUA_REQ_USE="deprecated"
+PYTHON_COMPAT=( python3_{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.30"
+
+COMMITSHA="acf32f4bd3330cf0c882ac39c3e11ce40d587b49"
+MY_P="crawl-${COMMITSHA}/crawl-ref"
+IS_RELEASE=true
+
+if [ "${IS_RELEASE}" = true ]; then
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	"
+else
+	# This is a _pre release
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
+	"
+fi
+SRC_URI="
+	${SRC_URI}
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.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"
+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
+	app-alternatives/yacc
+	"
+
+PATCHES=(
+	"${FILESDIR}"/make-v3.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=''
+		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+		# deprecated (in 5.1) luaL_openlib API (#869671)
+		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
+		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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2023-05-11  3:13 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2023-05-11  3:13 UTC (permalink / raw
  To: gentoo-commits

commit:     606d5c380e4d69da1fd65165e270d8d38f0dfe52
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Thu May 11 03:06:13 2023 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Thu May 11 03:06:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=606d5c38

games-roguelike/stone-soup: stabilize 0.30.0_pre20230408 for amd64, x86

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.30.0_pre20230408.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230408.ebuild b/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230408.ebuild
index 353556d7ed6e..f9f297b0b3fb 100644
--- a/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230408.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230408.ebuild
@@ -51,7 +51,7 @@ SRC_URI="
 # 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}"


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2023-05-11  3:13 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2023-05-11  3:13 UTC (permalink / raw
  To: gentoo-commits

commit:     cae04364eb6e0d94fa86814e15ba7bcf506f4443
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Thu May 11 03:09:39 2023 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Thu May 11 03:09:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cae04364

games-roguelike/stone-soup: drop 0.30.0_pre20230129

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 -
 .../stone-soup-0.30.0_pre20230129.ebuild           | 238 ---------------------
 2 files changed, 239 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 8774e05af573..8329b932bf9d 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -9,7 +9,6 @@ DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone-soup-0.29.1.tar.gz 17510846 BLAKE2B 65b84797c8d8a268a3ce95de9d928e131bf6e21a1ea6ac3e72263c75f9d6288e9d95f9df6401528c06aefbda9bb642c79bf78065a65224297d33c050abf37056 SHA512 2ca49c4cd228526d47e4ad7e9556b6c26566595458423cd8e6b762298f229eb7ba273770ae1e12939ba66574a5b55e44812d06c4809d4327ed9bfd738501af04
 DIST stone-soup-0.29.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.29.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone-soup-0.30.0_pre20230129.tar.gz 20929296 BLAKE2B 4ca826d5157c3530c3d7a1f36aa10cc8fbf961a33aca06e2dcd3afc1896e12babdc8e2e33fd937397d72cded0f208422f21757d95ad70171f4938237f6d4f034 SHA512 9d27d209eaee58bf33eaf84288e3f48b72bfb701496d8c3ac98f6207ef761d23134270a837194e0f18c9a6e64774949b4668929614db1f9a7334e7abbb5db4ea
 DIST stone-soup-0.30.0_pre20230408.tar.gz 21062127 BLAKE2B 41a06df2e9298cc5ec6ee1e7180dc93691d6414f959f59fea6f309cec859bd2ee7432680ef1b4af795101f056332ac1ccfde05f3ed67751c81f05fce819bdf34 SHA512 bf134484e56c77ed9aeb2300d3d040b4a4c53eabb6bd7b6bb5e1396cb4c290573a4bbdad90fd0553498883e0747cc2e0cfab7505cae092d5504b4a5184765a33
 DIST stone-soup-0.30.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.30.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f

diff --git a/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild b/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild
deleted file mode 100644
index 61ab7b0bd76c..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# There are many slots for this package because people in the community
-# like to play old versions.  Every release includes content changes
-# where species/spells/monsters are added or removed.  The public
-# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
-# versions back to 0.11.
-
-# It's not necessary for Gentoo to support these old version but it's
-# something nice that our distro can offer that others don't.  If the
-# maintenance burden becomes excessive than we can revisit that
-# position.
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 )
-LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{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.30"
-
-# Leave empty string if not a _pre release
-COMMITSHA="c68057be0a1ad1b17d0337fd8baed0213a428039"
-if [ -z "${COMMITSHA}" ]; then
-	# This is a tagged release
-	# Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1
-	SRC_URI="
-		https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	MY_P="crawl-${PV}/crawl-ref"
-else
-	# This is a _pre release
-	SRC_URI="
-		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
-	"
-	MY_P="crawl-${COMMITSHA}/crawl-ref"
-fi
-SRC_URI="
-	${SRC_URI}
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.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"
-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
-	app-alternatives/yacc
-	"
-
-PATCHES=(
-	"${FILESDIR}"/make-v2.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=''
-		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
-		# deprecated (in 5.1) luaL_openlib API (#869671)
-		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
-		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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2023-06-09 21:39 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2023-06-09 21:39 UTC (permalink / raw
  To: gentoo-commits

commit:     9bdd0d6c59b1ad446efd401dabc9ea718e1b6008
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  9 21:38:23 2023 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 21:39:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bdd0d6c

games-roguelike/stone-soup: enable py3.12

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild        | 2 +-
 games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild          | 2 +-
 games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild          | 2 +-
 games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild          | 2 +-
 games-roguelike/stone-soup/stone-soup-0.29.1.ebuild             | 2 +-
 games-roguelike/stone-soup/stone-soup-0.30.0.ebuild             | 2 +-
 games-roguelike/stone-soup/stone-soup-0.30.0_pre20230408.ebuild | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
index bb46296e7328..150e83d6270e 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{9,10,11,12} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
index 4108daba0ebf..76214392d586 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{9,10,11,12} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 

diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
index 96b13258933b..3f0437547cfa 100644
--- a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{9,10,11,12} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
index 138d4f637a0f..64e098e751ce 100644
--- a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{9,10,11,12} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 

diff --git a/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
index 16d449839711..5ff221ce1c56 100644
--- a/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{9,10,11,12} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 

diff --git a/games-roguelike/stone-soup/stone-soup-0.30.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.30.0.ebuild
index 626cff947189..a1e2b48e31eb 100644
--- a/games-roguelike/stone-soup/stone-soup-0.30.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.30.0.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{9,10,11,12} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 

diff --git a/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230408.ebuild b/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230408.ebuild
index f9f297b0b3fb..e28370cae715 100644
--- a/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230408.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230408.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{9,10,11,12} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2023-06-09 21:39 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2023-06-09 21:39 UTC (permalink / raw
  To: gentoo-commits

commit:     edc64bfd040a3560f13dfce0aa027d272881de17
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  9 21:30:49 2023 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 21:39:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edc64bfd

games-roguelike/stone-soup: metadata fix

Closes: https://bugs.gentoo.org/906146
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                 |  2 +-
 games-roguelike/stone-soup/stone-soup-0.30.0.ebuild | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 7d7a9a528f64..71bb9459d18a 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -9,7 +9,7 @@ DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone-soup-0.29.1.tar.gz 17510846 BLAKE2B 65b84797c8d8a268a3ce95de9d928e131bf6e21a1ea6ac3e72263c75f9d6288e9d95f9df6401528c06aefbda9bb642c79bf78065a65224297d33c050abf37056 SHA512 2ca49c4cd228526d47e4ad7e9556b6c26566595458423cd8e6b762298f229eb7ba273770ae1e12939ba66574a5b55e44812d06c4809d4327ed9bfd738501af04
 DIST stone-soup-0.29.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.29.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone-soup-0.30.0.tar.gz 21062127 BLAKE2B 41a06df2e9298cc5ec6ee1e7180dc93691d6414f959f59fea6f309cec859bd2ee7432680ef1b4af795101f056332ac1ccfde05f3ed67751c81f05fce819bdf34 SHA512 bf134484e56c77ed9aeb2300d3d040b4a4c53eabb6bd7b6bb5e1396cb4c290573a4bbdad90fd0553498883e0747cc2e0cfab7505cae092d5504b4a5184765a33
+DIST stone-soup-0.30.0.tar.gz 21498124 BLAKE2B 18a615d7a882d900d3c7f6523590c75064be8098415c7537ea709f44fe15ec795eb5f9014eefe813111b4a3273c0924e32fa25ba90153e04c1adfec12eee31a3 SHA512 f722a94fc5ce4a46e92a3f1d2dd1766d343662899d61eaab971df311f98d86fdd520264e2a800159e7bad57cc2af9a9a952bb01fde05438e191e1168747e4b4f
 DIST stone-soup-0.30.0_pre20230408.tar.gz 21062127 BLAKE2B 41a06df2e9298cc5ec6ee1e7180dc93691d6414f959f59fea6f309cec859bd2ee7432680ef1b4af795101f056332ac1ccfde05f3ed67751c81f05fce819bdf34 SHA512 bf134484e56c77ed9aeb2300d3d040b4a4c53eabb6bd7b6bb5e1396cb4c290573a4bbdad90fd0553498883e0747cc2e0cfab7505cae092d5504b4a5184765a33
 DIST stone-soup-0.30.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.30.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f

diff --git a/games-roguelike/stone-soup/stone-soup-0.30.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.30.0.ebuild
index 4f66438c8b87..626cff947189 100644
--- a/games-roguelike/stone-soup/stone-soup-0.30.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.30.0.ebuild
@@ -24,19 +24,21 @@ DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in
 HOMEPAGE="https://crawl.develz.org"
 SLOT="0.30"
 
-COMMITSHA="acf32f4bd3330cf0c882ac39c3e11ce40d587b49"
-MY_P="crawl-${COMMITSHA}/crawl-ref"
-IS_RELEASE=true
-
-if [ "${IS_RELEASE}" = true ]; then
+# Leave empty string if not a _pre release
+COMMITSHA=""
+if [ -z "${COMMITSHA}" ]; then
+	# This is a tagged release
+	# Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1
 	SRC_URI="
 		https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
 	"
+	MY_P="crawl-${PV}/crawl-ref"
 else
 	# This is a _pre release
 	SRC_URI="
 		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
 	"
+	MY_P="crawl-${COMMITSHA}/crawl-ref"
 fi
 SRC_URI="
 	${SRC_URI}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2023-07-02 20:18 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2023-07-02 20:18 UTC (permalink / raw
  To: gentoo-commits

commit:     9dc5f16e77a9775ac4699bed8aabc288139eafc0
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  2 19:58:49 2023 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Jul  2 20:18:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dc5f16e

games-roguelike/stone-soup: drop 0.30.0_pre20230408

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 -
 .../stone-soup-0.30.0_pre20230408.ebuild           | 238 ---------------------
 2 files changed, 239 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 71bb9459d18a..8f057f853ce5 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -10,7 +10,6 @@ DIST stone-soup-0.29.1.tar.gz 17510846 BLAKE2B 65b84797c8d8a268a3ce95de9d928e131
 DIST stone-soup-0.29.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.29.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.30.0.tar.gz 21498124 BLAKE2B 18a615d7a882d900d3c7f6523590c75064be8098415c7537ea709f44fe15ec795eb5f9014eefe813111b4a3273c0924e32fa25ba90153e04c1adfec12eee31a3 SHA512 f722a94fc5ce4a46e92a3f1d2dd1766d343662899d61eaab971df311f98d86fdd520264e2a800159e7bad57cc2af9a9a952bb01fde05438e191e1168747e4b4f
-DIST stone-soup-0.30.0_pre20230408.tar.gz 21062127 BLAKE2B 41a06df2e9298cc5ec6ee1e7180dc93691d6414f959f59fea6f309cec859bd2ee7432680ef1b4af795101f056332ac1ccfde05f3ed67751c81f05fce819bdf34 SHA512 bf134484e56c77ed9aeb2300d3d040b4a4c53eabb6bd7b6bb5e1396cb4c290573a4bbdad90fd0553498883e0747cc2e0cfab7505cae092d5504b4a5184765a33
 DIST stone-soup-0.30.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.30.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220

diff --git a/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230408.ebuild b/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230408.ebuild
deleted file mode 100644
index e28370cae715..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230408.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# There are many slots for this package because people in the community
-# like to play old versions.  Every release includes content changes
-# where species/spells/monsters are added or removed.  The public
-# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
-# versions back to 0.11.
-
-# It's not necessary for Gentoo to support these old version but it's
-# something nice that our distro can offer that others don't.  If the
-# maintenance burden becomes excessive than we can revisit that
-# position.
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 )
-LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9,10,11,12} )
-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.30"
-
-# Leave empty string if not a _pre release
-COMMITSHA="acf32f4bd3330cf0c882ac39c3e11ce40d587b49"
-if [ -z "${COMMITSHA}" ]; then
-	# This is a tagged release
-	# Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1
-	SRC_URI="
-		https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	MY_P="crawl-${PV}/crawl-ref"
-else
-	# This is a _pre release
-	SRC_URI="
-		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
-	"
-	MY_P="crawl-${COMMITSHA}/crawl-ref"
-fi
-SRC_URI="
-	${SRC_URI}
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.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"
-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
-	app-alternatives/yacc
-	"
-
-PATCHES=(
-	"${FILESDIR}"/make-v3.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=''
-		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
-		# deprecated (in 5.1) luaL_openlib API (#869671)
-		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
-		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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2023-07-02 20:18 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2023-07-02 20:18 UTC (permalink / raw
  To: gentoo-commits

commit:     0abe036dd47507ac4a13a14185fb5bf1dc8cbc77
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  2 19:57:52 2023 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Jul  2 20:18:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0abe036d

games-roguelike/stone-soup: stabilize 0.30.0 for amd64, x86

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.30.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.30.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.30.0.ebuild
index a1e2b48e31eb..cc9c0daa09b4 100644
--- a/games-roguelike/stone-soup/stone-soup-0.30.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.30.0.ebuild
@@ -51,7 +51,7 @@ SRC_URI="
 # 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}"


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2023-07-02 20:18 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2023-07-02 20:18 UTC (permalink / raw
  To: gentoo-commits

commit:     cafb5a63130b2211b2201fb28bd4e458863057f8
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  2 20:02:12 2023 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Jul  2 20:18:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cafb5a63

games-roguelike/stone-soup: add 0.30.1

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup/stone-soup-0.30.1.ebuild            | 238 +++++++++++++++++++++
 2 files changed, 239 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 8f057f853ce5..8be8b404eabe 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -10,6 +10,7 @@ DIST stone-soup-0.29.1.tar.gz 17510846 BLAKE2B 65b84797c8d8a268a3ce95de9d928e131
 DIST stone-soup-0.29.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.29.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.30.0.tar.gz 21498124 BLAKE2B 18a615d7a882d900d3c7f6523590c75064be8098415c7537ea709f44fe15ec795eb5f9014eefe813111b4a3273c0924e32fa25ba90153e04c1adfec12eee31a3 SHA512 f722a94fc5ce4a46e92a3f1d2dd1766d343662899d61eaab971df311f98d86fdd520264e2a800159e7bad57cc2af9a9a952bb01fde05438e191e1168747e4b4f
+DIST stone-soup-0.30.1.tar.gz 21502317 BLAKE2B 5fc39bb83c5d6b96a00d55c4bf18ee0e6051dd8513ee397dda7b2a55c730c31a4582860c2077e78fed3fda24b5e51c52ae037c603c7dec3376deb93402e2aa72 SHA512 069c9f9d8115f4865daa277a3621534839e3bd9bd5811ae2a9d1486d25abd66461b8e49f6ef4a4265b261be73c6c66c118c49b97c3f6e05087abde7064bf0d5f
 DIST stone-soup-0.30.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.30.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220

diff --git a/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild
new file mode 100644
index 000000000000..a1e2b48e31eb
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# There are many slots for this package because people in the community
+# like to play old versions.  Every release includes content changes
+# where species/spells/monsters are added or removed.  The public
+# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
+# versions back to 0.11.
+
+# It's not necessary for Gentoo to support these old version but it's
+# something nice that our distro can offer that others don't.  If the
+# maintenance burden becomes excessive than we can revisit that
+# position.
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 )
+LUA_REQ_USE="deprecated"
+PYTHON_COMPAT=( python3_{9,10,11,12} )
+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.30"
+
+# Leave empty string if not a _pre release
+COMMITSHA=""
+if [ -z "${COMMITSHA}" ]; then
+	# This is a tagged release
+	# Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	MY_P="crawl-${PV}/crawl-ref"
+else
+	# This is a _pre release
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
+	"
+	MY_P="crawl-${COMMITSHA}/crawl-ref"
+fi
+SRC_URI="
+	${SRC_URI}
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.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"
+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
+	app-alternatives/yacc
+	"
+
+PATCHES=(
+	"${FILESDIR}"/make-v3.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=''
+		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+		# deprecated (in 5.1) luaL_openlib API (#869671)
+		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
+		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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2023-08-14  1:53 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2023-08-14  1:53 UTC (permalink / raw
  To: gentoo-commits

commit:     9bd53b5101bd9e4f5368246607b6029c1236ad13
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 14 01:50:52 2023 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 01:51:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd53b51

games-roguelike/stone-soup: drop 0.30.0

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 -
 .../stone-soup/stone-soup-0.30.0.ebuild            | 238 ---------------------
 2 files changed, 239 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index bcf75caca211..b80f32953440 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -9,7 +9,6 @@ DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone-soup-0.29.1.tar.gz 17510846 BLAKE2B 65b84797c8d8a268a3ce95de9d928e131bf6e21a1ea6ac3e72263c75f9d6288e9d95f9df6401528c06aefbda9bb642c79bf78065a65224297d33c050abf37056 SHA512 2ca49c4cd228526d47e4ad7e9556b6c26566595458423cd8e6b762298f229eb7ba273770ae1e12939ba66574a5b55e44812d06c4809d4327ed9bfd738501af04
 DIST stone-soup-0.29.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.29.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone-soup-0.30.0.tar.gz 21498124 BLAKE2B 18a615d7a882d900d3c7f6523590c75064be8098415c7537ea709f44fe15ec795eb5f9014eefe813111b4a3273c0924e32fa25ba90153e04c1adfec12eee31a3 SHA512 f722a94fc5ce4a46e92a3f1d2dd1766d343662899d61eaab971df311f98d86fdd520264e2a800159e7bad57cc2af9a9a952bb01fde05438e191e1168747e4b4f
 DIST stone-soup-0.30.1.tar.gz 21502317 BLAKE2B 5fc39bb83c5d6b96a00d55c4bf18ee0e6051dd8513ee397dda7b2a55c730c31a4582860c2077e78fed3fda24b5e51c52ae037c603c7dec3376deb93402e2aa72 SHA512 069c9f9d8115f4865daa277a3621534839e3bd9bd5811ae2a9d1486d25abd66461b8e49f6ef4a4265b261be73c6c66c118c49b97c3f6e05087abde7064bf0d5f
 DIST stone-soup-0.30.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.30.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f

diff --git a/games-roguelike/stone-soup/stone-soup-0.30.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.30.0.ebuild
deleted file mode 100644
index cc9c0daa09b4..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.30.0.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# There are many slots for this package because people in the community
-# like to play old versions.  Every release includes content changes
-# where species/spells/monsters are added or removed.  The public
-# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
-# versions back to 0.11.
-
-# It's not necessary for Gentoo to support these old version but it's
-# something nice that our distro can offer that others don't.  If the
-# maintenance burden becomes excessive than we can revisit that
-# position.
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 )
-LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9,10,11,12} )
-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.30"
-
-# Leave empty string if not a _pre release
-COMMITSHA=""
-if [ -z "${COMMITSHA}" ]; then
-	# This is a tagged release
-	# Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1
-	SRC_URI="
-		https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	MY_P="crawl-${PV}/crawl-ref"
-else
-	# This is a _pre release
-	SRC_URI="
-		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
-	"
-	MY_P="crawl-${COMMITSHA}/crawl-ref"
-fi
-SRC_URI="
-	${SRC_URI}
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.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"
-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
-	app-alternatives/yacc
-	"
-
-PATCHES=(
-	"${FILESDIR}"/make-v3.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=''
-		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
-		# deprecated (in 5.1) luaL_openlib API (#869671)
-		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
-		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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2023-08-14  1:53 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2023-08-14  1:53 UTC (permalink / raw
  To: gentoo-commits

commit:     bd0193f5f57ed6da2c0cb01459eedae6531de67c
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 14 01:52:21 2023 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 01:52:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd0193f5

games-roguelike/stone-soup: stabilize 0.31.0_pre20230712 for amd64, x86

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.31.0_pre20230712.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.31.0_pre20230712.ebuild b/games-roguelike/stone-soup/stone-soup-0.31.0_pre20230712.ebuild
index 9ea0126c9a43..b7a3296129e4 100644
--- a/games-roguelike/stone-soup/stone-soup-0.31.0_pre20230712.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.31.0_pre20230712.ebuild
@@ -51,7 +51,7 @@ SRC_URI="
 # 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}"


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2023-08-14  1:53 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2023-08-14  1:53 UTC (permalink / raw
  To: gentoo-commits

commit:     2c34c697b1d228e815fe08ba6cd0411ddbbc9012
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 14 01:48:30 2023 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 01:48:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c34c697

games-roguelike/stone-soup: stabilize 0.30.1 for amd64, x86

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.30.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild
index a1e2b48e31eb..cc9c0daa09b4 100644
--- a/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild
@@ -51,7 +51,7 @@ SRC_URI="
 # 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}"


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2023-10-28  3:05 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2023-10-28  3:05 UTC (permalink / raw
  To: gentoo-commits

commit:     c979a8272018a153374210ee325960b938c7bd86
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 28 03:04:41 2023 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 03:05:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c979a827

games-roguelike/stone-soup: add 0.31.0_pre20231027

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup-0.31.0_pre20231027.ebuild           | 239 +++++++++++++++++++++
 2 files changed, 240 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index b80f32953440..981029eacdd5 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -13,6 +13,7 @@ DIST stone-soup-0.30.1.tar.gz 21502317 BLAKE2B 5fc39bb83c5d6b96a00d55c4bf18ee0e6
 DIST stone-soup-0.30.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.30.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.31.0_pre20230712.tar.gz 21654476 BLAKE2B c58e59eee09996d109aeb2ef21334497b18b665cfef42c77857446bf8108fe0e50064a29e662eb7c513026fba4f9f1b8ebe2122d5fc317223f61037ac31bee68 SHA512 bad8ba6a4479ed34f1a5b081062db11eb73f8a6cd7637a44c8c7da7013b0a0b943ef921345f5071be245eb7a575bffaef1c04973d634b6c5092a09211126f46a
+DIST stone-soup-0.31.0_pre20231027.tar.gz 22093957 BLAKE2B 7f434b3430f2b4c99abbb52fd245349caaf3864fc992263482144e1bb3c12a9b58be8b918d21c829e8c188116900dfbac082f5e1c490faf4f4a27e1d04998fd5 SHA512 76f957e5cbd580969aa8c1aa09c47604bb0eee85ea3e7895d3e311567a0ec5ece51b3816b143233e2be9a434baf7ad5dd86d815d06bd6ec6e9aac0df5d3d8ac5
 DIST stone-soup-0.31.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.31.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220

diff --git a/games-roguelike/stone-soup/stone-soup-0.31.0_pre20231027.ebuild b/games-roguelike/stone-soup/stone-soup-0.31.0_pre20231027.ebuild
new file mode 100644
index 000000000000..3a5d25dadbbf
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.31.0_pre20231027.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# There are many slots for this package because people in the community
+# like to play old versions.  Every release includes content changes
+# where species/spells/monsters are added or removed.  The public
+# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
+# versions back to 0.11.
+
+# It's not necessary for Gentoo to support these old version but it's
+# something nice that our distro can offer that others don't.  If the
+# maintenance burden becomes excessive than we can revisit that
+# position.
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 )
+LUA_REQ_USE="deprecated"
+PYTHON_COMPAT=( python3_{10,11,12} )
+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.31"
+
+# Leave empty string if not a _pre release
+COMMITSHA="75a2e9a4b400dc4ea8016b403626a028986a60ef"
+if [ -z "${COMMITSHA}" ]; then
+	# This is a tagged release
+	# Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	MY_P="crawl-${PV}/crawl-ref"
+else
+	# This is a _pre release
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
+	"
+	MY_P="crawl-${COMMITSHA}/crawl-ref"
+fi
+SRC_URI="
+	${SRC_URI}
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.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"
+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
+	app-alternatives/yacc
+	"
+
+PATCHES=(
+	"${FILESDIR}"/make-v3.patch
+	"${FILESDIR}"/rltiles-make.patch
+	"${FILESDIR}"/avoid-musl-execinfo.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=''
+		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+		# deprecated (in 5.1) luaL_openlib API (#869671)
+		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
+		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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2023-12-30  3:04 Sam James
  0 siblings, 0 replies; 111+ messages in thread
From: Sam James @ 2023-12-30  3:04 UTC (permalink / raw
  To: gentoo-commits

commit:     a77c796f63cac4bc2ae8271112e68d78b39ea665
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 03:03:13 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 03:03:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a77c796f

games-roguelike/stone-soup: Stabilize 0.31.0_pre20231027 amd64, #921004

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.31.0_pre20231027.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.31.0_pre20231027.ebuild b/games-roguelike/stone-soup/stone-soup-0.31.0_pre20231027.ebuild
index 3a5d25dadbbf..5dce88590024 100644
--- a/games-roguelike/stone-soup/stone-soup-0.31.0_pre20231027.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.31.0_pre20231027.ebuild
@@ -51,7 +51,7 @@ SRC_URI="
 # 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}"


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2023-12-30  6:38 Arthur Zamarin
  0 siblings, 0 replies; 111+ messages in thread
From: Arthur Zamarin @ 2023-12-30  6:38 UTC (permalink / raw
  To: gentoo-commits

commit:     d795a1de901d986fea70982b0e53ebe1cb362d44
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 06:37:56 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 06:37:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d795a1de

games-roguelike/stone-soup: Stabilize 0.31.0_pre20231027 x86, #921004

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.31.0_pre20231027.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.31.0_pre20231027.ebuild b/games-roguelike/stone-soup/stone-soup-0.31.0_pre20231027.ebuild
index 5dce88590024..58e6ae17cd6e 100644
--- a/games-roguelike/stone-soup/stone-soup-0.31.0_pre20231027.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.31.0_pre20231027.ebuild
@@ -51,7 +51,7 @@ SRC_URI="
 # 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}"


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2024-01-20 15:40 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2024-01-20 15:40 UTC (permalink / raw
  To: gentoo-commits

commit:     edbbe15f49c5e294376e1b10b13c8bdfc75603c9
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 20 15:07:53 2024 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 15:40:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edbbe15f

games-roguelike/stone-soup: drop 0.31.0_pre20230712

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 -
 .../stone-soup-0.31.0_pre20230712.ebuild           | 239 ---------------------
 2 files changed, 240 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 74157170ec07..508d7c33b989 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -13,7 +13,6 @@ DIST stone-soup-0.30.1.tar.gz 21502317 BLAKE2B 5fc39bb83c5d6b96a00d55c4bf18ee0e6
 DIST stone-soup-0.30.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.30.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.31.0.tar.gz 22432560 BLAKE2B f3e696915458674e3f7ce2a47d19c740c53de897ab40227efc9c127be42dcfbb4b3ee93258ea4094fb1a18aceb37c4341aac86c1174c42ab1ce300bca3281fc6 SHA512 ad354d57a39d07ad8a1a89a7fd20b33a4cd88fcbf1f2276cdefe8890c223272b7a34969a373f6b1f39cff72499c1e2773592ce368e887307908acd59ca00ca4b
-DIST stone-soup-0.31.0_pre20230712.tar.gz 21654476 BLAKE2B c58e59eee09996d109aeb2ef21334497b18b665cfef42c77857446bf8108fe0e50064a29e662eb7c513026fba4f9f1b8ebe2122d5fc317223f61037ac31bee68 SHA512 bad8ba6a4479ed34f1a5b081062db11eb73f8a6cd7637a44c8c7da7013b0a0b943ef921345f5071be245eb7a575bffaef1c04973d634b6c5092a09211126f46a
 DIST stone-soup-0.31.0_pre20231027.tar.gz 22093957 BLAKE2B 7f434b3430f2b4c99abbb52fd245349caaf3864fc992263482144e1bb3c12a9b58be8b918d21c829e8c188116900dfbac082f5e1c490faf4f4a27e1d04998fd5 SHA512 76f957e5cbd580969aa8c1aa09c47604bb0eee85ea3e7895d3e311567a0ec5ece51b3816b143233e2be9a434baf7ad5dd86d815d06bd6ec6e9aac0df5d3d8ac5
 DIST stone-soup-0.31.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.31.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f

diff --git a/games-roguelike/stone-soup/stone-soup-0.31.0_pre20230712.ebuild b/games-roguelike/stone-soup/stone-soup-0.31.0_pre20230712.ebuild
deleted file mode 100644
index 30ae6c07f99f..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.31.0_pre20230712.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# There are many slots for this package because people in the community
-# like to play old versions.  Every release includes content changes
-# where species/spells/monsters are added or removed.  The public
-# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
-# versions back to 0.11.
-
-# It's not necessary for Gentoo to support these old version but it's
-# something nice that our distro can offer that others don't.  If the
-# maintenance burden becomes excessive than we can revisit that
-# position.
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 )
-LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{10,11,12} )
-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.31"
-
-# Leave empty string if not a _pre release
-COMMITSHA="771a54ca4b33d56804086cbf34083023ac7d748c"
-if [ -z "${COMMITSHA}" ]; then
-	# This is a tagged release
-	# Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1
-	SRC_URI="
-		https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	MY_P="crawl-${PV}/crawl-ref"
-else
-	# This is a _pre release
-	SRC_URI="
-		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
-	"
-	MY_P="crawl-${COMMITSHA}/crawl-ref"
-fi
-SRC_URI="
-	${SRC_URI}
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.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"
-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}]')
-	app-alternatives/lex
-	tiles? (
-		advpng? (
-			app-arch/advancecomp
-		)
-		!advpng? (
-			media-gfx/pngcrush
-		)
-	)
-	virtual/pkgconfig
-	app-alternatives/yacc
-	"
-
-PATCHES=(
-	"${FILESDIR}"/make-v3.patch
-	"${FILESDIR}"/rltiles-make.patch
-	"${FILESDIR}"/avoid-musl-execinfo.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=''
-		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
-		# deprecated (in 5.1) luaL_openlib API (#869671)
-		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
-		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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2024-01-20 15:40 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2024-01-20 15:40 UTC (permalink / raw
  To: gentoo-commits

commit:     d2557e8382ff04be6a70e07a0ab55ee94e13000f
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 20 05:11:38 2024 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 15:40:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2557e83

games-roguelike/stone-soup: add 0.31.0

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup/stone-soup-0.31.0.ebuild            | 239 +++++++++++++++++++++
 2 files changed, 240 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 981029eacdd5..74157170ec07 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -12,6 +12,7 @@ DIST stone-soup-0.29.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone-soup-0.30.1.tar.gz 21502317 BLAKE2B 5fc39bb83c5d6b96a00d55c4bf18ee0e6051dd8513ee397dda7b2a55c730c31a4582860c2077e78fed3fda24b5e51c52ae037c603c7dec3376deb93402e2aa72 SHA512 069c9f9d8115f4865daa277a3621534839e3bd9bd5811ae2a9d1486d25abd66461b8e49f6ef4a4265b261be73c6c66c118c49b97c3f6e05087abde7064bf0d5f
 DIST stone-soup-0.30.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.30.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
+DIST stone-soup-0.31.0.tar.gz 22432560 BLAKE2B f3e696915458674e3f7ce2a47d19c740c53de897ab40227efc9c127be42dcfbb4b3ee93258ea4094fb1a18aceb37c4341aac86c1174c42ab1ce300bca3281fc6 SHA512 ad354d57a39d07ad8a1a89a7fd20b33a4cd88fcbf1f2276cdefe8890c223272b7a34969a373f6b1f39cff72499c1e2773592ce368e887307908acd59ca00ca4b
 DIST stone-soup-0.31.0_pre20230712.tar.gz 21654476 BLAKE2B c58e59eee09996d109aeb2ef21334497b18b665cfef42c77857446bf8108fe0e50064a29e662eb7c513026fba4f9f1b8ebe2122d5fc317223f61037ac31bee68 SHA512 bad8ba6a4479ed34f1a5b081062db11eb73f8a6cd7637a44c8c7da7013b0a0b943ef921345f5071be245eb7a575bffaef1c04973d634b6c5092a09211126f46a
 DIST stone-soup-0.31.0_pre20231027.tar.gz 22093957 BLAKE2B 7f434b3430f2b4c99abbb52fd245349caaf3864fc992263482144e1bb3c12a9b58be8b918d21c829e8c188116900dfbac082f5e1c490faf4f4a27e1d04998fd5 SHA512 76f957e5cbd580969aa8c1aa09c47604bb0eee85ea3e7895d3e311567a0ec5ece51b3816b143233e2be9a434baf7ad5dd86d815d06bd6ec6e9aac0df5d3d8ac5
 DIST stone-soup-0.31.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc

diff --git a/games-roguelike/stone-soup/stone-soup-0.31.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.31.0.ebuild
new file mode 100644
index 000000000000..c44ae6304971
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.31.0.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# There are many slots for this package because people in the community
+# like to play old versions.  Every release includes content changes
+# where species/spells/monsters are added or removed.  The public
+# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
+# versions back to 0.11.
+
+# It's not necessary for Gentoo to support these old version but it's
+# something nice that our distro can offer that others don't.  If the
+# maintenance burden becomes excessive than we can revisit that
+# position.
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 )
+LUA_REQ_USE="deprecated"
+PYTHON_COMPAT=( python3_{10,11,12} )
+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.31"
+
+# Leave empty string if not a _pre release
+COMMITSHA=""
+if [ -z "${COMMITSHA}" ]; then
+	# This is a tagged release
+	# Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	MY_P="crawl-${PV}/crawl-ref"
+else
+	# This is a _pre release
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
+	"
+	MY_P="crawl-${COMMITSHA}/crawl-ref"
+fi
+SRC_URI="
+	${SRC_URI}
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.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"
+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}]')
+	app-alternatives/lex
+	tiles? (
+		advpng? (
+			app-arch/advancecomp
+		)
+		!advpng? (
+			media-gfx/pngcrush
+		)
+	)
+	virtual/pkgconfig
+	app-alternatives/yacc
+	"
+
+PATCHES=(
+	"${FILESDIR}"/make-v3.patch
+	"${FILESDIR}"/rltiles-make.patch
+	"${FILESDIR}"/avoid-musl-execinfo.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=''
+		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+		# deprecated (in 5.1) luaL_openlib API (#869671)
+		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
+		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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2024-04-10  4:47 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2024-04-10  4:47 UTC (permalink / raw
  To: gentoo-commits

commit:     7948a4f78e862b1a1a251a52166274f3ae26761b
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 10 03:53:15 2024 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Wed Apr 10 04:47:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7948a4f7

games-roguelike/stone-soup: stabilize 0.31.0 for amd64, x86

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.31.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.31.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.31.0.ebuild
index c44ae6304971..3461e75a1504 100644
--- a/games-roguelike/stone-soup/stone-soup-0.31.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.31.0.ebuild
@@ -51,7 +51,7 @@ SRC_URI="
 # 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}"


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2024-04-10  4:47 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2024-04-10  4:47 UTC (permalink / raw
  To: gentoo-commits

commit:     244a20341fe47d91492317c90f17cca9ad76e5d4
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 10 03:54:48 2024 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Wed Apr 10 04:47:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=244a2034

games-roguelike/stone-soup: drop 0.31.0_pre20231027

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 -
 .../stone-soup-0.31.0_pre20231027.ebuild           | 239 ---------------------
 2 files changed, 240 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 508d7c33b989..a6c692f90cf0 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -13,7 +13,6 @@ DIST stone-soup-0.30.1.tar.gz 21502317 BLAKE2B 5fc39bb83c5d6b96a00d55c4bf18ee0e6
 DIST stone-soup-0.30.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.30.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.31.0.tar.gz 22432560 BLAKE2B f3e696915458674e3f7ce2a47d19c740c53de897ab40227efc9c127be42dcfbb4b3ee93258ea4094fb1a18aceb37c4341aac86c1174c42ab1ce300bca3281fc6 SHA512 ad354d57a39d07ad8a1a89a7fd20b33a4cd88fcbf1f2276cdefe8890c223272b7a34969a373f6b1f39cff72499c1e2773592ce368e887307908acd59ca00ca4b
-DIST stone-soup-0.31.0_pre20231027.tar.gz 22093957 BLAKE2B 7f434b3430f2b4c99abbb52fd245349caaf3864fc992263482144e1bb3c12a9b58be8b918d21c829e8c188116900dfbac082f5e1c490faf4f4a27e1d04998fd5 SHA512 76f957e5cbd580969aa8c1aa09c47604bb0eee85ea3e7895d3e311567a0ec5ece51b3816b143233e2be9a434baf7ad5dd86d815d06bd6ec6e9aac0df5d3d8ac5
 DIST stone-soup-0.31.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.31.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220

diff --git a/games-roguelike/stone-soup/stone-soup-0.31.0_pre20231027.ebuild b/games-roguelike/stone-soup/stone-soup-0.31.0_pre20231027.ebuild
deleted file mode 100644
index 94add6fe6130..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.31.0_pre20231027.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# There are many slots for this package because people in the community
-# like to play old versions.  Every release includes content changes
-# where species/spells/monsters are added or removed.  The public
-# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
-# versions back to 0.11.
-
-# It's not necessary for Gentoo to support these old version but it's
-# something nice that our distro can offer that others don't.  If the
-# maintenance burden becomes excessive than we can revisit that
-# position.
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 )
-LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{10,11,12} )
-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.31"
-
-# Leave empty string if not a _pre release
-COMMITSHA="75a2e9a4b400dc4ea8016b403626a028986a60ef"
-if [ -z "${COMMITSHA}" ]; then
-	# This is a tagged release
-	# Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1
-	SRC_URI="
-		https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	MY_P="crawl-${PV}/crawl-ref"
-else
-	# This is a _pre release
-	SRC_URI="
-		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
-	"
-	MY_P="crawl-${COMMITSHA}/crawl-ref"
-fi
-SRC_URI="
-	${SRC_URI}
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.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"
-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}]')
-	app-alternatives/lex
-	tiles? (
-		advpng? (
-			app-arch/advancecomp
-		)
-		!advpng? (
-			media-gfx/pngcrush
-		)
-	)
-	virtual/pkgconfig
-	app-alternatives/yacc
-	"
-
-PATCHES=(
-	"${FILESDIR}"/make-v3.patch
-	"${FILESDIR}"/rltiles-make.patch
-	"${FILESDIR}"/avoid-musl-execinfo.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=''
-		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
-		# deprecated (in 5.1) luaL_openlib API (#869671)
-		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
-		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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2024-04-10  4:47 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2024-04-10  4:47 UTC (permalink / raw
  To: gentoo-commits

commit:     f4e804178ec47706d9b1ae61b1dff20d9be15da7
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 10 04:46:11 2024 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Wed Apr 10 04:47:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4e80417

games-roguelike/stone-soup: add 0.32.0_pre20240409

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   3 +
 .../stone-soup-0.32.0_pre20240409.ebuild           | 241 +++++++++++++++++++++
 2 files changed, 244 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index a6c692f90cf0..a0219e086b37 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -15,6 +15,9 @@ DIST stone-soup-0.30.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone-soup-0.31.0.tar.gz 22432560 BLAKE2B f3e696915458674e3f7ce2a47d19c740c53de897ab40227efc9c127be42dcfbb4b3ee93258ea4094fb1a18aceb37c4341aac86c1174c42ab1ce300bca3281fc6 SHA512 ad354d57a39d07ad8a1a89a7fd20b33a4cd88fcbf1f2276cdefe8890c223272b7a34969a373f6b1f39cff72499c1e2773592ce368e887307908acd59ca00ca4b
 DIST stone-soup-0.31.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.31.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
+DIST stone-soup-0.32.0_pre20240409.tar.gz 23206591 BLAKE2B 7d5f44adc4aaa1c7f881e4fddf2bd83240c126987168c8ef2e15681f83790b6f5ff5ca840ea46091c24a2dbaf80fe456c6919a09665519d71c6430d6ac9f09ad SHA512 81992f69fb7d70c968bc82f91131a55753d4323c15a12a1fd095cb4b75b77dc9645c4b5d9eb1106227d81d31d705bdc5ecc0e2ad3a63ba6562ee3730545a6c2a
+DIST stone-soup-0.32.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
+DIST stone-soup-0.32.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220
 DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d
 DIST stone_soup-0.27.1.zip 96934633 BLAKE2B 8821920a4faad9474f08a34ae3c272cb9dcd3ddeb9029e033c22eb8e6650ef20bbc30e0c0ca1556d08c1b7b898fdbdd3667a3ac9a8527e0c322cd8c78ab391bb SHA512 845dafc9895ada3712903de63b95cca9eeb66160e4a04ba21193d916447fca8e7248b851f1e938f43b8d3937cf4f4437443bdc4fe2da893fe3918fed4e0b5204

diff --git a/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild b/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild
new file mode 100644
index 000000000000..053555479849
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# There are many slots for this package because people in the community
+# like to play old versions.  Every release includes content changes
+# where species/spells/monsters are added or removed.  The public
+# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
+# versions back to 0.11.
+
+# It's not necessary for Gentoo to support these old version but it's
+# something nice that our distro can offer that others don't.  If the
+# maintenance burden becomes excessive than we can revisit that
+# position.
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 )
+LUA_REQ_USE="deprecated"
+PYTHON_COMPAT=( python3_{10,11,12} )
+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"
+
+# Leave empty string if not a _pre release
+COMMITSHA="0f22ef8d6127abe4e43dc0a93299003b0dfbec3f"
+if [ -z "${COMMITSHA}" ]; then
+	# This is a tagged release
+	# Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	MY_P="crawl-${PV}/crawl-ref"
+else
+	# This is a _pre release
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
+	"
+	MY_P="crawl-${COMMITSHA}/crawl-ref"
+fi
+# MY_SLOT to satisfy pkgcheck variable order checking
+MY_SLOT="0.32"
+SRC_URI="
+	${SRC_URI}
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${MY_SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${MY_SLOT}.svg
+"
+
+S=${WORKDIR}/${MY_P}/source
+# 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="${MY_SLOT}"
+KEYWORDS="~amd64 ~x86"
+IUSE="advpng debug ncurses sound test +tiles"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+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}]')
+	app-alternatives/lex
+	tiles? (
+		advpng? (
+			app-arch/advancecomp
+		)
+		!advpng? (
+			media-gfx/pngcrush
+		)
+	)
+	virtual/pkgconfig
+	app-alternatives/yacc
+	"
+
+PATCHES=(
+	"${FILESDIR}"/make-v3.patch
+	"${FILESDIR}"/rltiles-make.patch
+	"${FILESDIR}"/avoid-musl-execinfo.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=''
+		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+		# deprecated (in 5.1) luaL_openlib API (#869671)
+		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
+		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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2024-04-10  4:47 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2024-04-10  4:47 UTC (permalink / raw
  To: gentoo-commits

commit:     35cb495fa06fdb252bb06f285e5a3180965466e8
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 10 04:15:14 2024 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Wed Apr 10 04:47:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35cb495f

games-roguelike/stone-soup: reorder vars to satisfy pkgcheck

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild | 10 ++++++----
 games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild   | 10 ++++++----
 games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild   | 10 ++++++----
 games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild   | 14 ++++++++------
 games-roguelike/stone-soup/stone-soup-0.29.1.ebuild      | 10 ++++++----
 games-roguelike/stone-soup/stone-soup-0.30.1.ebuild      | 10 ++++++----
 games-roguelike/stone-soup/stone-soup-0.31.0.ebuild      | 10 ++++++----
 7 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
index 2fd6ee339cb2..0b712dda89b3 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
@@ -23,18 +23,21 @@ inherit desktop python-any-r1 lua-single 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"
-SLOT="0.25"
+# MY_SLOT to satisfy pkgcheck variable order checking
+MY_SLOT="0.25"
 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
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${MY_SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${MY_SLOT}.svg
 "
 
+S=${WORKDIR}/${MY_P}/source
 # 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="${MY_SLOT}"
 KEYWORDS="amd64 x86"
 IUSE="advpng debug ncurses sound test +tiles"
 RESTRICT="!test? ( test )"
@@ -83,7 +86,6 @@ BDEPEND="
 	app-alternatives/yacc
 	"
 
-S=${WORKDIR}/${MY_P}/source
 PATCHES=(
 	"${FILESDIR}"/make.patch
 	"${FILESDIR}"/rltiles-make.patch

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
index 7429d5fa73d8..6e8f74d68955 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
@@ -23,18 +23,21 @@ inherit desktop python-any-r1 lua-single 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"
-SLOT="0.26"
+# MY_SLOT to satisfy pkgcheck variable order checking
+MY_SLOT="0.26"
 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
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${MY_SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${MY_SLOT}.svg
 "
 
+S=${WORKDIR}/${MY_P}/source
 # 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="${MY_SLOT}"
 KEYWORDS="amd64 x86"
 IUSE="advpng debug ncurses sound test +tiles"
 RESTRICT="!test? ( test )"
@@ -83,7 +86,6 @@ BDEPEND="
 	app-alternatives/yacc
 	"
 
-S=${WORKDIR}/${MY_P}/source
 PATCHES=(
 	"${FILESDIR}"/make.patch
 	"${FILESDIR}"/rltiles-make.patch

diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
index c22746fce76b..0c67e25b1d5e 100644
--- a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
@@ -23,18 +23,21 @@ inherit desktop python-any-r1 lua-single 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"
-SLOT="0.27"
+# MY_SLOT to satisfy pkgcheck variable order checking
+MY_SLOT="0.27"
 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
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${MY_SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${MY_SLOT}.svg
 "
 
+S=${WORKDIR}/${MY_P}/source
 # 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="${MY_SLOT}"
 KEYWORDS="amd64 x86"
 IUSE="advpng debug ncurses sound test +tiles"
 RESTRICT="!test? ( test )"
@@ -83,7 +86,6 @@ BDEPEND="
 	app-alternatives/yacc
 	"
 
-S=${WORKDIR}/${MY_P}/source
 PATCHES=(
 	"${FILESDIR}"/make.patch
 	"${FILESDIR}"/rltiles-make.patch

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
index 083a42449f70..a2a5d00a8ad8 100644
--- a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
@@ -22,39 +22,41 @@ 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.28"
 
 # Leave empty string if not a _pre release
 COMMITSHA=""
+# MY_SLOT to satisfy pkgcheck variable order checking
+MY_SLOT="0.28"
 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
+		https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${MY_SLOT}.png
+		https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${MY_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
+		https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${MY_SLOT}.png
+		https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${MY_SLOT}.svg
 	"
 	MY_P="crawl-${COMMITSHA}/crawl-ref"
 fi
 
+S=${WORKDIR}/${MY_P}/source
 # 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="${MY_SLOT}"
 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

diff --git a/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
index dd6981ccb593..b3aa85ee3dae 100644
--- a/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
@@ -22,7 +22,6 @@ 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=""
@@ -40,23 +39,26 @@ else
 	"
 	MY_P="crawl-${COMMITSHA}/crawl-ref"
 fi
+# MY_SLOT to satisfy pkgcheck variable order checking
+MY_SLOT="0.29"
 SRC_URI="
 	${SRC_URI}
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${MY_SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${MY_SLOT}.svg
 "
 
+S=${WORKDIR}/${MY_P}/source
 # 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="${MY_SLOT}"
 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

diff --git a/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild
index ef68cd84dd1f..92908ca4accc 100644
--- a/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild
@@ -22,7 +22,6 @@ 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.30"
 
 # Leave empty string if not a _pre release
 COMMITSHA=""
@@ -40,23 +39,26 @@ else
 	"
 	MY_P="crawl-${COMMITSHA}/crawl-ref"
 fi
+# MY_SLOT to satisfy pkgcheck variable order checking
+MY_SLOT="0.30"
 SRC_URI="
 	${SRC_URI}
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${MY_SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${MY_SLOT}.svg
 "
 
+S=${WORKDIR}/${MY_P}/source
 # 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="${MY_SLOT}"
 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

diff --git a/games-roguelike/stone-soup/stone-soup-0.31.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.31.0.ebuild
index 3461e75a1504..aabb2224fe3e 100644
--- a/games-roguelike/stone-soup/stone-soup-0.31.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.31.0.ebuild
@@ -22,7 +22,6 @@ 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.31"
 
 # Leave empty string if not a _pre release
 COMMITSHA=""
@@ -40,23 +39,26 @@ else
 	"
 	MY_P="crawl-${COMMITSHA}/crawl-ref"
 fi
+# MY_SLOT to satisfy pkgcheck variable order checking
+MY_SLOT="0.31"
 SRC_URI="
 	${SRC_URI}
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${MY_SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${MY_SLOT}.svg
 "
 
+S=${WORKDIR}/${MY_P}/source
 # 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="${MY_SLOT}"
 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


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2024-05-16  3:52 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2024-05-16  3:52 UTC (permalink / raw
  To: gentoo-commits

commit:     7c7631bacf9ebb098d95fdeacc9c4cf08fc5625d
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Thu May 16 03:51:18 2024 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Thu May 16 03:52:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c7631ba

games-roguelike/stone-soup: stabilize 0.32.0_pre20240409 for amd64, x86

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild b/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild
index 053555479849..b86851ad074c 100644
--- a/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild
@@ -54,7 +54,7 @@ S=${WORKDIR}/${MY_P}/source
 # 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="${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="advpng debug ncurses sound test +tiles"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}"


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2024-06-27  2:43 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2024-06-27  2:43 UTC (permalink / raw
  To: gentoo-commits

commit:     3550b62e6bcd8f46b1eb232f66e752a90a8a4b78
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 02:36:50 2024 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 02:37:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3550b62e

games-roguelike/stone-soup: add 0.32.0_pre20240626

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup-0.32.0_pre20240626.ebuild           | 241 +++++++++++++++++++++
 2 files changed, 242 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index a0219e086b37..3b005c777ff2 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -16,6 +16,7 @@ DIST stone-soup-0.31.0.tar.gz 22432560 BLAKE2B f3e696915458674e3f7ce2a47d19c740c
 DIST stone-soup-0.31.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.31.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.32.0_pre20240409.tar.gz 23206591 BLAKE2B 7d5f44adc4aaa1c7f881e4fddf2bd83240c126987168c8ef2e15681f83790b6f5ff5ca840ea46091c24a2dbaf80fe456c6919a09665519d71c6430d6ac9f09ad SHA512 81992f69fb7d70c968bc82f91131a55753d4323c15a12a1fd095cb4b75b77dc9645c4b5d9eb1106227d81d31d705bdc5ecc0e2ad3a63ba6562ee3730545a6c2a
+DIST stone-soup-0.32.0_pre20240626.tar.gz 23577520 BLAKE2B 43a7d9db8037cb1f37ff821da95106d77fa46b0bf34a6b0ef02b66023e1e77a76cc906d2f34d66d6bdea4e9b3859728e2e93909f2c9e1898caab52955d218de2 SHA512 f7a3c58a9f266f354e01175fcc9e2978f4afc5d4e1fc7b5f84979e36213057f2e3bb15f600d40988135e06dc01b65540a4342b16c82edf1c3cfb41421ea92285
 DIST stone-soup-0.32.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.32.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220

diff --git a/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild b/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild
new file mode 100644
index 000000000000..47a54b26f84b
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# There are many slots for this package because people in the community
+# like to play old versions.  Every release includes content changes
+# where species/spells/monsters are added or removed.  The public
+# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
+# versions back to 0.11.
+
+# It's not necessary for Gentoo to support these old version but it's
+# something nice that our distro can offer that others don't.  If the
+# maintenance burden becomes excessive than we can revisit that
+# position.
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 )
+LUA_REQ_USE="deprecated"
+PYTHON_COMPAT=( python3_{10,11,12} )
+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"
+
+# Leave empty string if not a _pre release
+COMMITSHA="3d6ac616a9d452a692b94beb1a9d6b8e66346631"
+if [ -z "${COMMITSHA}" ]; then
+	# This is a tagged release
+	# Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	MY_P="crawl-${PV}/crawl-ref"
+else
+	# This is a _pre release
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
+	"
+	MY_P="crawl-${COMMITSHA}/crawl-ref"
+fi
+# MY_SLOT to satisfy pkgcheck variable order checking
+MY_SLOT="0.32"
+SRC_URI="
+	${SRC_URI}
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${MY_SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${MY_SLOT}.svg
+"
+
+S=${WORKDIR}/${MY_P}/source
+# 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="${MY_SLOT}"
+KEYWORDS="~amd64 ~x86"
+IUSE="advpng debug ncurses sound test +tiles"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+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}]')
+	app-alternatives/lex
+	tiles? (
+		advpng? (
+			app-arch/advancecomp
+		)
+		!advpng? (
+			media-gfx/pngcrush
+		)
+	)
+	virtual/pkgconfig
+	app-alternatives/yacc
+	"
+
+PATCHES=(
+	"${FILESDIR}"/make-v3.patch
+	"${FILESDIR}"/rltiles-make.patch
+	"${FILESDIR}"/avoid-musl-execinfo.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=''
+		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+		# deprecated (in 5.1) luaL_openlib API (#869671)
+		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
+		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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2024-06-27  2:43 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2024-06-27  2:43 UTC (permalink / raw
  To: gentoo-commits

commit:     2cfbda49652e0025208371e8a0cb479c16f9a7c0
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 02:42:14 2024 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 02:42:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cfbda49

games-roguelike/stone-soup: enable py3.13

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild        | 2 +-
 games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild          | 2 +-
 games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild          | 2 +-
 games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild          | 2 +-
 games-roguelike/stone-soup/stone-soup-0.29.1.ebuild             | 2 +-
 games-roguelike/stone-soup/stone-soup-0.30.1.ebuild             | 2 +-
 games-roguelike/stone-soup/stone-soup-0.31.0.ebuild             | 2 +-
 games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild | 2 +-
 games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
index 0b712dda89b3..dd87d033bd97 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9,10,11,12} )
+PYTHON_COMPAT=( python3_{10,11,12,13} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
index 6e8f74d68955..69dd7d5bd22e 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9,10,11,12} )
+PYTHON_COMPAT=( python3_{10,11,12,13} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 

diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
index 0c67e25b1d5e..808ceedc5014 100644
--- a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9,10,11,12} )
+PYTHON_COMPAT=( python3_{10,11,12,13} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
index a2a5d00a8ad8..7596a6a35871 100644
--- a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9,10,11,12} )
+PYTHON_COMPAT=( python3_{10,11,12,13} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 

diff --git a/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
index b3aa85ee3dae..82d404c5678d 100644
--- a/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9,10,11,12} )
+PYTHON_COMPAT=( python3_{10,11,12,13} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 

diff --git a/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild
index 92908ca4accc..38c0919a3cab 100644
--- a/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9,10,11,12} )
+PYTHON_COMPAT=( python3_{10,11,12,13} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 

diff --git a/games-roguelike/stone-soup/stone-soup-0.31.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.31.0.ebuild
index aabb2224fe3e..4dadb2f8148e 100644
--- a/games-roguelike/stone-soup/stone-soup-0.31.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.31.0.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{10,11,12} )
+PYTHON_COMPAT=( python3_{10,11,12,13} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 

diff --git a/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild b/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild
index b86851ad074c..79c93c7aa401 100644
--- a/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{10,11,12} )
+PYTHON_COMPAT=( python3_{10,11,12,13} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 

diff --git a/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild b/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild
index 47a54b26f84b..3341d6b83dad 100644
--- a/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{10,11,12} )
+PYTHON_COMPAT=( python3_{10,11,12,13} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2024-07-13 15:44 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2024-07-13 15:44 UTC (permalink / raw
  To: gentoo-commits

commit:     3de384f5797b60a5488dc4e48d5e12f1017d2f49
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 13 15:42:25 2024 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 15:44:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3de384f5

games-roguelike/stone-soup: stabilize 0.32.0_pre20240626 for amd64, x86

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild b/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild
index 3341d6b83dad..482e21df35ca 100644
--- a/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild
@@ -54,7 +54,7 @@ S=${WORKDIR}/${MY_P}/source
 # 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="${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="advpng debug ncurses sound test +tiles"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}"


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2024-07-13 15:44 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2024-07-13 15:44 UTC (permalink / raw
  To: gentoo-commits

commit:     f49cb1cd7951deb1b40b639d172611af814c7e52
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 13 15:42:57 2024 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 15:44:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f49cb1cd

games-roguelike/stone-soup: drop 0.32.0_pre20240409

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 -
 .../stone-soup-0.32.0_pre20240409.ebuild           | 241 ---------------------
 2 files changed, 242 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 3b005c777ff2..028ea549eb88 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -15,7 +15,6 @@ DIST stone-soup-0.30.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone-soup-0.31.0.tar.gz 22432560 BLAKE2B f3e696915458674e3f7ce2a47d19c740c53de897ab40227efc9c127be42dcfbb4b3ee93258ea4094fb1a18aceb37c4341aac86c1174c42ab1ce300bca3281fc6 SHA512 ad354d57a39d07ad8a1a89a7fd20b33a4cd88fcbf1f2276cdefe8890c223272b7a34969a373f6b1f39cff72499c1e2773592ce368e887307908acd59ca00ca4b
 DIST stone-soup-0.31.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.31.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone-soup-0.32.0_pre20240409.tar.gz 23206591 BLAKE2B 7d5f44adc4aaa1c7f881e4fddf2bd83240c126987168c8ef2e15681f83790b6f5ff5ca840ea46091c24a2dbaf80fe456c6919a09665519d71c6430d6ac9f09ad SHA512 81992f69fb7d70c968bc82f91131a55753d4323c15a12a1fd095cb4b75b77dc9645c4b5d9eb1106227d81d31d705bdc5ecc0e2ad3a63ba6562ee3730545a6c2a
 DIST stone-soup-0.32.0_pre20240626.tar.gz 23577520 BLAKE2B 43a7d9db8037cb1f37ff821da95106d77fa46b0bf34a6b0ef02b66023e1e77a76cc906d2f34d66d6bdea4e9b3859728e2e93909f2c9e1898caab52955d218de2 SHA512 f7a3c58a9f266f354e01175fcc9e2978f4afc5d4e1fc7b5f84979e36213057f2e3bb15f600d40988135e06dc01b65540a4342b16c82edf1c3cfb41421ea92285
 DIST stone-soup-0.32.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.32.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f

diff --git a/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild b/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild
deleted file mode 100644
index 79c93c7aa401..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# There are many slots for this package because people in the community
-# like to play old versions.  Every release includes content changes
-# where species/spells/monsters are added or removed.  The public
-# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
-# versions back to 0.11.
-
-# It's not necessary for Gentoo to support these old version but it's
-# something nice that our distro can offer that others don't.  If the
-# maintenance burden becomes excessive than we can revisit that
-# position.
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 )
-LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{10,11,12,13} )
-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"
-
-# Leave empty string if not a _pre release
-COMMITSHA="0f22ef8d6127abe4e43dc0a93299003b0dfbec3f"
-if [ -z "${COMMITSHA}" ]; then
-	# This is a tagged release
-	# Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1
-	SRC_URI="
-		https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	MY_P="crawl-${PV}/crawl-ref"
-else
-	# This is a _pre release
-	SRC_URI="
-		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
-	"
-	MY_P="crawl-${COMMITSHA}/crawl-ref"
-fi
-# MY_SLOT to satisfy pkgcheck variable order checking
-MY_SLOT="0.32"
-SRC_URI="
-	${SRC_URI}
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${MY_SLOT}.png
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${MY_SLOT}.svg
-"
-
-S=${WORKDIR}/${MY_P}/source
-# 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="${MY_SLOT}"
-KEYWORDS="amd64 x86"
-IUSE="advpng debug ncurses sound test +tiles"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-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}]')
-	app-alternatives/lex
-	tiles? (
-		advpng? (
-			app-arch/advancecomp
-		)
-		!advpng? (
-			media-gfx/pngcrush
-		)
-	)
-	virtual/pkgconfig
-	app-alternatives/yacc
-	"
-
-PATCHES=(
-	"${FILESDIR}"/make-v3.patch
-	"${FILESDIR}"/rltiles-make.patch
-	"${FILESDIR}"/avoid-musl-execinfo.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=''
-		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
-		# deprecated (in 5.1) luaL_openlib API (#869671)
-		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
-		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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2024-09-15  2:04 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2024-09-15  2:04 UTC (permalink / raw
  To: gentoo-commits

commit:     b835aba23cff8c20856a10f6850f22c03409192f
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 00:42:57 2024 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 00:43:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b835aba2

games-roguelike/stone-soup: add 0.32.0

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup/stone-soup-0.32.0.ebuild            | 241 +++++++++++++++++++++
 2 files changed, 242 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 028ea549eb88..fff38bbf259f 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -15,6 +15,7 @@ DIST stone-soup-0.30.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone-soup-0.31.0.tar.gz 22432560 BLAKE2B f3e696915458674e3f7ce2a47d19c740c53de897ab40227efc9c127be42dcfbb4b3ee93258ea4094fb1a18aceb37c4341aac86c1174c42ab1ce300bca3281fc6 SHA512 ad354d57a39d07ad8a1a89a7fd20b33a4cd88fcbf1f2276cdefe8890c223272b7a34969a373f6b1f39cff72499c1e2773592ce368e887307908acd59ca00ca4b
 DIST stone-soup-0.31.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.31.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
+DIST stone-soup-0.32.0.tar.gz 24408342 BLAKE2B 884c8b067f692bcaeaed0098ab4d89936095c6bda068e9f7cc713357f709879b282f57c831ab23103e4639a0966ec940649e469e7f07db890d03bb6283254b42 SHA512 2c9dbe34158c1c00d58069be21226a739ed8f9da724d9ac615d4420473272e91699bd462c187041ab5744d661dc77b766f95b9dce8ae97a616098c0d7b477c5f
 DIST stone-soup-0.32.0_pre20240626.tar.gz 23577520 BLAKE2B 43a7d9db8037cb1f37ff821da95106d77fa46b0bf34a6b0ef02b66023e1e77a76cc906d2f34d66d6bdea4e9b3859728e2e93909f2c9e1898caab52955d218de2 SHA512 f7a3c58a9f266f354e01175fcc9e2978f4afc5d4e1fc7b5f84979e36213057f2e3bb15f600d40988135e06dc01b65540a4342b16c82edf1c3cfb41421ea92285
 DIST stone-soup-0.32.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.32.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f

diff --git a/games-roguelike/stone-soup/stone-soup-0.32.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.32.0.ebuild
new file mode 100644
index 000000000000..18316a1186e0
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.32.0.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# There are many slots for this package because people in the community
+# like to play old versions.  Every release includes content changes
+# where species/spells/monsters are added or removed.  The public
+# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
+# versions back to 0.11.
+
+# It's not necessary for Gentoo to support these old version but it's
+# something nice that our distro can offer that others don't.  If the
+# maintenance burden becomes excessive than we can revisit that
+# position.
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 )
+LUA_REQ_USE="deprecated"
+PYTHON_COMPAT=( python3_{10,11,12,13} )
+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"
+
+# Leave empty string if not a _pre release
+COMMITSHA=""
+if [ -z "${COMMITSHA}" ]; then
+	# This is a tagged release
+	# Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	MY_P="crawl-${PV}/crawl-ref"
+else
+	# This is a _pre release
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
+	"
+	MY_P="crawl-${COMMITSHA}/crawl-ref"
+fi
+# MY_SLOT to satisfy pkgcheck variable order checking
+MY_SLOT="0.32"
+SRC_URI="
+	${SRC_URI}
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${MY_SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${MY_SLOT}.svg
+"
+
+S=${WORKDIR}/${MY_P}/source
+# 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="${MY_SLOT}"
+KEYWORDS="~amd64 ~x86"
+IUSE="advpng debug ncurses sound test +tiles"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+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}]')
+	app-alternatives/lex
+	tiles? (
+		advpng? (
+			app-arch/advancecomp
+		)
+		!advpng? (
+			media-gfx/pngcrush
+		)
+	)
+	virtual/pkgconfig
+	app-alternatives/yacc
+	"
+
+PATCHES=(
+	"${FILESDIR}"/make-v3.patch
+	"${FILESDIR}"/rltiles-make.patch
+	"${FILESDIR}"/avoid-musl-execinfo.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=''
+		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+		# deprecated (in 5.1) luaL_openlib API (#869671)
+		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
+		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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2024-09-27  2:03 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2024-09-27  2:03 UTC (permalink / raw
  To: gentoo-commits

commit:     f1f28ad6f7a388d3a00d3f3a52687d90065b6248
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 27 01:59:20 2024 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Fri Sep 27 02:03:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1f28ad6

games-roguelike/stone-soup: add 0.32.1

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 +
 .../stone-soup/stone-soup-0.32.1.ebuild            | 241 +++++++++++++++++++++
 2 files changed, 242 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index fff38bbf259f..aaffc240f4dd 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -17,6 +17,7 @@ DIST stone-soup-0.31.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b6
 DIST stone-soup-0.31.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.32.0.tar.gz 24408342 BLAKE2B 884c8b067f692bcaeaed0098ab4d89936095c6bda068e9f7cc713357f709879b282f57c831ab23103e4639a0966ec940649e469e7f07db890d03bb6283254b42 SHA512 2c9dbe34158c1c00d58069be21226a739ed8f9da724d9ac615d4420473272e91699bd462c187041ab5744d661dc77b766f95b9dce8ae97a616098c0d7b477c5f
 DIST stone-soup-0.32.0_pre20240626.tar.gz 23577520 BLAKE2B 43a7d9db8037cb1f37ff821da95106d77fa46b0bf34a6b0ef02b66023e1e77a76cc906d2f34d66d6bdea4e9b3859728e2e93909f2c9e1898caab52955d218de2 SHA512 f7a3c58a9f266f354e01175fcc9e2978f4afc5d4e1fc7b5f84979e36213057f2e3bb15f600d40988135e06dc01b65540a4342b16c82edf1c3cfb41421ea92285
+DIST stone-soup-0.32.1.tar.gz 24409881 BLAKE2B 29bf6b36c858a7426b6dfc8d75aebe575540cf89a934ce9150134c68e55b23e1e2a2da0cc53db3c3f59eff2810ed68b5577d709e8515d2e51bf46206b8c0710b SHA512 0640b3af9be104963f635b61b71ee59d18f478d3266e6c3319db13584c92b19e6bea3789e6d90bb520424b6995efba4d9e8a56216a0d1a1158a2c01f00799894
 DIST stone-soup-0.32.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.32.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220

diff --git a/games-roguelike/stone-soup/stone-soup-0.32.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.32.1.ebuild
new file mode 100644
index 000000000000..18316a1186e0
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.32.1.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# There are many slots for this package because people in the community
+# like to play old versions.  Every release includes content changes
+# where species/spells/monsters are added or removed.  The public
+# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
+# versions back to 0.11.
+
+# It's not necessary for Gentoo to support these old version but it's
+# something nice that our distro can offer that others don't.  If the
+# maintenance burden becomes excessive than we can revisit that
+# position.
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 )
+LUA_REQ_USE="deprecated"
+PYTHON_COMPAT=( python3_{10,11,12,13} )
+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"
+
+# Leave empty string if not a _pre release
+COMMITSHA=""
+if [ -z "${COMMITSHA}" ]; then
+	# This is a tagged release
+	# Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	MY_P="crawl-${PV}/crawl-ref"
+else
+	# This is a _pre release
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
+	"
+	MY_P="crawl-${COMMITSHA}/crawl-ref"
+fi
+# MY_SLOT to satisfy pkgcheck variable order checking
+MY_SLOT="0.32"
+SRC_URI="
+	${SRC_URI}
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${MY_SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${MY_SLOT}.svg
+"
+
+S=${WORKDIR}/${MY_P}/source
+# 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="${MY_SLOT}"
+KEYWORDS="~amd64 ~x86"
+IUSE="advpng debug ncurses sound test +tiles"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+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}]')
+	app-alternatives/lex
+	tiles? (
+		advpng? (
+			app-arch/advancecomp
+		)
+		!advpng? (
+			media-gfx/pngcrush
+		)
+	)
+	virtual/pkgconfig
+	app-alternatives/yacc
+	"
+
+PATCHES=(
+	"${FILESDIR}"/make-v3.patch
+	"${FILESDIR}"/rltiles-make.patch
+	"${FILESDIR}"/avoid-musl-execinfo.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=''
+		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+		# deprecated (in 5.1) luaL_openlib API (#869671)
+		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
+		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
+}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2024-09-27  2:03 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2024-09-27  2:03 UTC (permalink / raw
  To: gentoo-commits

commit:     4b3095a838e56f57df54ccacf938ab04c6c5b384
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 27 02:00:26 2024 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Fri Sep 27 02:03:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b3095a8

games-roguelike/stone-soup: drop 0.32.0

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 -
 .../stone-soup/stone-soup-0.32.0.ebuild            | 241 ---------------------
 2 files changed, 242 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index aaffc240f4dd..e3d724da9613 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -15,7 +15,6 @@ DIST stone-soup-0.30.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone-soup-0.31.0.tar.gz 22432560 BLAKE2B f3e696915458674e3f7ce2a47d19c740c53de897ab40227efc9c127be42dcfbb4b3ee93258ea4094fb1a18aceb37c4341aac86c1174c42ab1ce300bca3281fc6 SHA512 ad354d57a39d07ad8a1a89a7fd20b33a4cd88fcbf1f2276cdefe8890c223272b7a34969a373f6b1f39cff72499c1e2773592ce368e887307908acd59ca00ca4b
 DIST stone-soup-0.31.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.31.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone-soup-0.32.0.tar.gz 24408342 BLAKE2B 884c8b067f692bcaeaed0098ab4d89936095c6bda068e9f7cc713357f709879b282f57c831ab23103e4639a0966ec940649e469e7f07db890d03bb6283254b42 SHA512 2c9dbe34158c1c00d58069be21226a739ed8f9da724d9ac615d4420473272e91699bd462c187041ab5744d661dc77b766f95b9dce8ae97a616098c0d7b477c5f
 DIST stone-soup-0.32.0_pre20240626.tar.gz 23577520 BLAKE2B 43a7d9db8037cb1f37ff821da95106d77fa46b0bf34a6b0ef02b66023e1e77a76cc906d2f34d66d6bdea4e9b3859728e2e93909f2c9e1898caab52955d218de2 SHA512 f7a3c58a9f266f354e01175fcc9e2978f4afc5d4e1fc7b5f84979e36213057f2e3bb15f600d40988135e06dc01b65540a4342b16c82edf1c3cfb41421ea92285
 DIST stone-soup-0.32.1.tar.gz 24409881 BLAKE2B 29bf6b36c858a7426b6dfc8d75aebe575540cf89a934ce9150134c68e55b23e1e2a2da0cc53db3c3f59eff2810ed68b5577d709e8515d2e51bf46206b8c0710b SHA512 0640b3af9be104963f635b61b71ee59d18f478d3266e6c3319db13584c92b19e6bea3789e6d90bb520424b6995efba4d9e8a56216a0d1a1158a2c01f00799894
 DIST stone-soup-0.32.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc

diff --git a/games-roguelike/stone-soup/stone-soup-0.32.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.32.0.ebuild
deleted file mode 100644
index 18316a1186e0..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.32.0.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# There are many slots for this package because people in the community
-# like to play old versions.  Every release includes content changes
-# where species/spells/monsters are added or removed.  The public
-# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
-# versions back to 0.11.
-
-# It's not necessary for Gentoo to support these old version but it's
-# something nice that our distro can offer that others don't.  If the
-# maintenance burden becomes excessive than we can revisit that
-# position.
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 )
-LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{10,11,12,13} )
-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"
-
-# Leave empty string if not a _pre release
-COMMITSHA=""
-if [ -z "${COMMITSHA}" ]; then
-	# This is a tagged release
-	# Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1
-	SRC_URI="
-		https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	MY_P="crawl-${PV}/crawl-ref"
-else
-	# This is a _pre release
-	SRC_URI="
-		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
-	"
-	MY_P="crawl-${COMMITSHA}/crawl-ref"
-fi
-# MY_SLOT to satisfy pkgcheck variable order checking
-MY_SLOT="0.32"
-SRC_URI="
-	${SRC_URI}
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${MY_SLOT}.png
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${MY_SLOT}.svg
-"
-
-S=${WORKDIR}/${MY_P}/source
-# 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="${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE="advpng debug ncurses sound test +tiles"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-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}]')
-	app-alternatives/lex
-	tiles? (
-		advpng? (
-			app-arch/advancecomp
-		)
-		!advpng? (
-			media-gfx/pngcrush
-		)
-	)
-	virtual/pkgconfig
-	app-alternatives/yacc
-	"
-
-PATCHES=(
-	"${FILESDIR}"/make-v3.patch
-	"${FILESDIR}"/rltiles-make.patch
-	"${FILESDIR}"/avoid-musl-execinfo.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=''
-		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
-		# deprecated (in 5.1) luaL_openlib API (#869671)
-		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
-		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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2024-10-27 14:35 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2024-10-27 14:35 UTC (permalink / raw
  To: gentoo-commits

commit:     df54602931fbd56b7b02cc9bdaaa7d31515abf53
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 27 14:34:24 2024 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Oct 27 14:34:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df546029

games-roguelike/stone-soup: stabilize 0.32.1 for amd64, x86

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/stone-soup-0.32.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/stone-soup/stone-soup-0.32.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.32.1.ebuild
index 18316a1186e0..c1a9484c9081 100644
--- a/games-roguelike/stone-soup/stone-soup-0.32.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.32.1.ebuild
@@ -54,7 +54,7 @@ S=${WORKDIR}/${MY_P}/source
 # 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="${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="advpng debug ncurses sound test +tiles"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}"


^ permalink raw reply related	[flat|nested] 111+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
@ 2024-10-27 14:35 Erik Mackdanz
  0 siblings, 0 replies; 111+ messages in thread
From: Erik Mackdanz @ 2024-10-27 14:35 UTC (permalink / raw
  To: gentoo-commits

commit:     9b2f3fe896861ae4bd87b4008addb062430cb239
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 27 14:35:28 2024 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Oct 27 14:35:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b2f3fe8

games-roguelike/stone-soup: drop 0.32.0_pre20240626

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

 games-roguelike/stone-soup/Manifest                |   1 -
 .../stone-soup-0.32.0_pre20240626.ebuild           | 241 ---------------------
 2 files changed, 242 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index e3d724da9613..9b4e9ca98d98 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -15,7 +15,6 @@ DIST stone-soup-0.30.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone-soup-0.31.0.tar.gz 22432560 BLAKE2B f3e696915458674e3f7ce2a47d19c740c53de897ab40227efc9c127be42dcfbb4b3ee93258ea4094fb1a18aceb37c4341aac86c1174c42ab1ce300bca3281fc6 SHA512 ad354d57a39d07ad8a1a89a7fd20b33a4cd88fcbf1f2276cdefe8890c223272b7a34969a373f6b1f39cff72499c1e2773592ce368e887307908acd59ca00ca4b
 DIST stone-soup-0.31.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.31.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone-soup-0.32.0_pre20240626.tar.gz 23577520 BLAKE2B 43a7d9db8037cb1f37ff821da95106d77fa46b0bf34a6b0ef02b66023e1e77a76cc906d2f34d66d6bdea4e9b3859728e2e93909f2c9e1898caab52955d218de2 SHA512 f7a3c58a9f266f354e01175fcc9e2978f4afc5d4e1fc7b5f84979e36213057f2e3bb15f600d40988135e06dc01b65540a4342b16c82edf1c3cfb41421ea92285
 DIST stone-soup-0.32.1.tar.gz 24409881 BLAKE2B 29bf6b36c858a7426b6dfc8d75aebe575540cf89a934ce9150134c68e55b23e1e2a2da0cc53db3c3f59eff2810ed68b5577d709e8515d2e51bf46206b8c0710b SHA512 0640b3af9be104963f635b61b71ee59d18f478d3266e6c3319db13584c92b19e6bea3789e6d90bb520424b6995efba4d9e8a56216a0d1a1158a2c01f00799894
 DIST stone-soup-0.32.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.32.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f

diff --git a/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild b/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild
deleted file mode 100644
index 482e21df35ca..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# There are many slots for this package because people in the community
-# like to play old versions.  Every release includes content changes
-# where species/spells/monsters are added or removed.  The public
-# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
-# versions back to 0.11.
-
-# It's not necessary for Gentoo to support these old version but it's
-# something nice that our distro can offer that others don't.  If the
-# maintenance burden becomes excessive than we can revisit that
-# position.
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 )
-LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{10,11,12,13} )
-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"
-
-# Leave empty string if not a _pre release
-COMMITSHA="3d6ac616a9d452a692b94beb1a9d6b8e66346631"
-if [ -z "${COMMITSHA}" ]; then
-	# This is a tagged release
-	# Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1
-	SRC_URI="
-		https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	MY_P="crawl-${PV}/crawl-ref"
-else
-	# This is a _pre release
-	SRC_URI="
-		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
-	"
-	MY_P="crawl-${COMMITSHA}/crawl-ref"
-fi
-# MY_SLOT to satisfy pkgcheck variable order checking
-MY_SLOT="0.32"
-SRC_URI="
-	${SRC_URI}
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${MY_SLOT}.png
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${MY_SLOT}.svg
-"
-
-S=${WORKDIR}/${MY_P}/source
-# 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="${MY_SLOT}"
-KEYWORDS="amd64 x86"
-IUSE="advpng debug ncurses sound test +tiles"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-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}]')
-	app-alternatives/lex
-	tiles? (
-		advpng? (
-			app-arch/advancecomp
-		)
-		!advpng? (
-			media-gfx/pngcrush
-		)
-	)
-	virtual/pkgconfig
-	app-alternatives/yacc
-	"
-
-PATCHES=(
-	"${FILESDIR}"/make-v3.patch
-	"${FILESDIR}"/rltiles-make.patch
-	"${FILESDIR}"/avoid-musl-execinfo.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=''
-		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
-		# deprecated (in 5.1) luaL_openlib API (#869671)
-		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
-		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
-}


^ permalink raw reply related	[flat|nested] 111+ messages in thread

end of thread, other threads:[~2024-10-27 14:35 UTC | newest]

Thread overview: 111+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-06 15:41 [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/ Erik Mackdanz
  -- strict thread matches above, loose matches on Subject: below --
2024-10-27 14:35 Erik Mackdanz
2024-10-27 14:35 Erik Mackdanz
2024-09-27  2:03 Erik Mackdanz
2024-09-27  2:03 Erik Mackdanz
2024-09-15  2:04 Erik Mackdanz
2024-07-13 15:44 Erik Mackdanz
2024-07-13 15:44 Erik Mackdanz
2024-06-27  2:43 Erik Mackdanz
2024-06-27  2:43 Erik Mackdanz
2024-05-16  3:52 Erik Mackdanz
2024-04-10  4:47 Erik Mackdanz
2024-04-10  4:47 Erik Mackdanz
2024-04-10  4:47 Erik Mackdanz
2024-04-10  4:47 Erik Mackdanz
2024-01-20 15:40 Erik Mackdanz
2024-01-20 15:40 Erik Mackdanz
2023-12-30  6:38 Arthur Zamarin
2023-12-30  3:04 Sam James
2023-10-28  3:05 Erik Mackdanz
2023-08-14  1:53 Erik Mackdanz
2023-08-14  1:53 Erik Mackdanz
2023-08-14  1:53 Erik Mackdanz
2023-07-02 20:18 Erik Mackdanz
2023-07-02 20:18 Erik Mackdanz
2023-07-02 20:18 Erik Mackdanz
2023-06-09 21:39 Erik Mackdanz
2023-06-09 21:39 Erik Mackdanz
2023-05-11  3:13 Erik Mackdanz
2023-05-11  3:13 Erik Mackdanz
2023-05-11  3:13 Erik Mackdanz
2023-03-05 15:23 Erik Mackdanz
2023-01-15 21:37 Erik Mackdanz
2023-01-15 21:37 Erik Mackdanz
2023-01-15 21:37 Erik Mackdanz
2022-10-29 13:30 David Seifert
2022-10-28 15:43 Sam James
2022-09-23 13:50 Erik Mackdanz
2022-09-23 13:50 Erik Mackdanz
2022-09-23 13:50 Erik Mackdanz
2022-09-23 13:50 Erik Mackdanz
2022-09-11 13:16 David Seifert
2022-08-27  1:39 Erik Mackdanz
2022-08-27  1:39 Erik Mackdanz
2022-08-11 10:38 Sam James
2022-07-02 18:10 Erik Mackdanz
2022-07-02 14:53 Erik Mackdanz
2022-07-02  4:30 Erik Mackdanz
2022-07-02  4:30 Erik Mackdanz
2022-07-02  4:30 Erik Mackdanz
2022-05-23  0:04 Erik Mackdanz
2022-03-13 14:18 Erik Mackdanz
2022-02-05  3:39 Erik Mackdanz
2022-02-05  3:39 Erik Mackdanz
2022-01-08  4:06 Erik Mackdanz
2022-01-08  4:06 Erik Mackdanz
2022-01-01 10:03 Sam James
2021-12-30 15:43 Erik Mackdanz
2021-12-24 22:44 Erik Mackdanz
2021-12-24 22:44 Erik Mackdanz
2021-11-27 23:01 Erik Mackdanz
2021-11-27 23:00 Erik Mackdanz
2021-11-01  4:02 Erik Mackdanz
2021-11-01  4:01 Erik Mackdanz
2021-10-02 11:31 Erik Mackdanz
2021-09-30 14:05 Erik Mackdanz
2021-09-30 14:05 Erik Mackdanz
2021-09-30 14:05 Erik Mackdanz
2021-09-05  3:14 Erik Mackdanz
2021-09-01  2:59 Erik Mackdanz
2021-08-26  4:25 Erik Mackdanz
2021-08-26  4:23 Erik Mackdanz
2021-08-26  4:18 Erik Mackdanz
2021-08-26  4:13 Erik Mackdanz
2021-08-01 18:46 Erik Mackdanz
2021-08-01 17:47 Erik Mackdanz
2021-04-28 17:00 Sam James
2021-04-27 19:38 Sam James
2021-03-06 15:41 Erik Mackdanz
2021-02-07  4:37 Erik Mackdanz
2021-01-23 20:13 Erik Mackdanz
2021-01-23 20:12 Erik Mackdanz
2021-01-10 23:16 Erik Mackdanz
2021-01-10 23:12 Erik Mackdanz
2020-12-12 14:07 Erik Mackdanz
2020-12-12 14:05 Erik Mackdanz
2020-12-12 13:51 Erik Mackdanz
2020-12-12  4:56 Erik Mackdanz
2020-11-16 21:24 Erik Mackdanz
2020-11-16 17:35 Erik Mackdanz
2020-11-16 16:55 Erik Mackdanz
2020-11-15  0:39 Marek Szuba
2020-11-14 20:56 Erik Mackdanz
2020-10-10 15:03 Erik Mackdanz
2020-10-10 15:02 Erik Mackdanz
2020-10-10 14:57 Erik Mackdanz
2020-06-19  1:19 Erik Mackdanz
2019-11-02  0:07 Erik Mackdanz
2019-11-02  0:05 Erik Mackdanz
2019-04-14  2:21 Erik Mackdanz
2019-04-14  2:16 Erik Mackdanz
2019-02-10  0:09 Erik Mackdanz
2019-02-09 22:40 Erik Mackdanz
2018-08-10  3:37 Erik Mackdanz
2018-08-10  3:32 Erik Mackdanz
2018-08-03  0:04 Erik Mackdanz
2017-12-01 19:31 David Seifert
2016-06-06 14:31 Agostino Sarubbo
2016-05-26 20:35 Michael Sterrett
2015-08-14 22:32 Julian Ospald
2015-08-14 22:32 Julian Ospald

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox