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

2023-07-12 Thread Erik Mackdanz 
commit: 7ae60d06a530df1f5aa157d7f6dc727fc1931ec5
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Thu Jul 13 04:40:21 2023 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Thu Jul 13 04:41:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ae60d06

games-roguelike/stone-soup: add 0.31.0_pre20230712

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

 games-roguelike/stone-soup/Manifest|   3 +
 games-roguelike/stone-soup/files/make-v3.patch |   9 -
 .../stone-soup-0.31.0_pre20230712.ebuild   | 238 +
 3 files changed, 241 insertions(+), 9 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest 
b/games-roguelike/stone-soup/Manifest
index 8be8b404eabe..bcf75caca211 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -13,6 +13,9 @@ DIST stone-soup-0.30.0.tar.gz 21498124 BLAKE2B 
18a615d7a882d900d3c7f6523590c7506
 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_pre20230712.tar.gz 21654476 BLAKE2B 
c58e59eee09996d109aeb2ef21334497b18b665cfef42c77857446bf8108fe0e50064a29e662eb7c513026fba4f9f1b8ebe2122d5fc317223f61037ac31bee68
 SHA512 
bad8ba6a4479ed34f1a5b081062db11eb73f8a6cd7637a44c8c7da7013b0a0b943ef921345f5071be245eb7a575bffaef1c04973d634b6c5092a09211126f46a
+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
 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-v3.patch 
b/games-roguelike/stone-soup/files/make-v3.patch
index 9d1235e3c604..7a1308b36bd6 100644
--- a/games-roguelike/stone-soup/files/make-v3.patch
+++ b/games-roguelike/stone-soup/files/make-v3.patch
@@ -1,14 +1,5 @@
 --- a/Makefile 2023-04-08 18:39:09.818483802 -0500
 +++ b/Makefile 2023-04-08 18:44:54.509321177 -0500
-@@ -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')

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
new file mode 100644
index ..9ea0126c9a43
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.31.0_pre20230712.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the

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

2023-04-08 Thread Erik Mackdanz 
commit: 82d4b0dd38996a280b120dd72d3698c4120b1e87
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sun Apr  9 00:13:26 2023 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sun Apr  9 00:14:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82d4b0dd

games-roguelike/stone-soup: add 0.30.0_pre20230408

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

 games-roguelike/stone-soup/Manifest|   1 +
 games-roguelike/stone-soup/files/make-v3.patch | 112 ++
 .../stone-soup-0.30.0_pre20230408.ebuild   | 238 +
 3 files changed, 351 insertions(+)

diff --git a/games-roguelike/stone-soup/Manifest 
b/games-roguelike/stone-soup/Manifest
index e44b6493bc06..8774e05af573 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_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
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 
0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006
 SHA512 
fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220

diff --git a/games-roguelike/stone-soup/files/make-v3.patch 
b/games-roguelike/stone-soup/files/make-v3.patch
new file mode 100644
index ..9d1235e3c604
--- /dev/null
+++ b/games-roguelike/stone-soup/files/make-v3.patch
@@ -0,0 +1,112 @@
+--- a/Makefile 2023-04-08 18:39:09.818483802 -0500
 b/Makefile 2023-04-08 18:44:54.509321177 -0500
+@@ -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))

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

2021-08-02 Thread Erik Mackdanz 
commit: 97a186dfbe961e0d9358f3d69ed434c365b8c730
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Tue Aug  3 04:26:40 2021 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Tue Aug  3 04:26:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97a186df

games-roguelike/stone-soup: EAPI=8, tests, no direct compiler calls

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

 games-roguelike/stone-soup/files/make.patch|  94 +++
 .../stone-soup/files/rltiles-make.patch|  58 +++
 .../stone-soup/stone-soup-0.25.1-r102.ebuild   | 182 
 .../stone-soup/stone-soup-0.26.1-r1.ebuild | 186 +
 .../stone-soup/stone-soup-0.27.0-r1.ebuild | 182 
 5 files changed, 702 insertions(+)

diff --git a/games-roguelike/stone-soup/files/make.patch 
b/games-roguelike/stone-soup/files/make.patch
new file mode 100644
index 000..b43c9c41e8c
--- /dev/null
+++ b/games-roguelike/stone-soup/files/make.patch
@@ -0,0 +1,94 @@
+--- 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)

diff --git a/games-roguelike/stone-soup/files/rltiles-make.patch 
b/games-roguelike/stone-soup/files/rltiles-make.patch
new file mode 100644
index 000..9a43932c598
--- /dev/null
+++ b/games-roguelike/stone-soup/files/rltiles-make.patch
@@ -0,0 +1,58 @@
+--- a/rltiles/Makefile 2021-08-02 14:03:40.106930544 -0500
 b/rltiles/Makefile 2021-08-02 14:03:51.145931133 -0500
+@@ -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,26 +39,15 @@
+ 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
+

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

2020-12-12 Thread Erik Mackdanz 
commit: 33364c5d29fd2093188f039540e81506417da041
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Sat Dec 12 13:59:41 2020 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Sat Dec 12 13:59:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33364c5d

games-roguelike/stone-soup: Patch out scan for fonts (sandbox violation)

Closes: https://bugs.gentoo.org/736792
Signed-off-by: Erik Mackdanz  gentoo.org>
Package-Manager: Portage-3.0.12, Repoman-3.0.2

 .../stone-soup/files/fixed-font-path.patch   | 20 
 games-roguelike/stone-soup/stone-soup-0.25.0.ebuild  |  1 +
 .../stone-soup/stone-soup-0.25.1-r1.ebuild   |  1 +
 .../stone-soup/stone-soup-0.25.1-r100.ebuild |  1 +
 games-roguelike/stone-soup/stone-soup-0.25.1.ebuild  |  1 +
 5 files changed, 24 insertions(+)

diff --git a/games-roguelike/stone-soup/files/fixed-font-path.patch 
b/games-roguelike/stone-soup/files/fixed-font-path.patch
new file mode 100644
index 000..5f6bd651bec
--- /dev/null
+++ b/games-roguelike/stone-soup/files/fixed-font-path.patch
@@ -0,0 +1,20 @@
+--- 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/stone-soup-0.25.0.ebuild 
b/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
index a26fe45f42c..48a422a661c 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
@@ -66,6 +66,7 @@ DEPEND="${RDEPEND}
 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
 )

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 8a4d1201dc1..64d7340db24 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
@@ -68,6 +68,7 @@ DEPEND="${RDEPEND}
 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
 )

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 58a9e530e1a..fd7baf97c0e 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
@@ -67,6 +67,7 @@ DEPEND="${RDEPEND}
 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
 )

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 69379b34c52..254ea797341 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
@@ -66,6 +66,7 @@ DEPEND="${RDEPEND}
 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
 )

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

2019-04-20 Thread Erik Mackdanz 
commit: 1cb29e8d5cca1b552bf8229a80087fe336791e22
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Fri Apr 19 08:16:43 2019 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Fri Apr 19 08:16:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cb29e8d

games-roguelike/stone-soup: Patch out unsafe pyyaml load call

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

 games-roguelike/stone-soup/files/pyyaml-safe-load.patch | 11 +++
 games-roguelike/stone-soup/stone-soup-0.23.2.ebuild |  1 +
 2 files changed, 12 insertions(+)

diff --git a/games-roguelike/stone-soup/files/pyyaml-safe-load.patch 
b/games-roguelike/stone-soup/files/pyyaml-safe-load.patch
new file mode 100644
index 000..dfbcdc96e1a
--- /dev/null
+++ b/games-roguelike/stone-soup/files/pyyaml-safe-load.patch
@@ -0,0 +1,11 @@
+--- /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)

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 97418769c95..a587c199868 100644
--- a/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild
@@ -63,6 +63,7 @@ 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
 )

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

2019-04-15 Thread Erik Mackdanz 
commit: b848934c51d73afe2436a7f89dbdd2f3e66294f2
Author: Erik Mackdanz  gentoo  org>
AuthorDate: Tue Apr 16 01:11:49 2019 +
Commit: Erik Mackdanz  gentoo  org>
CommitDate: Tue Apr 16 01:11:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b848934c

games-roguelike/stone-soup: disable git operations

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

 games-roguelike/stone-soup/files/gitless.patch  | 13 +
 games-roguelike/stone-soup/stone-soup-0.23.2.ebuild |  1 +
 2 files changed, 14 insertions(+)

diff --git a/games-roguelike/stone-soup/files/gitless.patch 
b/games-roguelike/stone-soup/files/gitless.patch
new file mode 100644
index 000..3aaeb747009
--- /dev/null
+++ b/games-roguelike/stone-soup/files/gitless.patch
@@ -0,0 +1,13 @@
+--- /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/stone-soup-0.23.2.ebuild 
b/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild
index 9ac6df9654a..97418769c95 100644
--- a/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild
@@ -62,6 +62,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}/source
 S_TEST=${WORKDIR}/${MY_P}_test/source
 PATCHES=(
+   "${FILESDIR}"/gitless.patch
"${FILESDIR}"/rltiles-ldflags-libs.patch
 )

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

2017-10-25 Thread Jeroen Roovers 
commit: eecd3bac95c31516d34bf7371def83c4bee3dd3b
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Oct 25 12:38:59 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Oct 25 12:38:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eecd3bac

games-roguelike/stone-soup: Version bump.

Package-Manager: Portage-2.3.12, Repoman-2.3.3

 games-roguelike/stone-soup/Manifest|  1 +
 .../stone-soup-0.20.1-rltiles-ldflags-libs.patch   | 45 ++
 .../stone-soup/stone-soup-0.16.2-r1.ebuild |  2 +-
 ...p-0.16.2-r1.ebuild => stone-soup-0.20.1.ebuild} | 37 +-
 4 files changed, 65 insertions(+), 20 deletions(-)

diff --git a/games-roguelike/stone-soup/Manifest 
b/games-roguelike/stone-soup/Manifest
index a247fb3d3d8..b317ed35eb3 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,3 +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.16.2.tar.xz 27843008 SHA256 
49d5947abb341eb7f0590fa538c475e68ea954064c615d852de968211b68780b SHA512 
fc48a1161028fbfc3c1b91bf717ffdeb761dc03a12aa8282f2235fe86368de343dd91ee33371fe4f682f4f84a8fc339d6984b6357527c3cf0c4139cb69cd5633
 WHIRLPOOL 
2016018e438e857031c382e53e904126efd7006a1da4b954b3b5eb4f5a9263e8535e7300fa8f54f8a870bf99b362cc0bdda630ea562e2f786e3d88c5b38d0c54
+DIST stone_soup-0.20.1.tar.xz 28372712 SHA256 
77d238bd859166e09bbf56127997f810d1c9794e1cf4a0d1edc0687b6f194dee SHA512 
420ccc3c66977da8ae15f9c0465b01a6260ad5db450efced3041455674922e714d9aaed226e1bc32fa3c22bca1ec06bd91979a9378c6ab08fbe1d2bfc3f0da4a
 WHIRLPOOL 
1057a0b86df62ebf8491274b37719691c4c709feb478c684882c465a7fd2c8f977bdc7b6a9c2990a47a42c2ffbdf4187a4da705a3c31e0a3a174e909af8ebc34

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
new file mode 100644
index 000..010c729b92e
--- /dev/null
+++ 
b/games-roguelike/stone-soup/files/stone-soup-0.20.1-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/stone-soup-0.16.2-r1.ebuild 
b/games-roguelike/stone-soup/stone-soup-0.16.2-r1.ebuild
index ceca0ef94f0..c9d46d428db 100644
--- a/games-roguelike/stone-soup/stone-soup-0.16.2-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.16.2-r1.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
media-fonts/dejavu
media-libs/freetype:2
media-libs/libpng:0
-   media-libs/libsdl2[opengl,video]
+   media-libs/libsdl2[X,opengl,video]
media-libs/sdl2-image[png]
virtual/glu
virtual/opengl

diff --git a/games-roguelike/stone-soup/stone-soup-0.16.2-r1.ebuild

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

2017-07-08 Thread Andreas Hüttel 
commit: fc201596cf88eddb2806776719b42b884a737ff4
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Jul  8 19:19:41 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat Jul  8 19:20:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc201596

games-roguelike/stone-soup: Add build fix for Perl 5.26

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../files/stone-soup-0.16.2-perl526.patch  | 48 ++
 .../stone-soup/stone-soup-0.16.2-r1.ebuild |  5 ++-
 2 files changed, 51 insertions(+), 2 deletions(-)

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
new file mode 100644
index 000..a450a635153
--- /dev/null
+++ b/games-roguelike/stone-soup/files/stone-soup-0.16.2-perl526.patch
@@ -0,0 +1,48 @@
+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 17:19:20.0 +0200
 source/util/gen-mi-enum2017-07-08 20:47:28.491234111 +0200
+@@ -5,7 +5,7 @@
+ $_=;
+ s/\r//g;
+ 
+-s/^enum monster_info_flags\n{\n//m && s/^\s*NUM_MB_FLAGS.*//ms
++s/^enum monster_info_flags\n\{\n//m && s/^\s*NUM_MB_FLAGS.*//ms
+ or die "Can't find monster_info_flags in mon-info.h\n";
+ open OUT, ">mi-enum.h" or die "Can't create mi-enum.h\n";
+ print OUT "// Generated by gen-mi-enum, do not edit.\n\n";

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
index 633aa546926..ceca0ef94f0 100644
--- a/games-roguelike/stone-soup/stone-soup-0.16.2-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.16.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 ## TODO
@@ -9,7 +9,7 @@ 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"
+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
@@ -57,6 +57,7 @@ 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
+   "${FILESDIR}"/${P}-perl526.patch
 )
 
 pkg_setup() {