commit: 1f587f5cfd4306dade3dd132063fe835979246bb Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> AuthorDate: Tue Jun 28 17:34:01 2016 +0000 Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> CommitDate: Tue Jun 28 17:34:01 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f587f5c
games-roguelike/stone-soup: old Package-Manager: portage-2.2.28 games-roguelike/stone-soup/Manifest | 1 - .../stone-soup/files/stone-soup-0.14.2-build.patch | 99 ------------- .../stone-soup/stone-soup-0.14.2-r1.ebuild | 162 --------------------- 3 files changed, 262 deletions(-) diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest index 3482e60..a247fb3 100644 --- a/games-roguelike/stone-soup/Manifest +++ b/games-roguelike/stone-soup/Manifest @@ -1,4 +1,3 @@ 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.14.2-nodeps.tar.xz 8843692 SHA256 3f70687690b6dbb427d86eb21b1c65894846526fe20553cabec172ca6bae79bf SHA512 d852a85ce07dff41ad4c5a611e9b21fa30be6db80b72b0e434baad8d449ecfa554e981209389a79e68aa9418c00972a6cf8098bfecdc847750e0ab3fc99e3f70 WHIRLPOOL 8ff166e43d6e99426135575be470645aab34838db871f0b3ce2fd0c8434466e7d9f8bb02d8d0a7e5a5f313c2673856944f4c6dac49c9377f65fe43b1cf90ce9b DIST stone_soup-0.16.2.tar.xz 27843008 SHA256 49d5947abb341eb7f0590fa538c475e68ea954064c615d852de968211b68780b SHA512 fc48a1161028fbfc3c1b91bf717ffdeb761dc03a12aa8282f2235fe86368de343dd91ee33371fe4f682f4f84a8fc339d6984b6357527c3cf0c4139cb69cd5633 WHIRLPOOL 2016018e438e857031c382e53e904126efd7006a1da4b954b3b5eb4f5a9263e8535e7300fa8f54f8a870bf99b362cc0bdda630ea562e2f786e3d88c5b38d0c54 diff --git a/games-roguelike/stone-soup/files/stone-soup-0.14.2-build.patch b/games-roguelike/stone-soup/files/stone-soup-0.14.2-build.patch deleted file mode 100644 index 5409c49..0000000 --- a/games-roguelike/stone-soup/files/stone-soup-0.14.2-build.patch +++ /dev/null @@ -1,99 +0,0 @@ -From: Julian Ospald <hasuf...@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/stone-soup-0.14.2-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.14.2-r1.ebuild deleted file mode 100644 index 72ef9cd..0000000 --- a/games-roguelike/stone-soup/stone-soup-0.14.2-r1.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -## 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="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 - 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="!debug? ( test )" -RESTRICT="test" - -RDEPEND=" - dev-db/sqlite:3 - luajit? ( >=dev-lang/luajit-2.0.0 ) - !luajit? ( >=dev-lang/lua-5.1.0:0[deprecated] ) - sys-libs/zlib - !ncurses? ( !tiles? ( sys-libs/ncurses ) ) - 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 - -pkg_setup() { - games_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() { - 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=( - USE_LUAJIT=$(usex luajit "yes" "") - 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 || (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 - - # 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}" prefix_fp="" bin_prefix="${D}${GAMES_BINDIR}" 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 - - 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 -}