From 38d7daa3f382c1c0b69a7de1bab029ffa8fa1437 Mon Sep 17 00:00:00 2001 From: Erik Mackdanz Date: Sat, 9 Feb 2019 18:08:15 -0600 Subject: games-roguelike/stone-soup: Bump to 0.23.0 Signed-off-by: Erik Mackdanz Package-Manager: Portage-2.3.59, Repoman-2.3.12 --- games-roguelike/stone-soup/Manifest | 1 + .../stone-soup-0.20.1-rltiles-ldflags-libs.patch | 45 ------- .../stone-soup/stone-soup-0.23.0.ebuild | 143 +++++++++++++++++++++ 3 files changed, 144 insertions(+), 45 deletions(-) delete mode 100644 games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch create mode 100644 games-roguelike/stone-soup/stone-soup-0.23.0.ebuild diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest index 36ddd33178a2..ce8d9856e027 100644 --- a/games-roguelike/stone-soup/Manifest +++ b/games-roguelike/stone-soup/Manifest @@ -1,3 +1,4 @@ DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc DIST stone-soup.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f DIST stone_soup-0.22.0.tar.xz 29263688 BLAKE2B e0a4d6953677583fafe1fce037d4d484c821b4d8782c63fa90b6b4f5db3df7b8fd4c5e843740517a7c2321f864df2a346fcd9bc69a1446c74685afc239d1fc55 SHA512 e8daa0f66a5212b116ce997b30b8f0f9ef01cef7e1213a1b6fe17c800d44fa7e318624902ce638dee79027ffaa3a4af8a10f6552de756a2045b5919d817498bd +DIST stone_soup-0.23.0.tar.xz 29899848 BLAKE2B 138f3c9fe1ad395d05d0654ea42788c6312e92839c6b92edfa538123b8b566f62d263862b05c6da64d589938c820b876e12475b0eeb16af7dd2e3f62c441eecb SHA512 6b53b5d670130aac451d09fe842e7654f61c131d126b34ed729d4542e9d2cbe2beaa6cd5f0b2bb78744ae6c643040996e39db8b0b3840c8946e442aaff54ff58 diff --git a/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch b/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch deleted file mode 100644 index 010c729b92eb..000000000000 --- a/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/rltiles/Makefile -+++ b/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 -@@ -29,7 +29,7 @@ - endif - - CFLAGS += $(PNG_INCLUDE) -- LDFLAGS += $(PNG_LIB) -+ LIBS += $(PNG_LIB) - - CFLAGS += -DUSE_TILE - endif -@@ -39,13 +39,13 @@ - endif - - ifneq (,$(findstring MINGW,$(uname_S))) --LDFLAGS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid -+LIBS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid - endif - ifeq ($(uname_S),Darwin) --LDFLAGS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL -+LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -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 -@@ -134,6 +134,6 @@ - $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@ - - $(TILEGEN): $(OBJECTS) -- $(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) -+ $(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS) - - .PHONY: all clean distclean diff --git a/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild new file mode 100644 index 000000000000..876c7001d735 --- /dev/null +++ b/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +## TODO +# add sound support (no sound files) + +EAPI=6 +VIRTUALX_REQUIRED="manual" +inherit eutils gnome2-utils toolchain-funcs eapi7-ver + +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=" + https://crawl.develz.org/release/$(ver_cut 1-2)/${PN/-/_}-${PV}.tar.xz + https://dev.gentoo.org/~hasufell/distfiles/${PN}.png + https://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 luajit ncurses test +tiles" +# test is broken +# see https://crawl.develz.org/mantis/view.php?id=6121 +RESTRICT="test" + +RDEPEND=" + dev-db/sqlite:3 + luajit? ( >=dev-lang/luajit-2.0.0 ) + sys-libs/zlib + !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) + ncurses? ( sys-libs/ncurses:0 ) + tiles? ( + media-fonts/dejavu + media-libs/freetype:2 + media-libs/libpng:0 + media-libs/libsdl2[X,opengl,video] + media-libs/sdl2-image[png] + virtual/glu + virtual/opengl + )" +DEPEND="${RDEPEND} + dev-lang/perl + sys-devel/flex + virtual/pkgconfig + virtual/yacc + tiles? ( + sys-libs/ncurses:0 + )" + +S=${WORKDIR}/${MY_P}/source +S_TEST=${WORKDIR}/${MY_P}_test/source +PATCHES=( + "${FILESDIR}"/${PN}-0.20.1-rltiles-ldflags-libs.patch +) + +pkg_setup() { + if use !ncurses && use !tiles ; then + ewarn "Neither ncurses nor tiles frontend" + ewarn "selected, choosing ncurses only." + ewarn "Note that you can also enable both." + fi +} + +src_prepare() { + default + + rm -r contrib/{fonts,freetype,libpng,pcre,sdl2,sdl2-image,sdl2-mixer,sqlite,zlib} || die +} + +src_compile() { + export HOSTCXX=$(tc-getBUILD_CXX) + + # leave DATADIR at the top + myemakeargs=( + $(usex debug "FULLDEBUG=y DEBUG=y" "") + $(usex luajit "" "BUILD_LUA=yes") # luajit is not bundled + AR="$(tc-getAR)" + CFOPTIMIZE='' + CFOTHERS="${CXXFLAGS}" + DATADIR="/usr/share/${PN}" + GCC="$(tc-getCC)" + GXX="$(tc-getCXX)" + LDFLAGS="${LDFLAGS}" + MAKEOPTS="${MAKEOPTS}" + PKGCONFIG="$(tc-getPKG_CONFIG)" + RANLIB="$(tc-getRANLIB)" + SAVEDIR="~/.crawl" + STRIP=touch + USE_LUAJIT=$(usex luajit "yes" "") + V=1 + prefix="/usr" + ) + + if use ncurses || (use !ncurses && use !tiles) ; 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 +} + +src_install() { + emake "${myemakeargs[@]}" $(usex tiles "TILES=y" "") DESTDIR="${D}" prefix_fp="" bin_prefix="${D}/usr/bin" install + [[ -e "${WORKDIR}"/crawl-ncurses ]] && dobin "${WORKDIR}"/crawl-ncurses + + # don't relocate docs, needed at runtime + rm -rf "${D}/usr/share/${PN}"/docs/license + + # 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 +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + + if use tiles && use ncurses ; then + elog "Since you have enabled both tiles and ncurses frontends" + elog "the ncurses binary is called 'crawl-ncurses' and the" + elog "tiles binary is called 'crawl'." + fi +} + +pkg_postrm() { + gnome2_icon_cache_update +} -- cgit v1.2.3-18-g5258