version bump, rm old

(Portage version: 2.2.12-r1/cvs/Linux x86_64, signed Manifest commit with key BDEED020)

5 files changed, 10 insertions, 246 deletions

diff --git a/games-roguelike/stone-soup/ChangeLog b/games-roguelike/stone-soup/ChangeLog
index 4805a7518a0c..7dcb18182589 100644
--- a/games-roguelike/stone-soup/ChangeLog
+++ b/games-roguelike/stone-soup/ChangeLog
@@ -1,6 +1,14 @@
 # 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.36 2014/09/05 20:18:13 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/ChangeLog,v 1.37 2014/09/23 15:37:10 hasufell Exp $
+
+*stone-soup-0.15.1 (23 Sep 2014)
+
+  23 Sep 2014; Julian Ospald <hasufell@gentoo.org> -stone-soup-0.13.1.ebuild,
+  -stone-soup-0.15.0.ebuild, +stone-soup-0.15.1.ebuild,
+  -files/stone-soup-0.13.1-build.patch, -files/stone-soup-0.15.0-build.patch,
+  +files/stone-soup-0.15.1-build.patch:
+  version bump, rm old
 
 *stone-soup-0.15.0 (05 Sep 2014)
 
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.15.0-build.patch b/games-roguelike/stone-soup/files/stone-soup-0.15.0-build.patch
deleted file mode 100644
index 5409c493780d..000000000000
--- a/games-roguelike/stone-soup/files/stone-soup-0.15.0-build.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Oct  5 13:55:07 UTC 2012
-Subject: build system 
-
-	respect flags and compiler
-
---- 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
- 
-@@ -747,7 +747,6 @@ ifdef FULLDEBUG
- DEFINES += -DFULLDEBUG
- endif
- ifdef DEBUG
--CFOTHERS := -ggdb $(CFOTHERS)
- DEFINES += -DDEBUG
- endif
- ifndef NOWIZARD
-@@ -1513,7 +1512,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
---- 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
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.13.1-build.patch b/games-roguelike/stone-soup/files/stone-soup-0.15.1-build.patch
index 5409c493780d..5409c493780d 100644
--- a/games-roguelike/stone-soup/files/stone-soup-0.13.1-build.patch
+++ b/games-roguelike/stone-soup/files/stone-soup-0.15.1-build.patch
diff --git a/games-roguelike/stone-soup/stone-soup-0.13.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.13.1.ebuild
deleted file mode 100644
index dd474472f355..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.13.1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# 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.13.1.ebuild,v 1.4 2014/08/19 21:22:27 hasufell Exp $
-
-## TODO
-# add sound support (no build switch, no sound files)
-
-# check if luajit works
-
-# 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}-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
-}
diff --git a/games-roguelike/stone-soup/stone-soup-0.15.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.15.1.ebuild
index ae99da95551c..f774ac800b68 100644
--- a/games-roguelike/stone-soup/stone-soup-0.15.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.15.1.ebuild
@@ -1,6 +1,6 @@
 # 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.0.ebuild,v 1.1 2014/09/05 20:18:13 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/stone-soup-0.15.1.ebuild,v 1.1 2014/09/23 15:37:10 hasufell Exp $
 
 ## TODO
 # add sound support (no build switch, no sound files)