version bump

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

4 files changed, 275 insertions, 9 deletions

diff --git a/games-roguelike/stone-soup/ChangeLog b/games-roguelike/stone-soup/ChangeLog
index 9476a15a11b3..8f79c7948a61 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.3 2012/10/05 14:13:29 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/ChangeLog,v 1.4 2012/11/22 17:25:29 hasufell Exp $
+
+*stone-soup-0.11.1 (22 Nov 2012)
+
+  22 Nov 2012; Julian Ospald <hasufell@gentoo.org> +stone-soup-0.11.1.ebuild,
+  +files/stone-soup-0.11.1-build.patch:
+  version bump
 
 *stone-soup-0.11.0 (05 Oct 2012)
 
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index efb43183cf01..b700c04cb7ca 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -3,22 +3,25 @@ Hash: SHA256
 
 AUX stone-soup-0.10.3-build.patch 3405 SHA256 ee0019200324498d32630884c9d31b207c67078d5af6e94c8cb0de7ea66ebf6c SHA512 547a1318b24c4a4f01684afacd73a680d4b983aab9a80205a35ae33e3e831427fb1273e6dc0b7936c5f594c924563d34c40d5f726976326759f8ccd20ef71a5e WHIRLPOOL 3cb6a2cc3557ea6efd6fb261ec91861b0637abf0bdc37a2192793d857ea2adbbc992073783d19be04008cb033e928b61aa8e74fc6cf6b02a6369636e3d5c8499
 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
 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.10.3-nodeps.tar.xz 6486324 SHA256 c61801030486bb7020992d95573fb9378e80355c400b82cfa0f476dbd823c4a2 SHA512 57f93c0a5c541aadd426ac918b6db4ec38e5e098f2aa33d70e0b5980f8d753f54c9e4da23d47311b1acf93443e3de4b8e480ab9762c1e922edcf27de0a8ead7c WHIRLPOOL 9070a2ba8825a074578e2179a226ab259e51905d370f8cf66fab9e8485de136aabc84d7ef0fe9677b7c3905660843537524f04ee050a566f9ddccf10fcd6f5b5
 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
 EBUILD stone-soup-0.10.3.ebuild 2883 SHA256 5b008bbf1af9f6e6c9de137eb0815efdd26fb91263cc6a35ad5d5ca7b8739479 SHA512 5800c7b6fe5b77d46f4ca436b2b7f60453d5bc5122f214a786da1cb51c536a1abe89a0292a9d508d904c5fa422fae8e9ee6843cd507ed6d40fd432e0da44c5ab WHIRLPOOL 648f4f3c1fcb36eb399e3dbdd1e3b72d1cddd8d0ba83f12f83b548611bd520a2ef3e2bc22c486309a6d57874d545c3ffca00437d30e1b27950541dabed47b522
 EBUILD stone-soup-0.11.0.ebuild 2997 SHA256 11eed50e4efd78c754164daaf68b6d8b1aeb36959138388f73495aa23684a95c SHA512 77e5cd6671245d5741f4e306e9f81b27370e774af43a78b99f19a6719f9756af5d99d55e939ac5d1dfdc21ccf7e4649e8bc8eb9e6687dc113e752f320ba39314 WHIRLPOOL 99ee78b2394e60db07c6a205bf93594c0f15445dc1347039a6caa8e485172c2e0e39d7088b3734ba23939189ad4f7b456bd57cf250052b4a4e383c23a03f4545
-MISC ChangeLog 729 SHA256 bf9d9524f892df03dffaa87423f092c41f90190e0b4bd99a47c816eacbf37f04 SHA512 8a12f0e03e3e5a003c0c0088ddb68c4f3b44d6d671f2eff418c2b20075246f1f43833dd4400b1207b36748ccfaaf622f97943a11480d1913b2f8f0d5b82005b7 WHIRLPOOL ea8e6bb2989d03eab74a5c6ecd379a0ca5ff0bdc97244bcf8415966a7b5296eb668731f3d29f8d4ef31984f555615b813df5d9a7b6141bbd36c26995d7e1cc8c
+EBUILD stone-soup-0.11.1.ebuild 2997 SHA256 5de439a44fa343aac08c73ccb3b35ae569fb0c8be68e2ae53374839eda8582b0 SHA512 27571a44a428ae3f3eac7678b080edc8a3d90b0ca46e0ccf0d26b5359340df189dda51cc0cfa60d9594c4cf452cba407b378730917b7fe9f1686a4a52dd0ec2e WHIRLPOOL 707499b9cd34fdf7c42483a3e8df9723542e09cfcb1beba6cca3cbdfc9c819a8649a7ab959da8a15454d34a1d7c9b1e446b6b3b9492833543beb867f6ca87fd7
+MISC ChangeLog 897 SHA256 0891caf4afbd0fedae4dbf0d3ed8e42099c14d4af75cb43f6aa5b32827eb4791 SHA512 d27a685378ee948de4e7487df2419d6ebadd02fd1ee7fbc09f97c6b49b2cce2875e1ca64e240280b528ebaa527214762af9890512c85865ee05a029699353bbb WHIRLPOOL 4a74fa26e3548cf847d719047daa6c5d55e1b6f636696c5f214b8587059674588daca47ca35581796955569139f9c7a1791d5ccecbc8f0475005b82208cf23af
 MISC metadata.xml 1452 SHA256 1c622ae995da8eefcec3e181ed7b400f211d7ab959bbd1b79c304319f9607026 SHA512 4c793107dd763b4c3849b0210e568899f5962403b2d1e4aa609c387c35800463d6c7326e64b168d41ae634258c28b271ac4d6fefcfc01bf9bb84a7cdce9e56f1 WHIRLPOOL ed181b375934935aff218204ab004c75f35deb427541320f404b318cba893cd4937e4d7b9f0c465140ed0371b0a067989684dc99dc94b7384310008f163daba5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQbusNAAoJEFpvPKfnPDWzcjsIAKhDXir+mpCJjbxfpBIcFuLU
-RRqKtRG6eV0DDjJsJis3g91Iy/3F0yncqmjJfO6RFh5xpd4mug5bDYHK7hdmLCOw
-BDbsf1myaraL0+ScsGuG+paLgqi9+sUJeMO81QBiCgilaWzo6BKwsGvR/mOt+XDm
-tvpJCctnfAx6sv52zvSdwlK71RDdrIcyNNtb8WVmvcGaSKOpUUOgXAL5FVqjLFUi
-4guSaLsSX0gUinmUf/WZfVnPKd8nqm26z+/G+303lrpjSgB7RswOXNSeBKNL8qsk
-ECymc0sEcY9ma6cRn8jc1mh67Zib34yiOOv9fgEZ+CZ38jcEq6lEV2hrLX9Vthk=
-=BMRL
+iQEcBAEBCAAGBQJQrmANAAoJEFpvPKfnPDWz2TQH/0kpkjRMESR8tk7hWI5tR7UO
+xKNBAPwVvjxh0O7qRvssbqS6xFCBN3T8VWJs6ZaUI0bESH8r+iejgqixjpLew/P8
+3qpjjYE9lBqQkWC3zmXgWeN86jcR45i4M/M+YKNZtarv7mgIRep/lPJEhUvyXutK
+fxSx9WeIeYk5Y9N99hOFnCG8aUfO6+kQjAT3YQz7XXfdMG3rZPIRZtxgy20oNF9V
+AXC8s2AdWymBqHaKMSjSahaatg9oIusgeF4TlfpiETe8FhZIzFQQiI7nzWt0HpTv
+7ZzhLF7ujGbv7X2Q7HrMhf1GAx2t7YTb9Qmyhh5lcEZ98t7xVzXeP62laJ2gh+k=
+=kRQs
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..772f670f04c6
--- /dev/null
+++ b/games-roguelike/stone-soup/files/stone-soup-0.11.1-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.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.11.1.ebuild
new file mode 100644
index 000000000000..c30669990ffb
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.11.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2012 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.ebuild,v 1.1 2012/11/22 17:25:29 hasufell 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-Universal MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +lua +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 )
+	lua? ( >=dev-lang/lua-5.1.0 )"
+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 lua "" "NO_LUA_BINDINGS=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
+}