commit:     a5f166a894d84d28516da74fb9164ccac4b94617
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Nov 16 08:00:45 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 13:25:40 2020 +0000
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 <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18278
Signed-off-by: Aaron Bauman <bman <AT> 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..00000000000
--- 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..00000000000
--- 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)

Reply via email to