version bump, remove old

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

8 files changed, 28 insertions, 554 deletions

diff --git a/games-roguelike/stone-soup/ChangeLog b/games-roguelike/stone-soup/ChangeLog
index b02b783b420c..019dda77594d 100644
--- a/games-roguelike/stone-soup/ChangeLog
+++ b/games-roguelike/stone-soup/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-roguelike/stone-soup
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/ChangeLog,v 1.14 2013/05/14 09:41:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/ChangeLog,v 1.15 2013/06/04 20:45:30 hasufell Exp $
+
+*stone-soup-0.12.2 (04 Jun 2013)
+
+  04 Jun 2013; Julian Ospald <hasufell@gentoo.org> -stone-soup-0.11.0.ebuild,
+  -files/stone-soup-0.11.0-build.patch, -stone-soup-0.11.1-r1.ebuild,
+  -files/stone-soup-0.11.1-build.patch, -stone-soup-0.12.1.ebuild,
+  -files/stone-soup-0.12.1-build.patch, +stone-soup-0.12.2.ebuild,
+  +files/stone-soup-0.12.2-build.patch:
+  version bump, remove old
 
   14 May 2013; Agostino Sarubbo <ago@gentoo.org> stone-soup-0.11.2.ebuild:
   Stable for x86, wrt bug #469742
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index b8a3016d5247..7fb05393d7b7 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,36 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX stone-soup-0.11.0-build.patch 3337 SHA256 7553e5133b0afc49c9ed59c270763c02c939de15e11d7bd571f93e8705d7a241 SHA512 c433cdaf55a9f128573f170540fa69b1f2f8720b6338d58d61dc341f65fbf350bb319c2091bfacf591a855c1f9d031f99b946cf3c634a6e3f81ea57a7bb23a2f WHIRLPOOL 66f02948720dc4129c77067029b28da517981e78d27e2b1e5da9863b12e657d41b3cdc99e2ace854133b93d0290abba64ff863c898a5a141ba98a3ecec6d32d9
-AUX stone-soup-0.11.1-build.patch 3337 SHA256 7553e5133b0afc49c9ed59c270763c02c939de15e11d7bd571f93e8705d7a241 SHA512 c433cdaf55a9f128573f170540fa69b1f2f8720b6338d58d61dc341f65fbf350bb319c2091bfacf591a855c1f9d031f99b946cf3c634a6e3f81ea57a7bb23a2f WHIRLPOOL 66f02948720dc4129c77067029b28da517981e78d27e2b1e5da9863b12e657d41b3cdc99e2ace854133b93d0290abba64ff863c898a5a141ba98a3ecec6d32d9
 AUX stone-soup-0.11.2-build.patch 3337 SHA256 7553e5133b0afc49c9ed59c270763c02c939de15e11d7bd571f93e8705d7a241 SHA512 c433cdaf55a9f128573f170540fa69b1f2f8720b6338d58d61dc341f65fbf350bb319c2091bfacf591a855c1f9d031f99b946cf3c634a6e3f81ea57a7bb23a2f WHIRLPOOL 66f02948720dc4129c77067029b28da517981e78d27e2b1e5da9863b12e657d41b3cdc99e2ace854133b93d0290abba64ff863c898a5a141ba98a3ecec6d32d9
-AUX stone-soup-0.12.1-build.patch 2590 SHA256 a5bcdbbf001d218a6dc2518797a5e90821b0c78dbcc5479dbd3005e29c0cc735 SHA512 ffde5f3528348119265da0bacac70b22a0b52e778fc2982deaff3f6809c3bd5cf155ebe48a3809ebcab2dded8563a86d9b167312fbaf6021bc83df905a483155 WHIRLPOOL 4eccb446c79ce6c4e1d48772a563bf794a6ed6314fd905c87c7178414bc62c751c6f1a1df1942e1e01cd8c531aaf632acc86d487cb977e7f39792b0779f4813a
+AUX stone-soup-0.12.2-build.patch 2576 SHA256 befc3345c2a0ae4fdee5e3a0ac61e78b1d5b9552cd2f4d9e495457e70183c8b5 SHA512 a4d4e5d68d129f15c3f2214d2cc33fe1f5436dfd3be1f4621383f7589ca6d33314c0c891c1ab9575b013fe0d23bf3876c35b2ba9310fd4059caa500bc6e8ff60 WHIRLPOOL 2426d084e79112b6e815f3916cd0b83b4c559afc397573cbe390ce6ace1df8c3ced791ef8e47ef25e3e5f5fbb6021125c88deee1a5244390f46765df4a27e55f
 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.11.0-nodeps.tar.xz 7516360 SHA256 2a39307c9f88608ee2a33d3b831c51d9190c91ccdedadececda5edae6dd69002 SHA512 3fb5ef82aea5c7445c39f9f993436bf228552ab5e87a9752c3a275a9ae4c69519c37318dc5fcc6fae9237ceadbe02b67496dfb8c2d82fefb4434d94df61950db WHIRLPOOL e9e2b9131a7700528bec3e8fb3327a4a72dcd8941f76f2499713c9e1cef6f33b0281a9121c128854fa71470e9c77b3b90a1d076a2986d805855ebb36cd7baa85
-DIST stone_soup-0.11.1-nodeps.tar.xz 7519768 SHA256 377d738cff21165763b252a57cd84049361d44db6d8d10f08f789cc9e7bb82b6 SHA512 0ceff12dcc3d4a17ea56d18b451cac4fa7805fa795551ca251ea8f3c60f25696083e602f337971f8f19ddbd2a5b7b0fc420e3ed11fc2b731de1ae0eeba1281c2 WHIRLPOOL a86d94118c131ab057258e8e9fcf8fe3d4b9024a9c4b4fabcdf0ec2cf8d26f5ddd83a1cb3d6ada90d146201bd816e74570c6d3eb55e09f371e214a7e7eea39b3
 DIST stone_soup-0.11.2-nodeps.tar.xz 7518884 SHA256 ae399a9ef1861918b5cef3224893618167b709d5d72321cc328859e111f8e259 SHA512 28d4fe005727fdc8662581921c33edb325bb561f7be2823bd036bfd84422128a0c85ac774785277f326c92de6ec3743751b86a5f74f12559b77f1fb02f1e1614 WHIRLPOOL 5c65c7efddba01265e9223d90ea539b42750e1d49fc76e7ada94b484244b5fb1301da3b3a883b89e3ebeff92279f92d69999cae69f6cf9de19f4a7d19aeae277
-DIST stone_soup-0.12.1-nodeps.tar.xz 8658732 SHA256 9fc81429a42f4e06bb4e2f6175c77ead8400771e985da7567368e544580dc10e SHA512 f1fff992f0354eb16a5c497d629144389d17bc750911cf5157016cda6bf7ea6d34ec6ccc279b6ec7aea313bea82261bb33d5762ef1f2b5e548e502ce8411b10d WHIRLPOOL 67806a74e8a3972ee3cfc64cd4e2df9e0c2b28411636f5ba46474dcd4d843c8e985ce6b8b9252763950d026c31bbf4420f8bf1e5e59544f6db5d5e33d95be9a9
-EBUILD stone-soup-0.11.0.ebuild 2941 SHA256 31447ccb68485d3a28a32cbcfc5bc59105604f9e0b82c93162c01d56d0a66324 SHA512 cd2ef3fd37058af7476974301c8264992d0e3ee2c9eac486ebed5a6f6b27dcbb4c48b82d0aad86c92a32147fd2676ae7a201e7831e58788a6db7b833add9dd6d WHIRLPOOL 2925c70109d3b1f117b14db533af936f6da27e7de18c91cdf9a3ef881a390d5c7ada159ea76414da6e07c73ebe3278124087de43d5e01a13f79bb0d0e110b822
-EBUILD stone-soup-0.11.1-r1.ebuild 3283 SHA256 c2eee7c88d6f722047536bbb60502c7bcbafe25b3e98bbd11e98f05113be016e SHA512 73df02ca523a25c9d5425a4f69c3c3dce8fb3c31937fd81dfd9b1a3270b23ae4d45a4ab616fe80b1817af9b805d6c96e289b992f6401654672464cfd7de5a065 WHIRLPOOL eec5147617b54fa816be6a190aeec138b9acc056a28d1c1acd7dc9879a0b79b98d0006738e747d08bbbc9dcb613e748146f19a4c190dde68aa81ca29ce821dc2
+DIST stone_soup-0.12.2-nodeps.tar.xz 8661464 SHA256 d9ecb2c121596fa635fd98a3f1363038beabf67159c7822e79eaf4698efef274 SHA512 4e961dc3a878a02f3cb88106c0bb23792a05cb99a5491126e83d9c2aa92021db226304ebf21e4334310460ef9c3e593a48e7d99543afbbb714fb407fb558972f WHIRLPOOL 894d19af22d4c422af6f16fa9f9c22d4f66241675077b657ed8031195c241d1b9282d1df9340ac1f756a948b2932019e645a1d9097264281e095bb8f7df079b5
 EBUILD stone-soup-0.11.2.ebuild 3278 SHA256 4b745583b0b4d9ea131c4d73ccaf6893a455270e24d9bf302d9389b82a4a3089 SHA512 75523b3c13c5415aaef98d0f27b37d215a2f99324a112585bbc9c022b40535a6b7e4af9b76dbf49e68196ca6344daa83808880a1114240e2ed17a588000d884a WHIRLPOOL f9f07d0bf2526f94bb83ab9897fff48e8a735df46e36ac4be9a96c583340c48f13487114b07e7a954e6792da5b39a0a3b8dd8da03ab2392bed05253fd225d8c6
-EBUILD stone-soup-0.12.1.ebuild 3616 SHA256 f980159f71bf090615cff5904fc62c56e7e1de62c26a19f10eb902ade328821e SHA512 60d85bdf40031ed348c08269aff50415664fa2b46fda0815cb4744034cffcc92c971952949a3dfda050f79c8cec8756f38a2ed6d0a3507c806040e8783728339 WHIRLPOOL 905b4d5c9610282d3c3021403d9058c0c9a6afe2a05c595d7662ccd100a966f87c45fa8803f668f118f317ea7d512a13675656a57b8d6d64983362030bd7a3f1
-MISC ChangeLog 2445 SHA256 f34ee39843674a21577692d80df76ba45e2964b44fe76ed17deb3ef963cee6e8 SHA512 c7c88d230a804c1b7729f84eeb5531f27a23394c61e188c4992e1e7e53a6159144347f7d99f6382874376acd79ed7d42f29dc936b26f097ddbd37462825afa3b WHIRLPOOL be8366104ef0c9343489efd1900b07146980e60ef8e6dc2040b781025154a82dc291a044a2c1753b8dfccd5f1d9f02d4bf5174044949994f97d8efbffe7d3a78
+EBUILD stone-soup-0.12.2.ebuild 3616 SHA256 f1420dafcf31069c18556e55813448df3040264954951585078b1f8eb2f2a652 SHA512 5fe4921fd53454cb6f211ef11109719abe6bcf95374c3e8d3d0bb2453fa3436b5e39fe974bb47b0174627c607f988420fb094513185df19c3a8b9c3122929ee4 WHIRLPOOL 8e185bb7aa091e8f4033d4d644f8545f5986dbc2393a36910fe9e21afca65b803343bffe49143734d62650c6577cfe3ab9a9e084c390a08a5fbab27e2990c02b
+MISC ChangeLog 2834 SHA256 d40fd98e939792c5c6754403129b0736ccb2255fe0c477cbbc9320e3a7fbec5d SHA512 f4ab9cda55a346081438245cf79489e67e3048d787653461db936a83dcd779677f535c1380944ce5409da70a27a42f865e0fb89ced4849a44c942d01e8e51e97 WHIRLPOOL 45ff1ecfdb1937251fd74cfb6228a6419094a9f2be51fd2661d0ebbb465fdbaa1d02488d735aab73eb1c89d315a20c004726ea4e521f307ada3861951d7ec25d
 MISC metadata.xml 1503 SHA256 aa2c7c89f65bb62311e407b2786549b917a89c3c65182dea9b47d5a8dbc1a295 SHA512 6808e1b61bbe2b4fa78699432781665919ebe01672e57838f75eca24dc79ae4126d6076daf6b2e6870886d3214a9efe4963520a0c7ae15b3b47dec32a03ad5bb WHIRLPOOL 5b71d200df668c137771b1c5d415c97cb37716633c3a346d124c56e1ac1311b1686444b2b57e6d78e2f633f561fbc1468941a1fff926d074d8d2dc33b6212031
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRkgbCAAoJELp701BxlEWf+vIP/22+UQWEt2eOhaCmhR9kLsXM
-a7uELAkOsuA+/MXr5PXPPDsbDu54iqQILI6nH2QELcVlc2pvUnXnPDLY1uVQiyUk
-aakHirFwmQBWnA8Z3F7XzzlDtS9tfeWD6ZE9My7Vl5gwzktlixPXLgSyMyRo9wIm
-og4jlro2GaQakI3MscVBnrkuwftyi1FSVuslBcGzbVJmxNeb2zzd3U9RTnrPL/KQ
-OwKKiqAWYs0vSvzTujjpwGZUshJr8/eQxAlDOD187AmZ2SSvQdMue6rS47leJ0aL
-S2gI7GKQE/qwV0imCk+L1VjzKDCDjLQ7Fy6vOd+znmWivKclDpzpw4xDbGzJwDCj
-zkt80hZzOytx+3+GpGb8Zo98S8L78hDOjnO2Lww3POW6R8B7wuSduDMFx56NAXrA
-NDWI6DuHQV34+DgXFGAfgsFlVUKeZ41/4DUMlhdJptQXVSDYfi0AvMCM+JpMWCQP
-qjd5CCR8WHbSxQ1c23kowCKoKuC50YeGw+sOOQeC6a/8kuzQlnk4BQx0pgUC47AC
-1mU5z8sxJQoSQA22S5EREFtnIUVddYwXSeTJt2+ZeAJcvACbWAQpkmQcDAeuFRPm
-bI6U0PlbyxOP9hJ913EdO5dkFiMrTW5gmjybNR3I688bqqF6eRPIJJ4tmIhqq+dK
-eTEpXHP+2zD02DNCOitE
-=w72x
+iQEcBAEBCAAGBQJRrlHvAAoJEFpvPKfnPDWzOE4IAKbXFWTXV0XINzmGrULsQjZ4
+ITzj+IIEDRvFu9OpJYWGjvWi8CcHK9XeUY7gD3rKaST0S8rqcMpDg6/iXyNpQWwX
+YlnWxzWDR7QY1YaC5CINfXXIZ2PVWqC7DvupjVrbrhkAhyFCz77bT2+mTh4rNEYf
+t1haWSfosy8mzWdQDdhGBLXT+PVN+jL7hTs8CAUgTjhcLYB5ZE0K5aYwZWXI3Vei
+GdUU/GLKFdNXKt0QgW/1rCXhZVwYpnSqid48pbxI5COcpDdT5tt/veKmT81UJU1j
+tCQ6aziLIV3xXc4b1BX3McwfnvOq6m/KVudOIQTWq6lbSzud61NiJyfkgEpDpuU=
+=fwR0
 -----END PGP SIGNATURE-----
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.11.0-build.patch b/games-roguelike/stone-soup/files/stone-soup-0.11.0-build.patch
deleted file mode 100644
index 772f670f04c6..000000000000
--- a/games-roguelike/stone-soup/files/stone-soup-0.11.0-build.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Oct  5 13:55:07 UTC 2012
-Subject: build system 
-
-	respect flags and compiler
-
---- source/Makefile
-+++ source/Makefile
-@@ -112,7 +112,7 @@
- 
- else
- 
--CFOPTIMIZE := -O2
-+CFOPTIMIZE := $(CXXFLAGS)
- 
- endif # USE_ICC
- 
-@@ -120,21 +120,19 @@
- CFOPTIMIZE += -flto=jobserver -fwhole-program
- endif
- 
--CFOTHERS := -pipe $(EXTERNAL_FLAGS)
-+CFOTHERS := $(EXTERNAL_FLAGS)
- CFWARN := -Wall -Wformat-security
- CFWARN_L := -Wundef
- 
- DEFINES := $(EXTERNAL_DEFINES)
- 
--LDFLAGS := $(EXTERNAL_LDFLAGS)
--
- #
- # The GCC and GXX variables are set later.
- #
--AR = ar
--RANLIB = ranlib
--CC = $(GCC)
--CXX = $(GXX)
-+AR ?= ar
-+RANLIB ?= ranlib
-+CC ?= $(GCC)
-+CXX ?= $(GXX)
- RM = rm -f
- COPY = cp
- COPY_R = cp -r
-@@ -145,7 +143,7 @@
- PNGCRUSH = $(COPY)
- PNGCRUSH_LABEL = COPY
- ADVPNG = advpng -z -4
--PKGCONFIG = pkg-config
-+PKGCONFIG ?= pkg-config
- DOXYGEN = doxygen
- DOXYGEN_SIMPLE_CONF = crawl_simple.doxy
- DOXYGEN_ALL_CONF = crawl_all.doxy
-@@ -1228,7 +1226,6 @@
- endif
- 	[ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix)
- 	$(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/
--	$(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME)
- 	mkdir -p $(datadir_fp)/dat/des
- 	mkdir -p $(datadir_fp)/dat/dlua
- 	mkdir -p $(datadir_fp)/dat/clua
-@@ -1570,7 +1567,7 @@
- 
- .PHONY: build-rltiles
- build-rltiles: .contrib-libs $(RLTILES)/dc-unrand.txt
--	+$(MAKE) -C $(RLTILES) all ARCH=$(ARCH) TILES=$(TILES)$(WEBTILES)
-+	+$(MAKE) -C $(RLTILES) all ARCH=$(ARCH) DEBUG=$(DEBUG) TILES=$(TILES)$(WEBTILES)
- 
- $(TILEDEFSRCS) $(TILEDEFHDRS) $(ORIGTILEFILES): build-rltiles
- 
---- source/rltiles/Makefile
-+++ 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 @@
- # 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 TILES
-   ifndef CONTRIB_SDL
-@@ -29,24 +29,24 @@
-     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
-@@ -127,9 +127,9 @@
- distclean: clean
- 
- %.o: %.cc .cflags
--	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -Wp,-MMD,$*.d,-MT,$@ -c $< -o $@
-+	$(CXX) $(CXXFLAGS) -Wp,-MD,$*.d,-MT,$@ -c $< -o $@
- 
- $(TILEGEN): $(OBJECTS)
--	$(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS)
-+	$(CXX) $(CXXFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS)
- 
- .PHONY: all clean distclean
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.11.1-build.patch b/games-roguelike/stone-soup/files/stone-soup-0.11.1-build.patch
deleted file mode 100644
index 772f670f04c6..000000000000
--- a/games-roguelike/stone-soup/files/stone-soup-0.11.1-build.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Oct  5 13:55:07 UTC 2012
-Subject: build system 
-
-	respect flags and compiler
-
---- source/Makefile
-+++ source/Makefile
-@@ -112,7 +112,7 @@
- 
- else
- 
--CFOPTIMIZE := -O2
-+CFOPTIMIZE := $(CXXFLAGS)
- 
- endif # USE_ICC
- 
-@@ -120,21 +120,19 @@
- CFOPTIMIZE += -flto=jobserver -fwhole-program
- endif
- 
--CFOTHERS := -pipe $(EXTERNAL_FLAGS)
-+CFOTHERS := $(EXTERNAL_FLAGS)
- CFWARN := -Wall -Wformat-security
- CFWARN_L := -Wundef
- 
- DEFINES := $(EXTERNAL_DEFINES)
- 
--LDFLAGS := $(EXTERNAL_LDFLAGS)
--
- #
- # The GCC and GXX variables are set later.
- #
--AR = ar
--RANLIB = ranlib
--CC = $(GCC)
--CXX = $(GXX)
-+AR ?= ar
-+RANLIB ?= ranlib
-+CC ?= $(GCC)
-+CXX ?= $(GXX)
- RM = rm -f
- COPY = cp
- COPY_R = cp -r
-@@ -145,7 +143,7 @@
- PNGCRUSH = $(COPY)
- PNGCRUSH_LABEL = COPY
- ADVPNG = advpng -z -4
--PKGCONFIG = pkg-config
-+PKGCONFIG ?= pkg-config
- DOXYGEN = doxygen
- DOXYGEN_SIMPLE_CONF = crawl_simple.doxy
- DOXYGEN_ALL_CONF = crawl_all.doxy
-@@ -1228,7 +1226,6 @@
- endif
- 	[ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix)
- 	$(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/
--	$(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME)
- 	mkdir -p $(datadir_fp)/dat/des
- 	mkdir -p $(datadir_fp)/dat/dlua
- 	mkdir -p $(datadir_fp)/dat/clua
-@@ -1570,7 +1567,7 @@
- 
- .PHONY: build-rltiles
- build-rltiles: .contrib-libs $(RLTILES)/dc-unrand.txt
--	+$(MAKE) -C $(RLTILES) all ARCH=$(ARCH) TILES=$(TILES)$(WEBTILES)
-+	+$(MAKE) -C $(RLTILES) all ARCH=$(ARCH) DEBUG=$(DEBUG) TILES=$(TILES)$(WEBTILES)
- 
- $(TILEDEFSRCS) $(TILEDEFHDRS) $(ORIGTILEFILES): build-rltiles
- 
---- source/rltiles/Makefile
-+++ 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 @@
- # 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 TILES
-   ifndef CONTRIB_SDL
-@@ -29,24 +29,24 @@
-     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
-@@ -127,9 +127,9 @@
- distclean: clean
- 
- %.o: %.cc .cflags
--	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -Wp,-MMD,$*.d,-MT,$@ -c $< -o $@
-+	$(CXX) $(CXXFLAGS) -Wp,-MD,$*.d,-MT,$@ -c $< -o $@
- 
- $(TILEGEN): $(OBJECTS)
--	$(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS)
-+	$(CXX) $(CXXFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS)
- 
- .PHONY: all clean distclean
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.12.1-build.patch b/games-roguelike/stone-soup/files/stone-soup-0.12.2-build.patch
index 018ec6321c52..ce5fb4f03b4f 100644
--- a/games-roguelike/stone-soup/files/stone-soup-0.12.1-build.patch
+++ b/games-roguelike/stone-soup/files/stone-soup-0.12.2-build.patch
@@ -6,16 +6,16 @@ Subject: build system
 
 --- source/Makefile
 +++ source/Makefile
-@@ -119,7 +119,7 @@
+@@ -101,7 +101,7 @@
+ #
  
- endif # USE_ICC
  
 -CFOTHERS := -pipe $(EXTERNAL_FLAGS)
 +CFOTHERS := $(EXTERNAL_FLAGS)
  CFWARN := -Wall -Wformat-security
  CFWARN_L := -Wundef
  
-@@ -730,7 +718,6 @@
+@@ -733,7 +733,6 @@
  DEFINES += -DFULLDEBUG
  endif
  ifdef DEBUG
@@ -23,7 +23,7 @@ Subject: build system
  DEFINES += -DDEBUG
  endif
  ifndef NOWIZARD
-@@ -1485,7 +1472,7 @@
+@@ -1488,7 +1487,7 @@
          # prove that tiles were generated properly
  	grep tile_info rltiles/*.cc| head
  else
diff --git a/games-roguelike/stone-soup/stone-soup-0.11.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.11.0.ebuild
deleted file mode 100644
index 8d2a107b3100..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.11.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2013 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.11.0.ebuild,v 1.5 2013/02/07 22:11:48 ulm Exp $
-
-## TODO
-# add sound support (no build switch, no sound files)
-
-EAPI=4
-VIRTUALX_REQUIRED="manual"
-inherit eutils gnome2-utils virtualx games
-
-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="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 +tiles"
-# test is broken
-# see https://crawl.develz.org/mantis/view.php?id=6121
-#RESTRICT="!debug? ( test )"
-RESTRICT="test"
-
-RDEPEND="
-	dev-db/sqlite:3
-	sys-libs/zlib
-	tiles? (
-		media-libs/freetype:2
-		media-libs/libpng:0
-		media-libs/libsdl[X,opengl,video]
-		media-libs/sdl-image[png]
-		)
-	!tiles? ( sys-libs/ncurses )
-	>=dev-lang/lua-5.1.0[deprecated]"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/flex
-	virtual/yacc
-	tiles? (
-		sys-libs/ncurses
-		virtual/pkgconfig
-		test? ( ${VIRTUALX_DEPEND} )
-		)"
-
-S=${WORKDIR}/${MY_P}/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() {
-	S_TEST=${WORKDIR}/${MY_P}_test/source
-
-	# leave DATADIR at the top
-	myemakeargs=(
-		DATADIR="${GAMES_DATADIR}/${PN}"
-		V=1
-		prefix="${GAMES_PREFIX}"
-		SAVEDIR="~/.crawl"
-		$(usex debug "FULLDEBUG=y DEBUG=y" "")
-		$(usex tiles "TILES=y" "")
-	)
-
-	emake ${myemakeargs[@]}
-
-	# 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[@]} DESTDIR="${D}" install
-
-	# 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
-
-	echo
-	elog "Your old config folder under '~/.crawl' is not compatible"
-	elog "with the new version. Remove it."
-	echo
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-roguelike/stone-soup/stone-soup-0.11.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.11.1-r1.ebuild
deleted file mode 100644
index 8b69518cd0fa..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.11.1-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2013 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.11.1-r1.ebuild,v 1.3 2013/02/07 22:11:48 ulm Exp $
-
-## TODO
-# add sound support (no build switch, no sound files)
-
-EAPI=5
-VIRTUALX_REQUIRED="manual"
-inherit eutils gnome2-utils virtualx games
-
-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="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"
-# test is broken
-# see https://crawl.develz.org/mantis/view.php?id=6121
-#RESTRICT="!debug? ( test )"
-RESTRICT="test"
-
-RDEPEND="
-	dev-db/sqlite:3
-	sys-libs/zlib
-	tiles? (
-		media-libs/freetype:2
-		media-libs/libpng:0
-		media-libs/libsdl[X,opengl,video]
-		media-libs/sdl-image[png]
-		)
-	ncurses? ( sys-libs/ncurses )
-	>=dev-lang/lua-5.1.0[deprecated]"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/flex
-	virtual/yacc
-	tiles? (
-		sys-libs/ncurses
-		virtual/pkgconfig
-		test? ( ${VIRTUALX_DEPEND} )
-		)"
-
-REQUIRED_USE="|| ( ncurses tiles )"
-
-S=${WORKDIR}/${MY_P}/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() {
-	S_TEST=${WORKDIR}/${MY_P}_test/source
-
-	# leave DATADIR at the top
-	myemakeargs=(
-		DATADIR="${GAMES_DATADIR}/${PN}"
-		V=1
-		prefix="${GAMES_PREFIX}"
-		SAVEDIR="~/.crawl"
-		$(usex debug "FULLDEBUG=y DEBUG=y" "")
-	)
-
-	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
-
-	echo
-	elog "Your old config folder under '~/.crawl' is not compatible"
-	elog "with the new version. Remove it."
-	echo
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-roguelike/stone-soup/stone-soup-0.12.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.12.2.ebuild
index 24993553acd8..d57802e174e7 100644
--- a/games-roguelike/stone-soup/stone-soup-0.12.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.12.1.ebuild,v 1.1 2013/05/05 16:06:40 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/stone-soup-0.12.2.ebuild,v 1.1 2013/06/04 20:45:30 hasufell Exp $
 
 ## TODO
 # add sound support (no build switch, no sound files)