commit: 0668c22542dceb972242ba6f20cb65ddd69316c2 Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> AuthorDate: Mon Dec 8 21:13:23 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Dec 24 17:14:27 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0668c225
games-roguelike/tome: drop 2.3.5-r1 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> Part-of: https://github.com/gentoo/gentoo/pull/44964 Signed-off-by: Sam James <sam <AT> gentoo.org> games-roguelike/tome/Manifest | 1 - games-roguelike/tome/files/tome-2.3.5-format.patch | 88 ------------ .../tome/files/tome-2.3.5-gentoo-paths.patch | 31 ----- games-roguelike/tome/files/tome-2.3.5-noX.patch | 11 -- games-roguelike/tome/tome-2.3.5-r1.ebuild | 148 --------------------- 5 files changed, 279 deletions(-) diff --git a/games-roguelike/tome/Manifest b/games-roguelike/tome/Manifest index 3ba0e1ce507a..e2280c3e0f16 100644 --- a/games-roguelike/tome/Manifest +++ b/games-roguelike/tome/Manifest @@ -1,2 +1 @@ DIST tome-2.4.0_p20250227.tar.gz 2554393 BLAKE2B c919ad0b1d63a600b19bd2df02c826a9245b210817aae43b34ef8317d1ab67fecdfe9ede489b20f567329f03e121c5f8067ef251367b02888c5b20855f203fb8 SHA512 5a55bba7d5c8f200625c73851bd09b0d3cc253b963d20e86776d3f24c8374be779fc66918c3f81f88d035985c13fd9c8658abba444b888d987c8e3417cc16e6d -DIST tome-235-src.tar.bz2 2951227 BLAKE2B 7a9a6c608873062f9d6deae38c7e39244ca25d2bbb553d338014078c86b9decc36869c2f39f875425f9c3bb26784d3e460a225c5dabd197437781488f3e15d74 SHA512 f456aa91d18397297c213fa67dd14a4d29e024525be99f83b22cbe42f4d426b57fe6115a7124e3ec34de8f351117de525eab996ba7a2a230119e43639c4c9205 diff --git a/games-roguelike/tome/files/tome-2.3.5-format.patch b/games-roguelike/tome/files/tome-2.3.5-format.patch deleted file mode 100644 index 90057b44d19e..000000000000 --- a/games-roguelike/tome/files/tome-2.3.5-format.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- a/dungeon.c 2016-02-07 20:12:39.258150130 +0100 -+++ b/dungeon.c 2016-02-07 20:12:58.239805610 +0100 -@@ -1489,7 +1489,7 @@ - { - char buf[20]; - -- sprintf(buf, get_day(bst(YEAR, turn) + START_YEAR)); -+ sprintf(buf, "%s", get_day(bst(YEAR, turn) + START_YEAR)); - cmsg_format(TERM_L_GREEN, - "Today it is %s of the %s year of the third age.", - get_month_name(bst(DAY, turn), wizard, FALSE), buf); ---- a/files.c 2016-02-07 20:15:07.736451417 +0100 -+++ b/files.c 2016-02-07 20:15:27.595089867 +0100 -@@ -4856,7 +4856,7 @@ - - /* Terminate */ - tmp[k] = '\0'; -- sprintf(player_base, tmp); -+ sprintf(player_base, "%s", tmp); - - /* Require a "base" name */ - if (!player_base[0]) strcpy(player_base, "PLAYER"); ---- a/lua_bind.c 2016-02-07 20:09:29.071592178 +0100 -+++ b/lua_bind.c 2016-02-07 20:10:48.094164373 +0100 -@@ -490,7 +490,7 @@ - /* Files */ - void lua_print_hook(cptr str) - { -- fprintf(hook_file, str); -+ fprintf(hook_file, "%s", str); - } - - ---- a/plots.c 2016-02-07 20:11:35.389308152 +0100 -+++ b/plots.c 2016-02-07 20:12:19.247513152 +0100 -@@ -93,7 +93,7 @@ - { - MAKE(new, hooks_chain); - new->hook = hook; -- sprintf(new->name, name); -+ sprintf(new->name, "%s", name); - #ifdef DEBUG_HOOK - if (wizard) cmsg_format(TERM_VIOLET, "HOOK ADD: %s", name); - if (take_notes) add_note(format("HOOK ADD: %s", name), 'D'); ---- a/spells1.c 2016-02-07 20:15:47.277731397 +0100 -+++ b/spells1.c 2016-02-07 20:16:03.373438169 +0100 -@@ -7312,7 +7312,7 @@ - - if (who == -2) - { -- sprintf(killer, t_name + t_info[cave[p_ptr->py][p_ptr->px].t_idx].name); -+ sprintf(killer, "%s", t_name + t_info[cave[p_ptr->py][p_ptr->px].t_idx].name); - } - - /* Analyze the damage */ ---- a/squeltch.c 2016-02-07 20:13:11.872558078 +0100 -+++ b/squeltch.c 2016-02-07 20:13:42.707997918 +0100 -@@ -399,7 +399,7 @@ - - if (!max) continue; - -- sprintf(name, string_exec_lua(format("return __rules[%d].table.args.name", sel))); -+ sprintf(name, "%s", string_exec_lua(format("return __rules[%d].table.args.name", sel))); - if (input_box("New name?", hgt / 2, wid / 2, name, 15)) - { - exec_lua(format("auto_aux:rename_rule(%d, '%s')", sel, name)); ---- a/util.c 2016-02-07 20:14:22.786269296 +0100 -+++ b/util.c 2016-02-07 20:16:44.227693551 +0100 -@@ -4468,7 +4468,7 @@ - { - char buf2[20]; - -- sprintf(buf2, get_day(day + 1)); -+ sprintf(buf2, "%s", get_day(day + 1)); - if (full) sprintf(buf, "%s (%s day)", month_name[i], buf2); - else sprintf(buf, "%s", month_name[i]); - break; -@@ -4479,8 +4479,8 @@ - char buf2[20]; - char buf3[20]; - -- sprintf(buf2, get_day(day + 1 - month_day[i])); -- sprintf(buf3, get_day(day + 1)); -+ sprintf(buf2, "%s", get_day(day + 1 - month_day[i])); -+ sprintf(buf3, "%s", get_day(day + 1)); - - if (full) sprintf(buf, "%s day of %s (%s day)", buf2, month_name[i], buf3); - else if (compact) sprintf(buf, "%s day of %s", buf2, month_name[i]); diff --git a/games-roguelike/tome/files/tome-2.3.5-gentoo-paths.patch b/games-roguelike/tome/files/tome-2.3.5-gentoo-paths.patch deleted file mode 100644 index b3ef7fd98e67..000000000000 --- a/games-roguelike/tome/files/tome-2.3.5-gentoo-paths.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -rU 1 a/files.c b/files.c ---- a/files.c 2004-01-14 11:17:02.423263360 -0500 -+++ b/files.c 2004-01-14 11:17:50.074019344 -0500 -@@ -5670,3 +5670,3 @@ - /* Build the filename */ -- path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw"); -+ sprintf(buf, "GENTOO_DIR/tome-scores.raw"); - -@@ -5748,3 +5748,3 @@ - /* Build the filename */ -- path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw"); -+ sprintf(buf, "GENTOO_DIR/tome-scores.raw"); - -@@ -5846,3 +5846,3 @@ - /* Build the filename */ -- path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw"); -+ sprintf(buf, "GENTOO_DIR/tome-scores.raw"); - -@@ -6296,3 +6296,3 @@ - /* Build the filename */ -- path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw"); -+ sprintf(buf, "GENTOO_DIR/tome-scores.raw"); - -diff -rU 1 a/init2.c b/init2.c ---- a/init2.c 2004-01-14 11:17:02.473255760 -0500 -+++ b/init2.c 2004-01-14 11:17:58.286770816 -0500 -@@ -6686,3 +6686,3 @@ - /* Build the filename */ -- path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw"); -+ sprintf(buf, "GENTOO_DIR/tome-scores.raw"); - diff --git a/games-roguelike/tome/files/tome-2.3.5-noX.patch b/games-roguelike/tome/files/tome-2.3.5-noX.patch deleted file mode 100644 index b3830af50be1..000000000000 --- a/games-roguelike/tome/files/tome-2.3.5-noX.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/makefile 2012-05-28 14:02:44.787705444 +0200 -+++ b/makefile 2012-05-28 14:03:44.520524011 +0200 -@@ -458,7 +458,7 @@ - $(CC) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - - $(TOLUA): $(TOLUAOBJS) lua/tolua.c lua/tolualua.c -- $(CC) $(CFLAGS) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(TOLUAOBJS) lua/tolua.c lua/tolualua.c $(LIBS) -+ $(CC) $(CFLAGS) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(TOLUAOBJS) lua/tolua.c lua/tolualua.c - - # - # An install rule. diff --git a/games-roguelike/tome/tome-2.3.5-r1.ebuild b/games-roguelike/tome/tome-2.3.5-r1.ebuild deleted file mode 100644 index 0595068d383e..000000000000 --- a/games-roguelike/tome/tome-2.3.5-r1.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_PV=${PV//./} -DESCRIPTION="save the world from Morgoth and battle evil (or become evil ;])" -HOMEPAGE="https://t-o-m-e.net/"; -SRC_URI="http://t-o-m-e.net/dl/src/tome-${MY_PV}-src.tar.bz2"; -S="${WORKDIR}"/tome-${MY_PV}-src/src - -LICENSE="Moria" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gtk sdl X Xaw3d" - -RDEPEND=" - >=sys-libs/ncurses-5:0= - sdl? ( - media-libs/sdl-ttf - media-libs/sdl-image - media-libs/libsdl ) - gtk? ( >=x11-libs/gtk+-2.12.8:2 ) - X? ( x11-libs/libX11 ) - Xaw3d? ( x11-libs/libXaw ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - x11-misc/makedepend -" - -RDEPEND+=" acct-group/gamestat" - -PATCHES=( - "${FILESDIR}/"${PN}-2.3.5-gentoo-paths.patch - "${FILESDIR}"/${PN}-2.3.5-format.patch - "${FILESDIR}"/${PN}-2.3.5-noX.patch -) - -src_prepare() { - mv makefile.std makefile || die - - default - - sed -i -e '/^CC =/d' makefile || die - sed -i -e "s:xx:x:" ../lib/edit/p_info.txt || die - # sed -i -e "s:GENTOO_DIR:${GAMES_STATEDIR}:" files.c init2.c || die - - find .. -name .cvsignore -exec rm -f \{\} + || die - find ../lib/edit -type f -exec chmod a-x \{\} + || die -} - -src_compile() { - tc-export CC - - local GENTOO_INCLUDES="" GENTOO_DEFINES="-DUSE_GCU " GENTOO_LIBS="$($(tc-getPKG_CONFIG) ncurses --libs)" - - if use sdl || use X || use gtk || use Xaw3d; then - GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_EGO_GRAPHICS -DUSE_TRANSPARENCY \ - -DSUPPORT_GAMMA" - fi - - if use sdl || use X || use Xaw3d; then - GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_PRECISE_CMOVIE -DUSE_UNIXSOCK " - fi - - if use sdl; then - GENTOO_INCLUDES="${GENTOO_INCLUDES} $(sdl-config --cflags)" - GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_SDL " - GENTOO_LIBS="${GENTOO_LIBS} $(sdl-config --libs) -lSDL_image -lSDL_ttf" - fi - - if use X; then - GENTOO_INCLUDES="${GENTOO_INCLUDES} -I/usr/X11R6/include " - GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_X11 " - GENTOO_LIBS="${GENTOO_LIBS} -L/usr/X11R6/lib -lX11 " - fi - - if use Xaw3d; then - GENTOO_INCLUDES="${GENTOO_INCLUDES} -I/usr/X11R6/include " - GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_XAW " - GENTOO_LIBS="${GENTOO_LIBS} -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 " - fi - - if use gtk; then - GENTOO_INCLUDES="${GENTOO_INCLUDES} $($(tc-getPKG_CONFIG) gtk+-2.0 --cflags)" - GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_GTK2 " - GENTOO_LIBS="${GENTOO_LIBS} $($(tc-getPKG_CONFIG) gtk+-2.0 --libs) " - GTK_SRC_FILE="main-gtk2.c" - GTK_OBJ_FILE="main-gtk2.o" - else - GTK_SRC_FILE="" - GTK_OBJ_FILE="" - fi - - if use amd64; then - GENTOO_DEFINES="${GENTOO_DEFINES} -DLUA_NUM_TYPE=int " - fi - - GENTOO_INCLUDES="${GENTOO_INCLUDES} -Ilua -I." - GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_LUA" - - emake -j1 \ - INCLUDES="${GENTOO_INCLUDES}" \ - DEFINES="${GENTOO_DEFINES}" \ - depend - - emake tolua - - emake \ - COPTS="${CFLAGS}" \ - INCLUDES="${GENTOO_INCLUDES}" \ - DEFINES="${GENTOO_DEFINES}" \ - LIBS="${GENTOO_LIBS} -lm" \ - BINDIR="${EPREFIX}/usr/bin" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" \ - GTK_SRC_FILE="${GTK_SRC_FILE}" \ - GTK_OBJ_FILE="${GTK_OBJ_FILE}" -} - -src_install() { - emake -j1 \ - DESTDIR="${D}" \ - OWNER="nobody" \ - BINDIR="${EPREFIX}/usr/bin" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" install - - cd .. || die - dodoc *.txt - - dodir /var/games - touch "${ED}/var/games/${PN}-scores.raw" || die - - fperms 660 /var/games/${PN}-scores.raw - fowners root:gamestat /var/games/${PN}-scores.raw /usr/bin/${PN} - fperms g+s /usr/bin/${PN} -} - -pkg_postinst() { - ewarn "ToME ${PV} is not save-game compatible with 2.3.0 and previous versions." - echo - ewarn "If you have older save files and you wish to continue those games," - ewarn "you'll need to remerge the version of ToME with which you started" - ewarn "those save-games." -}
