From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 65D9D1582EF for ; Mon, 10 Mar 2025 01:42:39 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 50688343145 for ; Mon, 10 Mar 2025 01:42:39 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 0BBB51103CB; Mon, 10 Mar 2025 01:42:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 06F861103CB for ; Mon, 10 Mar 2025 01:42:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A56BF343143 for ; Mon, 10 Mar 2025 01:42:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F098028BE for ; Mon, 10 Mar 2025 01:42:22 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1741570828.f0b03620a1195c6e4cbadf1bb422e7cd09252c57.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-engines/frotz/, games-engines/frotz/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-engines/frotz/Manifest games-engines/frotz/files/frotz-stray-dollar.patch games-engines/frotz/frotz-2.55_pre20240518.ebuild X-VCS-Directories: games-engines/frotz/files/ games-engines/frotz/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f0b03620a1195c6e4cbadf1bb422e7cd09252c57 X-VCS-Branch: master Date: Mon, 10 Mar 2025 01:42:22 +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: c2ffcf74-a033-4744-8e21-f46b9d366963 X-Archives-Hash: 59f6837aa223884ebf7d7000f77e28bc commit: f0b03620a1195c6e4cbadf1bb422e7cd09252c57 Author: NHOrus yahoo com> AuthorDate: Wed Feb 26 09:05:44 2025 +0000 Commit: Sam James gentoo org> CommitDate: Mon Mar 10 01:40:28 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b03620 games-engines/frotz: drop 2.55_pre20240518 Signed-off-by: NHOrus yahoo.com> Closes: https://github.com/gentoo/gentoo/pull/40766 Signed-off-by: Sam James gentoo.org> games-engines/frotz/Manifest | 1 - games-engines/frotz/files/frotz-stray-dollar.patch | 26 ------- games-engines/frotz/frotz-2.55_pre20240518.ebuild | 80 ---------------------- 3 files changed, 107 deletions(-) diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest index 96255b5f1bb6..22be9bd3fe8e 100644 --- a/games-engines/frotz/Manifest +++ b/games-engines/frotz/Manifest @@ -1,2 +1 @@ DIST frotz-2.55.tar.bz2 363261 BLAKE2B c249a48d397a1dfa58bf4b6af01e1e3ed978ed370da252d11eb952781b604fd9485235b5772a0c2a3de656b649598331ff46a378965fba2dd88414de4d07c521 SHA512 a5a39ff16781b39aabe4b27f6acfa1303c025f0b5af5e4aa843f86f8208a6dd44a5f73e49ac0d8eced8e48571320d6b9eb1693e0ec54a199a5356f3ef8df0ef4 -DIST frotz-2.55_pre20240518.tar.bz2 361873 BLAKE2B feffedec989adfda7e949ab4997dff6496e1d9fef4b55902cd8430556587e54996872107c70a1ecc6db4bc6e29357ec101df9f8f411043cddfbf03bc46d4fe4d SHA512 b18670d6360fff48c20e8d26cb5173784ea900128a8e08d39625297aeae6eb5ea5be7fe361785b3863f25667649d935f2b9edb9d92751388bfaaa00edf678ec2 diff --git a/games-engines/frotz/files/frotz-stray-dollar.patch b/games-engines/frotz/files/frotz-stray-dollar.patch deleted file mode 100644 index 9cc2a4212741..000000000000 --- a/games-engines/frotz/files/frotz-stray-dollar.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7c14d1bd6c129670869db0dc6c025c68f28944a4 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot -Date: Tue, 21 May 2024 22:53:33 +0100 -Subject: [PATCH] Fix stray $ that breaks the frotz filename when specifying - LDFLAGS - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 8860297..35d8246 100644 ---- a/Makefile -+++ b/Makefile -@@ -394,7 +394,7 @@ DOSVER = $(shell echo $(VERSION) | sed s/\\.//g) - curses: $(FROTZ_BIN) - ncurses: $(FROTZ_BIN) - $(FROTZ_BIN): $(FROTZ_LIBS) -- $(CC) $+ -o $@$ $(LDFLAGS) $(CURSES_LDFLAGS) $(CURSES_SOUND_LDFLAGS) -+ $(CC) $+ -o $@ $(LDFLAGS) $(CURSES_LDFLAGS) $(CURSES_SOUND_LDFLAGS) - @echo "** Done building Frotz with curses interface" - @echo "** Audio support $(CURSES_SOUND) (type $(SOUND_TYPE))" - @echo "** Blorb support $(BLORB_SUPPORT)" --- -2.45.1 - diff --git a/games-engines/frotz/frotz-2.55_pre20240518.ebuild b/games-engines/frotz/frotz-2.55_pre20240518.ebuild deleted file mode 100644 index 23013101c44c..000000000000 --- a/games-engines/frotz/frotz-2.55_pre20240518.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -COMMIT="f96e6b33d8b13f80258af49b4bb567428870291c" -DESCRIPTION="Interpreter for Z-code based text games" -HOMEPAGE="https://661.org/proj/if/frotz/" -SRC_URI="https://gitlab.com/DavidGriffith/frotz/-/archive/${COMMIT}/frotz-master.tar.bz2 -> ${P}.tar.bz2" -S="${WORKDIR}/${PN}-${COMMIT}" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~riscv ~x86" -IUSE="ncurses sdl sound unicode" -REQUIRED_USE="sound? ( || ( ncurses sdl ) )" - -DEPEND=" - ncurses? ( - sys-libs/ncurses:=[unicode(+)?] - sound? ( - media-libs/libao - media-libs/libmodplug - media-libs/libsamplerate - media-libs/libsndfile[-minimal] - media-libs/libvorbis - ) - ) - sdl? ( - media-libs/freetype:2 - media-libs/libjpeg-turbo:= - media-libs/libpng:0= - media-libs/libsdl2[sound,threads(+),video] - media-libs/sdl2-mixer[mod,vorbis,wav] - sys-libs/zlib - ) -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-stray-dollar.patch -) - -src_compile() { - emake \ - dumb \ - $(use ncurses && echo ncurses) \ - $(use sdl && echo sdl) \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - RANLIB="$(tc-getRANLIB)" \ - CURSES=$(usex unicode ncursesw ncurses) \ - USE_UTF8=$(usex unicode yes "") \ - SOUND_TYPE=$(usex sound ao none) \ - PREFIX="${EPREFIX}/usr" \ - SYSCONFDIR="${EPREFIX}/etc" -} - -src_install() { - emake \ - install_dumb \ - $(use ncurses && echo install) \ - $(use sdl && echo install_sdl) \ - PREFIX="${EPREFIX}/usr" \ - DESTDIR="${D}" - - dodoc \ - AUTHORS ChangeLog CONTRIBUTORS DUMB HOW_TO_PLAY README README.md \ - doc/frotz.conf-{big,small} -} - -pkg_postinst() { - echo - elog "Global config file can be installed in ${EPREFIX}/etc/frotz.conf" - elog "Sample config files are in ${EPREFIX}/usr/share/doc/${PF}" - echo -}