summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2015-08-13 17:36:41 +0200
committerJulian Ospald <hasufell@gentoo.org>2015-08-13 17:37:58 +0200
commit2c652793d90f7b46c4ab282e4b5364586f11e554 (patch)
tree5f193e0984befa477c44ec0a962514f63818e379 /games-roguelike
parentdev-java/qdox: Update jflex dependency. Fixes bug 557292. (diff)
downloadgentoo-2c652793d90f7b46c4ab282e4b5364586f11e554.tar.gz
gentoo-2c652793d90f7b46c4ab282e4b5364586f11e554.tar.bz2
gentoo-2c652793d90f7b46c4ab282e4b5364586f11e554.zip
games-roguelike/stone-soup: rm old
Diffstat (limited to 'games-roguelike')
-rw-r--r--games-roguelike/stone-soup/Manifest5
-rw-r--r--games-roguelike/stone-soup/files/stone-soup-0.13.2-build.patch99
-rw-r--r--games-roguelike/stone-soup/files/stone-soup-0.14.1-build.patch99
-rw-r--r--games-roguelike/stone-soup/files/stone-soup-0.15.1-build.patch99
-rw-r--r--games-roguelike/stone-soup/files/stone-soup-0.15.2-Use-pkg-config-for-linking-to-ncurses.patch49
-rw-r--r--games-roguelike/stone-soup/files/stone-soup-0.15.2-respect-flags-and-compiler.patch110
-rw-r--r--games-roguelike/stone-soup/stone-soup-0.13.2.ebuild145
-rw-r--r--games-roguelike/stone-soup/stone-soup-0.14.1.ebuild145
-rw-r--r--games-roguelike/stone-soup/stone-soup-0.15.1-r1.ebuild162
-rw-r--r--games-roguelike/stone-soup/stone-soup-0.15.1.ebuild162
-rw-r--r--games-roguelike/stone-soup/stone-soup-0.15.2.ebuild163
11 files changed, 0 insertions, 1238 deletions
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index be3d71bb10d..a2a980006d3 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 a/games-roguelike/stone-soup/files/stone-soup-0.13.2-build.patch b/games-roguelike/stone-soup/files/stone-soup-0.13.2-build.patch
deleted file mode 100644
index 5409c493780..00000000000
--- a/games-roguelike/stone-soup/files/stone-soup-0.13.2-build.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-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
-
- # Attempt to use a full compiler name, to make
-@@ -137,10 +137,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
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.14.1-build.patch b/games-roguelike/stone-soup/files/stone-soup-0.14.1-build.patch
deleted file mode 100644
index 5409c493780..00000000000
--- a/games-roguelike/stone-soup/files/stone-soup-0.14.1-build.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-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
-
- # Attempt to use a full compiler name, to make
-@@ -137,10 +137,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
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.15.1-build.patch b/games-roguelike/stone-soup/files/stone-soup-0.15.1-build.patch
deleted file mode 100644
index 5409c493780..00000000000
--- a/games-roguelike/stone-soup/files/stone-soup-0.15.1-build.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-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
-
- # Attempt to use a full compiler name, to make
-@@ -137,10 +137,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
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.15.2-Use-pkg-config-for-linking-to-ncurses.patch b/games-roguelike/stone-soup/files/stone-soup-0.15.2-Use-pkg-config-for-linking-to-ncurses.patch
deleted file mode 100644
index 5ca192d3c92..00000000000
--- a/games-roguelike/stone-soup/files/stone-soup-0.15.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/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
-@@ -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.15.2-respect-flags-and-compiler.patch b/games-roguelike/stone-soup/files/stone-soup-0.15.2-respect-flags-and-compiler.patch
deleted file mode 100644
index 528393a1679..00000000000
--- a/games-roguelike/stone-soup/files/stone-soup-0.15.2-respect-flags-and-compiler.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 14abbe4e6c888148caecbf16231ae48499d6d2b2 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Mon, 27 Oct 2014 20:39:50 +0100
-Subject: [PATCH 1/2] respect flags and compiler
-
----
- source/Makefile | 5 ++---
- source/rltiles/Makefile | 22 +++++++++++-----------
- 2 files changed, 13 insertions(+), 14 deletions(-)
-
-diff --git a/source/Makefile b/source/Makefile
-index db39bd9..df51e70 100644
---- 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
-
-@@ -770,7 +770,6 @@ ifdef FULLDEBUG
- DEFINES += -DFULLDEBUG
- endif
- ifdef DEBUG
--CFOTHERS := -ggdb $(CFOTHERS)
- DEFINES += -DDEBUG
- endif
- ifndef NOWIZARD
-@@ -1559,7 +1558,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/source/rltiles/Makefile b/source/rltiles/Makefile
-index aacd551..41b3ebe 100644
---- 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
-
- # Attempt to use a full compiler name, to make
-@@ -137,10 +137,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.1.2
-
diff --git a/games-roguelike/stone-soup/stone-soup-0.13.2.ebuild b/games-roguelike/stone-soup/stone-soup-0.13.2.ebuild
deleted file mode 100644
index f307f6d4fd9..00000000000
--- a/games-roguelike/stone-soup/stone-soup-0.13.2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-## TODO
-# add sound support (no build switch, no sound files)
-
-# check if luajit works
-
-# cross compiling is severly broken
-
-EAPI=5
-VIRTUALX_REQUIRED="manual"
-inherit eutils gnome2-utils virtualx toolchain-funcs games
-
-MY_P="stone_soup-${PV}"
-DESCRIPTION="A role-playing roguelike game of exploration and treasure-hunting in dungeons"
-HOMEPAGE="http://crawl.develz.org/wordpress/"
-SRC_URI="mirror://sourceforge/crawl-ref/Stone%20Soup/${PV}/${MY_P}-nodeps.tar.xz
- http://dev.gentoo.org/~hasufell/distfiles/${PN}.png
- http://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 test +tiles"
-REQUIRED_USE="|| ( ncurses tiles )"
-# test is broken
-# see https://crawl.develz.org/mantis/view.php?id=6121
-#RESTRICT="!debug? ( test )"
-RESTRICT="test"
-
-RDEPEND="
- dev-db/sqlite:3
- >=dev-lang/lua-5.1.0[deprecated]
- sys-libs/zlib
- ncurses? ( sys-libs/ncurses )
- tiles? (
- media-fonts/dejavu
- media-libs/freetype:2
- media-libs/libpng:0
- media-libs/libsdl[X,opengl,video]
- media-libs/sdl-image[png]
- virtual/glu
- virtual/opengl
- )"
-DEPEND="${RDEPEND}
- dev-lang/perl
- sys-devel/flex
- virtual/pkgconfig
- virtual/yacc
- tiles? (
- sys-libs/ncurses
- test? ( ${VIRTUALX_DEPEND} )
- )"
-
-S=${WORKDIR}/${MY_P}/source
-S_TEST=${WORKDIR}/${MY_P}_test/source
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-build.patch
-
-# if use test ; then
-# cp -av "${WORKDIR}/${MY_P}" "${WORKDIR}/${MY_P}_test" \
-# || die "setting up test-dir failed"
-# fi
-}
-
-src_compile() {
- export HOSTCXX=$(tc-getBUILD_CXX)
-
- # leave DATADIR at the top
- myemakeargs=(
- DATADIR="${GAMES_DATADIR}/${PN}"
- V=1
- prefix="${GAMES_PREFIX}"
- 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
- )
-
- if use ncurses ; then
- emake "${myemakeargs[@]}"
- # move it in case we build both variants
- use tiles && { mv crawl "${WORKDIR}"/crawl-ncurses || die ;}
- fi
-
- if use tiles ; then
- emake clean
- emake "${myemakeargs[@]}" "TILES=y"
- fi
-
- # for test to work we need to compile with unset DATADIR
-# if use test ; then
-# emake ${myemakeargs[@]:1} -C "${S_TEST}"
-# fi
-}
-
-src_install() {
- emake "${myemakeargs[@]}" $(usex tiles "TILES=y" "") DESTDIR="${D}" install
- [[ -e "${WORKDIR}"/crawl-ncurses ]] && dogamesbin "${WORKDIR}"/crawl-ncurses
-
- # don't relocate docs, needed at runtime
- rm -rf "${D}${GAMES_DATADIR}"/${PN}/docs/license
- dodoc "${WORKDIR}"/${MY_P}/README.{txt,pdf}
-
- # icons and menu for graphical build
- if use tiles ; then
- doicon -s 48 "${DISTDIR}"/${PN}.png
- doicon -s scalable "${DISTDIR}"/${PN}.svg
- make_desktop_entry crawl
- fi
-
- prepgamesdirs
-}
-
-src_test() {
- $(usex tiles "X" "")emake "${myemakeargs[@]:1}" -C "${S_TEST}" test
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-roguelike/stone-soup/stone-soup-0.14.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.14.1.ebuild
deleted file mode 100644
index 00ee24adf75..00000000000
--- a/games-roguelike/stone-soup/stone-soup-0.14.1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-## TODO
-# add sound support (no build switch, no sound files)
-
-# check if luajit works
-
-# cross compiling is severly broken
-
-EAPI=5
-VIRTUALX_REQUIRED="manual"
-inherit eutils gnome2-utils virtualx toolchain-funcs games
-
-MY_P="stone_soup-${PV}"
-DESCRIPTION="A role-playing roguelike game of exploration and treasure-hunting in dungeons"
-HOMEPAGE="http://crawl.develz.org/wordpress/"
-SRC_URI="mirror://sourceforge/crawl-ref/Stone%20Soup/${PV}/${MY_P}-nodeps.tar.xz
- http://dev.gentoo.org/~hasufell/distfiles/${PN}.png
- http://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 test +tiles"
-REQUIRED_USE="|| ( ncurses tiles )"
-# test is broken
-# see https://crawl.develz.org/mantis/view.php?id=6121
-#RESTRICT="!debug? ( test )"
-RESTRICT="test"
-
-RDEPEND="
- dev-db/sqlite:3
- >=dev-lang/lua-5.1.0[deprecated]
- sys-libs/zlib
- ncurses? ( sys-libs/ncurses )
- tiles? (
- media-fonts/dejavu
- media-libs/freetype:2
- media-libs/libpng:0
- media-libs/libsdl[X,opengl,video]
- media-libs/sdl-image[png]
- virtual/glu
- virtual/opengl
- )"
-DEPEND="${RDEPEND}
- dev-lang/perl
- sys-devel/flex
- virtual/pkgconfig
- virtual/yacc
- tiles? (
- sys-libs/ncurses
- test? ( ${VIRTUALX_DEPEND} )
- )"
-
-S=${WORKDIR}/${MY_P}/source
-S_TEST=${WORKDIR}/${MY_P}_test/source
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-build.patch
-
-# if use test ; then
-# cp -av "${WORKDIR}/${MY_P}" "${WORKDIR}/${MY_P}_test" \
-# || die "setting up test-dir failed"
-# fi
-}
-
-src_compile() {
- export HOSTCXX=$(tc-getBUILD_CXX)
-
- # leave DATADIR at the top
- myemakeargs=(
- DATADIR="${GAMES_DATADIR}/${PN}"
- V=1
- prefix="${GAMES_PREFIX}"
- 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
- )
-
- if use ncurses ; then
- emake "${myemakeargs[@]}"
- # move it in case we build both variants
- use tiles && { mv crawl "${WORKDIR}"/crawl-ncurses || die ;}
- fi
-
- if use tiles ; then
- emake clean
- emake "${myemakeargs[@]}" "TILES=y"
- fi
-
- # for test to work we need to compile with unset DATADIR
-# if use test ; then
-# emake ${myemakeargs[@]:1} -C "${S_TEST}"
-# fi
-}
-
-src_install() {
- emake "${myemakeargs[@]}" $(usex tiles "TILES=y" "") DESTDIR="${D}" install
- [[ -e "${WORKDIR}"/crawl-ncurses ]] && dogamesbin "${WORKDIR}"/crawl-ncurses
-
- # don't relocate docs, needed at runtime
- rm -rf "${D}${GAMES_DATADIR}"/${PN}/docs/license
- dodoc "${WORKDIR}"/${MY_P}/README.{txt,pdf}
-
- # icons and menu for graphical build
- if use tiles ; then
- doicon -s 48 "${DISTDIR}"/${PN}.png
- doicon -s scalable "${DISTDIR}"/${PN}.svg
- make_desktop_entry crawl
- fi
-
- prepgamesdirs
-}
-
-src_test() {
- $(usex tiles "X" "")emake "${myemakeargs[@]:1}" -C "${S_TEST}" test
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-roguelike/stone-soup/stone-soup-0.15.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.15.1-r1.ebuild
deleted file mode 100644
index 82d0c11169a..00000000000
--- a/games-roguelike/stone-soup/stone-soup-0.15.1-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-## TODO
-# add sound support (no build switch, no sound files)
-
-# cross compiling is severly broken
-
-EAPI=5
-VIRTUALX_REQUIRED="manual"
-inherit eutils gnome2-utils virtualx toolchain-funcs games
-
-MY_P="stone_soup-${PV}"
-DESCRIPTION="A role-playing roguelike game of exploration and treasure-hunting in dungeons"
-HOMEPAGE="http://crawl.develz.org/wordpress/"
-SRC_URI="mirror://sourceforge/crawl-ref/Stone%20Soup/${PV}/${MY_P}.tar.xz
- http://dev.gentoo.org/~hasufell/distfiles/${PN}.png
- http://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="!debug? ( test )"
-RESTRICT="test"
-
-RDEPEND="
- dev-db/sqlite:3
- luajit? ( >=dev-lang/luajit-2.0.0 )
- sys-libs/zlib
- !ncurses? ( !tiles? ( sys-libs/ncurses ) )
- ncurses? ( sys-libs/ncurses )
- tiles? (
- media-fonts/dejavu
- media-libs/freetype:2
- media-libs/libpng:0
- media-libs/libsdl[X,opengl,video]
- media-libs/sdl-image[png]
- virtual/glu
- virtual/opengl
- )"
-DEPEND="${RDEPEND}
- dev-lang/perl
- sys-devel/flex
- virtual/pkgconfig
- virtual/yacc
- tiles? (
- sys-libs/ncurses
- test? ( ${VIRTUALX_DEPEND} )
- )"
-
-S=${WORKDIR}/${MY_P}/source
-S_TEST=${WORKDIR}/${MY_P}_test/source
-
-pkg_setup() {
- games_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() {
- epatch "${FILESDIR}"/${P}-build.patch
-
- rm -r contrib/{fonts,freetype,libpng,pcre,sdl,sdl-image,sqlite,zlib} || die
-
-# if use test ; then
-# cp -av "${WORKDIR}/${MY_P}" "${WORKDIR}/${MY_P}_test" \
-# || die "setting up test-dir failed"
-# fi
-}
-
-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="${GAMES_DATADIR}/${PN}"
- V=1
- prefix="${GAMES_PREFIX}"
- 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
- )
-
- if use ncurses || (use !ncurses && use !tiles) ; then
- emake "${myemakeargs[@]}"
- # move it in case we build both variants
- use tiles && { mv crawl "${WORKDIR}"/crawl-ncurses || die ;}
- fi
-
- if use tiles ; then
- emake clean
- emake "${myemakeargs[@]}" "TILES=y"
- fi
-
- # for test to work we need to compile with unset DATADIR
-# if use test ; then
-# emake ${myemakeargs[@]:1} -C "${S_TEST}"
-# fi
-}
-
-src_install() {
- emake "${myemakeargs[@]}" $(usex tiles "TILES=y" "") DESTDIR="${D}" prefix_fp="" bin_prefix="${D}${GAMES_BINDIR}" install
- [[ -e "${WORKDIR}"/crawl-ncurses ]] && dogamesbin "${WORKDIR}"/crawl-ncurses
-
- # don't relocate docs, needed at runtime
- rm -rf "${D}${GAMES_DATADIR}"/${PN}/docs/license
- dodoc "${WORKDIR}"/${MY_P}/README.{txt,pdf}
-
- # icons and menu for graphical build
- if use tiles ; then
- doicon -s 48 "${DISTDIR}"/${PN}.png
- doicon -s scalable "${DISTDIR}"/${PN}.svg
- make_desktop_entry crawl
- fi
-
- prepgamesdirs
-}
-
-src_test() {
- $(usex tiles "X" "")emake "${myemakeargs[@]:1}" -C "${S_TEST}" test
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
-
- if use tiles && use ncurses ; then
- elog "Since you have enabled both tiles and ncurses frontends"
- elog "the ncurses binary is called 'crawl-ncurses' and the"
- elog "tiles binary is called 'crawl'."
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-roguelike/stone-soup/stone-soup-0.15.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.15.1.ebuild
deleted file mode 100644
index 0f703aefe6e..00000000000
--- a/games-roguelike/stone-soup/stone-soup-0.15.1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-## TODO
-# add sound support (no build switch, no sound files)
-
-# check if luajit works
-
-# cross compiling is severly broken
-
-EAPI=5
-VIRTUALX_REQUIRED="manual"
-inherit eutils gnome2-utils virtualx toolchain-funcs games
-
-MY_P="stone_soup-${PV}"
-DESCRIPTION="A role-playing roguelike game of exploration and treasure-hunting in dungeons"
-HOMEPAGE="http://crawl.develz.org/wordpress/"
-SRC_URI="mirror://sourceforge/crawl-ref/Stone%20Soup/${PV}/${MY_P}-nodeps.tar.xz
- http://dev.gentoo.org/~hasufell/distfiles/${PN}.png
- http://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="!debug? ( test )"
-RESTRICT="test"
-
-RDEPEND="
- dev-db/sqlite:3
- luajit? ( >=dev-lang/luajit-2.0.0 )
- !luajit? ( >=dev-lang/lua-5.1.0[deprecated] )
- sys-libs/zlib
- !ncurses? ( !tiles? ( sys-libs/ncurses ) )
- ncurses? ( sys-libs/ncurses )
- tiles? (
- media-fonts/dejavu
- media-libs/freetype:2
- media-libs/libpng:0
- media-libs/libsdl[X,opengl,video]
- media-libs/sdl-image[png]
- virtual/glu
- virtual/opengl
- )"
-DEPEND="${RDEPEND}
- dev-lang/perl
- sys-devel/flex
- virtual/pkgconfig
- virtual/yacc
- tiles? (
- sys-libs/ncurses
- test? ( ${VIRTUALX_DEPEND} )
- )"
-
-S=${WORKDIR}/${MY_P}/source
-S_TEST=${WORKDIR}/${MY_P}_test/source
-
-pkg_setup() {
- games_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() {
- epatch "${FILESDIR}"/${P}-build.patch
-
-# if use test ; then
-# cp -av "${WORKDIR}/${MY_P}" "${WORKDIR}/${MY_P}_test" \
-# || die "setting up test-dir failed"
-# fi
-}
-
-src_compile() {
- export HOSTCXX=$(tc-getBUILD_CXX)
-
- # leave DATADIR at the top
- myemakeargs=(
- USE_LUAJIT=$(usex luajit "yes" "")
- DATADIR="${GAMES_DATADIR}/${PN}"
- V=1
- prefix="${GAMES_PREFIX}"
- 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
- )
-
- if use ncurses || (use !ncurses && use !tiles) ; then
- emake "${myemakeargs[@]}"
- # move it in case we build both variants
- use tiles && { mv crawl "${WORKDIR}"/crawl-ncurses || die ;}
- fi
-
- if use tiles ; then
- emake clean
- emake "${myemakeargs[@]}" "TILES=y"
- fi
-
- # for test to work we need to compile with unset DATADIR
-# if use test ; then
-# emake ${myemakeargs[@]:1} -C "${S_TEST}"
-# fi
-}
-
-src_install() {
- emake "${myemakeargs[@]}" $(usex tiles "TILES=y" "") DESTDIR="${D}" prefix_fp="" bin_prefix="${D}${GAMES_BINDIR}" install
- [[ -e "${WORKDIR}"/crawl-ncurses ]] && dogamesbin "${WORKDIR}"/crawl-ncurses
-
- # don't relocate docs, needed at runtime
- rm -rf "${D}${GAMES_DATADIR}"/${PN}/docs/license
- dodoc "${WORKDIR}"/${MY_P}/README.{txt,pdf}
-
- # icons and menu for graphical build
- if use tiles ; then
- doicon -s 48 "${DISTDIR}"/${PN}.png
- doicon -s scalable "${DISTDIR}"/${PN}.svg
- make_desktop_entry crawl
- fi
-
- prepgamesdirs
-}
-
-src_test() {
- $(usex tiles "X" "")emake "${myemakeargs[@]:1}" -C "${S_TEST}" test
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
-
- if use tiles && use ncurses ; then
- elog "Since you have enabled both tiles and ncurses frontends"
- elog "the ncurses binary is called 'crawl-ncurses' and the"
- elog "tiles binary is called 'crawl'."
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-roguelike/stone-soup/stone-soup-0.15.2.ebuild b/games-roguelike/stone-soup/stone-soup-0.15.2.ebuild
deleted file mode 100644
index cd5a282b0c1..00000000000
--- a/games-roguelike/stone-soup/stone-soup-0.15.2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-## TODO
-# add sound support (no build switch, no sound files)
-
-# cross compiling is severly broken
-
-EAPI=5
-VIRTUALX_REQUIRED="manual"
-inherit eutils gnome2-utils virtualx toolchain-funcs games
-
-MY_P="stone_soup-${PV}"
-DESCRIPTION="Dungeon Crawl Stone Soup is a role-playing roguelike game of exploration and treasure-hunting in dungeons"
-HOMEPAGE="http://crawl.develz.org/wordpress/"
-SRC_URI="mirror://sourceforge/crawl-ref/Stone%20Soup/${PV}/${MY_P}.tar.xz
- http://dev.gentoo.org/~hasufell/distfiles/${PN}.png
- http://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="!debug? ( test )"
-RESTRICT="test"
-
-RDEPEND="
- dev-db/sqlite:3
- luajit? ( >=dev-lang/luajit-2.0.0 )
- sys-libs/zlib
- !ncurses? ( !tiles? ( sys-libs/ncurses ) )
- ncurses? ( sys-libs/ncurses )
- tiles? (
- media-fonts/dejavu
- media-libs/freetype:2
- media-libs/libpng:0
- media-libs/libsdl[X,opengl,video]
- media-libs/sdl-image[png]
- virtual/glu
- virtual/opengl
- )"
-DEPEND="${RDEPEND}
- dev-lang/perl
- sys-devel/flex
- virtual/pkgconfig
- virtual/yacc
- tiles? (
- sys-libs/ncurses
- test? ( ${VIRTUALX_DEPEND} )
- )"
-
-S=${WORKDIR}/${MY_P}/source
-S_TEST=${WORKDIR}/${MY_P}_test/source
-
-pkg_setup() {
- games_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() {
- epatch "${FILESDIR}"/${P}-respect-flags-and-compiler.patch \
- "${FILESDIR}"/${P}-Use-pkg-config-for-linking-to-ncurses.patch
-
- rm -r contrib/{fonts,freetype,libpng,pcre,sdl,sdl-image,sqlite,zlib} || die
-
-# if use test ; then
-# cp -av "${WORKDIR}/${MY_P}" "${WORKDIR}/${MY_P}_test" \
-# || die "setting up test-dir failed"
-# fi
-}
-
-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="${GAMES_DATADIR}/${PN}"
- V=1
- prefix="${GAMES_PREFIX}"
- 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
- )
-
- if use ncurses || (use !ncurses && use !tiles) ; then
- emake "${myemakeargs[@]}"
- # move it in case we build both variants
- use tiles && { mv crawl "${WORKDIR}"/crawl-ncurses || die ;}
- fi
-
- if use tiles ; then
- emake clean
- emake "${myemakeargs[@]}" "TILES=y"
- fi
-
- # for test to work we need to compile with unset DATADIR
-# if use test ; then
-# emake ${myemakeargs[@]:1} -C "${S_TEST}"
-# fi
-}
-
-src_install() {
- emake "${myemakeargs[@]}" $(usex tiles "TILES=y" "") DESTDIR="${D}" prefix_fp="" bin_prefix="${D}${GAMES_BINDIR}" install
- [[ -e "${WORKDIR}"/crawl-ncurses ]] && dogamesbin "${WORKDIR}"/crawl-ncurses
-
- # don't relocate docs, needed at runtime
- rm -rf "${D}${GAMES_DATADIR}"/${PN}/docs/license
- dodoc "${WORKDIR}"/${MY_P}/README.{txt,pdf}
-
- # icons and menu for graphical build
- if use tiles ; then
- doicon -s 48 "${DISTDIR}"/${PN}.png
- doicon -s scalable "${DISTDIR}"/${PN}.svg
- make_desktop_entry crawl
- fi
-
- prepgamesdirs
-}
-
-src_test() {
- $(usex tiles "X" "")emake "${myemakeargs[@]:1}" -C "${S_TEST}" test
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
-
- if use tiles && use ncurses ; then
- elog "Since you have enabled both tiles and ncurses frontends"
- elog "the ncurses binary is called 'crawl-ncurses' and the"
- elog "tiles binary is called 'crawl'."
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}