From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D13791382C5 for ; Sat, 12 Dec 2020 14:08:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2FB5CE0998; Sat, 12 Dec 2020 14:08:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 02544E0998 for ; Sat, 12 Dec 2020 14:08:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 76930340E8A for ; Sat, 12 Dec 2020 14:07:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1747742F for ; Sat, 12 Dec 2020 14:07:58 +0000 (UTC) From: "Erik Mackdanz" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Erik Mackdanz" Message-ID: <1607782068.dad9d43f6b491448b59e914ad266b63d7f20c091.stasibear@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-roguelike/stone-soup/Manifest games-roguelike/stone-soup/stone-soup-0.25.0.ebuild games-roguelike/stone-soup/stone-soup-0.25.1.ebuild X-VCS-Directories: games-roguelike/stone-soup/ X-VCS-Committer: stasibear X-VCS-Committer-Name: Erik Mackdanz X-VCS-Revision: dad9d43f6b491448b59e914ad266b63d7f20c091 X-VCS-Branch: master Date: Sat, 12 Dec 2020 14:07:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ed6ac333-ab18-4bd0-9d7a-74cbce05dea3 X-Archives-Hash: 8bcbf4213c87004534ffd788dcc13a08 commit: dad9d43f6b491448b59e914ad266b63d7f20c091 Author: Erik Mackdanz gentoo org> AuthorDate: Sat Dec 12 14:07:48 2020 +0000 Commit: Erik Mackdanz gentoo org> CommitDate: Sat Dec 12 14:07:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dad9d43f games-roguelike/stone-soup: Remove old Signed-off-by: Erik Mackdanz gentoo.org> Package-Manager: Portage-3.0.12, Repoman-3.0.2 games-roguelike/stone-soup/Manifest | 1 - .../stone-soup/stone-soup-0.25.0.ebuild | 176 --------------------- .../stone-soup/stone-soup-0.25.1.ebuild | 169 -------------------- 3 files changed, 346 deletions(-) diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest index aa90c7e2f70..2afbffc332e 100644 --- a/games-roguelike/stone-soup/Manifest +++ b/games-roguelike/stone-soup/Manifest @@ -1,4 +1,3 @@ DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc DIST stone-soup.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f -DIST stone_soup-0.25.0.tar.xz 30247768 BLAKE2B 1e6595ae895beb8a4eede97002d5085e710de93726034a3ab9bd4d44fc9d03fc6cc22ff8878c2e6f825ffd0b28e73bbd1d9a087fc5eae9ffd2bc36403edf5b27 SHA512 387bce2c0491bf88c267af8e37afb1037dfc98d4ba4fb4dd3fe442f3446b6bf6f23c10f32483fb7d27e90c6045033bd70fb9e88e0bbe486489bc38ab71e62529 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220 diff --git a/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild deleted file mode 100644 index 48a422a661c..00000000000 --- a/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# TODO -# - attempt +test, linked bug claims to be fixed - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9} ) -VIRTUALX_REQUIRED="manual" -inherit desktop distutils-r1 eutils xdg-utils toolchain-funcs - -MY_P="stone_soup-${PV}" -DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons" -HOMEPAGE="https://crawl.develz.org" -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 ncurses sound test +tiles" -# test is broken -# see https://crawl.develz.org/mantis/view.php?id=6121 -RESTRICT="test" - -RDEPEND=" - dev-db/sqlite:3 - =dev-lang/lua-5.1*: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 - 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[${PYTHON_USEDEP}] - sys-devel/flex - tiles? ( - app-arch/advancecomp - media-gfx/pngcrush - sys-libs/ncurses:0 - ) - virtual/pkgconfig - virtual/yacc - " - -S=${WORKDIR}/${MY_P}/source -S_TEST=${WORKDIR}/${MY_P}_test/source -PATCHES=( - "${FILESDIR}"/fixed-font-path.patch - "${FILESDIR}"/gitless-1.patch - "${FILESDIR}"/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 - - if use sound && use !tiles ; then - ewarn "Sound support is only available with tiles." - fi -} - -src_compile() { - - # Insurance that we're not using bundled lib sources - rm -rf contrib || die "Couldn't delete contrib directory" - - rm \ - dat/des/arrival/._simple.des \ - dat/des/branches/._crypt.des \ - dat/des/branches/._lair.des \ - dat/des/branches/._pan.des \ - dat/des/branches/._slime.des \ - dat/des/branches/._temple.des \ - dat/des/builder/._layout_halls.des \ - dat/des/builder/._shops.des \ - dat/des/portals/._bazaar.des \ - dat/des/portals/._gauntlet.des \ - dat/des/portals/._ossuary.des \ - dat/des/sprint/._menkaure.des \ - dat/des/sprint/._red_sonja.des \ - dat/des/sprint/._sprint_mu.des \ - dat/des/variable/._the_grid.des \ - || die "Can't remove bogus Apple Macintosh files" - - export HOSTCXX=$(tc-getBUILD_CXX) - - # leave DATADIR at the top - myemakeargs=( - $(usex debug "FULLDEBUG=y DEBUG=y" "") - BUILD_LUA= - AR="$(tc-getAR)" - CFOPTIMIZE='' - CFOTHERS="${CXXFLAGS}" - CONTRIBS= - DATADIR="/usr/share/${PN}" - GCC="$(tc-getCC)" - GXX="$(tc-getCXX)" - LDFLAGS="${LDFLAGS}" - MAKEOPTS="${MAKEOPTS}" - PKGCONFIG="$(tc-getPKG_CONFIG)" - RANLIB="$(tc-getRANLIB)" - SAVEDIR="~/.crawl" - 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 "${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 - - doman "${WORKDIR}/${MY_P}"/docs/crawl.6 - - # 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_postinst() { - xdg_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() { - xdg_icon_cache_update -} diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild deleted file mode 100644 index 254ea797341..00000000000 --- a/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# TODO -# - attempt +test, linked bug claims to be fixed - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9} ) -VIRTUALX_REQUIRED="manual" -inherit desktop python-any-r1 eutils xdg-utils toolchain-funcs - -MY_P="stone_soup-${PV}" -DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons" -HOMEPAGE="https://crawl.develz.org" -SRC_URI=" - https://github.com/crawl/crawl/releases/download/${PV}/${PN/-/_}-${PV}.zip - 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 ncurses sound test +tiles" -# test is broken -# see https://crawl.develz.org/mantis/view.php?id=6121 -RESTRICT="test" - -RDEPEND=" - dev-db/sqlite:3 - =dev-lang/lua-5.1*: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 - 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} - app-arch/unzip - dev-lang/perl - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - sys-devel/flex - tiles? ( - sys-libs/ncurses:0 - ) - virtual/pkgconfig - virtual/yacc - " - -S=${WORKDIR}/${MY_P}/source -S_TEST=${WORKDIR}/${MY_P}_test/source -PATCHES=( - "${FILESDIR}"/fixed-font-path.patch - "${FILESDIR}"/gitless-1.patch - "${FILESDIR}"/rltiles-ldflags-libs.patch -) - -python_check_deps() { - has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" -} - -pkg_setup() { - - python-any-r1_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 - - if use sound && use !tiles ; then - ewarn "Sound support is only available with tiles." - fi -} - -src_prepare() { - default - python_fix_shebang "${S}/util/species-gen.py" -} - -src_compile() { - - # Insurance that we're not using bundled lib sources - rm -rf contrib || die "Couldn't delete contrib directory" - - export HOSTCXX=$(tc-getBUILD_CXX) - - # leave DATADIR at the top - myemakeargs=( - $(usex debug "FULLDEBUG=y DEBUG=y" "") - BUILD_LUA= - AR="$(tc-getAR)" - CFOPTIMIZE='' - CFOTHERS="${CXXFLAGS}" - CONTRIBS= - DATADIR="/usr/share/${PN}" - GCC="$(tc-getCC)" - GXX="$(tc-getCXX)" - LDFLAGS="${LDFLAGS}" - MAKEOPTS="${MAKEOPTS}" - PKGCONFIG="$(tc-getPKG_CONFIG)" - RANLIB="$(tc-getRANLIB)" - SAVEDIR="~/.crawl" - 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 "${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 - - doman "${WORKDIR}/${MY_P}"/docs/crawl.6 - - # 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_postinst() { - xdg_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() { - xdg_icon_cache_update -}