diff options
Diffstat (limited to 'games-roguelike/stone-soup')
| -rw-r--r-- | games-roguelike/stone-soup/Manifest | 8 | ||||
| -rw-r--r-- | games-roguelike/stone-soup/files/gitless.patch | 13 | ||||
| -rw-r--r-- | games-roguelike/stone-soup/files/pyyaml-safe-load.patch | 11 | ||||
| -rw-r--r-- | games-roguelike/stone-soup/metadata.xml | 4 | ||||
| -rw-r--r-- | games-roguelike/stone-soup/stone-soup-0.23.2.ebuild (renamed from games-roguelike/stone-soup/stone-soup-0.22.0.ebuild) | 52 |
5 files changed, 62 insertions, 26 deletions
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest index 47f305ba6e84..b1b7f87e25e2 100644 --- a/games-roguelike/stone-soup/Manifest +++ b/games-roguelike/stone-soup/Manifest @@ -1,8 +1,10 @@ +AUX gitless.patch 552 BLAKE2B 5bf8976ed06979f164d543f5e0b70d072847f6d79bead84d9f90f7bfd2eb4bf95f20b4abe077889d3199c91cda50645711f28950492bfde15ec19119212e64ed SHA512 45b7da032a20b8b50725b8602f9762edb14579556cc9c53863d14358df2154a0fcf2ee7ecb718c970e60c9bac38110c74108472615eb53ea5e08620236f2bf99 +AUX pyyaml-safe-load.patch 460 BLAKE2B 39fdb2753539c7e973afcd23b86b89623c14b37d96776dcb6ceafa755457dc3427943a62f73caa1fa7a166d1579ce987069c28df4142a6c5ceda9ae5546ecc60 SHA512 d9f6404ad363ee739933d3e3ca772401d8f64d868458d795a632d72f8c0d7705fb18faaf5d25e501b9c6fbc3a98b65652c6373f9259828bac88f32e708859c74 AUX rltiles-ldflags-libs.patch 1373 BLAKE2B 5a5a48bdb6081bb81bd66993bed3a6cfed4951ca059b2bf7069ab512e30c855eb65abc9d552da4e3c15c5156924bf14adc852dbb46248aa9840b8f63d1d33652 SHA512 955b6784f7a2ffbccefff6648de2072391d535f998516f52a7b5681e41aeedb34c47ac6cb6d649519448c23ce7007f08f0b0c36ced976dac0f111f2dae204287 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 -EBUILD stone-soup-0.22.0.ebuild 3529 BLAKE2B 61d6110b871d0ac57bf1215368fbe6874b4ca8623d709311ef20f526f0ce148211c1f73a1a0a9c2ebbbc9dd2b3651d9324d3217b524bf083fd485343ee75163f SHA512 41e34f3b5857afd720ddd527b05e24e3a3a48427624a8f9b8604bb6bed44d2dbfbad7e7edd16b62a147f7969a3cda1b1cf2e797dceacbf867c1b4919388c89dc +DIST stone_soup-0.23.2.tar.xz 30157732 BLAKE2B 5d264fa33abeb2254efbdef461774c987f65ef28160d43d90848b77d46a8f0e63c4e59a9cb7257257551a08c509e53758d72acbb0edf5a0e8b70e5d3ca09ea14 SHA512 61ccb0ac262a798e7c06fdb5e821c9885a690e082c33f6255358561929d6800b272106632279d27320e8ae240d903e2002f59d908d5db4841065a5cfa97bbee8 EBUILD stone-soup-0.23.0.ebuild 3529 BLAKE2B 61d6110b871d0ac57bf1215368fbe6874b4ca8623d709311ef20f526f0ce148211c1f73a1a0a9c2ebbbc9dd2b3651d9324d3217b524bf083fd485343ee75163f SHA512 41e34f3b5857afd720ddd527b05e24e3a3a48427624a8f9b8604bb6bed44d2dbfbad7e7edd16b62a147f7969a3cda1b1cf2e797dceacbf867c1b4919388c89dc -MISC metadata.xml 1546 BLAKE2B f7af831bd9db76d5d95e88db7651c81fc2838f010daa6ff473ea55f82797fb989f2a99e640fea915da87be7255e112f9e4f5766195ad74ec807118908840690e SHA512 7531275c7d11591b8eb8ba4b490a5357bb65d12369b504639b54d3681c364ead0bce2356549028d3a02d06934a3c04ccc57204ee17702b1e7a8866e7960c768b +EBUILD stone-soup-0.23.2.ebuild 3651 BLAKE2B cc9ac0829b1742a8bd42b6f7aae9701aa5311e0feda0a9d18ae2b8aeec12ea87f6b84fe4e5012d72664ae434b535fbe7dd9e8fcebad17b87a014be4cfa5e0978 SHA512 2c8e937342edfe3014a24df89d78dd40d617ef92118c99a8702670a4660100f572b387f3d8967512d094fb0cd1007a6b519e649ed255a14cd90a62cbcce0ca38 +MISC metadata.xml 1656 BLAKE2B 0d1a508b4e227d63f226e3c6a356274be71f4107d690bb268960a992b69e07541f519dad89ea466bb98dfd6d86837d233d4e1cd66bac059e5122d54e1ed9bc9d SHA512 c482e96fe8d414a29ff9085c71c6c87782e9521bdfeb7118d546ff053ae551966b7cbbe50bc987276c7dfa3337f534b47228f39b83800d307592e780f44ce662 diff --git a/games-roguelike/stone-soup/files/gitless.patch b/games-roguelike/stone-soup/files/gitless.patch new file mode 100644 index 000000000000..3aaeb7470095 --- /dev/null +++ b/games-roguelike/stone-soup/files/gitless.patch @@ -0,0 +1,13 @@ +--- /Makefile 2019-04-15 19:34:40.604288477 -0500 ++++ /Makefile 2019-04-15 19:36:25.249286603 -0500 +@@ -1149,9 +1149,8 @@ + + LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??))) + SRC_PKG_BASE := stone_soup +-SRC_VERSION := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat util/release_ver) ++SRC_VERSION := $(shell cat util/release_ver) + MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|sed -r 's/-.*//;s/^([^.]+\.[^.]+).*/\1/') +-RECENT_TAG := $(shell git describe --abbrev=0 --tags $(MERGE_BASE)) + + export SRC_VERSION + diff --git a/games-roguelike/stone-soup/files/pyyaml-safe-load.patch b/games-roguelike/stone-soup/files/pyyaml-safe-load.patch new file mode 100644 index 000000000000..dfbcdc96e1ad --- /dev/null +++ b/games-roguelike/stone-soup/files/pyyaml-safe-load.patch @@ -0,0 +1,11 @@ +--- /util/species-gen.py 2019-04-18 23:19:07.444170831 -0500 ++++ /util/species-gen.py 2019-04-18 23:20:19.958169533 -0500 +@@ -417,7 +417,7 @@ + continue + f_path = os.path.join(args.datadir, f_name) + try: +- species_spec = yaml.load(open(f_path)) ++ species_spec = yaml.safe_load(open(f_path)) + except yaml.YAMLError as e: + print("Failed to load %s: %s" % (f_name, e)) + sys.exit(1) diff --git a/games-roguelike/stone-soup/metadata.xml b/games-roguelike/stone-soup/metadata.xml index 68e84b34cc48..ec38a399560c 100644 --- a/games-roguelike/stone-soup/metadata.xml +++ b/games-roguelike/stone-soup/metadata.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person"> + <email>stasibear@gentoo.org</email> + <name>Erik Mackdanz</name> + </maintainer> <maintainer type="project"> <email>games@gentoo.org</email> <name>Gentoo Games Project</name> diff --git a/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild index 92ce93f41ce3..a587c1998687 100644 --- a/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild +++ b/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -## TODO -# add sound support (no sound files) +# TODO +# - attempt +test, linked bug claims to be fixed -EAPI=6 +EAPI=7 VIRTUALX_REQUIRED="manual" -inherit eutils gnome2-utils toolchain-funcs eapi7-ver +inherit desktop eutils xdg-utils toolchain-funcs MY_P="stone_soup-${PV}" DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons" @@ -24,14 +24,14 @@ SRC_URI=" LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug luajit ncurses test +tiles" +IUSE="debug ncurses sound 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 ) + =dev-lang/lua-5.1*:0= sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) @@ -39,23 +39,31 @@ RDEPEND=" media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 - media-libs/libsdl2[X,opengl,video] + sound? ( + media-libs/libsdl2[X,opengl,sound,video] + media-libs/sdl2-mixer + ) + !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl )" DEPEND="${RDEPEND} dev-lang/perl + dev-python/pyyaml sys-devel/flex - virtual/pkgconfig - virtual/yacc tiles? ( sys-libs/ncurses:0 - )" + ) + virtual/pkgconfig + virtual/yacc + " S=${WORKDIR}/${MY_P}/source S_TEST=${WORKDIR}/${MY_P}_test/source PATCHES=( + "${FILESDIR}"/gitless.patch + "${FILESDIR}"/pyyaml-safe-load.patch "${FILESDIR}"/rltiles-ldflags-libs.patch ) @@ -65,12 +73,10 @@ pkg_setup() { 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 + if use sound && use !tiles ; then + ewarn "Sound support is only available with tiles." + fi } src_compile() { @@ -79,10 +85,11 @@ src_compile() { # leave DATADIR at the top myemakeargs=( $(usex debug "FULLDEBUG=y DEBUG=y" "") - $(usex luajit "" "BUILD_LUA=yes") # luajit is not bundled + BUILD_LUA= AR="$(tc-getAR)" CFOPTIMIZE='' CFOTHERS="${CXXFLAGS}" + CONTRIBS= DATADIR="/usr/share/${PN}" GCC="$(tc-getCC)" GXX="$(tc-getCXX)" @@ -91,8 +98,9 @@ src_compile() { PKGCONFIG="$(tc-getPKG_CONFIG)" RANLIB="$(tc-getRANLIB)" SAVEDIR="~/.crawl" + SOUND=$(usex sound "y" "") STRIP=touch - USE_LUAJIT=$(usex luajit "yes" "") + USE_LUAJIT= V=1 prefix="/usr" ) @@ -116,6 +124,8 @@ src_install() { # don't relocate docs, needed at runtime rm -rf "${D}/usr/share/${PN}"/docs/license + doman "${WORKDIR}/${MY_P}"/docs/crawl.6 + # icons and menu for graphical build if use tiles ; then doicon -s 48 "${DISTDIR}"/${PN}.png @@ -124,12 +134,8 @@ src_install() { fi } -pkg_preinst() { - gnome2_icon_savelist -} - pkg_postinst() { - gnome2_icon_cache_update + xdg_icon_cache_update if use tiles && use ncurses ; then elog "Since you have enabled both tiles and ncurses frontends" @@ -139,5 +145,5 @@ pkg_postinst() { } pkg_postrm() { - gnome2_icon_cache_update + xdg_icon_cache_update } |