[gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/

2024-05-27 Thread Erik Mackdanz 
commit: 1bb6a03d98568d0f01507acfb41d0c47f494b155
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Tue May 28 02:01:35 2024 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Tue May 28 03:06:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bb6a03d

games-roguelike/stone-soup: fix doubled slash for install paths for musl

Closes: https://bugs.gentoo.org/929087

Signed-off-by: Erik Mackdanz  gentoo.org>

 games-roguelike/stone-soup/files/make-v3.patch | 25 ++---
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/games-roguelike/stone-soup/files/make-v3.patch 
b/games-roguelike/stone-soup/files/make-v3.patch
index 7a1308b36bd6..19a308336cc3 100644
--- a/games-roguelike/stone-soup/files/make-v3.patch
+++ b/games-roguelike/stone-soup/files/make-v3.patch
@@ -1,5 +1,5 @@
 a/Makefile 2023-04-08 18:39:09.818483802 -0500
-+++ b/Makefile 2023-04-08 18:44:54.509321177 -0500
+--- a/Makefile 2024-05-27 19:43:53.339479403 -0500
 b/Makefile 2024-05-27 19:45:08.737841222 -0500
 @@ -206,7 +206,7 @@
  uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
  uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
@@ -82,16 +82,27 @@
  WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo 
win32)
  
  export SRC_VERSION
-@@ -1644,7 +1630,7 @@
+@@ -1645,13 +1631,13 @@
$(COPY) dat/tiles/stone_soup_icon-512x512.png 
$(prefix_fp)/share/icons/hicolor/512x512/apps/$(XDG_NAME).png
$(COPY) dat/tiles/stone_soup_icon.svg 
$(prefix_fp)/share/icons/hicolor/scalable/apps/$(XDG_NAME).svg
  
 -install: all install-data
+-  [ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix)
+-  $(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/
+-  $(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME)
 +install: install-data
-   [ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix)
-   $(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/
-   $(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME)
-@@ -1901,9 +1887,6 @@
++  [ -d $(prefix_fp)$(bin_prefix) ] || mkdir -p $(prefix_fp)$(bin_prefix)
++  $(COPY) $(GAME) $(prefix_fp)$(bin_prefix)/
++  $(STRIP) $(prefix_fp)$(bin_prefix)/$(GAME)
+ ifeq ($(USE_DGAMELAUNCH),)
+-  $(CHOWN) $(INSTALL_UGRP) $(prefix_fp)/$(bin_prefix)/$(GAME) || true
+-  $(CHMOD) $(MCHMOD) $(prefix_fp)/$(bin_prefix)/$(GAME) || true
++  $(CHOWN) $(INSTALL_UGRP) $(prefix_fp)$(bin_prefix)/$(GAME) || true
++  $(CHMOD) $(MCHMOD) $(prefix_fp)$(bin_prefix)/$(GAME) || true
+ endif
+ 
+ clean: clean-rltiles clean-webserver clean-android clean-monster clean-catch2 
\
+@@ -1905,9 +1891,6 @@
  
  dat/tiles/%.png: $(RLTILES)/%.png
$(QUIET_PNGCRUSH)$(PNGCRUSH) $< $@

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/, games-roguelike/stone-soup/

2023-08-14 Thread Erik Mackdanz 
commit: eaab00c81c45e54fd2174fee1caa92b17c61c50a
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Mon Aug 14 17:53:53 2023 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Mon Aug 14 17:55:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaab00c8

games-roguelike/stone-soup: avoid execinfo.h on non-glibc

Upstream: https://github.com/crawl/crawl/issues/2446
Closes: https://bugs.gentoo.org/831632
Signed-off-by: Erik Mackdanz  gentoo.org>

 games-roguelike/stone-soup/files/avoid-musl-execinfo.patch   | 12 
 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.1.ebuild  |  1 +
 games-roguelike/stone-soup/stone-soup-0.30.1.ebuild  |  1 +
 .../stone-soup/stone-soup-0.31.0_pre20230712.ebuild  |  1 +
 8 files changed, 19 insertions(+)

diff --git a/games-roguelike/stone-soup/files/avoid-musl-execinfo.patch 
b/games-roguelike/stone-soup/files/avoid-musl-execinfo.patch
new file mode 100644
index ..923f940c3f57
--- /dev/null
+++ b/games-roguelike/stone-soup/files/avoid-musl-execinfo.patch
@@ -0,0 +1,12 @@
+--- a/crash.cc2023-08-14 02:39:46.638062516 +
 b/crash.cc2023-08-14 02:41:28.020698537 +
+@@ -27,7 +27,8 @@
+ #endif
+
+ #ifdef BACKTRACE_SUPPORTED
+-#if defined(TARGET_CPU_MIPS) || \
++#if !defined(__GLIBC__) || \
++defined(TARGET_CPU_MIPS) || \
+ defined(TARGET_OS_FREEBSD) || \
+ defined(TARGET_OS_NETBSD) || \
+ defined(TARGET_OS_OPENBSD) || \

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 150e83d6270e..cfb186245ce1 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
@@ -87,6 +87,7 @@ S=${WORKDIR}/${MY_P}/source
 PATCHES=(
"${FILESDIR}"/make.patch
"${FILESDIR}"/rltiles-make.patch
+   "${FILESDIR}"/avoid-musl-execinfo.patch
 )
 
 python_check_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 76214392d586..ac840b8128cf 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
@@ -87,6 +87,7 @@ S=${WORKDIR}/${MY_P}/source
 PATCHES=(
"${FILESDIR}"/make.patch
"${FILESDIR}"/rltiles-make.patch
+   "${FILESDIR}"/avoid-musl-execinfo.patch
 )
 
 python_check_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 3f0437547cfa..c8dde8ecd912 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
@@ -87,6 +87,7 @@ S=${WORKDIR}/${MY_P}/source
 PATCHES=(
"${FILESDIR}"/make.patch
"${FILESDIR}"/rltiles-make.patch
+   "${FILESDIR}"/avoid-musl-execinfo.patch
 )
 
 python_check_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 64e098e751ce..1907acb253f4 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
@@ -101,6 +101,7 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}"/make.patch
"${FILESDIR}"/rltiles-make.patch
+   "${FILESDIR}"/avoid-musl-execinfo.patch
 )
 
 python_check_deps() {

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 5ff221ce1c56..d751569f7cc8 100644
--- a/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
@@ -103,6 +103,7 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}"/make.patch
"${FILESDIR}"/rltiles-make.patch
+   "${FILESDIR}"/avoid-musl-execinfo.patch
 )
 
 python_check_deps() {

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 cc9c0daa09b4..48d500eea5f4 100644
--- a/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild
@@ -103,6 +103,7 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}"/make-v3.patch
"${FILESDIR}"/rltiles-make.patch
+   "${FILESDIR}"/avoid-musl-execinfo.patch
 )
 
 python_check_deps() {

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 b7a3296129e4..27d9fbf7f734 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
@@

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/

2023-05-22 Thread Conrad Kostecki 
commit: 945deae1e5ebcad1f4aab98f4719985f7279aa89
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri May 12 15:29:34 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Mon May 22 21:25:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=945deae1

games-roguelike/stone-soup: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31007
Signed-off-by: Conrad Kostecki  gentoo.org>

 games-roguelike/stone-soup/files/make-v2.patch | 120 -
 1 file changed, 120 deletions(-)

diff --git a/games-roguelike/stone-soup/files/make-v2.patch 
b/games-roguelike/stone-soup/files/make-v2.patch
deleted file mode 100644
index 7813fa1aebc1..
--- a/games-roguelike/stone-soup/files/make-v2.patch
+++ /dev/null
@@ -1,120 +0,0 @@
 a/Makefile 2023-01-29 16:54:29.445857641 -0600
-+++ b/Makefile 2023-01-29 16:55:57.363274244 -0600
-@@ -92,7 +92,7 @@
- # processes. Not supported for MSYS2/cygwin builds, and will be overridden for
- # mac universal builds. This does not count as a change in build flags.
- ifndef GAME
--  GAME = crawl
-+  GAME = crawl-0.30
- endif
- 
- # Disable GNU Make implicit rules and variables. Leaving them enabled will 
slow
-@@ -206,7 +206,7 @@
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
- 
--HOST := $(shell sh -c 'cc -dumpmachine || echo unknown')
-+HOST :=
- ARCH := $(HOST)
- 
- ifdef CROSSHOST
-@@ -509,15 +509,7 @@
- GCC_VER_SUFFIX:=-$(GCC_VER)
- endif
- 
--# Attempt to use a full compiler name, to make
--# distcc builds work nicely.
--LMACH := $(shell gcc -dumpmachine)-
--ifeq ($(LMACH),-)
- LMACH :=
--endif
--ifeq ($(shell which $(LMACH)gcc$(GCC_VER_SUFFIX) > /dev/null 2> /dev/null && 
echo "Yes"),)
--LMACH :=
--endif
- 
- ifneq ($(FORCE_CC),)
- GCC := $(FORCE_CC)
-@@ -862,10 +854,11 @@
-   COVERAGE=YesPlease
-   # current catch2 doesn't support c++11
-   STDFLAG = -std=c++14
-+  # tests require this
-+  LIBS += -lgcov
- endif
- 
- ifdef HURRY
--  NO_OPTIMIZE=YesPlease
- endif
- 
- ifdef COVERAGE
-@@ -1017,7 +1010,7 @@
- INSTALL_FONTS += "$(PROPORTIONAL_FONT)"
-   endif
- else
--  SYS_PROPORTIONAL_FONT = $(shell util/find_font "$(OUR_PROPORTIONAL_FONT)")
-+  SYS_PROPORTIONAL_FONT = /usr/share/fonts/dejavu/DejaVuSans.ttf
-   ifneq (,$(SYS_PROPORTIONAL_FONT))
- ifeq (,$(COPY_FONTS))
-   DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\"
-@@ -1037,7 +1030,7 @@
- INSTALL_FONTS += "$(MONOSPACED_FONT)"
-   endif
- else
--  SYS_MONOSPACED_FONT = $(shell util/find_font "$(OUR_MONOSPACED_FONT)")
-+  SYS_MONOSPACED_FONT = /usr/share/fonts/dejavu/DejaVuSansMono.ttf
-   ifneq (,$(SYS_MONOSPACED_FONT))
- ifeq (,$(COPY_FONTS))
-   DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\"
-@@ -1177,14 +1170,8 @@
- 
- ifdef TILES_ANY
- ifndef NO_OPTIMIZE
--  ifneq (,$(shell which advpng))
--USE_ADVPNG = y
--  else
--ifneq (,$(shell which pngcrush))
-   PNGCRUSH = pngcrush -q -m 113
-   PNGCRUSH_LABEL = PNGCRUSH
--endif
--  endif
- endif
- endif
- 
-@@ -1280,9 +1266,8 @@
- 
- LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
- SRC_PKG_BASE  := stone_soup
--SRC_VERSION   := $(shell git describe $(MERGE_BASE) 2>/dev/null || cat 
util/release_ver)
-+SRC_VERSION   := $(shell cat util/release_ver)
- MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|$(SED) -r 
's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
--RECENT_TAG:= $(shell git describe --abbrev=0 $(MERGE_BASE))
- WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo 
win32)
- 
- export SRC_VERSION
-@@ -1644,7 +1629,7 @@
-   $(COPY) dat/tiles/stone_soup_icon-512x512.png 
$(prefix_fp)/share/icons/hicolor/512x512/apps/$(XDG_NAME).png
-   $(COPY) dat/tiles/stone_soup_icon.svg 
$(prefix_fp)/share/icons/hicolor/scalable/apps/$(XDG_NAME).svg
- 
--install: all install-data
-+install: install-data
-   [ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix)
-   $(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/
-   $(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME)
-@@ -1667,7 +1652,6 @@
-   +$(MAKE) -C contrib clean
- 
- clean-android:
--  $(RM) -r $(datadir_fp)
-   +cd android-project && rm -f local.properties && rm -f app/build.gradle
- 
- distclean: clean clean-contrib clean-rltiles
-@@ -1899,9 +1883,6 @@
- 
- dat/tiles/%.png: $(RLTILES)/%.png
-   $(QUIET_PNGCRUSH)$(PNGCRUSH) $< $@
--ifdef USE_ADVPNG
--  $(QUIET_ADVPNG)$(ADVPNG) $@
--endif
- 
- clean-rltiles:
-   $(RM) $(DESTTILEFILES)

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/, games-roguelike/stone-soup/

2023-01-29 Thread Erik Mackdanz 
commit: b4cc770e07d3e3df6513b53f9bedc5122f803451
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sun Jan 29 23:41:14 2023 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sun Jan 29 23:41:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4cc770e

games-roguelike/stone-soup: add 0.30.0_pre20230129

Signed-off-by: Erik Mackdanz  gentoo.org>

 games-roguelike/stone-soup/Manifest|   3 +
 games-roguelike/stone-soup/files/make-v2.patch | 120 +++
 .../stone-soup-0.30.0_pre20230129.ebuild   | 238 +
 3 files changed, 361 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest 
b/games-roguelike/stone-soup/Manifest
index 6935f1e8d89e..e44b6493bc06 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -9,6 +9,9 @@ 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.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
 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/files/make-v2.patch 
b/games-roguelike/stone-soup/files/make-v2.patch
new file mode 100644
index ..7813fa1aebc1
--- /dev/null
+++ b/games-roguelike/stone-soup/files/make-v2.patch
@@ -0,0 +1,120 @@
+--- a/Makefile 2023-01-29 16:54:29.445857641 -0600
 b/Makefile 2023-01-29 16:55:57.363274244 -0600
+@@ -92,7 +92,7 @@
+ # processes. Not supported for MSYS2/cygwin builds, and will be overridden for
+ # mac universal builds. This does not count as a change in build flags.
+ ifndef GAME
+-  GAME = crawl
++  GAME = crawl-0.30
+ endif
+ 
+ # Disable GNU Make implicit rules and variables. Leaving them enabled will 
slow
+@@ -206,7 +206,7 @@
+ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+ uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
+ 
+-HOST := $(shell sh -c 'cc -dumpmachine || echo unknown')
++HOST :=
+ ARCH := $(HOST)
+ 
+ ifdef CROSSHOST
+@@ -509,15 +509,7 @@
+ GCC_VER_SUFFIX:=-$(GCC_VER)
+ endif
+ 
+-# Attempt to use a full compiler name, to make
+-# distcc builds work nicely.
+-LMACH := $(shell gcc -dumpmachine)-
+-ifeq ($(LMACH),-)
+ LMACH :=
+-endif
+-ifeq ($(shell which $(LMACH)gcc$(GCC_VER_SUFFIX) > /dev/null 2> /dev/null &&

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/

2022-07-14 Thread Sam James 
commit: 15e728310edb223dc1608ecbe51f6864f50846e7
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Jul  7 14:35:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 15 01:29:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e72831

games-roguelike/stone-soup: remove unused patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/26265
Signed-off-by: Sam James  gentoo.org>

 .../stone-soup/files/make-no-png-dep-fix.patch | 94 --
 1 file changed, 94 deletions(-)

diff --git a/games-roguelike/stone-soup/files/make-no-png-dep-fix.patch 
b/games-roguelike/stone-soup/files/make-no-png-dep-fix.patch
deleted file mode 100644
index b43c9c41e8c8..
--- a/games-roguelike/stone-soup/files/make-no-png-dep-fix.patch
+++ /dev/null
@@ -1,94 +0,0 @@
 a/Makefile 2021-08-02 13:54:26.603900984 -0500
-+++ b/Makefile 2021-08-02 13:57:26.018910565 -0500
-@@ -186,7 +186,7 @@
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
- 
--HOST := $(shell sh -c 'cc -dumpmachine || echo unknown')
-+HOST :=
- ARCH := $(HOST)
- 
- ifdef CROSSHOST
-@@ -457,15 +457,7 @@
- GCC_VER_SUFFIX:=-$(GCC_VER)
- endif
- 
--# Attempt to use a full compiler name, to make
--# distcc builds work nicely.
--LMACH := $(shell gcc -dumpmachine)-
--ifeq ($(LMACH),-)
- LMACH :=
--endif
--ifeq ($(shell which $(LMACH)gcc$(GCC_VER_SUFFIX) > /dev/null 2> /dev/null && 
echo "Yes"),)
--LMACH :=
--endif
- 
- ifneq ($(FORCE_CC),)
- GCC := $(FORCE_CC)
-@@ -765,7 +757,6 @@
-   FULLDEBUG=YesPlease
-   DEBUG=YesPlease
-   NO_OPTIMIZE=YesPlease
--  COVERAGE=YesPlease
- endif
- 
- # Debug-Lite
-@@ -773,7 +764,6 @@
- ifneq (,$(filter debug-lite,$(MAKECMDGOALS)))
-   DEBUG=YesPlease
-   NO_OPTIMIZE=YesPlease
--  COVERAGE=YesPlease
- endif
- 
- # Profile
-@@ -781,12 +771,10 @@
- ifneq (,$(filter profile,$(MAKECMDGOALS)))
-   FULLDEBUG=YesPlease
-   DEBUG=YesPlease
--  COVERAGE=YesPlease
- endif
- 
- # Unit tests
- ifneq (,$(filter catch2-tests,$(MAKECMDGOALS)))
--  COVERAGE=YesPlease
- endif
- 
- ifdef HURRY
-@@ -938,7 +926,7 @@
- INSTALL_FONTS += "$(PROPORTIONAL_FONT)"
-   endif
- else
--  SYS_PROPORTIONAL_FONT = $(shell util/find_font "$(OUR_PROPORTIONAL_FONT)")
-+  SYS_PROPORTIONAL_FONT = /usr/share/fonts/dejavu/DejaVuSans.ttf
-   ifneq (,$(SYS_PROPORTIONAL_FONT))
- ifeq (,$(COPY_FONTS))
-   DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\"
-@@ -958,7 +946,7 @@
- INSTALL_FONTS += "$(MONOSPACED_FONT)"
-   endif
- else
--  SYS_MONOSPACED_FONT = $(shell util/find_font "$(OUR_MONOSPACED_FONT)")
-+  SYS_MONOSPACED_FONT = /usr/share/fonts/dejavu/DejaVuSansMono.ttf
-   ifneq (,$(SYS_MONOSPACED_FONT))
- ifeq (,$(COPY_FONTS))
-   DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\"
-@@ -1187,9 +1175,8 @@
- 
- LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
- SRC_PKG_BASE  := stone_soup
--SRC_VERSION   := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat 
util/release_ver)
-+SRC_VERSION   := $(shell cat util/release_ver)
- MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|$(SED) -r 
's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
--RECENT_TAG:= $(shell git describe --abbrev=0 --tags $(MERGE_BASE))
- WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo 
win32)
- 
- export SRC_VERSION
-@@ -1523,7 +1510,7 @@
- endif
- endif
- 
--install: all install-data
-+install: install-data
-   [ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix)
-   $(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/
-   $(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME)

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/, games-roguelike/stone-soup/

2022-05-22 Thread Erik Mackdanz 
commit: ad15f92151f402b95fc352d61b55d037efe2d5bb
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sun May 22 23:34:01 2022 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Mon May 23 00:04:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad15f921

games-roguelike/stone-soup: add USE=advpng

... as a .png compression option.  Patches makes the advpng/pngcrush
decision deterministic not automagic.

Also split DEPEND/BDEPEND

Signed-off-by: Erik Mackdanz  gentoo.org>
Closes: https://bugs.gentoo.org/843413
Package-Manager: Portage-3.0.30, Repoman-3.0.3

 games-roguelike/stone-soup/files/make-advpng.patch | 21 ++
 .../{make.patch => make-no-png-dep-fix.patch}  |  0
 games-roguelike/stone-soup/files/make.patch| 45 +-
 games-roguelike/stone-soup/metadata.xml|  6 ++-
 .../stone-soup/stone-soup-0.25.1-r102.ebuild   |  2 +-
 ...1-r102.ebuild => stone-soup-0.25.1-r103.ebuild} | 23 ---
 .../stone-soup/stone-soup-0.26.1-r1.ebuild |  2 +-
 26.1-r1.ebuild => stone-soup-0.26.1-r2.ebuild} | 23 ---
 ...p-0.27.1.ebuild => stone-soup-0.27.1-r1.ebuild} | 23 ---
 .../stone-soup/stone-soup-0.27.1.ebuild|  2 +-
 ...p-0.28.0.ebuild => stone-soup-0.28.0-r1.ebuild} | 23 ---
 .../stone-soup/stone-soup-0.28.0.ebuild|  2 +-
 12 files changed, 136 insertions(+), 36 deletions(-)

diff --git a/games-roguelike/stone-soup/files/make-advpng.patch 
b/games-roguelike/stone-soup/files/make-advpng.patch
new file mode 100644
index ..683e478212b4
--- /dev/null
+++ b/games-roguelike/stone-soup/files/make-advpng.patch
@@ -0,0 +1,21 @@
+--- a/Makefile 2022-05-22 11:54:15.819138403 -0500
 b/Makefile 2022-05-22 11:56:24.475145274 -0500
+@@ -1080,8 +1080,7 @@
+ 
+ ifdef TILES_ANY
+ ifndef NO_OPTIMIZE
+-  PNGCRUSH = pngcrush -q -m 113
+-  PNGCRUSH_LABEL = PNGCRUSH
++USE_ADVPNG = y
+ endif
+ endif
+ 
+@@ -1727,7 +1726,8 @@
+ $(TILEDEFSRCS) $(TILEDEFHDRS) $(ORIGTILEFILES): build-rltiles
+ 
+ dat/tiles/%.png: $(RLTILES)/%.png
+   $(QUIET_PNGCRUSH)$(PNGCRUSH) $< $@
++  $(QUIET_ADVPNG)$(ADVPNG) $@
+ 
+ clean-rltiles:
+   $(RM) $(DESTTILEFILES)

diff --git a/games-roguelike/stone-soup/files/make.patch 
b/games-roguelike/stone-soup/files/make-no-png-dep-fix.patch
similarity index 100%
copy from games-roguelike/stone-soup/files/make.patch
copy to games-roguelike/stone-soup/files/make-no-png-dep-fix.patch

diff --git a/games-roguelike/stone-soup/files/make.patch 
b/games-roguelike/stone-soup/files/make.patch
index b43c9c41e8c8..e0d086520099 100644
--- a/games-roguelike/stone-soup/files/make.patch
+++ b/games-roguelike/stone-soup/files/make.patch
@@ -1,5 +1,5 @@
 a/Makefile 2021-08-02 13:54:26.603900984 -0500
-+++ b/Makefile 2021-08-02 13:57:26.018910565 -0500
+--- a/Makefile 2022-05-22 11:25:51.733047395 -0500
 b/Makefile 2022-05-22 11:42:54.240102003 -0500
 @@ -186,7 +186,7 @@
  uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
  uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
@@ -9,7 +9,7 @@
  ARCH := $(HOST)
  
  ifdef CROSSHOST
-@@ -457,15 +457,7 @@
+@@ -451,15 +451,7 @@
  GCC_VER_SUFFIX:=-$(GCC_VER)
  endif
  
@@ -25,7 +25,7 @@
  
  ifneq ($(FORCE_CC),)
  GCC := $(FORCE_CC)
-@@ -765,7 +757,6 @@
+@@ -759,7 +751,6 @@
FULLDEBUG=YesPlease
DEBUG=YesPlease
NO_OPTIMIZE=YesPlease
@@ -33,7 +33,7 @@
  endif
  
  # Debug-Lite
-@@ -773,7 +764,6 @@
+@@ -767,7 +758,6 @@
  ifneq (,$(filter debug-lite,$(MAKECMDGOALS)))
DEBUG=YesPlease
NO_OPTIMIZE=YesPlease
@@ -41,7 +41,7 @@
  endif
  
  # Profile
-@@ -781,12 +771,10 @@
+@@ -775,12 +765,10 @@
  ifneq (,$(filter profile,$(MAKECMDGOALS)))
FULLDEBUG=YesPlease
DEBUG=YesPlease
@@ -54,7 +54,7 @@
  endif
  
  ifdef HURRY
-@@ -938,7 +926,7 @@
+@@ -932,7 +920,7 @@
  INSTALL_FONTS += "$(PROPORTIONAL_FONT)"
endif
  else
@@ -63,7 +63,7 @@
ifneq (,$(SYS_PROPORTIONAL_FONT))
  ifeq (,$(COPY_FONTS))
DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\"
-@@ -958,7 +946,7 @@
+@@ -952,7 +940,7 @@
  INSTALL_FONTS += "$(MONOSPACED_FONT)"
endif
  else
@@ -72,7 +72,22 @@
ifneq (,$(SYS_MONOSPACED_FONT))
  ifeq (,$(COPY_FONTS))
DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\"
-@@ -1187,9 +1175,8 @@
+@@ -1092,14 +1080,8 @@
+ 
+ ifdef TILES_ANY
+ ifndef NO_OPTIMIZE
+-  ifneq (,$(shell which advpng))
+-USE_ADVPNG = y
+-  else
+-ifneq (,$(shell which pngcrush))
+   PNGCRUSH = pngcrush -q -m 113
+   PNGCRUSH_LABEL = PNGCRUSH
+-endif
+-  endif
+ endif
+ endif
+ 
+@@ -1181,9 +1163,8 @@
  
  LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
  SRC_PKG_BASE  := stone_soup
@@ -83,7 +98,7 @@
  WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo 
win32)
  
  export SRC_VERSION
-@@ -1523,7 +1510,7 @@
+@@ -1511,7 +1492,7 @@
  endif
  endif
  
@@

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/

2021-08-27 Thread Conrad Kostecki 
commit: d297d1041e08d7a94d14ee6032e33a67ebe752a2
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri Aug 27 07:20:15 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Fri Aug 27 23:34:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d297d104

games-roguelike/stone-soup: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/22124
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../stone-soup/files/fixed-font-path.patch | 20 --
 games-roguelike/stone-soup/files/gitless-1.patch   | 13 ---
 .../stone-soup/files/rltiles-ldflags-libs.patch| 45 --
 3 files changed, 78 deletions(-)

diff --git a/games-roguelike/stone-soup/files/fixed-font-path.patch 
b/games-roguelike/stone-soup/files/fixed-font-path.patch
deleted file mode 100644
index 5f6bd651bec..000
--- a/games-roguelike/stone-soup/files/fixed-font-path.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 a/Makefile 2020-12-11 23:37:30.506956304 -0600
-+++ b/Makefile 2020-12-11 23:40:02.925609235 -0600
-@@ -932,7 +932,7 @@
- INSTALL_FONTS += "$(PROPORTIONAL_FONT)"
-   endif
- else
--  SYS_PROPORTIONAL_FONT = $(shell util/find_font "$(OUR_PROPORTIONAL_FONT)")
-+  SYS_PROPORTIONAL_FONT = /usr/share/fonts/dejavu/DejaVuSans.ttf
-   ifneq (,$(SYS_PROPORTIONAL_FONT))
- ifeq (,$(COPY_FONTS))
-   DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\"
-@@ -952,7 +952,7 @@
- INSTALL_FONTS += "$(MONOSPACED_FONT)"
-   endif
- else
--  SYS_MONOSPACED_FONT = $(shell util/find_font "$(OUR_MONOSPACED_FONT)")
-+  SYS_MONOSPACED_FONT = /usr/share/fonts/dejavu/DejaVuSansMono.ttf
-   ifneq (,$(SYS_MONOSPACED_FONT))
- ifeq (,$(COPY_FONTS))
-   DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\"

diff --git a/games-roguelike/stone-soup/files/gitless-1.patch 
b/games-roguelike/stone-soup/files/gitless-1.patch
deleted file mode 100644
index a7118dc13fc..000
--- a/games-roguelike/stone-soup/files/gitless-1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
 /Makefile  2020-06-18 17:49:19.339016246 -0500
-+++ /Makefile  2020-06-18 17:55:11.200700094 -0500
-@@ -1181,9 +1181,8 @@
- 
- LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
- SRC_PKG_BASE  := stone_soup
--SRC_VERSION   := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat 
util/release_ver)
-+SRC_VERSION   := $(shell cat util/release_ver)
- MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|$(SED) -r 
's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
--RECENT_TAG:= $(shell git describe --abbrev=0 --tags $(MERGE_BASE))
- WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo 
win32)
- 
- export SRC_VERSION

diff --git a/games-roguelike/stone-soup/files/rltiles-ldflags-libs.patch 
b/games-roguelike/stone-soup/files/rltiles-ldflags-libs.patch
deleted file mode 100644
index a2948b23619..000
--- a/games-roguelike/stone-soup/files/rltiles-ldflags-libs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
 a/rltiles/Makefile
-+++ b/rltiles/Makefile
-@@ -1,7 +1,7 @@
- uname_S := $(shell uname -s)
-
- ifneq (,$(findstring MINGW,$(uname_S)))
--LDFLAGS += -lmingw32
-+LIBS += -lmingw32
- endif
-
- # Note: since generation of tiles is done on the host, we don't care about
-@@ -29,7 +29,7 @@
-   endif
-
-   CFLAGS += $(PNG_INCLUDE)
--  LDFLAGS += $(PNG_LIB)
-+  LIBS += $(PNG_LIB)
-
-   CFLAGS += -DUSE_TILE
- endif
-@@ -39,13 +39,13 @@
- endif
-
- ifneq (,$(findstring MINGW,$(uname_S)))
--LDFLAGS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion 
-luuid
-+LIBS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid
- endif
- ifeq ($(uname_S),Darwin)
--LDFLAGS += -framework AppKit -framework AudioUnit -framework CoreAudio 
-framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
-+LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio 
-framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
- endif
- ifeq ($(uname_S),Linux)
--LDFLAGS += -ldl -lpthread
-+LIBS += -ldl -lpthread
- endif
-
- # Attempt to use a full compiler name, to make
-@@ -134,6 +134,6 @@
-   $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
-
- $(TILEGEN): $(OBJECTS)
--  $(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS)
-+  $(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) 
$(LIBS)
-
- .PHONY: all clean distclean

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/

2020-11-20 Thread Aaron Bauman 
commit: a5f166a894d84d28516da74fb9164ccac4b94617
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Nov 16 08:00:45 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Nov 20 13:25:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f166a8

games-roguelike/stone-soup: remove unused patches

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18278
Signed-off-by: Aaron Bauman  gentoo.org>

 games-roguelike/stone-soup/files/gitless.patch  | 13 -
 games-roguelike/stone-soup/files/pyyaml-safe-load.patch | 11 ---
 2 files changed, 24 deletions(-)

diff --git a/games-roguelike/stone-soup/files/gitless.patch 
b/games-roguelike/stone-soup/files/gitless.patch
deleted file mode 100644
index 3aaeb747009..000
--- a/games-roguelike/stone-soup/files/gitless.patch
+++ /dev/null
@@ -1,13 +0,0 @@
 /Makefile  2019-04-15 19:34:40.604288477 -0500
-+++ /Makefile  2019-04-15 19:36:25.249286603 -0500
-@@ -1149,9 +1149,8 @@
- 
- LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
- SRC_PKG_BASE  := stone_soup
--SRC_VERSION   := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat 
util/release_ver)
-+SRC_VERSION   := $(shell cat util/release_ver)
- MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|sed -r 
's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
--RECENT_TAG:= $(shell git describe --abbrev=0 --tags $(MERGE_BASE))
- 
- export SRC_VERSION
- 

diff --git a/games-roguelike/stone-soup/files/pyyaml-safe-load.patch 
b/games-roguelike/stone-soup/files/pyyaml-safe-load.patch
deleted file mode 100644
index dfbcdc96e1a..000
--- a/games-roguelike/stone-soup/files/pyyaml-safe-load.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 /util/species-gen.py   2019-04-18 23:19:07.444170831 -0500
-+++ /util/species-gen.py   2019-04-18 23:20:19.958169533 -0500
-@@ -417,7 +417,7 @@
- continue
- f_path = os.path.join(args.datadir, f_name)
- try:
--species_spec = yaml.load(open(f_path))
-+species_spec = yaml.safe_load(open(f_path))
- except yaml.YAMLError as e:
- print("Failed to load %s: %s" % (f_name, e))
- sys.exit(1)

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/, games-roguelike/stone-soup/

2020-06-18 Thread Erik Mackdanz 
commit: f95a7a3bebca782fb340c8f66030532f2b45dba0
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Fri Jun 19 01:17:03 2020 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Fri Jun 19 01:17:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f95a7a3b

games-roguelike/stone-soup: bump to 0.25.0

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

 games-roguelike/stone-soup/Manifest|   1 +
 games-roguelike/stone-soup/files/gitless-1.patch   |  13 ++
 .../stone-soup/stone-soup-0.25.0.ebuild| 171 +
 3 files changed, 185 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest 
b/games-roguelike/stone-soup/Manifest
index a428119bdb6..26b98ec5817 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.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

diff --git a/games-roguelike/stone-soup/files/gitless-1.patch 
b/games-roguelike/stone-soup/files/gitless-1.patch
new file mode 100644
index 000..a7118dc13fc
--- /dev/null
+++ b/games-roguelike/stone-soup/files/gitless-1.patch
@@ -0,0 +1,13 @@
+--- /Makefile  2020-06-18 17:49:19.339016246 -0500
 /Makefile  2020-06-18 17:55:11.200700094 -0500
+@@ -1181,9 +1181,8 @@
+ 
+ LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
+ SRC_PKG_BASE  := stone_soup
+-SRC_VERSION   := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat 
util/release_ver)
++SRC_VERSION   := $(shell cat util/release_ver)
+ MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|$(SED) -r 
's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
+-RECENT_TAG:= $(shell git describe --abbrev=0 --tags $(MERGE_BASE))
+ WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo 
win32)
+ 
+ export SRC_VERSION

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild 
b/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
new file mode 100644
index 000..a617058863e
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO
+# - attempt +test, linked bug claims to be fixed
+
+EAPI=7
+VIRTUALX_REQUIRED="manual"
+inherit desktop eutils xdg-utils toolchain-funcs
+
+MY_P="stone_soup-${PV}"
+DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting 
in dungeons"
+HOMEPAGE="http://crawl.develz.org/wordpress/;
+SRC_URI="
+   https://crawl.develz.org/release/$(ver_cut 1-2)/${PN/-/_}-${PV}.tar.xz
+   https://dev.gentoo.org/~hasufell/distfiles/${PN}.png
+   https://dev.gentoo.org/~hasufell/distfiles/${PN}.svg
+"
+
+# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h
+# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
+# Public Domain|CC0: most of tiles
+# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
+LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ncurses sound test +tiles"
+# test is broken
+# see https://crawl.develz.org/mantis/view.php?id=6121
+RESTRICT="test"
+
+RDEPEND="
+   dev-db/sqlite:3
+   =dev-lang/lua-5.1*:0=
+   sys-libs/zlib
+   !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
+   ncurses? ( sys-libs/ncurses:0 )
+   tiles? (
+   media-fonts/dejavu
+   media-libs/freetype:2
+   media-libs/libpng:0
+   sound? (
+  media-libs/libsdl2[X,opengl,sound,video]
+  media-libs/sdl2-mixer
+   )
+   !sound? (

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/, games-roguelike/stone-soup/

2019-02-10 Thread Erik Mackdanz 
commit: 3cb82a5ff29268783f6972ff448172dbf7af95f3
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Mon Feb 11 02:59:11 2019 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Mon Feb 11 02:59:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cb82a5f

games-roguelike/stone-soup: Restore deleted patch

Closes: https://bugs.gentoo.org/677620
Signed-off-by: Erik Mackdanz  gentoo.org>
Package-Manager: Portage-2.3.59, Repoman-2.3.12

 .../stone-soup/files/rltiles-ldflags-libs.patch| 45 ++
 games-roguelike/stone-soup/metadata.xml|  4 --
 .../stone-soup/stone-soup-0.22.0.ebuild|  4 +-
 .../stone-soup/stone-soup-0.23.0.ebuild|  2 +-
 4 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/games-roguelike/stone-soup/files/rltiles-ldflags-libs.patch 
b/games-roguelike/stone-soup/files/rltiles-ldflags-libs.patch
new file mode 100644
index 000..a2948b23619
--- /dev/null
+++ b/games-roguelike/stone-soup/files/rltiles-ldflags-libs.patch
@@ -0,0 +1,45 @@
+--- a/rltiles/Makefile
 b/rltiles/Makefile
+@@ -1,7 +1,7 @@
+ uname_S := $(shell uname -s)
+
+ ifneq (,$(findstring MINGW,$(uname_S)))
+-LDFLAGS += -lmingw32
++LIBS += -lmingw32
+ endif
+
+ # Note: since generation of tiles is done on the host, we don't care about
+@@ -29,7 +29,7 @@
+   endif
+
+   CFLAGS += $(PNG_INCLUDE)
+-  LDFLAGS += $(PNG_LIB)
++  LIBS += $(PNG_LIB)
+
+   CFLAGS += -DUSE_TILE
+ endif
+@@ -39,13 +39,13 @@
+ endif
+
+ ifneq (,$(findstring MINGW,$(uname_S)))
+-LDFLAGS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion 
-luuid
++LIBS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid
+ endif
+ ifeq ($(uname_S),Darwin)
+-LDFLAGS += -framework AppKit -framework AudioUnit -framework CoreAudio 
-framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
++LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio 
-framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
+ endif
+ ifeq ($(uname_S),Linux)
+-LDFLAGS += -ldl -lpthread
++LIBS += -ldl -lpthread
+ endif
+
+ # Attempt to use a full compiler name, to make
+@@ -134,6 +134,6 @@
+   $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
+
+ $(TILEGEN): $(OBJECTS)
+-  $(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS)
++  $(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) 
$(LIBS)
+
+ .PHONY: all clean distclean

diff --git a/games-roguelike/stone-soup/metadata.xml 
b/games-roguelike/stone-soup/metadata.xml
index ec38a399560..68e84b34cc4 100644
--- a/games-roguelike/stone-soup/metadata.xml
+++ b/games-roguelike/stone-soup/metadata.xml
@@ -1,10 +1,6 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   stasib...@gentoo.org
-   Erik Mackdanz
-   

ga...@gentoo.org
Gentoo Games Project

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 742c2c56bd9..92ce93f41ce 100644
--- a/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.22.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 luajit ncurses test +tiles"
 # test is broken
 # see https://crawl.develz.org/mantis/view.php?id=6121
@@ -56,7 +56,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}/source
 S_TEST=${WORKDIR}/${MY_P}_test/source
 PATCHES=(
-   "${FILESDIR}"/${PN}-0.20.1-rltiles-ldflags-libs.patch
+   "${FILESDIR}"/rltiles-ldflags-libs.patch
 )
 
 pkg_setup() {

diff --git a/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild 
b/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild
index 876c7001d73..92ce93f41ce 100644
--- a/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild
@@ -56,7 +56,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}/source
 S_TEST=${WORKDIR}/${MY_P}_test/source
 PATCHES=(
-   "${FILESDIR}"/${PN}-0.20.1-rltiles-ldflags-libs.patch
+   "${FILESDIR}"/rltiles-ldflags-libs.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/, games-roguelike/stone-soup/

2019-02-09 Thread Erik Mackdanz 
commit: 38d7daa3f382c1c0b69a7de1bab029ffa8fa1437
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sun Feb 10 00:08:15 2019 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sun Feb 10 00:08:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d7daa3

games-roguelike/stone-soup: Bump to 0.23.0

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

 games-roguelike/stone-soup/Manifest|   1 +
 .../stone-soup-0.20.1-rltiles-ldflags-libs.patch   |  45 ---
 .../stone-soup/stone-soup-0.23.0.ebuild| 143 +
 3 files changed, 144 insertions(+), 45 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest 
b/games-roguelike/stone-soup/Manifest
index 36ddd33178a..ce8d9856e02 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.22.0.tar.xz 29263688 BLAKE2B 
e0a4d6953677583fafe1fce037d4d484c821b4d8782c63fa90b6b4f5db3df7b8fd4c5e843740517a7c2321f864df2a346fcd9bc69a1446c74685afc239d1fc55
 SHA512 
e8daa0f66a5212b116ce997b30b8f0f9ef01cef7e1213a1b6fe17c800d44fa7e318624902ce638dee79027ffaa3a4af8a10f6552de756a2045b5919d817498bd
+DIST stone_soup-0.23.0.tar.xz 29899848 BLAKE2B 
138f3c9fe1ad395d05d0654ea42788c6312e92839c6b92edfa538123b8b566f62d263862b05c6da64d589938c820b876e12475b0eeb16af7dd2e3f62c441eecb
 SHA512 
6b53b5d670130aac451d09fe842e7654f61c131d126b34ed729d4542e9d2cbe2beaa6cd5f0b2bb78744ae6c643040996e39db8b0b3840c8946e442aaff54ff58

diff --git 
a/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch 
b/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch
deleted file mode 100644
index 010c729b92e..000
--- 
a/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
 a/rltiles/Makefile
-+++ b/rltiles/Makefile
-@@ -1,7 +1,7 @@
- uname_S := $(shell uname -s)
- 
- ifneq (,$(findstring MINGW,$(uname_S)))
--LDFLAGS += -lmingw32
-+LIBS += -lmingw32
- endif
- 
- # Note: since generation of tiles is done on the host, we don't care about
-@@ -29,7 +29,7 @@
-   endif
- 
-   CFLAGS += $(PNG_INCLUDE)
--  LDFLAGS += $(PNG_LIB)
-+  LIBS += $(PNG_LIB)
- 
-   CFLAGS += -DUSE_TILE
- endif
-@@ -39,13 +39,13 @@
- endif
- 
- ifneq (,$(findstring MINGW,$(uname_S)))
--LDFLAGS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion 
-luuid
-+LIBS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid
- endif
- ifeq ($(uname_S),Darwin)
--LDFLAGS += -framework AppKit -framework AudioUnit -framework CoreAudio 
-framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
-+LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio 
-framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
- endif
- ifeq ($(uname_S),Linux)
--LDFLAGS += -ldl -lpthread
-+LIBS += -ldl -lpthread
- endif
- 
- # Attempt to use a full compiler name, to make
-@@ -134,6 +134,6 @@
-   $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
- 
- $(TILEGEN): $(OBJECTS)
--  $(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS)
-+  $(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) 
$(LIBS)
- 
- .PHONY: all clean distclean

diff --git a/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild 
b/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild
new file mode 100644
index 000..876c7001d73
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild
@@ -0,0 +1,143 @@
+# 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:

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/

2017-12-23 Thread David Seifert 
commit: d74d32dbd7cb73c8b7f4f98f5e32b06a7c62d5b2
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Dec 22 15:26:58 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Dec 23 13:10:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d74d32db

games-roguelike/stone-soup: remove unused patches

 ...6.2-Use-pkg-config-for-linking-to-ncurses.patch |  49 -
 .../files/stone-soup-0.16.2-perl526.patch  |  48 -
 ...ne-soup-0.16.2-respect-flags-and-compiler.patch | 110 -
 3 files changed, 207 deletions(-)

diff --git 
a/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
 
b/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
deleted file mode 100644
index e0b676c3d2e..000
--- 
a/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 88579f929f0fc62de1ad0895264ad077e0ee Mon Sep 17 00:00:00 2001
-From: hasufell 
-Date: Mon, 27 Oct 2014 20:48:03 +0100
-Subject: [PATCH 2/2] Use pkg-config for linking to ncurses
-
-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=527034

- source/Makefile | 14 ++
- 1 file changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index df51e70..2db2781 100644
 a/Makefile
-+++ b/Makefile
-@@ -956,17 +956,15 @@ endif
- # Your ncurses library may include Unicode support, and you may not have a
- # separate libncursesw; this is the case on Mac OS/Darwin.
- ifdef LIBNCURSES_IS_UNICODE
--NC_LIB = ncurses
--NC_INCLUDE = $(NC_PREFIX)/include/ncurses
-+NC_LIBS = $(shell $(PKGCONFIG) --libs ncurses 2>/dev/null || echo 
"-L$(NC_PREFIX)/lib -lncurses")
-+NC_CFLAGS = $(shell $(PKGCONFIG) --cflags ncurses 2>/dev/null || echo 
"-isystem $(NC_PREFIX)/include/ncurses")
- else
--NC_LIB = ncursesw
--NC_INCLUDE = $(NC_PREFIX)/include/ncursesw
-+NC_LIBS = $(shell $(PKGCONFIG) --libs ncursesw || echo "-L$(NC_PREFIX)/lib 
-lncursesw")
-+NC_CFLAGS = $(shell $(PKGCONFIG) --cflags ncursesw 2>/dev/null || echo 
"-isystem $(NC_PREFIX)/include/ncursesw")
- endif
- 
--INCLUDES_L += -isystem $(NC_INCLUDE)
--
- ifndef TILES
--LIBS += -L$(NC_PREFIX)/lib -l$(NC_LIB)
-+LIBS += $(NC_LIBS)
- endif
- 
- endif
-@@ -,7 +1109,7 @@ CFLAGS   := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) $(CFLAGS)
- else
- CFLAGS   := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN)
- endif
--CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L) 
$(CFOTHERS_L)
-+CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L) 
$(CFOTHERS_L) $(NC_CFLAGS)
- ALL_CFLAGS := $(CFLAGS) $(CFLAGS_L)
- YACC_CFLAGS  := $(ALL_CFLAGS) -Wno-unused-function -Wno-sign-compare 
-DYYENABLE_NLS=0 -DYYLTYPE_IS_TRIVIAL=0
- 
--- 
-2.1.2
-

diff --git a/games-roguelike/stone-soup/files/stone-soup-0.16.2-perl526.patch 
b/games-roguelike/stone-soup/files/stone-soup-0.16.2-perl526.patch
deleted file mode 100644
index a450a635153..000
--- a/games-roguelike/stone-soup/files/stone-soup-0.16.2-perl526.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ruN stone_soup-0.16.2.orig/source/util/gather_abilities 
stone_soup-0.16.2/source/util/gather_abilities
 source.orig/util/gather_abilities  2015-08-10 03:32:30.0 +0200
-+++ source/util/gather_abilities   2017-07-08 20:46:16.112231100 +0200
-@@ -5,7 +5,7 @@
- $_ = ;
- close IN;
- 
--s/.*Ability_List\[\] =\n{\n(.*?)};.*/$1/s
-+s/.*Ability_List\[\] =\n\{\n(.*?)};.*/$1/s
- or die "Can't find Ability_List[] in ability.cc\n";
- 
- print join("\n", sort /ABIL_[A-Z0-9_]+\s*,\s*"([*-Za-z0-9 '-]+)"/sg), "\n";
-diff -ruN stone_soup-0.16.2.orig/source/util/gather_cards 
stone_soup-0.16.2/source/util/gather_cards
 source.orig/util/gather_cards  2015-08-10 03:32:30.0 +0200
-+++ source/util/gather_cards   2017-07-08 20:46:45.113232307 +0200
-@@ -5,7 +5,7 @@
- $_ = ;
- close IN;
- 
--s/.*card_name\(card_type card\)\n{\n\s+switch(.*?)\n}\n.*/$1/s
-+s/.*card_name\(card_type card\)\n\{\n\s+switch(.*?)\n}\n.*/$1/s
- or die "Can't find card_name() in decks.cc\n";
- 
- @cards = map { /case CARD_[A-Z_]+:\s+return "([^"]+)";$/ ? ("$1") : () } 
split /\n/;
-diff -ruN stone_soup-0.16.2.orig/source/util/gather_mons 
stone_soup-0.16.2/source/util/gather_mons
 source.orig/util/gather_mons   2014-07-28 17:19:20.0 +0200
-+++ source/util/gather_mons2017-07-08 20:47:10.378233358 +0200
-@@ -99,7 +99,7 @@
- open IN, "util/cpp_version spl-summoning.cc|" or die "Can't read 
spl-summoning.cc\n";
- while ()
- {
--$mons{$1} = 1 if (/^{ MONS_[A-Z0-9_]+, "([A-Za-z0-9 ']+)" },$/);
-+$mons{$1} = 1 if (/^\{ MONS_[A-Z0-9_]+, "([A-Za-z0-9 ']+)" },$/);
- }
- close IN;
- }
-diff -ruN stone_soup-0.16.2.orig/source/util/gen-mi-enum 
stone_soup-0.16.2/source/util/gen-mi-enum
 source.orig/util/gen-mi-enum   2014-07-28

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/

2017-10-25 Thread Jeroen Roovers 
commit: 218086fe54d54874836389eda013c3501036ccd9
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Oct 25 10:33:52 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Oct 25 10:33:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=218086fe

games-roguelike/stone-soup: Fix pkg-config call.

Package-Manager: Portage-2.3.12, Repoman-2.3.3

 .../stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
 
b/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
index 0c029c9f096..e0b676c3d2e 100644
--- 
a/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
+++ 
b/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
@@ -18,12 +18,12 @@ index df51e70..2db2781 100644
  ifdef LIBNCURSES_IS_UNICODE
 -NC_LIB = ncurses
 -NC_INCLUDE = $(NC_PREFIX)/include/ncurses
-+NC_LIBS = $(shell $(PKGCONFIG) --lib ncurses 2>/dev/null || echo 
"-L$(NC_PREFIX)/lib -lncurses")
++NC_LIBS = $(shell $(PKGCONFIG) --libs ncurses 2>/dev/null || echo 
"-L$(NC_PREFIX)/lib -lncurses")
 +NC_CFLAGS = $(shell $(PKGCONFIG) --cflags ncurses 2>/dev/null || echo 
"-isystem $(NC_PREFIX)/include/ncurses")
  else
 -NC_LIB = ncursesw
 -NC_INCLUDE = $(NC_PREFIX)/include/ncursesw
-+NC_LIBS = $(shell $(PKGCONFIG) --lib ncursesw || echo "-L$(NC_PREFIX)/lib 
-lncursesw")
++NC_LIBS = $(shell $(PKGCONFIG) --libs ncursesw || echo "-L$(NC_PREFIX)/lib 
-lncursesw")
 +NC_CFLAGS = $(shell $(PKGCONFIG) --cflags ncursesw 2>/dev/null || echo 
"-isystem $(NC_PREFIX)/include/ncursesw")
  endif

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/, games-roguelike/stone-soup/

2016-09-14 Thread Austin English 
commit: 2827c9b71994d1b022bb545cc8e4cd7b7079b7bf
Author: Austin English  gentoo  org>
AuthorDate: Wed Sep 14 19:12:16 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Wed Sep 14 19:12:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2827c9b7

games-roguelike/stone-soup: remove deprecated games eclass

Also update to EAPI 6

Gentoo-Bug: https://bugs.gentoo.org/574082

Package-Manager: portage-2.3.0

 ...6.2-Use-pkg-config-for-linking-to-ncurses.patch |   6 +-
 .../stone-soup/stone-soup-0.16.2-r1.ebuild | 144 +
 2 files changed, 147 insertions(+), 3 deletions(-)

diff --git 
a/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
 
b/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
index 5ca192d..0c029c9 100644
--- 
a/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
+++ 
b/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
@@ -8,10 +8,10 @@ Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=527034
  source/Makefile | 14 ++
  1 file changed, 6 insertions(+), 8 deletions(-)
 
-diff --git a/source/Makefile b/source/Makefile
+diff --git a/Makefile b/Makefile
 index df51e70..2db2781 100644
 a/source/Makefile
-+++ b/source/Makefile
+--- a/Makefile
 b/Makefile
 @@ -956,17 +956,15 @@ endif
  # Your ncurses library may include Unicode support, and you may not have a
  # separate libncursesw; this is the case on Mac OS/Darwin.

diff --git a/games-roguelike/stone-soup/stone-soup-0.16.2-r1.ebuild 
b/games-roguelike/stone-soup/stone-soup-0.16.2-r1.ebuild
new file mode 100644
index ..4f79422
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.16.2-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+## TODO
+# add sound support (no sound files)
+
+EAPI=6
+VIRTUALX_REQUIRED="manual"
+inherit eutils gnome2-utils toolchain-funcs
+
+MY_P="stone_soup-${PV}"
+DESCRIPTION="Dungeon Crawl Stone Soup is a 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
+   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[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}"/${P}-respect-flags-and-compiler.patch
+   "${FILESDIR}"/${P}-Use-pkg-config-for-linking-to-ncurses.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 luajit "" "BUILD_LUA=yes") # luajit is not bundled
+   USE_LUAJIT=$(usex luajit "yes" "")
+   DATADIR="/usr/share/${PN}"
+   V=1
+   prefix="/usr"
+   SAVEDIR="~/.crawl"
+   $(usex debug "FULLDEBUG=y DEBUG=y" "")
+   CFOPTIMIZE="${CXXFLAGS}"
+   LDFLAGS="${LDFLAGS}"
+   MAKEOPTS="${MAKEOPTS}"
+   AR="$(tc-getAR)"
+   RANLIB="$(tc-getRANLIB)"
+   CC="$(tc-getCC)"
+   CXX="$(tc-getCXX)"
+   PKGCONFIG="$(tc-getPKG_CONFIG)"
+   STRIP=touch
+

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/, games-roguelike/stone-soup/

2016-06-28 Thread Michael Sterrett 
commit: 1f587f5cfd4306dade3dd132063fe835979246bb
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Jun 28 17:34:01 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Jun 28 17:34:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f587f5c

games-roguelike/stone-soup: old

Package-Manager: portage-2.2.28

 games-roguelike/stone-soup/Manifest|   1 -
 .../stone-soup/files/stone-soup-0.14.2-build.patch |  99 -
 .../stone-soup/stone-soup-0.14.2-r1.ebuild | 162 -
 3 files changed, 262 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest 
b/games-roguelike/stone-soup/Manifest
index 3482e60..a247fb3 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,4 +1,3 @@
 DIST stone-soup.png 1351 SHA256 
486da51db277817f6fa59c32b131fa4d50cace7d8c9a84995d22f13a92e384e1 SHA512 
4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 WHIRLPOOL 
621b93f192d9335f57b18a72489450511be993f79ac5ea26529d3424adcddf1c64cb2c996fa1265cbd341a31dabe550253d0302c941fcd751197aff7840acee3
 DIST stone-soup.svg 68546 SHA256 
f2b476f57f6e8a9b56bc20ec2da0accac9376fea1ff3e4dbe59e7f2f231eb071 SHA512 
dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 WHIRLPOOL 
49b7e0ca45319b2f016203e02b1e08207e9f0c18501b17f5922f1983fbb6bfabc12a9ca3199697f78561739e253f200bfbe984082bb99e1c8e289e5c41004bed
-DIST stone_soup-0.14.2-nodeps.tar.xz 8843692 SHA256 
3f70687690b6dbb427d86eb21b1c65894846526fe20553cabec172ca6bae79bf SHA512 
d852a85ce07dff41ad4c5a611e9b21fa30be6db80b72b0e434baad8d449ecfa554e981209389a79e68aa9418c00972a6cf8098bfecdc847750e0ab3fc99e3f70
 WHIRLPOOL 
8ff166e43d6e99426135575be470645aab34838db871f0b3ce2fd0c8434466e7d9f8bb02d8d0a7e5a5f313c2673856944f4c6dac49c9377f65fe43b1cf90ce9b
 DIST stone_soup-0.16.2.tar.xz 27843008 SHA256 
49d5947abb341eb7f0590fa538c475e68ea954064c615d852de968211b68780b SHA512 
fc48a1161028fbfc3c1b91bf717ffdeb761dc03a12aa8282f2235fe86368de343dd91ee33371fe4f682f4f84a8fc339d6984b6357527c3cf0c4139cb69cd5633
 WHIRLPOOL 
2016018e438e857031c382e53e904126efd7006a1da4b954b3b5eb4f5a9263e8535e7300fa8f54f8a870bf99b362cc0bdda630ea562e2f786e3d88c5b38d0c54

diff --git a/games-roguelike/stone-soup/files/stone-soup-0.14.2-build.patch 
b/games-roguelike/stone-soup/files/stone-soup-0.14.2-build.patch
deleted file mode 100644
index 5409c49..000
--- a/games-roguelike/stone-soup/files/stone-soup-0.14.2-build.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From: Julian Ospald 
-Date: Fri Oct  5 13:55:07 UTC 2012
-Subject: build system 
-
-   respect flags and compiler
-
 a/source/Makefile
-+++ b/source/Makefile
-@@ -101,7 +101,7 @@ include Makefile.obj
- #
- 
- 
--CFOTHERS := -pipe $(EXTERNAL_FLAGS)
-+CFOTHERS := $(EXTERNAL_FLAGS)
- CFWARN := -Wall -Wformat-security
- CFWARN_L := -Wundef
- 
-@@ -747,7 +747,6 @@ ifdef FULLDEBUG
- DEFINES += -DFULLDEBUG
- endif
- ifdef DEBUG
--CFOTHERS := -ggdb $(CFOTHERS)
- DEFINES += -DDEBUG
- endif
- ifndef NOWIZARD
-@@ -1513,7 +1512,7 @@ ifdef ANDROID
- # prove that tiles were generated properly
-   grep tile_info rltiles/*.cc| head
- else
--  +$(MAKE) -C $(RLTILES) all ARCH=$(ARCH) TILES=$(TILES)$(WEBTILES)
-+  +$(MAKE) -C $(RLTILES) all V=$(V) ARCH=$(ARCH) DEBUG=$(DEBUG) 
TILES=$(TILES)$(WEBTILES)
- endif
- 
- $(TILEDEFSRCS) $(TILEDEFHDRS) $(ORIGTILEFILES): build-rltiles
 a/source/rltiles/Makefile
-+++ b/source/rltiles/Makefile
-@@ -1,7 +1,7 @@
- uname_S := $(shell uname -s)
- 
- ifneq (,$(findstring MINGW,$(uname_S)))
--LDFLAGS += -lmingw32
-+LIBS += -lmingw32
- endif
- 
- # Note: since generation of tiles is done on the host, we don't care about
-@@ -10,7 +10,7 @@ endif
- # Also, cross-compilation with no system libraries for host rather than target
- # is not supported.  If host=target, contribs are enough.
- 
--CFLAGS := -O2 -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter
-+CXXFLAGS := -Wall -Wextra -Wno-parentheses -Wno-unused-parameter
- 
- ifdef ANDROID
-   CXXFLAGS :=
-@@ -35,24 +35,24 @@ ifdef TILES
- PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a 
../contrib/install/$(ARCH)/lib/libz.a
-   endif
- 
--  CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE)
--  LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB)
-+  CXXFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE)
-+  LIBS += $(SDL_LDFLAGS) $(PNG_LIB)
- 
--  CFLAGS += -DUSE_TILE
-+  CXXFLAGS += -DUSE_TILE
- endif
- 
- ifdef DEBUG
--CFLAGS += -O0 -DDEBUG -ggdb
-+CXXFLAGS += -DDEBUG
- endif
- 
- ifneq (,$(findstring MINGW,$(uname_S)))
--LDFLAGS += -lgdi32 -lwinmm
-+LIBS += -lgdi32 -lwinmm
- endif
- ifeq ($(uname_S),Darwin)
- LDFLAGS += -framework AppKit -framework AudioUnit -framework Carbon 
-framework IOKit -framework OpenGL
- endif
- ifeq ($(uname_S),Linux)
--LDFLAGS += -ldl -lpthread
-+LIBS += -ldl -lpthread
- endif

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/, games-roguelike/stone-soup/

2015-08-14 Thread Julian Ospald 
commit: f78be723d29cafb3d541537f9af04f0419849bfe
Author: Julian Ospald hasufell AT gentoo DOT org
AuthorDate: Fri Aug 14 22:28:34 2015 +
Commit: Julian Ospald hasufell AT gentoo DOT org
CommitDate: Fri Aug 14 22:28:34 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f78be723

games-roguelike/stone-soup: rm old 0.16.1

 games-roguelike/stone-soup/Manifest|   1 -
 ...6.1-Use-pkg-config-for-linking-to-ncurses.patch |  49 ---
 ...ne-soup-0.16.1-respect-flags-and-compiler.patch | 110 --
 .../stone-soup/stone-soup-0.16.1.ebuild| 160 -
 4 files changed, 320 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest 
b/games-roguelike/stone-soup/Manifest
index 8d112d3..3482e60 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,5 +1,4 @@
 DIST stone-soup.png 1351 SHA256 
486da51db277817f6fa59c32b131fa4d50cace7d8c9a84995d22f13a92e384e1 SHA512 
4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 WHIRLPOOL 
621b93f192d9335f57b18a72489450511be993f79ac5ea26529d3424adcddf1c64cb2c996fa1265cbd341a31dabe550253d0302c941fcd751197aff7840acee3
 DIST stone-soup.svg 68546 SHA256 
f2b476f57f6e8a9b56bc20ec2da0accac9376fea1ff3e4dbe59e7f2f231eb071 SHA512 
dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 WHIRLPOOL 
49b7e0ca45319b2f016203e02b1e08207e9f0c18501b17f5922f1983fbb6bfabc12a9ca3199697f78561739e253f200bfbe984082bb99e1c8e289e5c41004bed
 DIST stone_soup-0.14.2-nodeps.tar.xz 8843692 SHA256 
3f70687690b6dbb427d86eb21b1c65894846526fe20553cabec172ca6bae79bf SHA512 
d852a85ce07dff41ad4c5a611e9b21fa30be6db80b72b0e434baad8d449ecfa554e981209389a79e68aa9418c00972a6cf8098bfecdc847750e0ab3fc99e3f70
 WHIRLPOOL 
8ff166e43d6e99426135575be470645aab34838db871f0b3ce2fd0c8434466e7d9f8bb02d8d0a7e5a5f313c2673856944f4c6dac49c9377f65fe43b1cf90ce9b
-DIST stone_soup-0.16.1.tar.xz 27835264 SHA256 
c3cca203dd7473759648cf225648787e1db687ac8c614293c4faae561fd20242 SHA512 
d77dfc2483d309b4bfddd6736c0974825944e36d2c582fc9e133a6a4cc8287200a3207355536b54cb079fd0a0134706f2b4a42b7d5ceecc4a7e23da7d2c3ba07
 WHIRLPOOL 
882546716037576b77e285a7fdc2f59af032dd034532fe7f82ddc09c4e9000150b8dbf00c6e684b6c21482d810056a2cbf1667be6e84aa08678e1427785fed14
 DIST stone_soup-0.16.2.tar.xz 27843008 SHA256 
49d5947abb341eb7f0590fa538c475e68ea954064c615d852de968211b68780b SHA512 
fc48a1161028fbfc3c1b91bf717ffdeb761dc03a12aa8282f2235fe86368de343dd91ee33371fe4f682f4f84a8fc339d6984b6357527c3cf0c4139cb69cd5633
 WHIRLPOOL 
2016018e438e857031c382e53e904126efd7006a1da4b954b3b5eb4f5a9263e8535e7300fa8f54f8a870bf99b362cc0bdda630ea562e2f786e3d88c5b38d0c54

diff --git 
a/games-roguelike/stone-soup/files/stone-soup-0.16.1-Use-pkg-config-for-linking-to-ncurses.patch
 
b/games-roguelike/stone-soup/files/stone-soup-0.16.1-Use-pkg-config-for-linking-to-ncurses.patch
deleted file mode 100644
index 5ca192d..000
--- 
a/games-roguelike/stone-soup/files/stone-soup-0.16.1-Use-pkg-config-for-linking-to-ncurses.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 88579f929f0fc62de1ad0895264ad077e0ee Mon Sep 17 00:00:00 2001
-From: hasufell hasuf...@gentoo.org
-Date: Mon, 27 Oct 2014 20:48:03 +0100
-Subject: [PATCH 2/2] Use pkg-config for linking to ncurses
-
-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=527034

- source/Makefile | 14 ++
- 1 file changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/source/Makefile b/source/Makefile
-index df51e70..2db2781 100644
 a/source/Makefile
-+++ b/source/Makefile
-@@ -956,17 +956,15 @@ endif
- # Your ncurses library may include Unicode support, and you may not have a
- # separate libncursesw; this is the case on Mac OS/Darwin.
- ifdef LIBNCURSES_IS_UNICODE
--NC_LIB = ncurses
--NC_INCLUDE = $(NC_PREFIX)/include/ncurses
-+NC_LIBS = $(shell $(PKGCONFIG) --lib ncurses 2/dev/null || echo 
-L$(NC_PREFIX)/lib -lncurses)
-+NC_CFLAGS = $(shell $(PKGCONFIG) --cflags ncurses 2/dev/null || echo 
-isystem $(NC_PREFIX)/include/ncurses)
- else
--NC_LIB = ncursesw
--NC_INCLUDE = $(NC_PREFIX)/include/ncursesw
-+NC_LIBS = $(shell $(PKGCONFIG) --lib ncursesw || echo -L$(NC_PREFIX)/lib 
-lncursesw)
-+NC_CFLAGS = $(shell $(PKGCONFIG) --cflags ncursesw 2/dev/null || echo 
-isystem $(NC_PREFIX)/include/ncursesw)
- endif
- 
--INCLUDES_L += -isystem $(NC_INCLUDE)
--
- ifndef TILES
--LIBS += -L$(NC_PREFIX)/lib -l$(NC_LIB)
-+LIBS += $(NC_LIBS)
- endif
- 
- endif
-@@ -,7 +1109,7 @@ CFLAGS   := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) $(CFLAGS)
- else
- CFLAGS   := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN)
- endif
--CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L) 
$(CFOTHERS_L)
-+CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L) 
$(CFOTHERS_L) $(NC_CFLAGS)
- ALL_CFLAGS := $(CFLAGS) $(CFLAGS_L)
- YACC_CFLAGS  := $(ALL_CFLAGS)

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/, games-roguelike/stone-soup/

2015-08-13 Thread Julian Ospald 
commit: 2c652793d90f7b46c4ab282e4b5364586f11e554
Author: Julian Ospald hasufell AT gentoo DOT org
AuthorDate: Thu Aug 13 15:36:41 2015 +
Commit: Julian Ospald hasufell AT gentoo DOT org
CommitDate: Thu Aug 13 15:37:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c652793

games-roguelike/stone-soup: rm old

 games-roguelike/stone-soup/Manifest|   5 -
 .../stone-soup/files/stone-soup-0.13.2-build.patch |  99 -
 .../stone-soup/files/stone-soup-0.14.1-build.patch |  99 -
 .../stone-soup/files/stone-soup-0.15.1-build.patch |  99 -
 ...5.2-Use-pkg-config-for-linking-to-ncurses.patch |  49 ---
 ...ne-soup-0.15.2-respect-flags-and-compiler.patch | 110 --
 .../stone-soup/stone-soup-0.13.2.ebuild| 145 --
 .../stone-soup/stone-soup-0.14.1.ebuild| 145 --
 .../stone-soup/stone-soup-0.15.1-r1.ebuild | 162 
 .../stone-soup/stone-soup-0.15.1.ebuild| 162 
 .../stone-soup/stone-soup-0.15.2.ebuild| 163 -
 11 files changed, 1238 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest 
b/games-roguelike/stone-soup/Manifest
index be3d71b..a2a9800 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,9 +1,4 @@
 DIST stone-soup.png 1351 SHA256 
486da51db277817f6fa59c32b131fa4d50cace7d8c9a84995d22f13a92e384e1 SHA512 
4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 WHIRLPOOL 
621b93f192d9335f57b18a72489450511be993f79ac5ea26529d3424adcddf1c64cb2c996fa1265cbd341a31dabe550253d0302c941fcd751197aff7840acee3
 DIST stone-soup.svg 68546 SHA256 
f2b476f57f6e8a9b56bc20ec2da0accac9376fea1ff3e4dbe59e7f2f231eb071 SHA512 
dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 WHIRLPOOL 
49b7e0ca45319b2f016203e02b1e08207e9f0c18501b17f5922f1983fbb6bfabc12a9ca3199697f78561739e253f200bfbe984082bb99e1c8e289e5c41004bed
-DIST stone_soup-0.13.2-nodeps.tar.xz 9512924 SHA256 
279ff5f27fdff6f970f97cb2aaebe8915c0b407f781d48275de87571cb356eea SHA512 
9f35aec7e4fca61c1a464e7b97974b49cb8b90d84897bd246505ce4db2e0ebf2f758038963364702db4ea87de323d897b6114ae94a89a8ef1753115077bff61a
 WHIRLPOOL 
62b8ac3432126d48dd3693c11535eba55406aec48c7710ecd88f3475fadf1fb075b0aa229193fc8e3d4da6e6bf3d2bedf050911e2031093b3accf7d09e92fe3e
-DIST stone_soup-0.14.1-nodeps.tar.xz 8903416 SHA256 
91726d0224b93ba26b5d4bd3762bc5aabe1f02974ea6c937be89dc6c6ab7a4dd SHA512 
9b304c9e993b000316aa2e3975c3802caa76a0d8687f20f03560f6cf39d2bc7cbf78fce30d12ccfa671e4679adc0e2a29f98c647fd2d9997b7a045af3956db88
 WHIRLPOOL 
498ee49cf693de3cabf1a9441b23582acfa63be84215434943b455fd16c84243d5a5871224f11b0cc358325281732335e2f8b9f102db31cf2338b93d80075d27
 DIST stone_soup-0.14.2-nodeps.tar.xz 8843692 SHA256 
3f70687690b6dbb427d86eb21b1c65894846526fe20553cabec172ca6bae79bf SHA512 
d852a85ce07dff41ad4c5a611e9b21fa30be6db80b72b0e434baad8d449ecfa554e981209389a79e68aa9418c00972a6cf8098bfecdc847750e0ab3fc99e3f70
 WHIRLPOOL 
8ff166e43d6e99426135575be470645aab34838db871f0b3ce2fd0c8434466e7d9f8bb02d8d0a7e5a5f313c2673856944f4c6dac49c9377f65fe43b1cf90ce9b
-DIST stone_soup-0.15.1-nodeps.tar.xz 8971016 SHA256 
44782a3a7b1ca7dac5fc11582b0c862e5696c9ae54120b2cb4ed28d9b9461dc1 SHA512 
e84cb045ecdaac5e4b49fc2965f535ae97c11a823debb90b6e649b31638d332241911b6d5490c7293d589817765b3763367a6a6248065ae416269372ed75706e
 WHIRLPOOL 
0b7d6a9be81b0425db1ffc57aaf7d254c747be66b600618b72d6d0936c18478e72caf41819b36deca531d93fa14c890219f47018a92beaf1b5c1ac65c19705a8
-DIST stone_soup-0.15.1.tar.xz 18220524 SHA256 
57b336262e0c3dc52503a8a77206f6f1f5bd23bafc898bf966c6032556e14ead SHA512 
3f2a32a50cf8f1937d79df4bdd839ae0a9b37ae822ffd3369d2f2c77e0af353ab1db612fbbbc3aa1eab78cce2bbc9b5fd55d6e561cf42e532481a2bfa8602317
 WHIRLPOOL 
538fca85e717a7d0ea5a9929d0387d266288dcf4e0a7ee0a448f4ac742943fe1c8cf2976fb9aafb4f8dfcfc5b54612acf5b571e6daa9fd63cd0c07ccecf0c02d
-DIST stone_soup-0.15.2.tar.xz 18228128 SHA256 
2802e67a7ca366df40ecbd11cf5193909a562bc4842aa17f3ee43606b3f6d1b1 SHA512 
b50e415b653d007a75e1b0f5fd88fadbc0661c724f30774f8c4ec0ef182750e0a56b286165179eb7bb91a6544d3466590fc05ce1be0f25963770d3bb875443c9
 WHIRLPOOL 
0d5c5a1f69845d88327a9d39f0c9266590d71f95d66480903222d66132279b8dd2b1fa6d6dbe68a089f4ed1fc63b4347e90ed6caad8fc9cc620d70ae5887244b
 DIST stone_soup-0.16.1.tar.xz 27835264 SHA256 
c3cca203dd7473759648cf225648787e1db687ac8c614293c4faae561fd20242 SHA512 
d77dfc2483d309b4bfddd6736c0974825944e36d2c582fc9e133a6a4cc8287200a3207355536b54cb079fd0a0134706f2b4a42b7d5ceecc4a7e23da7d2c3ba07
 WHIRLPOOL 
882546716037576b77e285a7fdc2f59af032dd034532fe7f82ddc09c4e9000150b8dbf00c6e684b6c21482d810056a2cbf1667be6e84aa08678e1427785fed14

diff --git

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/, games-roguelike/stone-soup/

2015-08-13 Thread Julian Ospald 
commit: 48ebe1fd72b5036a0f3416d390a9f398c10835f4
Author: Julian Ospald hasufell AT gentoo DOT org
AuthorDate: Thu Aug 13 15:41:01 2015 +
Commit: Julian Ospald hasufell AT gentoo DOT org
CommitDate: Thu Aug 13 15:41:01 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48ebe1fd

games-roguelike/stone-soup: version bump to 0.16.2

 games-roguelike/stone-soup/Manifest|   1 +
 ...6.2-Use-pkg-config-for-linking-to-ncurses.patch |  49 +++
 ...ne-soup-0.16.2-respect-flags-and-compiler.patch | 110 
 .../stone-soup/stone-soup-0.16.2.ebuild| 145 +
 4 files changed, 305 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest 
b/games-roguelike/stone-soup/Manifest
index a2a9800..8d112d3 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -2,3 +2,4 @@ DIST stone-soup.png 1351 SHA256 
486da51db277817f6fa59c32b131fa4d50cace7d8c9a8499
 DIST stone-soup.svg 68546 SHA256 
f2b476f57f6e8a9b56bc20ec2da0accac9376fea1ff3e4dbe59e7f2f231eb071 SHA512 
dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 WHIRLPOOL 
49b7e0ca45319b2f016203e02b1e08207e9f0c18501b17f5922f1983fbb6bfabc12a9ca3199697f78561739e253f200bfbe984082bb99e1c8e289e5c41004bed
 DIST stone_soup-0.14.2-nodeps.tar.xz 8843692 SHA256 
3f70687690b6dbb427d86eb21b1c65894846526fe20553cabec172ca6bae79bf SHA512 
d852a85ce07dff41ad4c5a611e9b21fa30be6db80b72b0e434baad8d449ecfa554e981209389a79e68aa9418c00972a6cf8098bfecdc847750e0ab3fc99e3f70
 WHIRLPOOL 
8ff166e43d6e99426135575be470645aab34838db871f0b3ce2fd0c8434466e7d9f8bb02d8d0a7e5a5f313c2673856944f4c6dac49c9377f65fe43b1cf90ce9b
 DIST stone_soup-0.16.1.tar.xz 27835264 SHA256 
c3cca203dd7473759648cf225648787e1db687ac8c614293c4faae561fd20242 SHA512 
d77dfc2483d309b4bfddd6736c0974825944e36d2c582fc9e133a6a4cc8287200a3207355536b54cb079fd0a0134706f2b4a42b7d5ceecc4a7e23da7d2c3ba07
 WHIRLPOOL 
882546716037576b77e285a7fdc2f59af032dd034532fe7f82ddc09c4e9000150b8dbf00c6e684b6c21482d810056a2cbf1667be6e84aa08678e1427785fed14
+DIST stone_soup-0.16.2.tar.xz 27843008 SHA256 
49d5947abb341eb7f0590fa538c475e68ea954064c615d852de968211b68780b SHA512 
fc48a1161028fbfc3c1b91bf717ffdeb761dc03a12aa8282f2235fe86368de343dd91ee33371fe4f682f4f84a8fc339d6984b6357527c3cf0c4139cb69cd5633
 WHIRLPOOL 
2016018e438e857031c382e53e904126efd7006a1da4b954b3b5eb4f5a9263e8535e7300fa8f54f8a870bf99b362cc0bdda630ea562e2f786e3d88c5b38d0c54

diff --git 
a/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
 
b/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
new file mode 100644
index 000..5ca192d
--- /dev/null
+++ 
b/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
@@ -0,0 +1,49 @@
+From 88579f929f0fc62de1ad0895264ad077e0ee Mon Sep 17 00:00:00 2001
+From: hasufell hasuf...@gentoo.org
+Date: Mon, 27 Oct 2014 20:48:03 +0100
+Subject: [PATCH 2/2] Use pkg-config for linking to ncurses
+
+Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=527034
+---
+ source/Makefile | 14 ++
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/source/Makefile b/source/Makefile
+index df51e70..2db2781 100644
+--- a/source/Makefile
 b/source/Makefile
+@@ -956,17 +956,15 @@ endif
+ # Your ncurses library may include Unicode support, and you may not have a
+ # separate libncursesw; this is the case on Mac OS/Darwin.
+ ifdef LIBNCURSES_IS_UNICODE
+-NC_LIB = ncurses
+-NC_INCLUDE = $(NC_PREFIX)/include/ncurses
++NC_LIBS = $(shell $(PKGCONFIG) --lib ncurses 2/dev/null || echo 
-L$(NC_PREFIX)/lib -lncurses)
++NC_CFLAGS = $(shell $(PKGCONFIG) --cflags ncurses 2/dev/null || echo 
-isystem $(NC_PREFIX)/include/ncurses)
+ else
+-NC_LIB = ncursesw
+-NC_INCLUDE = $(NC_PREFIX)/include/ncursesw
++NC_LIBS = $(shell $(PKGCONFIG) --lib ncursesw || echo -L$(NC_PREFIX)/lib 
-lncursesw)
++NC_CFLAGS = $(shell $(PKGCONFIG) --cflags ncursesw 2/dev/null || echo 
-isystem $(NC_PREFIX)/include/ncursesw)
+ endif
+ 
+-INCLUDES_L += -isystem $(NC_INCLUDE)
+-
+ ifndef TILES
+-LIBS += -L$(NC_PREFIX)/lib -l$(NC_LIB)
++LIBS += $(NC_LIBS)
+ endif
+ 
+ endif
+@@ -,7 +1109,7 @@ CFLAGS   := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) $(CFLAGS)
+ else
+ CFLAGS   := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN)
+ endif
+-CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L) 
$(CFOTHERS_L)
++CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L) 
$(CFOTHERS_L) $(NC_CFLAGS)
+ ALL_CFLAGS := $(CFLAGS) $(CFLAGS_L)
+ YACC_CFLAGS  := $(ALL_CFLAGS) -Wno-unused-function -Wno-sign-compare 
-DYYENABLE_NLS=0 -DYYLTYPE_IS_TRIVIAL=0
+ 
+-- 
+2.1.2
+

diff --git 
a/games-roguelike/stone-soup/files/stone-soup-0.16.2-respect-flags-and-compiler.patch
 
b/games-roguelike/stone-soup/files/stone-soup-0.16.2-respect-flags-and-compiler.patch
new