gentoo resync : 23.12.2017

5 files changed, 0 insertions, 210 deletions

diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 4da4611840f3..714ef97a5d1b 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index bb7739c05e07..3e5776e81e38 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,6 +1,3 @@
-AUX stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch 1804 BLAKE2B 821f991f6a4c4c675d17f4e780453b69d43febfd6d82b50902c277cef187bdc1d58739317f0b251e7ab75f2efdb87e12a8bdb2eeea8f9720d8c8656b9a12aac4 SHA512 ff9ca921fb192592bda24f430961335875529a5a310d01ff6b5103b37102006b2129ca7be144bb677175d6efef9324798caa6250f4aedad4dc14b690d8b2f14c
-AUX stone-soup-0.16.2-perl526.patch 2189 BLAKE2B 7305f30409084380ffc6fa581d8718c9a6a5b154b54c348cff7851d95ae5ff31af4543aed97fafcc208a2f8f224304a2f0cd1677ef699bd3cbf496893c75fb68 SHA512 7433e87c5acedb72012fd98a047207da38759497f26a9286ff4fe345090135fd1240c63c1723d9369f37569ae38aa0c7a76d89375d9a803f77c346411339bd76
-AUX stone-soup-0.16.2-respect-flags-and-compiler.patch 3075 BLAKE2B d32d86bf6d4373f8d7fbc115f78075d7e289cda72c1773a175be60d9da155d3dd8ccc9f8f06640a725e636de0adfb7d68eabb4752e7596ce38d87eb0bb059325 SHA512 dc12c240bce0bdc94ea1b76da0e435b7bbfc51fb22c0bcbe4f2383740262c2cf43efd03dfdfe24a162b07059f5d74e64d0e66d902c02e743b05f75d3186b7fb9
 AUX stone-soup-0.20.1-rltiles-ldflags-libs.patch 1376 BLAKE2B 86c9408973b1f0f8684281e60f891b3597f4cfa6521e5599243628a15acb5a264f2138712e0ccb71f2ed4ece3e2d2f22f357e866e575c7fd40387c0414f4a68c SHA512 ad139978d67df1d824a772f70d331779ed56cf2cce30c4022804740afd77b6d8b22badd9d20af47b4df0a60499a914f749a3520a5ea76ae3e14795d2bf07affa
 DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
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 e0b676c3d2e7..000000000000
--- 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 88579f929f0fc777762de1ad0895264ad077e0ee Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@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/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
-@@ -1111,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 a450a635153f..000000000000
--- 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.000000000 +0200
-+++ source/util/gather_abilities	2017-07-08 20:46:16.112231100 +0200
-@@ -5,7 +5,7 @@
- $_ = <IN>;
- 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.000000000 +0200
-+++ source/util/gather_cards	2017-07-08 20:46:45.113232307 +0200
-@@ -5,7 +5,7 @@
- $_ = <IN>;
- 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.000000000 +0200
-+++ source/util/gather_mons	2017-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 (<IN>)
-     {
--        $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.000000000 +0200
-+++ source/util/gen-mi-enum	2017-07-08 20:47:28.491234111 +0200
-@@ -5,7 +5,7 @@
- $_=<IN>;
- 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/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
deleted file mode 100644
index bf07f4e07edf..000000000000
--- a/games-roguelike/stone-soup/files/stone-soup-0.16.2-respect-flags-and-compiler.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From aaa7cde91e4b086164f0c7f46569a34bfbb4e479 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Sun, 3 May 2015 15:05:43 +0200
-Subject: [PATCH] Respect flags and compiler
-
----
- Makefile         |  5 ++---
- rltiles/Makefile | 22 +++++++++++-----------
- 2 files changed, 13 insertions(+), 14 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 8b9efd9..0f37edf 100644
---- a/Makefile
-+++ b/Makefile
-@@ -103,7 +103,7 @@ include Makefile.obj
- #
- 
- 
--CFOTHERS := -pipe $(EXTERNAL_FLAGS)
-+CFOTHERS := $(EXTERNAL_FLAGS)
- CFWARN := 
- CFWARN_L := -Wall -Wformat-security -Wundef
- 
-@@ -809,7 +809,6 @@ ifdef FULLDEBUG
- DEFINES += -DFULLDEBUG
- endif
- ifdef DEBUG
--CFOTHERS := -ggdb $(CFOTHERS)
- DEFINES += -DDEBUG
- endif
- ifndef NOWIZARD
-@@ -1627,7 +1626,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
-diff --git a/rltiles/Makefile b/rltiles/Makefile
-index ae11f43..464424f 100644
---- 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
-@@ -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 :=
-@@ -27,24 +27,24 @@ ifdef TILES
-     PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a
-   endif
- 
--  CFLAGS += $(PNG_INCLUDE)
--  LDFLAGS += $(PNG_LIB)
-+  CXXFLAGS += $(PNG_INCLUDE)
-+  LIBS += $(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 -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
- endif
- ifeq ($(uname_S),Linux)
--LDFLAGS += -ldl -lpthread
-+LIBS += -ldl -lpthread
- endif
- 
- # Attempt to use a full compiler name, to make
-@@ -129,10 +129,10 @@ clean:
- 
- distclean: clean
- 
--%.o: %.cc .cflags
--	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
-+%.o: %.cc
-+	$(QUIET_HOSTLINK)$(HOSTCXX) $(CXXFLAGS) -c $< -o $@
- 
- $(TILEGEN): $(OBJECTS)
--	$(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS)
-+	$(QUIET_HOSTLINK)$(HOSTCXX) $(CXXFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS)
- 
- .PHONY: all clean distclean
--- 
-2.3.5
-