version bump

Package-Manager: portage-2.2.12-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

4 files changed, 286 insertions, 16 deletions

diff --git a/games-roguelike/stone-soup/ChangeLog b/games-roguelike/stone-soup/ChangeLog
index d60a85448e5b..4805a7518a0c 100644
--- a/games-roguelike/stone-soup/ChangeLog
+++ b/games-roguelike/stone-soup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-roguelike/stone-soup
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/ChangeLog,v 1.35 2014/08/28 20:17:02 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/ChangeLog,v 1.36 2014/09/05 20:18:13 hasufell Exp $
+
+*stone-soup-0.15.0 (05 Sep 2014)
+
+  05 Sep 2014; Julian Ospald <hasufell@gentoo.org> +stone-soup-0.15.0.ebuild,
+  +files/stone-soup-0.15.0-build.patch:
+  version bump
 
 *stone-soup-0.14.2 (28 Aug 2014)
 
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 111087c05083..ead615f1e43b 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -5,34 +5,37 @@ AUX stone-soup-0.13.1-build.patch 2660 SHA256 e1bb697055c3cce3d3d58d13fbb731b3ad
 AUX stone-soup-0.13.2-build.patch 2660 SHA256 e1bb697055c3cce3d3d58d13fbb731b3ad215c11acd1b87ff238f55609db6442 SHA512 ec13535360e8224a8354f8ed335a1e1d862d75faca8622ae1536d0a6fdbac750d75f87289b4e5d2eb8031f6b6663b04fd0ab6b0b30249b81d45a2c0004668047 WHIRLPOOL 90575542e59cbc4b568b2d85c2bebb04661018cffb74346b03eaeaecd81456365007536851baffc42f416c1ed97640529391a98f7089d1049df4bdfeafa7f3ae
 AUX stone-soup-0.14.1-build.patch 2660 SHA256 e1bb697055c3cce3d3d58d13fbb731b3ad215c11acd1b87ff238f55609db6442 SHA512 ec13535360e8224a8354f8ed335a1e1d862d75faca8622ae1536d0a6fdbac750d75f87289b4e5d2eb8031f6b6663b04fd0ab6b0b30249b81d45a2c0004668047 WHIRLPOOL 90575542e59cbc4b568b2d85c2bebb04661018cffb74346b03eaeaecd81456365007536851baffc42f416c1ed97640529391a98f7089d1049df4bdfeafa7f3ae
 AUX stone-soup-0.14.2-build.patch 2660 SHA256 e1bb697055c3cce3d3d58d13fbb731b3ad215c11acd1b87ff238f55609db6442 SHA512 ec13535360e8224a8354f8ed335a1e1d862d75faca8622ae1536d0a6fdbac750d75f87289b4e5d2eb8031f6b6663b04fd0ab6b0b30249b81d45a2c0004668047 WHIRLPOOL 90575542e59cbc4b568b2d85c2bebb04661018cffb74346b03eaeaecd81456365007536851baffc42f416c1ed97640529391a98f7089d1049df4bdfeafa7f3ae
+AUX stone-soup-0.15.0-build.patch 2660 SHA256 e1bb697055c3cce3d3d58d13fbb731b3ad215c11acd1b87ff238f55609db6442 SHA512 ec13535360e8224a8354f8ed335a1e1d862d75faca8622ae1536d0a6fdbac750d75f87289b4e5d2eb8031f6b6663b04fd0ab6b0b30249b81d45a2c0004668047 WHIRLPOOL 90575542e59cbc4b568b2d85c2bebb04661018cffb74346b03eaeaecd81456365007536851baffc42f416c1ed97640529391a98f7089d1049df4bdfeafa7f3ae
 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.1-nodeps.tar.xz 9456356 SHA256 9e32ca7e48bc3e12ce6bc8d963b01a0bce3f5826c6ca1d60947867f5602921e8 SHA512 1fbb69cf79d5e44e3a2f7a7a16b6284d9ffcaaec0033627c1f0f485fb6012fde8b5bb81557d8ba96cd19d5cd53d989bc71cdb8fd8397ba4c518d596e5e845e8b WHIRLPOOL b956dc51a2d26175adf62076a9d62faa7977b496a3337db488c5ab6849986f719c201befe8e08cb74abc20af3bebb39fa9a223979522ab9ed31be4958ded4bb0
 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.0-nodeps.tar.xz 8965368 SHA256 3aef4762a9b9bc142010dcddc747b023e8a8bd351ae3c22d1bab09b9d302f5da SHA512 b00324e21cfc7e2f992705f1128b1382f7e3d9b4735ba8fca5299aacf6332873f4f1b6cd27810a95b6a74f0bc0211fa8288516b99f8a25de67e6b627489df8f0 WHIRLPOOL 4e560a0bf843a685d1cd71f6aa48e1625f099e530d9242053ae65c900c550d3fc28b3b31b1382a62711529b8b5ab5545d995062f94d314069998f69d3926749f
 EBUILD stone-soup-0.13.1.ebuild 3570 SHA256 fa9184d3388435ed72f93ce7c69350fca9838303bef36252406cadfbc06669c8 SHA512 c99e2f949b51b8ad9f28d6111ddf4584a7fac7bcbf1f4d568f89ac3c875d6e6ac99fca1477196d15515113f8a34984505ef1613b0dd2ef45c6bed9c41eb94205 WHIRLPOOL c0dcf58b69cb2d5abe3d3885b6d1676ee761a98a54f536bd56035565ba8a6380f7cec1fe2559561b9eb08ab939ffdf2570d13a6e7c2339370a6c1c355bc44ed4
 EBUILD stone-soup-0.13.2.ebuild 3572 SHA256 28d6f4cb6920281eff9b32260b81a6e2715f268a636902a5b6a3dfa004177a40 SHA512 ecca1efc3af74fcf624c56d8b917c9ca116e191abe8062e27c90b7f9f2d2daf491c4ede0bec860482cc553576cba54863d4a282705508c005f7a40d2a3386590 WHIRLPOOL a82882bc4ea9a8b2c25c745f58ba51c27a0a134623d10c6fd9be5a177ba5e95024ff3603a57c8f7cb98523bff8b3971c5f6a277b248f3e07a2bda593dec319f4
 EBUILD stone-soup-0.14.1.ebuild 3570 SHA256 3d30fa4516f4ba66fbafb91828e3d01a1c6a280dc55b1f862ca07ef4f3845ea9 SHA512 d5443233c8f8475339e7e02396cd5ef861e9d5b288b4c6af72d24df41b41c75b70d3dfb3c911fc0259b53b7f8d0e627441f8042e85bf1907b9784f7fa09b5993 WHIRLPOOL ce6fe993b237774d9b981977d83289ec183f4041148d83aac29884c935c9f3aa758d562f2794b5cec49e093b9d11d0ad71138147ca6e846d33a83ddac7b4d651
 EBUILD stone-soup-0.14.2.ebuild 4171 SHA256 885230de0e1393c21b80f776d541d6d4da4aea69796353f45173551a27a5a6ba SHA512 97833b0153ce538b25cfa19d937c56da3cd62684c092738677684b62cbc482679571e972558a8004ae9b9ccbb4378cec8c79578f2e92824a5f79204b2958d1a5 WHIRLPOOL 07e3ec437d06b6d0380de841e9c65952f3c3be5f4aa91c50130890115a1fb18f639c605c8283e228581a01a5e53efcb88023eb61d0430a1c823d02087f92dd1b
-MISC ChangeLog 5824 SHA256 950d0030c784261b7b3e103380dc5c10dd4dd153efd9cc01b94f61c731baf707 SHA512 e7288ac651092380c28cdd2e43df694395e809dcb48a104558c652fc68101366fc9f298d05d203f41cd45f58e470428e8af973cfca4ce68a4b1f4caac41d2ad1 WHIRLPOOL d9d9b1709c37036276076a38df19a7fb20badc703463047808385ce1d7dd77b0fde78e84c156cfae7e373be582a12c2580bd7b6b42170b3a8273cd65f9d315cc
+EBUILD stone-soup-0.15.0.ebuild 4171 SHA256 cb564d8dd0e3db31f6b44ccc03ff2cfbb59311a44fbf557f8a18600abfd8a566 SHA512 d0152f44730c3f0202269de1c5e6974a37d4e899595ea387bac27fe4b31d33006e5bc627a00bfffbd44875f706c9d28f5523ede45d47cacc0059247d363b2b5e WHIRLPOOL 3032b2411bd1801d2a11ae20d359990b7ae43ca07e828cb9481cb5e41b8760a7fc8869aca5c0a94de6f0a102153800e74271b37839637ee10558da33bc9c8188
+MISC ChangeLog 5992 SHA256 94dac253ec28855ed1ea2a3da74589de1f922ceaca9a68374002c2cd5de0c857 SHA512 41a5d258909947bd7b74ee9f964c86b3fb20531f3742d084fcff53a6b213bfc483f698a0fc98e566d8655fef6346eb0a097675c6e8d88fc6a48447d8efa7a8e1 WHIRLPOOL 83b9fbbc21da953fb3f04942f506669342252d5e9be2450966c6079d13bcbebbfa30f4d80b3220404fe35543f3e31a1e8c21beea430fd427152868aed6825769
 MISC metadata.xml 1626 SHA256 c0a6b426acc69c395fca385f4a87bc0c10a0ccb551fd6f7c1d7716c167e79c8a SHA512 4495b75f1cf34839b68c89891bec9caefa6864c3f584816d3d71adc616ad38bc291a5995bf2e0aa58be50201b38e003e7ea031c993f9fe65554cd271f246a4fe WHIRLPOOL 3cca52cfdd831fb5a7948ab25d025c75412b8302bbad60185512b983791a359901c26322dec066195209b4a9f7055e728fea7a7b01eebca57c83774ed48b462e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJT/45BXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUChqIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgZdoP/iQjz1rWcU79ngYmtD8lLDKl
-m0oIdKYgCOoi8PDBMkI4z+mB5uRvwObk5He2vBMuzBcAjZl9zA0N1d7bV3dmGsl9
-Zb20gMrDjtWM/TrQSxEzOalSW9PIsQiojVM0u+3El7oFS30lSpZIDAuvECnVMDNO
-+VhmZWp5ObLHVRQjovYwletz51TVa4DOLvZZOv0J/SuIVD39uBZ8yxdmjvYUuaWo
-VkS/ZJrjD/wuv5PC31+hLGyw/Fey67Stq6f2yan2Ba6IvxWlPi6hFVsXobcptEp7
-DUXi4GLPaoHVpCGY/ixfarzigOEpa898MeeZldVrJFpiPc2WcDMECS0MX1HWGBc/
-vAJU3K3xvkpdwqgw4IL8SWd1Twc9Eh6TJKEyzTZGyx9R4kNl7IouQZsVw2wV9yrQ
-oBjNqjP9DZ/DmGfbmqh6Qu6IDBEG0yisiuIdPNVjgiN3FkfcKS+Tr5GVuxM3RD6R
-omm5/zNND2tEKy3D5db4TQ4eb788UcPftI+D0TLW5L5B3/liRhYIjRBSlJ3ZniXd
-eMXRIT6BpuYw6svO5CZxuNfEMoAtP1mSzesnvWhw7hUUXnfH1CH1ZDX7C7hCMU5o
-AreN2xMncKYaKZPV9QEfWTm36RNW6awW4Tr9795mhwxtk7Q9+UjEbgtUBLS9S6Uq
-YU9NpmG7AdqsK8CQYvH/
-=VAuD
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg2wsP/1u0d6GTTsh94Aa8eL2h9P8c
+fON8vAnFxGv8ujdlT++yEnaURQOKT6di1ERUMruuBJ+B4FWK/CogWA8BvutB5g4p
+xv+NfmcsaCgs0FQ7CFAAQTwGcxmvLPl+PIn9socXso9bp7qekfeMA5SrPyAlmaY1
+b+L54xO6KONWg7kiNMIGuQUUtUdblonWXZ2amL+pcB2dWYxT8KdRaj5ORSpnGrdK
+7CADAOfxq4aYarQ3DpMiQas0uzt+DThOvt62vbaAZBUWVaBr1EZAMOwyjoDLbGK9
+5/UxXCjghEDyoo/+6HqjwMvNGeA1gcCjzXq2CSnuekYJ85/YTtvzfVJRhCLV6OMQ
+kiXkmOVRNkHk0dpTRPDZCFnJDybKcOeHii3le++ePIaWBJ/k2qpC5MqDxVljo+Bw
+lh+NaX4L67t5iCJedglYukl3DCLaTSK2EXuysrlII4ZB1Juhzs144NkhghZaPZpr
+NYJgR+BoVlEAjVdJU7c6XxJ+rUoNLElRB0/qtzMBmP86bP7m8MP9KAmKgSwoam2O
+wd7uIXCv61P1tgJyCqm8Gph1cmws7U+Agbo0YJiQ2A9ZS5AOda02pLVl0hhZ91hW
+o0uQYfnhC6n65yM40VudO6CgziqXc008ECxQeBJL7YDNHEfFYYmWG5fvcH5gW68h
+MScRsrORNQtgctn7/WV/
+=DOg6
 -----END PGP SIGNATURE-----
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.15.0-build.patch b/games-roguelike/stone-soup/files/stone-soup-0.15.0-build.patch
new file mode 100644
index 000000000000..5409c493780d
--- /dev/null
+++ b/games-roguelike/stone-soup/files/stone-soup-0.15.0-build.patch
@@ -0,0 +1,99 @@
+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/stone-soup-0.15.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.15.0.ebuild
new file mode 100644
index 000000000000..ae99da95551c
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.15.0.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/stone-soup-0.15.0.ebuild,v 1.1 2014/09/05 20:18:13 hasufell Exp $
+
+## 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="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}-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
+}