version bump, possibly fix bug #527034

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

5 files changed, 357 insertions, 2 deletions

diff --git a/games-roguelike/stone-soup/ChangeLog b/games-roguelike/stone-soup/ChangeLog
index 9f1de0d68b20..12b165006587 100644
--- a/games-roguelike/stone-soup/ChangeLog
+++ b/games-roguelike/stone-soup/ChangeLog
@@ -1,6 +1,13 @@
 # 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.41 2014/10/27 02:58:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/ChangeLog,v 1.42 2014/10/27 19:59:02 hasufell Exp $
+
+*stone-soup-0.15.2 (27 Oct 2014)
+
+  27 Oct 2014; Julian Ospald <hasufell@gentoo.org> +stone-soup-0.15.2.ebuild,
+  +files/stone-soup-0.15.2-Use-pkg-config-for-linking-to-ncurses.patch,
+  +files/stone-soup-0.15.2-respect-flags-and-compiler.patch:
+  version bump, possibly fix bug #527034
 
   27 Oct 2014; Patrick Lauer <patrick@gentoo.org> stone-soup-0.13.2.ebuild,
   stone-soup-0.14.1.ebuild, stone-soup-0.14.2.ebuild,
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 9b152e9e637c..78639b0fb693 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,7 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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.1-build.patch 2660 SHA256 e1bb697055c3cce3d3d58d13fbb731b3ad215c11acd1b87ff238f55609db6442 SHA512 ec13535360e8224a8354f8ed335a1e1d862d75faca8622ae1536d0a6fdbac750d75f87289b4e5d2eb8031f6b6663b04fd0ab6b0b30249b81d45a2c0004668047 WHIRLPOOL 90575542e59cbc4b568b2d85c2bebb04661018cffb74346b03eaeaecd81456365007536851baffc42f416c1ed97640529391a98f7089d1049df4bdfeafa7f3ae
+AUX stone-soup-0.15.2-Use-pkg-config-for-linking-to-ncurses.patch 1830 SHA256 36137b903788dcb96736952ac85e1c59c17e4eb67f8f6a169eca5dc308ccb239 SHA512 d99c4e16a5ece954f01fa6ea19cb0b015afa8428b6d1074b9162e5d876d77b82ccefe482a345a7056904ab9256a78901bab8145cee1e8164796c83fbf951fdc3 WHIRLPOOL 5a8b9f2fb1a8d21d5dee7e7cefa87d8486b5c55151c7a3040862d8802f3de52466d49dd80828fa8234738595e76b3533f9aeda3ff4cdc3b16e8dce92c586a22c
+AUX stone-soup-0.15.2-respect-flags-and-compiler.patch 3052 SHA256 15eb46ab15076b1c33f1afd44d6278b65367709bae3536714bff32472f72e669 SHA512 64f58a61981cddfd7d834ed8df298f986136c06e246096739e432adaf6e17228833e394a30ea682297c1ab4d6823932ae3814a52443d0a5505a38d84bb6b21c9 WHIRLPOOL 62376e5f99eb49458f43a055592dd9ada720c6c0d53c74bed80f670d4d44c0046efa3d2d3d902afca5619bd52977b5b3c8b061f1ef54e6490c1bc559c03a71ab
 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
@@ -9,10 +14,31 @@ DIST stone_soup-0.14.1-nodeps.tar.xz 8903416 SHA256 91726d0224b93ba26b5d4bd3762b
 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
 EBUILD stone-soup-0.13.2.ebuild 3543 SHA256 8406fef757e6c5dd79651a7344462e5e5d8b8de3ad9ff6804f0c1dd9470a3eda SHA512 0911d57d004b0a6b924ddbacb48b5afb3990108858df19d17f436908f4bb648d4f9bb0215508aacf411ebbd8e88e2b3d25b11a3ac5d79938287248142350c641 WHIRLPOOL 2e62012cc142cd9a617ee548b72bea9f9a42ccb7d5ea4614908751ce79614a53be70f6fc40df0549aa63f08ce0748678c9c812752b094d92853007fd7a0e8bde
 EBUILD stone-soup-0.14.1.ebuild 3541 SHA256 693c475734d9bd890001894b0a4e35b348217e0b7e876968dcb7b2cd0121a81e SHA512 4fee50368458c027ba39a9a562654fc1896eb9b054831572167094d1a2dc306983737f65f729d97eb6d053ade50a50f0dd89b744ef7589766ac64acb52fb0b2e WHIRLPOOL ed4068f7357ae2e1a7f8f106860cc58582a8862c1108bd514c919a2e7f6c9f15451e5544eb73da46e79a57bf5732d1a0a56c5766ce6578cdb5dcad59d99ea4e2
 EBUILD stone-soup-0.14.2.ebuild 4140 SHA256 90ee3c3e7b69708dcf4cad966a1ced68db620eb305c9311e9a7798449eddadb7 SHA512 5dd0dd779460b493b56be5d7360d2d48da008d199cb3f45a66c0bc3c3e7916dea5cce1ee5ac57a88116f3ec2ebc334f653c4aa83f3ec0b1af56ad9d1f4e1dd20 WHIRLPOOL fbac8df041c35ba1a53d45f6a4e321ecde93d5e3086ad026e3b94bacb5393b724a1030a87cc70393989879c53d2bf62a305548bed4c8fea68ccdf2efa246fd40
 EBUILD stone-soup-0.15.1-r1.ebuild 4204 SHA256 1c098bcfc08a9668158794a8c37dd9b46457be16517dc5111207262a6bebf109 SHA512 db8e14429e21d338048a54725c106868186eac673f559377a8ae7f8188bcf529e60c32ab57c16e586d7864cb16a2396eda8cd6c588ab3103e850b532bc665266 WHIRLPOOL 64a4a5c4dc161eb23b592704eb46c52ace7b1f90991a122cb2a12d654c2da2d0444bca99d03d635d33849d583a9ca428037e8f30dde56a5f889f14987dc47ca2
 EBUILD stone-soup-0.15.1.ebuild 4142 SHA256 d1db8929ad85d7222e9cff538f9d3977f8352a5d5393418fad41f3108d10bb43 SHA512 b0c2ff560c00fd01ed87688f59a663b8a73b4b37eaf7ed03edda25d9de2ebe808980d78c7d536345d358a2f2fdd85ebf97fd87bd5146bae0161a781a751b4fa1 WHIRLPOOL 84802c8095897432e020da725365866dc22b0bc9c3015e13b503b5f7c0e8a013d5fc2a677fc8f0414b36e70182298a5db2e72f76860a146e21a6415e265849d5
-MISC ChangeLog 6890 SHA256 4f1e2bd114a343ea08b1c8132b91f2e27deca39fc7212af0339e35465f0093a9 SHA512 fb7a2dd144a4b476727574f9706316cb79d81e7c3d0523eb65662083b736fa0c32dcda0c8f8318dfdce9182e6d15927eef36a6911cb614f0c5874dd1ef3a0ea4 WHIRLPOOL c94a9d14c469a6c398418514c8ccdbba31ec96156bb569bd708f42e26af0b9fef1e9d8c2aa09c67550d4470efb04e3e261690f26468b0bce62e8fff470b48ac0
+EBUILD stone-soup-0.15.2.ebuild 4318 SHA256 27970cfcc2fcff595ec3ca57053f26c3ef543a705f3b0157605dc7be9f21a3ed SHA512 425c54858ab1bd2bbe96f96b94bfaebe8d48174ace4c5f881c51c89a701ffb17767e833523b671e9aa59617f012fba1ffd3665a67c8acb1e3f84bd1763178645 WHIRLPOOL 115886748c9e4a131ce82acf86c0fed5cd9c9e3d14b9082a9304d93c961eaff21a8d3741bf8f04e64bb3ca273fbf304dd22ca9f0b1db2330368158506ef774e6
+MISC ChangeLog 7178 SHA256 312a090191fb69cdc0199bacda6038bc564ef1a6526ee6979704e32ec449abff SHA512 db2ae25c71b0dc971600550cd2c05466af37cf96f60e0658812bf539bffa59dd4fc4a89744e682152c19fc9c88579224799ccea221b48a4a688e2b01895a6b61 WHIRLPOOL f54f8992c94dc8ec72dfd7cc6d6a478d137b89d430802255868b30d9aa07d8c0da37ac43d50d84e6f93165a5c92746d7093ff015f9481a3bb5312c687e2f56d2
 MISC metadata.xml 1626 SHA256 c0a6b426acc69c395fca385f4a87bc0c10a0ccb551fd6f7c1d7716c167e79c8a SHA512 4495b75f1cf34839b68c89891bec9caefa6864c3f584816d3d71adc616ad38bc291a5995bf2e0aa58be50201b38e003e7ea031c993f9fe65554cd271f246a4fe WHIRLPOOL 3cca52cfdd831fb5a7948ab25d025c75412b8302bbad60185512b983791a359901c26322dec066195209b4a9f7055e728fea7a7b01eebca57c83774ed48b462e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJUTqQJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgwoEQAMYOhXs3wEFRriXNT0+4YmcK
+25Yq5rllfSd1dCufguRGUY6CQEO7PUBswJk1aNDybGi0wgjboW6lIPzZ5eE53cfC
+z/P/h3sLPT2gNLEO+l06cA1O7XTf3ZUHzrnD8jduI+YoRqB1vqv1AuCezTq471OZ
+RiXHTB0kkzeD2UnkcDb6fGOdvwxCHoZFy0YrbHAZ3P3UP9VBoLcWC40foJrclyh1
+OWFGc8+x155D9vZSwfHc+pPU53F2Qa61NnEWGgx/G77xocxABnav9iTFrSfjKnVo
+XncB9s64P/6YdV/y4zacWqf1pw6Ogo3cB2x8lFHN5sG4iHSOy/TEgUl20roTFRzy
+xR+4DACM1e9ImoHPBoUSeyPIF9IUt40iWklQm3UjQjkHDwUj9cPtwQpL7Pxg7d9w
+q/agmeRJfz8n1aoZr+wgynMqnoutE5vaaP0HjtkR+LOr5MZUDA+xqwTuz4Ys/AIQ
+4VqpVg2xGUcPrpOji3GHF3cokDkOyXiISzuaucxYQnaQ4DZzGHMtpyykuZ6ERWwg
+emn7NsWTEpVTp1rbW4+DIgl+OXBfyMQ7NXWgstxjui9TNKji2qFa1ai9ztx1YxzV
+cOOo3pRTvpE9kqsKInQ2fASILtA4/kfWI97zasP3A9Mzj0EgXQHWrkgLo+P+hsDv
+DAT2jp5lHKnu+WazOQWK
+=jJNf
+-----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..5ca192d3c929
--- /dev/null
+++ b/games-roguelike/stone-soup/files/stone-soup-0.15.2-Use-pkg-config-for-linking-to-ncurses.patch
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 000000000000..528393a16790
--- /dev/null
+++ b/games-roguelike/stone-soup/files/stone-soup-0.15.2-respect-flags-and-compiler.patch
@@ -0,0 +1,110 @@
+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.15.2.ebuild b/games-roguelike/stone-soup/stone-soup-0.15.2.ebuild
new file mode 100644
index 000000000000..9584ceef64a9
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.15.2.ebuild
@@ -0,0 +1,163 @@
+# 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.2.ebuild,v 1.1 2014/10/27 19:59:02 hasufell Exp $
+
+## 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
+}