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 4ED69158287 for ; Thu, 15 May 2025 11:35:36 +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 375AD3435E8 for ; Thu, 15 May 2025 11:35:36 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 15C7911036D; Thu, 15 May 2025 11:35:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 09FFD11036D for ; Thu, 15 May 2025 11:35:35 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD055343594 for ; Thu, 15 May 2025 11:35:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1ADC42834 for ; Thu, 15 May 2025 11:35:33 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1747308925.6824a87b8adbfd9931b5efda261268b6ec1759ba.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-roguelike/tomenet/, games-roguelike/tomenet/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-roguelike/tomenet/Manifest games-roguelike/tomenet/files/tomenet-4.7.3-makefile.patch games-roguelike/tomenet/tomenet-4.7.3.ebuild X-VCS-Directories: games-roguelike/tomenet/ games-roguelike/tomenet/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 6824a87b8adbfd9931b5efda261268b6ec1759ba X-VCS-Branch: master Date: Thu, 15 May 2025 11:35:33 +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: 5e3dc19f-fe4a-48f5-890f-2a7dfea10e27 X-Archives-Hash: 1e97d942a2d375f0a5b328d0a947d582 commit: 6824a87b8adbfd9931b5efda261268b6ec1759ba Author: David Seifert gentoo org> AuthorDate: Thu May 15 11:35:25 2025 +0000 Commit: David Seifert gentoo org> CommitDate: Thu May 15 11:35:25 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6824a87b games-roguelike/tomenet: drop 4.7.3 Signed-off-by: David Seifert gentoo.org> games-roguelike/tomenet/Manifest | 1 - .../tomenet/files/tomenet-4.7.3-makefile.patch | 43 ---------- games-roguelike/tomenet/tomenet-4.7.3.ebuild | 97 ---------------------- 3 files changed, 141 deletions(-) diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest index b410db5df252..bc788f22d46a 100644 --- a/games-roguelike/tomenet/Manifest +++ b/games-roguelike/tomenet/Manifest @@ -1,2 +1 @@ -DIST tomenet-4.7.3.tar.bz2 3355774 BLAKE2B e574434d283525793ad7b7e2c23103692c540be8727a90623b9fd52aba47d245be99cb39846046f4ba78795e168c8ef9342ff9ee16417dce3698036cbd6c50eb SHA512 25c7dedcd63306ada738078c412a45483ee6ac4c6fe116624a409cb4c9795270942cac2428c1ecafac45bbc9e3044890e308f8bd1bb1344dd156a610948addcd DIST tomenet-4.9.2.tar.bz2 7601198 BLAKE2B 3b7ac9264973ba04e929bbc29636ccfbd4f3ddc1990e9de50c500b58a8ae2ffd460bbde13656b834853cbbdcc89a399a0620b7069b59aa69e000af98f907ea48 SHA512 efa68b3e0ca4c090659991edf72bade09ed64de34e6dd5c6b9d562d2c24fa3fdad90b8ed5c04deab39820a8430c1149f85b24cc7fc4b943a8b980c15f91de958 diff --git a/games-roguelike/tomenet/files/tomenet-4.7.3-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.7.3-makefile.patch deleted file mode 100644 index c00fc5f1e699..000000000000 --- a/games-roguelike/tomenet/files/tomenet-4.7.3-makefile.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/makefile b/makefile -index ee56a33..7f3c81f 100644 ---- a/makefile -+++ b/makefile -@@ -224,7 +224,7 @@ CPP = cpp - #thing is, that the correctly transcribed URL will actually make tolua choke. - #So, -nostdinc will prevent the whole own comment blob of cpp to get generated - #in the first place, as we never asked for it: --CPPFLAGS = -C -P -nostdinc -+CPPFLAGS = -C -P -nostdinc $(GENTOO_CPPFLAGS) - - # gcc variant: - #CPP = gcc ---- a/makefile -+++ b/makefile -@@ -234,5 +234,19 @@ CC = gcc - X11BASE = /usr/X11R6 - -+# defines -+ifdef USE_SDL -+CFLAGS += -DSOUND_SDL $(shell sdl-config --cflags) -+SDL_LIBS = $(shell sdl-config --libs) -lSDL_mixer -+endif -+ -+ifdef USE_X -+CFLAGS += -DUSE_X11 -+LIBS += -lX11 -+endif -+ -+CFLAGS += -Wall -+CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -+LIBS += $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm ${SDL_LIBS} - - ## - ## Standard version -- supports X11 (main-x11.c) -@@ -259,7 +274,5 @@ X11BASE = /usr/X11R6 - #CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32 -fPIE --CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32 -fPIE -Wno-format-truncation - #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer --LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer - ACCEDIT_LIBS = -lcurses -lcrypt - ## - ## Without SDL diff --git a/games-roguelike/tomenet/tomenet-4.7.3.ebuild b/games-roguelike/tomenet/tomenet-4.7.3.ebuild deleted file mode 100644 index 7c9991bde4d9..000000000000 --- a/games-roguelike/tomenet/tomenet-4.7.3.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit desktop toolchain-funcs xdg - -DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien" -HOMEPAGE="https://www.tomenet.eu" -SRC_URI="https://www.tomenet.eu/downloads/${P}.tar.bz2" - -LICENSE="Moria" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+client server +sound X" -REQUIRED_USE="|| ( client server )" - -RDEPEND="sys-libs/ncurses:0 - client? ( - X? ( - x11-libs/libX11 - ) - sound? ( - media-libs/libsdl[sound] - media-libs/sdl-mixer[vorbis,smpeg,mp3] - ) - )" -DEPEND="${RDEPEND} - client? ( sound? ( app-arch/p7zip[wxwidgets] ) )" -BDEPEND="virtual/pkgconfig" - -S=${WORKDIR}/${P}/src - -PATCHES=( - "${FILESDIR}"/${P}-makefile.patch -) - -src_prepare() { - default - if ! use server; then - rm -r ../lib/{config,data,save} || die - fi - - sed \ - -e "s#@LIBDIR@#${EPREFIX}/usr/share/${PN}#" \ - "${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die - - if use server; then - sed \ - -e "s#@LIBDIR@#${EPREFIX}/usr/share/${PN}#" \ - "${FILESDIR}"/${PN}-server-wrapper > "${T}"/${PN}.server || die - fi - - tc-export PKG_CONFIG -} - -src_compile() { - local mytargets="$(usex client "tomenet" "") $(usex server "accedit tomenet.server" "")" - emake \ - $(usex client "$(usex X "USE_X=1" "")" "") \ - $(usex client "$(usex sound "USE_SDL=1" "")" "") \ - CC="$(tc-getCC)" \ - CPP="$(tc-getCPP)" \ - GENTOO_CPPFLAGS="${CPPFLAGS}" \ - -f makefile \ - ${mytargets[@]} -} - -src_install() { - dodoc ../TomeNET-Guide.txt - - if use client ; then - newbin ${PN} ${PN}.bin - dobin "${T}"/${PN} - - doicon -s 48 client/tomenet4.png - make_desktop_entry ${PN} ${PN} ${PN}4 - fi - - if use server ; then - newbin tomenet.server tomenet.server.bin - dobin "${T}"/${PN}.server accedit - fi - - insinto "/usr/share/${PN}" - doins -r ../lib/* - doins ../.tomenetrc -} - -pkg_postinst() { - xdg_pkg_postinst - - if use sound; then - elog "You can get soundpacks from here:" - elog ' https://tomenet.eu/downloads.php' - elog "They must be placed inside ~/.tomenet directory." - fi -}