version bump

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

4 files changed, 286 insertions, 10 deletions

diff --git a/games-roguelike/stone-soup/ChangeLog b/games-roguelike/stone-soup/ChangeLog
index ff1e709a9538..801b9579ac8c 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/ChangeLog,v 1.9 2012/12/13 18:17:05 hasufell Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/ChangeLog,v 1.10 2013/01/26 23:02:16 hasufell Exp $
+
+*stone-soup-0.11.2 (26 Jan 2013)
+
+  26 Jan 2013; Julian Ospald <hasufell@gentoo.org> +stone-soup-0.11.2.ebuild,
+  +files/stone-soup-0.11.2-build.patch:
+  version bump
 
   13 Dec 2012; Julian Ospald <hasufell@gentoo.org> -stone-soup-0.10.3.ebuild,
   -files/stone-soup-0.10.3-build.patch, -stone-soup-0.11.1.ebuild:
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 27822748ba5f..382d1ea25b59 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -3,22 +3,25 @@ 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
 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
 EBUILD stone-soup-0.11.0.ebuild 2956 SHA256 989ef3a1de2cbce9351db2c2497952b509114994f63b38f1b0e5f81fc915212e SHA512 feb2660bcb1ec9d9674a85270ddeafc791fcc55e95a8ab1c1f9fef900d6c6a83a21e74414448dfc95779fc8a327d5ad00cca4f1642f3610c9e2abae57f1522cd WHIRLPOOL 9c30814f2f420be1e6827caba18862676e736435849f4e8b1a312d8abfe009d9a4ab21c3d972d9cfcd5b3fbbb21ea4ba840d2f6318f72e9238410708e22b4b45
 EBUILD stone-soup-0.11.1-r1.ebuild 3298 SHA256 07b728209fe220fba541a5e908668d8472780eaf4a5351e0b9e0fc682b8cd9ba SHA512 5a0d9953a70ac45e3699a39bb3e10914c2e97aab46effdccc19ae7eb8ec26e33b27a757e7d67b593a03fa839a3a040c475a3e837a032d8f774d0373f9c66c86f WHIRLPOOL e55c70aa63971e039cb241abd29baa42f6a56b023af4becf47cdd68e8240b9877b51f78d76107fdb309b7d88782005b655af57f7e7c2d5211615d530bfe3c532
-MISC ChangeLog 1709 SHA256 e04ab9af8e85ef4fb88be6a099f791da44dffb172cb17b2952ec35b2a99d3848 SHA512 bdb8e277a0b3a9768e89d5f553f989b6f40d3d656d491234accd4427d31f2d488b035b1538e75cfbd7fc32c85578b55a74b1151db2f8fd24a28be7c6599ecd91 WHIRLPOOL b2c3e78189a5841fb16c1ff0ff6fd767ed847262e61a69de6b0553473def635adcb4d01beb6ab2e69916675dda8830739cd1e3d320dfc5b4f0f65b7d672ad4f0
+EBUILD stone-soup-0.11.2.ebuild 3295 SHA256 701c60ce449a3b84ce361b25366bffdcd9d4cdef7a412101bf6fd0cd82feb972 SHA512 6b385e6c9cb6f28fb9572db233488ee235489f9cae416f48c39d06bf4e71e846318d0dd370cf050dd81dfed995923be103de3862e3141fde86206fe18a87b0a3 WHIRLPOOL af4cac532bee614d661fe186cfa6bda28ef60b05531cad16a0dcc8968fea0f0cb0f1e06cca581c88441e81a8993ef1c24f1b445b3744ac3309c574dfd6f35103
+MISC ChangeLog 1878 SHA256 60f60794b98ff4bfd197412e0675d2d1f52ff953273731241026150779b77083 SHA512 33bc231a291f3eed289e336340bdf4d02d2407ec4192f34ca4bc2827cb586901902ae734ee826df6b666a8219a9bbf5eeea3efa6986ecb8fc7f7bfbfa171b3bc WHIRLPOOL 93933cd7ff1490fac53745607aeeecbc6afaeeab9bd9f26ff6d6f1240487393a6191a3f03f42a359f106a8cf529965757667afcde9e2935aa24f3686f71a5e02
 MISC metadata.xml 1503 SHA256 aa2c7c89f65bb62311e407b2786549b917a89c3c65182dea9b47d5a8dbc1a295 SHA512 6808e1b61bbe2b4fa78699432781665919ebe01672e57838f75eca24dc79ae4126d6076daf6b2e6870886d3214a9efe4963520a0c7ae15b3b47dec32a03ad5bb WHIRLPOOL 5b71d200df668c137771b1c5d415c97cb37716633c3a346d124c56e1ac1311b1686444b2b57e6d78e2f633f561fbc1468941a1fff926d074d8d2dc33b6212031
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQyhumAAoJEFpvPKfnPDWzxt8H/2dR/oXn5pvnm7pQEJFDIlvB
-le+ikzKPcILMI/8YePv82nJRcontG7VtMr9wOzwIK2/Jt2cBthB9LIcCbKoy7Od5
-5lMPzzO50GOQOYBHBNk/VWRSsof0xHkN2DVxaWs5Ow1K8ASFUKQI//KxGf/UWczY
-ecb4f3CnAQl3q0rHVLl+3l4CQAASzTqfUo37O/rXrFpzxmw+blnFn69kwOW5m2bn
-o40Is+l9rqMR4NxZ/wv3GKLpUrx/DH6sM7ejqJMdWdlwcmzkhGrUltNWRqU4AhEi
-q1NJacS6UMrkeaYaHKMSqVmH4MWVMAvqMIGM5vHuUJUaU3pNSeIy3gKTkzOo/C0=
-=GiQ3
+iQEcBAEBCAAGBQJRBGB8AAoJEFpvPKfnPDWz0+kH/3mWIo6sghzTeOnD8YNtyDgf
+sG+zAinyARwelQ+ZUol15yMFfYn8JEm+SrRMcg0drIIo9TuYqqdXoycdOX8Fgzve
+SzoRMMa8w6XqhZ0NtEbBPaXC3jOWbWVU9fJfJy1ITuEOAl/S5kMKlYRFiTVEtn5h
+kI0Y9X5pOreKNpAIm8exfzwksealvT77dhc/QYlCLGmW60ZCdd0jC/qYoVTjthmY
+fvZe2eGcPF8NmYVrCVb0ekhFYoagycbQPAUrXBZGGkWis0bq5zrVMNlLRYpJDDtx
+HxCQLG4l9qRaChEAHzxTGYPiKPAsU/lpwKWt4jEbK5C+6DtCsrRyyJBGZYHxBlg=
+=WWiK
 -----END PGP SIGNATURE-----
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.11.2-build.patch b/games-roguelike/stone-soup/files/stone-soup-0.11.2-build.patch
new file mode 100644
index 000000000000..772f670f04c6
--- /dev/null
+++ b/games-roguelike/stone-soup/files/stone-soup-0.11.2-build.patch
@@ -0,0 +1,133 @@
+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/stone-soup-0.11.2.ebuild b/games-roguelike/stone-soup/stone-soup-0.11.2.ebuild
new file mode 100644
index 000000000000..00e7194406fa
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.11.2.ebuild
@@ -0,0 +1,134 @@
+# 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.2.ebuild,v 1.1 2013/01/26 23:02:16 hasufell 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-Universal 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
+}