gentoo resync : 29.10.2017

8 files changed, 221 insertions, 7 deletions

diff --git a/games-roguelike/powder/Manifest b/games-roguelike/powder/Manifest
index 8dbd936f259a..ebe94426edca 100644
--- a/games-roguelike/powder/Manifest
+++ b/games-roguelike/powder/Manifest
@@ -1,5 +1,6 @@
+AUX powder-117-gcc6.patch 354 SHA256 38b351a9946a7cd08193b3c9099129f8d2d75ee7c0305b22e71d15a5881cfb77 SHA512 7d486a29bad2b389cd6e772c44227b2475dce7630e8fd2932bbafb0f52ba3f3ae3af1eaccdd69e3c3742cec1a9d80b98d9d8527591dd14383e70131620270db6 WHIRLPOOL f994f120ee2476b049b8965a34fe153a21d8112ceb752b9b98dfa67389264bd153fd49b930ecfbb2dff6af04cdcba61b2ff8f66e9e0e72597a162085627d744b
 DIST powder117_src.tar.gz 1891043 SHA256 070346921ee83bc40943b1e1cb576ab3222cecc319fe10f5c138a4deec85e861 SHA512 cdbf67d6d582af39c40cc0872411725d0c296326b21cf8efbe7c7ccd11cd3c831ad129e5e91fb661f938a399ac799509e5123653494f54398c55750026bc6736 WHIRLPOOL 86d5ecfc92b6b1786fa798451f39c6825f8b40483397b240a150ed96d8ad9950d9b3d5cda65f12f8027d997d48d888d15185c48b31dec166b1b1f6ecd462e48e
-EBUILD powder-117-r1.ebuild 871 SHA256 6cdf693638b61d517b6e6b8503ac35f80d5623f95367a5226c892d68c7d5b03b SHA512 6260741f63bfd5c4236e16fa0fc061f0cd13576f8889db0dd3effe5191481fbc52bec6940c29ef1efbf024a5c156e0f18c73e0f70e0d210f2dc1b7b57074802f WHIRLPOOL d8b530131fe5f04ca8b096bd55a7e9f169e35cf36cad8eebd547508645fb70632ba752348f908f2858832d53b3a48530aa7741c931e71c2be2eb3231d0e59981
+EBUILD powder-117-r1.ebuild 919 SHA256 cbc7d4475a3010da373f6481e628aa77b2c9d72088c10d1e9b66f00184215c0c SHA512 592244d7bf3452a1c4cc5cb4db8f88e8c849346dbe95ce0ec9f85b21b40440bbf5ec8999d738cb8836a4c08d2bde92f7fa635c93a1ac007525f9e03373bb1bef WHIRLPOOL 6139eb65ba01ab72475de2b4a45bda7881e65685e9135797b749fbeb36a035c1c1e157c061ff72097c765f3897de3a43d93dcbaba89de614f9cbe6dc5d487a0b
 EBUILD powder-117.ebuild 915 SHA256 e92d63e1511d632ef6aea94c9490b95cafbc4cee6b6e834ed57d74199b96b845 SHA512 0e7d46cdd559085b851e72a8e1200539e9db2ccc9e73184462762fe5704ce2ee0dac92e3b021dcde7e590ad9a0ef011f845733f122ef712e85c4da34eb549264 WHIRLPOOL c6cca6679dd3b41c5fab85757ac6cff0e185cdbbb0c70dd5784d7ed583c6d2f59b17347dfe7762aa0d088ecbaf96de8ba0863df6aad947dd1e40222981c1187b
 MISC ChangeLog 2673 SHA256 3489a8475f499caa6cf90158edf9ca719cb9b8a3820a51c6465f11401391488b SHA512 95d68efcb663cbd3959b8c48f53d53a280974a0d33f7a6825a675ab61d661262d0fadc1e375215297d0ac4786f96bffbc17eaa8a917506b561100e2c722b5abc WHIRLPOOL 12c7571cd8e490148e17fb51cbf42bd93f04a8c2de51eadf0cf8e045aac3e914abafd2dd7f35ac661da2e486639674e0de67feb40204a7406397de854cbb4c09
 MISC ChangeLog-2015 2699 SHA256 431a1ee5d5e89284af93043fcb5c27e2d99de258b83c47a14ffc13b5256a420c SHA512 919efe8c5da408c7263b0a90323b58448a649e3bdc6a8c5f5ba8ce6664c1a41747227b288a29e429ec7fe7209903ce7e700d2115c59557c2d77bcd9b78e1676f WHIRLPOOL 79801acf7f33fb9873e0d55752d69328c193f4a7991f17ed65969d569c4e908353f7c7e68c452e75feab4464cfd2edefd3b4ab91de4d44974d175fedc66dad01
diff --git a/games-roguelike/powder/files/powder-117-gcc6.patch b/games-roguelike/powder/files/powder-117-gcc6.patch
new file mode 100644
index 000000000000..3a9b7f2af541
--- /dev/null
+++ b/games-roguelike/powder/files/powder-117-gcc6.patch
@@ -0,0 +1,20 @@
+Bug: https://bugs.gentoo.org/598928
+
+--- a/source.txt
++++ b/source.txt
+@@ -13400,13 +13400,13 @@
+ 
+ BRANCH MAIN
+ {
+-    symbol	'\\207'
++    symbol	static_cast<u8>('\\207')
+     welcome	"%U <return> to the main dungeon."
+ }
+ 
+ BRANCH TRIDUDE
+ {
+-    symbol	'\\211'
++    symbol	static_cast<u8>('\\211')
+     welcome	"%U <enter> a cave made of metal."
+ }
+ 
diff --git a/games-roguelike/powder/powder-117-r1.ebuild b/games-roguelike/powder/powder-117-r1.ebuild
index b0199fe9fa0d..e7c6acc40057 100644
--- a/games-roguelike/powder/powder-117-r1.ebuild
+++ b/games-roguelike/powder/powder-117-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
 
 EAPI=6
@@ -20,6 +20,8 @@ RDEPEND=${DEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}"/${PN}-117-gcc6.patch )
+
 src_compile() {
 	append-cxxflags -DCHANGE_WORK_DIRECTORY
 	emake -C port/linux premake
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 8ce1f8284b92..5023d8d18daf 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,11 +1,14 @@
-AUX stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch 1802 SHA256 535964d2040d36db3fa45b0ca5c3c7aab03068256e98a96a53265019b8734161 SHA512 7830614f564f5fbfcca18629197e81b8edfa8f31656544ca7c9169c15f5cf6f89fcc98479fcd0d9ca5b742f1d8490d49c8a1e0e4f966724ce4035313b3d5af6a WHIRLPOOL d328c6bec23e0760323d70c22ba1a9534467e42fd2613002f4458a4d4b693105f01ae7dc158c844a3c0a26c1e63e2d26218508d2b2a88a6aaeee57390dd6da7e
+AUX stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch 1804 SHA256 8bc9f9413aff2834194d7a0cd4796af6e3b65c0b3752f5a5416dce4305ed108b SHA512 ff9ca921fb192592bda24f430961335875529a5a310d01ff6b5103b37102006b2129ca7be144bb677175d6efef9324798caa6250f4aedad4dc14b690d8b2f14c WHIRLPOOL bf449a8bc78b7945e35e207d6698a37adb8a5a77ffdd70a4afd93203e7bad78e03a3b71a7dc088871d5a31a70669b1181fd48ac40bf8514a13e07b2d070e218f
 AUX stone-soup-0.16.2-perl526.patch 2189 SHA256 cabdd4c0263a661cac20cf14bc0b84cd814b787ef3b3fdb3aeabc3f6eeef67d6 SHA512 7433e87c5acedb72012fd98a047207da38759497f26a9286ff4fe345090135fd1240c63c1723d9369f37569ae38aa0c7a76d89375d9a803f77c346411339bd76 WHIRLPOOL 560e7e7c65748cca1f85e3b9b9a1c3ff2b91a2d9f1778e0abdf1117096addd83785b809992f7244af8dfe9636a0a2a6517fe83f16695ee44446658ba35452e8c
 AUX stone-soup-0.16.2-respect-flags-and-compiler.patch 3075 SHA256 fd7d351447a4e308141263e8d20ad5086e3a9bcdb180555a1512d749ff3caeac SHA512 dc12c240bce0bdc94ea1b76da0e435b7bbfc51fb22c0bcbe4f2383740262c2cf43efd03dfdfe24a162b07059f5d74e64d0e66d902c02e743b05f75d3186b7fb9 WHIRLPOOL 3c33e95c1908dc153355214cf52d14a4058be16359e9b48539fa4b9aeb6def097e0e3732d29601a8a61c142f97220f6c300182319eaae0433fdb0561155aa733
+AUX stone-soup-0.20.1-rltiles-ldflags-libs.patch 1376 SHA256 e7840af84e97571bcf402014edd2d02ca1b3321ea1fdb33bfd8e42e5489aca63 SHA512 ad139978d67df1d824a772f70d331779ed56cf2cce30c4022804740afd77b6d8b22badd9d20af47b4df0a60499a914f749a3520a5ea76ae3e14795d2bf07affa WHIRLPOOL a8c414ecce6eafcc3895a65d470778987ed95f2ae099cc50d67023b76d20b376076441825b67a6787d029413229ad452d7fb394c69d7ead9f3766b2879663cdb
 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
-EBUILD stone-soup-0.16.2-r1.ebuild 3643 SHA256 aa5b9b64f66914f04950432a8665ac80ea119df0a82414e3dd0a02dcc37b6a7b SHA512 837ee2c3570b0a6a7e75f2b4d6220d90099eae1c16a84368cc4173e12bb661ddcbd32af2bb29510d443fc8917c6fcb3feab65406550f95657d8563bd4750e22e WHIRLPOOL 0e42569f07477f52657477cf60e8a6d7463a2279916d9125c501f00ebd476e758c734b017baa26e16c227451d1899776a89e402def33a7e5d9215a68128cebc3
+DIST stone_soup-0.20.1.tar.xz 28372712 SHA256 77d238bd859166e09bbf56127997f810d1c9794e1cf4a0d1edc0687b6f194dee SHA512 420ccc3c66977da8ae15f9c0465b01a6260ad5db450efced3041455674922e714d9aaed226e1bc32fa3c22bca1ec06bd91979a9378c6ab08fbe1d2bfc3f0da4a WHIRLPOOL 1057a0b86df62ebf8491274b37719691c4c709feb478c684882c465a7fd2c8f977bdc7b6a9c2990a47a42c2ffbdf4187a4da705a3c31e0a3a174e909af8ebc34
+EBUILD stone-soup-0.16.2-r1.ebuild 3645 SHA256 ec21234c0736769ae1abacf779eb6564f36ab7300633e026429965b569bd3fc2 SHA512 a0e2283fb4450d32ce0fabca94938a62347ca8c3e19c44a2bd84d325464370ac54cb4b363287b169346a3b566bceae7d677008a124407a73fee033dd78401c78 WHIRLPOOL 23ef661d5a0e7bd77c858d1ba6f0bb3843e6db7f92e01d683788e432b03ef5622b3bfa554186cbf72a6b6d53607b74a31088c3316cc820d23c7a1f14a65b364e
 EBUILD stone-soup-0.16.2.ebuild 3738 SHA256 1a3f9505130541f4882448b7554a6bf8d01688918c169743dfa803177d526398 SHA512 8bbfa57c78c5fad691c53778c5a93140f1ec48e8abbfbb90721171b951630b069c322032c81cd783d46688c871ff8d1d9f0f2f4039fedb5b353467afebc95afc WHIRLPOOL c08ced69367a9fd538a20d05036e738eb1eeca705ce3397aaeb766bc4c9dccd8aa1b938fece6eff5c2493b37b28386bc49f2e7379daa6eb94b0088840a481258
+EBUILD stone-soup-0.20.1.ebuild 3567 SHA256 50cb2a92f1812cd5c579a179106d7432d9684e104ab04f4b4325848d75941491 SHA512 f796f07117afbc7f2051e1423c8192939aa3edbcf427be5ca0bb86d12f377280fc10b13850420505a423ad1f8a8153ac72800bbfee31441c25183b2ced45f137 WHIRLPOOL 541ddeade9be0a0c59f2bf4d94b66864ba450cac8a2729b7879b2cb3fead8f927759a95ed0261110ae29426ef7248921a80741433dfdda19524e330bbe7d6e9e
 MISC ChangeLog 6460 SHA256 3724e2b9126426f4ae5d55aa9ef6862ad4dfe288bc8547df7706da4b21515f43 SHA512 601c36c394297e77741675f24bcb1a42f47a2e9ecb6103cf42255d3c518f3532cad6a0fa4b0b5409ee7efbcb0e3f12f75c10b91e6214cf30b91161b3751425a8 WHIRLPOOL 30bdcac1ad5e75ec4c4f894e89344b14c1fa97baf32c29956d8d5e9f8860c77713c234df1edf959c7c4a180e51673eac896511bea2a7423cc25b26b02bb796eb
 MISC ChangeLog-2015 7439 SHA256 ec9122ef3b534e63ea74bdbe093186e13f1e2e477e96dc4639990452c88039e6 SHA512 a2c08caf62a47422614be9d170f31f24ce702c5d7a8bbc528566c91f8285b171b71a122a0baba4d28785a276d76c444e60a17f53c34844a696e3f94dfcce2b6b WHIRLPOOL b388b1318ef1866b71b111de8f73d24e7d66833e78f9eeb3c0a7e32ab2802a32b8b2cf155981a382cbcfc0d6779e553d1a9f3e2efcf3b651297eb50e1a3da818
 MISC metadata.xml 1666 SHA256 ce36b2eb1bdefb43dd075ce8f2992f1fcdcfb67ce4e17e17056579ef6bb85da4 SHA512 e3d0317f0aca8cae787aa7e659d07f6cf024ce7a983f87b1c54e91a955df96dd4daf570e56eb73c877601855b0fe26041943672dc2f51e5208742e91dd3e84e7 WHIRLPOOL afad12a083da1b9b8a65758992b8119ec9fd56cbfa9b2fb01dcb75a81e2cc6ccabd67b3b0426d91654681fd468ade03b5e88d2155d60cd4fd0c51f8db856b6cc
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
index 0c029c9f0966..e0b676c3d2e7 100644
--- 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
@@ -18,12 +18,12 @@ index df51e70..2db2781 100644
  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_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) --lib ncursesw || echo "-L$(NC_PREFIX)/lib -lncursesw")
++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
  
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 000000000000..010c729b92eb
--- /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 ceca0ef94f0c..c9d46d428dbc 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.20.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.20.1.ebuild
new file mode 100644
index 000000000000..6046f53ae7e5
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.20.1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+## TODO
+# add sound support (no sound files)
+
+EAPI=6
+VIRTUALX_REQUIRED="manual"
+inherit eutils gnome2-utils toolchain-funcs versionator
+
+MY_P="stone_soup-${PV}"
+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/$(get_version_component_range 1-2)/${PN/-/_}-${PV}.tar.xz
+	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png
+	https://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="test"
+
+RDEPEND="
+	dev-db/sqlite:3
+	luajit? ( >=dev-lang/luajit-2.0.0 )
+	sys-libs/zlib
+	!ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
+	ncurses? ( sys-libs/ncurses:0 )
+	tiles? (
+		media-fonts/dejavu
+		media-libs/freetype:2
+		media-libs/libpng:0
+		media-libs/libsdl2[X,opengl,video]
+		media-libs/sdl2-image[png]
+		virtual/glu
+		virtual/opengl
+	)"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	tiles? (
+		sys-libs/ncurses:0
+	)"
+
+S=${WORKDIR}/${MY_P}/source
+S_TEST=${WORKDIR}/${MY_P}_test/source
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.20.1-rltiles-ldflags-libs.patch
+)
+
+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() {
+	default
+
+	rm -r contrib/{fonts,freetype,libpng,pcre,sdl2,sdl2-image,sdl2-mixer,sqlite,zlib} || die
+}
+
+src_compile() {
+	export HOSTCXX=$(tc-getBUILD_CXX)
+
+	# leave DATADIR at the top
+	myemakeargs=(
+		$(usex debug "FULLDEBUG=y DEBUG=y" "")
+		$(usex luajit "" "BUILD_LUA=yes") # luajit is not bundled
+		AR="$(tc-getAR)"
+		CFOPTIMIZE=''
+		CFOTHERS="${CXXFLAGS}"
+		DATADIR="/usr/share/${PN}"
+		GCC="$(tc-getCC)"
+		GXX="$(tc-getCXX)"
+		LDFLAGS="${LDFLAGS}"
+		MAKEOPTS="${MAKEOPTS}"
+		PKGCONFIG="$(tc-getPKG_CONFIG)"
+		RANLIB="$(tc-getRANLIB)"
+		SAVEDIR="~/.crawl"
+		STRIP=touch
+		USE_LUAJIT=$(usex luajit "yes" "")
+		V=1
+		prefix="/usr"
+	)
+
+	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
+}
+
+src_install() {
+	emake "${myemakeargs[@]}" $(usex tiles "TILES=y" "") DESTDIR="${D}" prefix_fp="" bin_prefix="${D}/usr/bin" install
+	[[ -e "${WORKDIR}"/crawl-ncurses ]] && dobin "${WORKDIR}"/crawl-ncurses
+
+	# don't relocate docs, needed at runtime
+	rm -rf "${D}/usr/share/${PN}"/docs/license
+
+	# 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
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+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
+}