From 61966498b463d88a09132a9a22c68c0c37159e41 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 30 Jan 2023 02:56:37 +0000 Subject: gentoo auto-resync : 30:01:2023 - 02:56:37 --- games-roguelike/stone-soup/Manifest | 5 + games-roguelike/stone-soup/files/make-v2.patch | 120 +++++++++++ .../stone-soup-0.30.0_pre20230129.ebuild | 238 +++++++++++++++++++++ 3 files changed, 363 insertions(+) create mode 100644 games-roguelike/stone-soup/files/make-v2.patch create mode 100644 games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild (limited to 'games-roguelike/stone-soup') diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest index 2bc6a4675a4b..30baf22d4194 100644 --- a/games-roguelike/stone-soup/Manifest +++ b/games-roguelike/stone-soup/Manifest @@ -1,4 +1,5 @@ AUX make-advpng.patch 501 BLAKE2B 06ea1fdc6f9fa9c26f39493c074213c517434e376934faff2231a5600715af9122fb7cbdc00a6c1c8b1301e5a22f11493bd72de42d94c8d802f680f0de338ae4 SHA512 28f6bfcdc14c92ce6ff041a93d156af7a0e45609a6c97af0e3ec749e86d9b33e9a2aa46f664c69173ad08c1cc0985c4121d452954b8ffe7f56558fd529f503be +AUX make-v2.patch 3601 BLAKE2B 814d540dbd568282e1abe325cda8584b267454330b80d03897a7d34c0b45a213f1912ab8088de85bf1ae63d6252ddade505f14e6e87db414956296a893958370 SHA512 ec61eb094da2a9f13300ef8fd6fe2e56fd3abfe12318c6ba580da2999f99364d53b3dbe730b4577d3825ce533adfa0328b30c8e810e66a7dfde9b7ed1f8cf0f3 AUX make.patch 3190 BLAKE2B 82322638290720242d1bfbf9995dce61e2ba857716cb233297ec4e5f32ef1cf9c88730a17b8dbf78897c635660a5beea9f88da51d0dcdf10f2490609bc7e4b62 SHA512 15fc91a939997b67249638c87071a1c7e6d7b5ed2625e14ca48cc7721ca0216d6b4590da40070077b31d9380ed96626ec7c80c780b1f9a8bba74a2d4800fb1ed AUX rltiles-make.patch 1704 BLAKE2B b740e8b305e9071a9b024589e4ef6cb4fd088d4424e35ab164f920ec0cf06b94a46b19ac7d223d5eac3ca92bb2565efea00731a556e429056041cddb5658988a SHA512 378bea1e53477c881b93f824e45231b13c34318e34cf1413325a642d2d4f7f16c654b00584bec552238e1e2ec6e8046b67ea7cbd5aa4cb6ecf9fb6a70d600dd9 DIST stone-soup-0.25.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc @@ -12,6 +13,9 @@ DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2 DIST stone-soup-0.29.1.tar.gz 17510846 BLAKE2B 65b84797c8d8a268a3ce95de9d928e131bf6e21a1ea6ac3e72263c75f9d6288e9d95f9df6401528c06aefbda9bb642c79bf78065a65224297d33c050abf37056 SHA512 2ca49c4cd228526d47e4ad7e9556b6c26566595458423cd8e6b762298f229eb7ba273770ae1e12939ba66574a5b55e44812d06c4809d4327ed9bfd738501af04 DIST stone-soup-0.29.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc DIST stone-soup-0.29.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f +DIST stone-soup-0.30.0_pre20230129.tar.gz 20929296 BLAKE2B 4ca826d5157c3530c3d7a1f36aa10cc8fbf961a33aca06e2dcd3afc1896e12babdc8e2e33fd937397d72cded0f208422f21757d95ad70171f4938237f6d4f034 SHA512 9d27d209eaee58bf33eaf84288e3f48b72bfb701496d8c3ac98f6207ef761d23134270a837194e0f18c9a6e64774949b4668929614db1f9a7334e7abbb5db4ea +DIST stone-soup-0.30.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc +DIST stone-soup-0.30.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220 DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d DIST stone_soup-0.27.1.zip 96934633 BLAKE2B 8821920a4faad9474f08a34ae3c272cb9dcd3ddeb9029e033c22eb8e6650ef20bbc30e0c0ca1556d08c1b7b898fdbdd3667a3ac9a8527e0c322cd8c78ab391bb SHA512 845dafc9895ada3712903de63b95cca9eeb66160e4a04ba21193d916447fca8e7248b851f1e938f43b8d3937cf4f4437443bdc4fe2da893fe3918fed4e0b5204 @@ -21,4 +25,5 @@ EBUILD stone-soup-0.26.1-r2.ebuild 5945 BLAKE2B 3badf2dd4f9a556a6a956aa9aac7f41b EBUILD stone-soup-0.27.1-r1.ebuild 5732 BLAKE2B 9ae1528fb47c13dcd52ca5d56c5208f5144acd50ca59568993fd4b6dcb748e36e37539d6ca91001329b1ce011dbf6aa40a997b4d8dcce4e4185e8aa5a0694252 SHA512 4ebd380e1ffbd803bd4011dd6fa45b8a6893b89dd50dff76dc7f2c37a80d4328d153b1f57eed65f0e607d12ec3e61cc5013de01d10716aa5dc38fdf51a49768a EBUILD stone-soup-0.28.0-r1.ebuild 6329 BLAKE2B 8aae9585ba9d9ec85d7617d3502618027ff2b2f01ae25d7d7660ad37606c2015f490d25644699fe043b5cd27b77b9477246a6877590670e444b83f4867cad3ac SHA512 efcfb66010b5276644f83776b3eb0d47fb2366972a2d2844ed81bfd80e0b5069ee127bfb7566b7d9dfebaddade6f61871ac2bfbae03afcb1f16963e6f4c6bd62 EBUILD stone-soup-0.29.1.ebuild 6287 BLAKE2B 17da6360011f74cbba5f98e4e49c14f17130be92243cdc2d34396fb2d99342c0958ede8f0c003633cf85b2ced1c20555a5e13373617c85d36aa372f027df37f2 SHA512 90d1276b112f2f8a8f29ab7de60b6389c6fd7781fce33596f055f38a96be10235dcce04a621c22e50ca5671e7bb4669f1fe04c11de5e1ba402348ea0891ef65c +EBUILD stone-soup-0.30.0_pre20230129.ebuild 6332 BLAKE2B 60e78f6b1b3e56c6299ab4620f5ad73f633fc28957e732c8e943afe413387c8db6ecb5ba562f161949960107832383034e0c91f771d5db4ff76dc5268dcd8a16 SHA512 72e5cdae4d76c13fd3db68df9c7fa5f428bbaa5952c3d155659971f8950e947e819ae6894a2249009ef6d8aa7a60e769734422ebafe1f428d037989ead97e859 MISC metadata.xml 1735 BLAKE2B 7c4c4777bbda596e10acf0eafac0b5682a8d3a6e81562b12ca38ad6d09c66a672933a127b9d5c853122ffcd4feb436667149f5e64732053e002b6e1044e7b1ee SHA512 a252f1ffe9b57659d9c7ee25aca3263d6dd79e95399fde3d888aa6d3fceb8f821ccf2a47fc0fa72eb5e1bab4bac4c861d436732818366d81b8cf7df6f0e659aa diff --git a/games-roguelike/stone-soup/files/make-v2.patch b/games-roguelike/stone-soup/files/make-v2.patch new file mode 100644 index 000000000000..7813fa1aebc1 --- /dev/null +++ b/games-roguelike/stone-soup/files/make-v2.patch @@ -0,0 +1,120 @@ +--- a/Makefile 2023-01-29 16:54:29.445857641 -0600 ++++ b/Makefile 2023-01-29 16:55:57.363274244 -0600 +@@ -92,7 +92,7 @@ + # processes. Not supported for MSYS2/cygwin builds, and will be overridden for + # mac universal builds. This does not count as a change in build flags. + ifndef GAME +- GAME = crawl ++ GAME = crawl-0.30 + endif + + # Disable GNU Make implicit rules and variables. Leaving them enabled will slow +@@ -206,7 +206,7 @@ + uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') + uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') + +-HOST := $(shell sh -c 'cc -dumpmachine || echo unknown') ++HOST := + ARCH := $(HOST) + + ifdef CROSSHOST +@@ -509,15 +509,7 @@ + GCC_VER_SUFFIX:=-$(GCC_VER) + endif + +-# Attempt to use a full compiler name, to make +-# distcc builds work nicely. +-LMACH := $(shell gcc -dumpmachine)- +-ifeq ($(LMACH),-) + LMACH := +-endif +-ifeq ($(shell which $(LMACH)gcc$(GCC_VER_SUFFIX) > /dev/null 2> /dev/null && echo "Yes"),) +-LMACH := +-endif + + ifneq ($(FORCE_CC),) + GCC := $(FORCE_CC) +@@ -862,10 +854,11 @@ + COVERAGE=YesPlease + # current catch2 doesn't support c++11 + STDFLAG = -std=c++14 ++ # tests require this ++ LIBS += -lgcov + endif + + ifdef HURRY +- NO_OPTIMIZE=YesPlease + endif + + ifdef COVERAGE +@@ -1017,7 +1010,7 @@ + INSTALL_FONTS += "$(PROPORTIONAL_FONT)" + endif + else +- SYS_PROPORTIONAL_FONT = $(shell util/find_font "$(OUR_PROPORTIONAL_FONT)") ++ SYS_PROPORTIONAL_FONT = /usr/share/fonts/dejavu/DejaVuSans.ttf + ifneq (,$(SYS_PROPORTIONAL_FONT)) + ifeq (,$(COPY_FONTS)) + DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\" +@@ -1037,7 +1030,7 @@ + INSTALL_FONTS += "$(MONOSPACED_FONT)" + endif + else +- SYS_MONOSPACED_FONT = $(shell util/find_font "$(OUR_MONOSPACED_FONT)") ++ SYS_MONOSPACED_FONT = /usr/share/fonts/dejavu/DejaVuSansMono.ttf + ifneq (,$(SYS_MONOSPACED_FONT)) + ifeq (,$(COPY_FONTS)) + DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\" +@@ -1177,14 +1170,8 @@ + + ifdef TILES_ANY + ifndef NO_OPTIMIZE +- ifneq (,$(shell which advpng)) +- USE_ADVPNG = y +- else +- ifneq (,$(shell which pngcrush)) + PNGCRUSH = pngcrush -q -m 113 + PNGCRUSH_LABEL = PNGCRUSH +- endif +- endif + endif + endif + +@@ -1280,9 +1266,8 @@ + + LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??))) + SRC_PKG_BASE := stone_soup +-SRC_VERSION := $(shell git describe $(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 $(MERGE_BASE)) + WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo win32) + + export SRC_VERSION +@@ -1644,7 +1629,7 @@ + $(COPY) dat/tiles/stone_soup_icon-512x512.png $(prefix_fp)/share/icons/hicolor/512x512/apps/$(XDG_NAME).png + $(COPY) dat/tiles/stone_soup_icon.svg $(prefix_fp)/share/icons/hicolor/scalable/apps/$(XDG_NAME).svg + +-install: all install-data ++install: install-data + [ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix) + $(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/ + $(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME) +@@ -1667,7 +1652,6 @@ + +$(MAKE) -C contrib clean + + clean-android: +- $(RM) -r $(datadir_fp) + +cd android-project && rm -f local.properties && rm -f app/build.gradle + + distclean: clean clean-contrib clean-rltiles +@@ -1899,9 +1883,6 @@ + + dat/tiles/%.png: $(RLTILES)/%.png + $(QUIET_PNGCRUSH)$(PNGCRUSH) $< $@ +-ifdef USE_ADVPNG +- $(QUIET_ADVPNG)$(ADVPNG) $@ +-endif + + clean-rltiles: + $(RM) $(DESTTILEFILES) diff --git a/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild b/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild new file mode 100644 index 000000000000..7d2e05402a44 --- /dev/null +++ b/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild @@ -0,0 +1,238 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# There are many slots for this package because people in the community +# like to play old versions. Every release includes content changes +# where species/spells/monsters are added or removed. The public +# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing +# versions back to 0.11. + +# It's not necessary for Gentoo to support these old version but it's +# something nice that our distro can offer that others don't. If the +# maintenance burden becomes excessive than we can revisit that +# position. + +EAPI=8 + +LUA_COMPAT=( lua5-1 ) +LUA_REQ_USE="deprecated" +PYTHON_COMPAT=( python3_{9,10,11} ) +VIRTUALX_REQUIRED="manual" +inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs + +DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons" +HOMEPAGE="https://crawl.develz.org" +SLOT="0.30" + +# Leave empty string if not a _pre release +COMMITSHA="c68057be0a1ad1b17d0337fd8baed0213a428039" +if [ -z "${COMMITSHA}" ]; then + # This is a tagged release + # Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1 + SRC_URI=" + https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + " + MY_P="crawl-${PV}/crawl-ref" +else + # This is a _pre release + SRC_URI=" + https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz + " + MY_P="crawl-${COMMITSHA}/crawl-ref" +fi +SRC_URI=" + ${SRC_URI} + https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png + https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.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" +KEYWORDS="~amd64 ~x86" +IUSE="advpng debug ncurses sound test +tiles" +RESTRICT="!test? ( test )" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +S=${WORKDIR}/${MY_P}/source +RDEPEND=" + ${LUA_DEPS} + dev-db/sqlite:3 + 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 + 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} + test? ( "${S}/util/release_ver" || die "Couldn't write release_ver" + fi + + # Replace bundled catch2 package with system implementation + # https://bugs.gentoo.org/829950 + if use test; then + cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" || die "Couldn't substitute system catch2" + fi +} + +src_compile() { + + # Insurance that we're not using bundled lib sources + rm -rf contrib || die "Couldn't delete contrib directory" + + myemakeargs=( + $(usex debug "FULLDEBUG=y DEBUG=y" "") + BUILD_LUA= + AR="$(tc-getAR)" + CFOPTIMIZE='' + # -DLUA_COMPAT_OPENLIB=1 is required to enable the + # deprecated (in 5.1) luaL_openlib API (#869671) + CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1" + CONTRIBS= + DATADIR="/usr/share/${PN}-${SLOT}" + FORCE_CC="$(tc-getCC)" + FORCE_CXX="$(tc-getCXX)" + LDFLAGS="${LDFLAGS}" + MAKEOPTS="${MAKEOPTS}" + PKGCONFIG="$(tc-getPKG_CONFIG)" + RANLIB="$(tc-getRANLIB)" + SAVEDIR="~/.crawl-${SLOT}" + SOUND=$(usex sound "y" "") + STRIP=touch + USE_LUAJIT= + 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-${SLOT}" "${WORKDIR}"/crawl-ncurses-${SLOT} || die ;} + fi + + if use tiles ; then + emake "${myemakeargs[@]}" clean + emake "${myemakeargs[@]}" "TILES=y" + fi +} + +src_test() { + emake "${myemakeargs[@]}" \ + $(usex tiles "TILES=y" "") \ + catch2-tests +} + +src_install() { + emake "${myemakeargs[@]}" \ + $(usex tiles "TILES=y" "") \ + DESTDIR="${D}" \ + prefix_fp="" \ + bin_prefix="${D}/usr/bin" \ + install + + [[ -e "${WORKDIR}/crawl-ncurses-${SLOT}" ]] && dobin "${WORKDIR}/crawl-ncurses-${SLOT}" + + # don't relocate docs, needed at runtime + rm -rf "${D}/usr/share/${PN}-${SLOT}"/docs/license + + mv "${WORKDIR}/${MY_P}"/docs/crawl.6 "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" \ + || die "Couldn't append slot to man page name" + doman "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" + + # icons and menu for graphical build + if use tiles ; then + doicon -s 48 "${DISTDIR}"/${PN}-${SLOT}.png + doicon -s scalable "${DISTDIR}"/${PN}-${SLOT}.svg + make_desktop_entry "crawl-${SLOT}" "crawl-${SLOT}" "crawl-${SLOT}" + fi +} + +pkg_postinst() { + xdg_icon_cache_update + + elog "crawl is a slotted install that supports having" + elog "multiple versions installed. The binary has the" + elog "slot appended, e.g. 'crawl-"${SLOT}"'." + + if use tiles && use ncurses ; then + elog + elog "Since you have enabled both tiles and ncurses frontends" + elog "the ncurses binary is called 'crawl-ncurses-"${SLOT}"' and the" + elog "tiles binary is called 'crawl-"${SLOT}"'." + fi +} + +pkg_postrm() { + xdg_icon_cache_update +} -- cgit v1.2.3