version bump

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

4 files changed, 260 insertions, 9 deletions

diff --git a/games-roguelike/stone-soup/ChangeLog b/games-roguelike/stone-soup/ChangeLog
index d464976c26a9..9014434de85c 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/ChangeLog,v 1.19 2013/08/27 13:36:10 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/ChangeLog,v 1.20 2013/09/23 14:06:40 hasufell Exp $
+
+*stone-soup-0.12.3 (23 Sep 2013)
+
+  23 Sep 2013; Julian Ospald <hasufell@gentoo.org>
+  +files/stone-soup-0.12.3-build.patch, +stone-soup-0.12.3.ebuild:
+  version bump
 
   27 Aug 2013; Julian Ospald <hasufell@gentoo.org> metadata.xml:
   update metadata.xml
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 1205d4e4dcd0..38861fbc526c 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -3,22 +3,25 @@ Hash: SHA256
 
 AUX stone-soup-0.11.2-build.patch 3337 SHA256 7553e5133b0afc49c9ed59c270763c02c939de15e11d7bd571f93e8705d7a241 SHA512 c433cdaf55a9f128573f170540fa69b1f2f8720b6338d58d61dc341f65fbf350bb319c2091bfacf591a855c1f9d031f99b946cf3c634a6e3f81ea57a7bb23a2f WHIRLPOOL 66f02948720dc4129c77067029b28da517981e78d27e2b1e5da9863b12e657d41b3cdc99e2ace854133b93d0290abba64ff863c898a5a141ba98a3ecec6d32d9
 AUX stone-soup-0.12.2-build.patch 2576 SHA256 befc3345c2a0ae4fdee5e3a0ac61e78b1d5b9552cd2f4d9e495457e70183c8b5 SHA512 a4d4e5d68d129f15c3f2214d2cc33fe1f5436dfd3be1f4621383f7589ca6d33314c0c891c1ab9575b013fe0d23bf3876c35b2ba9310fd4059caa500bc6e8ff60 WHIRLPOOL 2426d084e79112b6e815f3916cd0b83b4c559afc397573cbe390ce6ace1df8c3ced791ef8e47ef25e3e5f5fbb6021125c88deee1a5244390f46765df4a27e55f
+AUX stone-soup-0.12.3-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.2-nodeps.tar.xz 7518884 SHA256 ae399a9ef1861918b5cef3224893618167b709d5d72321cc328859e111f8e259 SHA512 28d4fe005727fdc8662581921c33edb325bb561f7be2823bd036bfd84422128a0c85ac774785277f326c92de6ec3743751b86a5f74f12559b77f1fb02f1e1614 WHIRLPOOL 5c65c7efddba01265e9223d90ea539b42750e1d49fc76e7ada94b484244b5fb1301da3b3a883b89e3ebeff92279f92d69999cae69f6cf9de19f4a7d19aeae277
 DIST stone_soup-0.12.2-nodeps.tar.xz 8661464 SHA256 d9ecb2c121596fa635fd98a3f1363038beabf67159c7822e79eaf4698efef274 SHA512 4e961dc3a878a02f3cb88106c0bb23792a05cb99a5491126e83d9c2aa92021db226304ebf21e4334310460ef9c3e593a48e7d99543afbbb714fb407fb558972f WHIRLPOOL 894d19af22d4c422af6f16fa9f9c22d4f66241675077b657ed8031195c241d1b9282d1df9340ac1f756a948b2932019e645a1d9097264281e095bb8f7df079b5
+DIST stone_soup-0.12.3-nodeps.tar.xz 8665464 SHA256 11c43653da7f2862a7f67f6d596f024778cb5618b3d30f74a0bc07b5e8a58fc1 SHA512 b1f82013844cb8ae5778ebac85d3aede6a22667f026b51cb346d6f8ea017ead0357cabec03f112f216506a9f1a628e12b6565b7eb04a906a21534f87940800cf WHIRLPOOL 734c584f817ec14fe2d3cf39386be4da99b8174baf45bcdf85c4d140991bfe15e5a7e88c24da41f57c68efe000f073cdb0899f766d28a000803101d8fe810359
 EBUILD stone-soup-0.11.2.ebuild 3278 SHA256 4b745583b0b4d9ea131c4d73ccaf6893a455270e24d9bf302d9389b82a4a3089 SHA512 75523b3c13c5415aaef98d0f27b37d215a2f99324a112585bbc9c022b40535a6b7e4af9b76dbf49e68196ca6344daa83808880a1114240e2ed17a588000d884a WHIRLPOOL f9f07d0bf2526f94bb83ab9897fff48e8a735df46e36ac4be9a96c583340c48f13487114b07e7a954e6792da5b39a0a3b8dd8da03ab2392bed05253fd225d8c6
 EBUILD stone-soup-0.12.2.ebuild 3630 SHA256 e9d8a2a0516b3c04ad00cdb89d389dd8cea108fe4768ed10a259600d100bece8 SHA512 5377446d1918f2af78ae42c58ad977db7caf6bae080e91844369431980611534304e38ef92633bc4066905fef8bcfc7cccd026d29de6457ed1e289f3dad81c5e WHIRLPOOL 716f9d08444d288895a43d86e60a106a5a8c22680da19cad9a2cc2e1c16a26d89c4f405a06f8b35d5ef3e36dce587950418d9401cfc9966a8072d5274d3c8ea1
-MISC ChangeLog 3271 SHA256 3364391e7ba56a04ee47c33d39c6ba7f54888502862e1b71ce92d66f40d253c8 SHA512 cc003b880a387a14529bba8bebaf60f72bb5a3559f976edb6267370caaed6d5fef42142fdbe74b585928dbf76a6b4085ae41467a9501d0c9f4b252a2b89fee75 WHIRLPOOL e3d83c8cfff0b9b6a93e8fd894ebeaca97a56c6dbcaa41bdd0a210bbdffdc3914167609d715022b27340d10897acfdec9f5bdf5d51335cd7f4e441f3fbe32618
+EBUILD stone-soup-0.12.3.ebuild 3517 SHA256 9b21bd71d14f1a38574d7d6f19ec3db6d7d75b1c9e89e034cdd5222b559bb5ee SHA512 fc0f7092318b64c3b1750eb825967515f309d98e33a68ad64b390a47ba18948d9ca88926109f86ad6256cce593476406af6e7b1fd92c886a6be1d0445b1c5abc WHIRLPOOL c0594ff8456048910f82d0256c6e1e1408cb7637a5611e7016292895e47a97f0974b792f8e60257fde6a75011dc0efa6d6995493b562b01159da3d3a2d45fbcb
+MISC ChangeLog 3439 SHA256 26bbafbed68e3710431a7dff4bea963539edd2cc5a0cff799b695e9255d0706b SHA512 6fe21738cf9b7195eb3b055809c1d1e85d8d0f9aaac88ec4f8013a8c0e3d60544efb797e5230b3ea3149f48c679fed18ceb05307aaed1d0ecb2b51b9f23ef119 WHIRLPOOL 097a3d8064ba789b05ab390f29512f4e79f3301f5689ced12312c075565048226b9170822be8ee5d5f5e449958299a6beda7eeefab39edd0f5e3fb64137b0448
 MISC metadata.xml 1503 SHA256 2d765e18464f1454dd60719d89dbbbb7dffd6c36d5e50457a9766fd30ae7be1e SHA512 6b128a5b573a67e6333cd64813489abc4b451ef1fdf7df97ff2aaf4e7b8f3cdf0d7d5afdd6e930372b4af773d6e365e8d2b7552e765e3b1a8fbe081088c4accd WHIRLPOOL 5d4fdb548f52e4fde8643e7bdab7288ec4220f7b6ea30191fef82ae4a4d131929ca73bf0057f6e796dcbedce11b83a829521c8c4f932aafdd20e9d9f1d6cb703
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSHKtQAAoJEFpvPKfnPDWz88sIAInWQKrBYBMjwiGXHs+AsGU8
-AwMHKEFeM7okT1U+XoLGl3ITu8SgaF+QxijJbixCpiEQUcNjvFou8K1J2G5K2jwy
-KXVQHLrkPZm1OmYg1i7Kv1MY6PO+kyXnNwlDGpbxn+eu7fhC3JJy7bieG9OLS4Gb
-eWtq5xTEyi0BvgQ7LioCX27Vry6QAY2S98DqxXv6lpvSPslw0Dp5o2qg38V5IYfp
-ySCBafJpWXf1M08DyyjWV6+MmV5LPnbhleC1IoHp+3Ayi0tcC4VKEd7jTgBMxrPg
-CpaiG9kmPGJYCAgciE0R1s3tJRII+efF7MeGNxdqZUWwWcGb7iUXkWjCntDPrrg=
-=EIlN
+iQEcBAEBCAAGBQJSQEr0AAoJEFpvPKfnPDWzeTwH/1oYWK+UPdD7cvPa+NgtuPGa
+UXFmxVhIiMnuWpuw6rQAISbzRMXY0BezcS5QKIxy53zeO1BByEo9kSzxVZ6dTdcq
+rk0kHhkyUALWlndIvNUcxrLzGpd5KfHGrXWdv9BVu4cJjuRN4Kbpz4iYPVqRc+9h
+zDVNwK+m0V1UVT0juwKAFB8vvMi4387n3NcoKfFLn83zQzIMvX0Cj9+g445Mq8QG
+dUqBTok3IpxlJ1NMRhQyVscNO7jA9XaeF+38BEh8VmFOQg9NYOGqtqGQGDgan3T3
+KyuIzDhAv/rS/Q0MWtmHMLWOh42JT2N39s2bUQs7fOaX1/9AdUZUvehhWNQXT4Q=
+=3Uv6
 -----END PGP SIGNATURE-----
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.12.3-build.patch b/games-roguelike/stone-soup/files/stone-soup-0.12.3-build.patch
new file mode 100644
index 000000000000..ce5fb4f03b4f
--- /dev/null
+++ b/games-roguelike/stone-soup/files/stone-soup-0.12.3-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
+
+--- source/Makefile
++++ source/Makefile
+@@ -101,7 +101,7 @@
+ #
+ 
+ 
+-CFOTHERS := -pipe $(EXTERNAL_FLAGS)
++CFOTHERS := $(EXTERNAL_FLAGS)
+ CFWARN := -Wall -Wformat-security
+ CFWARN_L := -Wundef
+ 
+@@ -733,7 +733,6 @@
+ DEFINES += -DFULLDEBUG
+ endif
+ ifdef DEBUG
+-CFOTHERS := -ggdb $(CFOTHERS)
+ DEFINES += -DDEBUG
+ endif
+ ifndef NOWIZARD
+@@ -1488,7 +1487,7 @@
+         # 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
+--- 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 ANDROID
+   CXXFLAGS :=
+@@ -35,24 +35,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
+@@ -137,10 +137,10 @@
+ 
+ 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.12.3.ebuild b/games-roguelike/stone-soup/stone-soup-0.12.3.ebuild
new file mode 100644
index 000000000000..a7733a1ba0e2
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.12.3.ebuild
@@ -0,0 +1,143 @@
+# 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.3.ebuild,v 1.1 2013/09/23 14:06:40 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="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"
+REQUIRED_USE="|| ( ncurses tiles )"
+# test is broken
+# see https://crawl.develz.org/mantis/view.php?id=6121
+#RESTRICT="!debug? ( test )"
+RESTRICT="test"
+
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-lang/lua-5.1.0[deprecated]
+	sys-libs/zlib
+	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
+
+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=(
+		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 ; 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
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}