[gentoo-commits] repo/gentoo:master commit in: games-roguelike/nethack/, games-roguelike/nethack/files/

[Stefan Strogin]

commit:     7f96879d0ec152ef151d0555d68be3d7c8641a19
Author:     Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 11:36:59 2020 +0000
Commit:     Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 11:41:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f96879d

games-roguelike/nethack: drop old 3.6.0-r3

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>

 games-roguelike/nethack/Manifest                   |   1 -
 .../nethack/files/nethack-3.6.0-recover.patch      | 110 ------------
 .../nethack/files/nethack-3.6.0-x11-color.patch    | 186 ---------------------
 games-roguelike/nethack/metadata.xml               |   3 -
 games-roguelike/nethack/nethack-3.6.0-r3.ebuild    | 142 ----------------
 5 files changed, 442 deletions(-)

diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest
index a95fbc6ee0b..66a24f403d3 100644
--- a/games-roguelike/nethack/Manifest
+++ b/games-roguelike/nethack/Manifest
@@ -1,4 +1,3 @@
 DIST nethack-3.6.3.tar.gz 5568657 BLAKE2B f0aa12a27fdf5005f57dcc802af88939b8460cfcfea3dc4d262b15a2807376ed434233dfa85ae0bfd60e50ad5a51ff4b060b5063e393d5859bac1b98364b5359 SHA512 38bc6140b12188397539f28528dd8e34364fb7efeb42dbe36d86fea6cc473e292b7f47fba01db19cf7641414dee86092e33deb3b074afa0e8b811e71be71e1d1
 DIST nethack-3.6.4.tar.gz 5573777 BLAKE2B 4e5a48bbf521406f17bc699643dd9f9d912381cc91ab2228affc6f54ad2b84ea7c946ab2d5936c274752a36920440d34001b13f28ce4c8f35844300d596086a7 SHA512 c951f939d50027b4468ebd2e32f79771e696035df0918b814bf02899f5c1e89d462ebc3f63155c23f5c627e66ca74244512d666b102c380242df1500a2c0afa9
-DIST nethack-360-src.tgz 4261282 BLAKE2B 7be22b8bdc7b5124418fa904aa3776d77440f67ec18782b878e037b989a18092ed88ca192224c7bc1eaa3cb438823188035c3e6d2aa85d13a7aa1e86c8527d32 SHA512 92370a3c60a4f6861b9c0f1e1320fc23d91cedc1615d0d09e06a0ee3e13c9c8c0cd931389bfd7a25845ed07ef966d19d9e46e77ae07084a941685dc67f49c813
 DIST nethack-361-src.tgz 4640769 BLAKE2B 3793a753e4012df64335e7e7ec60284de206012d5bb5d30a7ccfb458e456818f30dd0b4bfa9c41b1691bd01ee6aec2e44b57327586f0c9d76a573bf4c9bb00b1 SHA512 bd6e36c163f0d85e1ab1fc659464696b5a02c3864a800ad47e047fdc4a35fff4ef7dd28a9b071fa46f7f67fa45c97fdc77bc1f2bdbad80cc02950d73731d9c30

diff --git a/games-roguelike/nethack/files/nethack-3.6.0-recover.patch b/games-roguelike/nethack/files/nethack-3.6.0-recover.patch
deleted file mode 100644
index c7e8ab3dca0..00000000000
--- a/games-roguelike/nethack/files/nethack-3.6.0-recover.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From c15cf56e61c908ce756d698a8afa3064030761b3 Mon Sep 17 00:00:00 2001
-From: Luis Ressel <aranea@×××××.de>
-Date: Fri, 18 Dec 2015 23:16:56 +0100
-Subject: [PATCH] doc: Rename recover to recover-nethack
-
----
- doc/recover.6 | 30 +++++++++++++++---------------
- 1 file changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/doc/recover.6 b/doc/recover.6
-index 4c9f509..edd05e3 100644
---- a/doc/recover.6
-+++ b/doc/recover.6
-@@ -1,10 +1,10 @@
--.TH RECOVER 6 "9 January 1993"
-+.TH RECOVER-NETHACK 6 "9 January 1993"
- .\" NetHack 3.6  recover.6	$NHDT-Date: 1432512786 2015/05/25 00:13:06 $  $NHDT-Branch: master $:$NHDT-Revision: 1.6 $
- .UC 4
- .SH NAME
--recover \- recover a NetHack game interrupted by disaster
-+recover-nethack \- recover a NetHack game interrupted by disaster
- .SH SYNOPSIS
--.B recover
-+.B recover-nethack
- [
- .B \-d
- .I directory
-@@ -22,7 +22,7 @@ so such games can be recovered at the point of the last level change.
- The
- .I base
- options tell
--.I recover
-+.I recover-nethack
- which files to process.
- Each base option specifies recovery of a separate game.
- .PP
-@@ -72,47 +72,47 @@ by a user number to avoid conflicts,
- or "xlock" if the number of concurrent players is being limited.
- It may be necessary to look in the playground to find the correct
- base name of the interrupted game.
--.I recover
-+.I recover-nethack
- will transform these level files into a save file of the same name as
- .I nethack
- would have used.
- .PP
- Since
--.I recover
-+.I recover-nethack
- must be able to read and delete files from the playground
- and create files in the save directory,
- it has interesting interactions with game security.
- Giving ordinary players access to
--.I recover
-+.I recover-nethack
- through setuid or setgid is tantamount to leaving the playground
- world-writable,
- with respect to both cheating and messing up other players.
- For a single-user system, this of course does not change anything,
- so some of the microcomputer ports install
--.I recover
-+.I recover-nethack
- by default.
- .PP
- For a multi-user system,
- the game administrator may want to arrange for all .0 files in the
--playground to be fed to recover when the host machine boots,
-+playground to be fed to recover-nethack when the host machine boots,
- and handle game crashes individually.
- If the user population is sufficiently trustworthy,
--.I recover
-+.I recover-nethack
- can be installed with the same permissions the
- .I nethack
- executable has.
- In either case,
--.I recover
-+.I recover-nethack
- is easily compiled from the distribution utility directory.
- .SH NOTES
- .PP
- Like
- .I nethack
- itself,
--.I recover
-+.I recover-nethack
- will overwrite existing savefiles of the same name.
- Savefiles created by
--.I recover
-+.I recover-nethack
- are uncompressed;
- they may be compressed afterwards if desired,
- but even a compression-using
-@@ -122,11 +122,11 @@ will find them in the uncompressed form.
- nethack(6)
- .SH BUGS
- .PP
--.I recover
-+.I recover-nethack
- makes no attempt to find out if a base name specifies a game in progress.
- If multiple machines share a playground, this would be impossible to
- determine.
- .PP
--.I recover
-+.I recover-nethack
- should be taught to use the nethack playground locking mechanism to
- avoid conflicts.
--- 
-2.6.4
-

diff --git a/games-roguelike/nethack/files/nethack-3.6.0-x11-color.patch b/games-roguelike/nethack/files/nethack-3.6.0-x11-color.patch
deleted file mode 100644
index d34ca029d51..00000000000
--- a/games-roguelike/nethack/files/nethack-3.6.0-x11-color.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From f92bf2b495450d323e157eb41130c79a3d369239 Mon Sep 17 00:00:00 2001
-From: PatR <rankin@×××××××.org>
-Date: Mon, 8 Feb 2016 19:01:26 -0800
-Subject: [PATCH] fix #H4237 - color ignored for X11 text map
-
-Color was only being tracked for locations that had the pile of
-objects flag set.  And hilite_pile made a monster on a pile take
-on the color of the top object of the pile.
-
-This restores the tracking of color for the whole map, and makes
-highlighted piles be drawn in inverse like highligted pets.  The
-drawing routine doesn't know the difference (but could tell, if
-necessary, by testing whether the glyph is an object or a monster).
-
-Also, variables 'inbuf', 'inptr', and 'incount' were global; limit
-their scope to winmap.c.
----
- win/X11/winmap.c | 68 +++++++++++++++++++++++++++-----------------------------
- 1 file changed, 33 insertions(+), 35 deletions(-)
-
-diff --git a/win/X11/winmap.c b/win/X11/winmap.c
-index 93f5dd6..523e13d 100644
---- a/win/X11/winmap.c
-+++ b/win/X11/winmap.c
-@@ -102,6 +102,7 @@ int bkglyph UNUSED;
-         int color, och;
-         unsigned special;
- #ifdef TEXTCOLOR
-+        int colordif;
-         register unsigned char *co_ptr;
- #endif
- 
-@@ -116,24 +117,22 @@ int bkglyph UNUSED;
- 
-         /* Only update if we need to. */
-         ch_ptr = &map_info->text_map.text[y][x];
--
--#ifdef TEXTCOLOR
--        co_ptr = &map_info->text_map.colors[y][x];
--        if (*ch_ptr != ch || *co_ptr != color)
--#else
--        if (*ch_ptr != ch)
--#endif
--        {
-+        if (*ch_ptr != ch) {
-             *ch_ptr = ch;
-+            if (!map_info->is_tile)
-+                update_bbox = TRUE;
-+        }
- #ifdef TEXTCOLOR
--            if ((special & MG_PET) && iflags.hilite_pet)
--                color += CLR_MAX;
--            if ((special & MG_OBJPILE) && iflags.hilite_pile)
--            *co_ptr = color;
--#endif
-+        co_ptr = &map_info->text_map.colors[y][x];
-+        colordif = (((special & MG_PET) && iflags.hilite_pet)
-+                    || ((special & MG_OBJPILE) && iflags.hilite_pile))
-+                      ? CLR_MAX : 0;
-+        if (*co_ptr != (uchar) (color + colordif)) {
-+            *co_ptr = (uchar) (color + colordif);
-             if (!map_info->is_tile)
-                 update_bbox = TRUE;
-         }
-+#endif
-     }
- 
-     if (update_bbox) { /* update row bbox */
-@@ -844,7 +843,8 @@ Font font;
-     set_color_gc(CLR_BRIGHT_CYAN, XtNbright_cyan);
-     set_color_gc(CLR_WHITE, XtNwhite);
- #else
--    set_gc(wp->w, font, XtNforeground, bgpixel, &map_info->text_map.copy_gc,
-+    set_gc(wp->w, font, XtNforeground, bgpixel,
-+           &map_info->text_map.copy_gc,
-            &map_info->text_map.inv_copy_gc);
- #endif
- }
-@@ -943,17 +943,17 @@ struct xwindow *wp;
- 
-     map_all_stone(map_info);
-     (void) memset((genericptr_t) map_info->text_map.text, ' ',
--                  sizeof(map_info->text_map.text));
-+                  sizeof map_info->text_map.text);
- #ifdef TEXTCOLOR
-     (void) memset((genericptr_t) map_info->text_map.colors, NO_COLOR,
--                  sizeof(map_info->text_map.colors));
-+                  sizeof map_info->text_map.colors);
- #endif
- 
-     /* force a full update */
-     (void) memset((genericptr_t) map_info->t_start, (char) 0,
--                  sizeof(map_info->t_start));
-+                  sizeof map_info->t_start);
-     (void) memset((genericptr_t) map_info->t_stop, (char) COLNO - 1,
--                  sizeof(map_info->t_stop));
-+                  sizeof map_info->t_stop);
-     display_map_window(wp);
- }
- 
-@@ -978,8 +978,8 @@ struct xwindow *wp;
- #ifdef VERBOSE
-     printf("Font information:\n");
-     printf("fid = %ld, direction = %d\n", fs->fid, fs->direction);
--    printf("first = %d, last = %d\n", fs->min_char_or_byte2,
--           fs->max_char_or_byte2);
-+    printf("first = %d, last = %d\n",
-+           fs->min_char_or_byte2, fs->max_char_or_byte2);
-     printf("all chars exist? %s\n", fs->all_chars_exist ? "yes" : "no");
-     printf("min_bounds:lb=%d rb=%d width=%d asc=%d des=%d attr=%d\n",
-            fs->min_bounds.lbearing, fs->min_bounds.rbearing,
-@@ -990,8 +990,8 @@ struct xwindow *wp;
-            fs->max_bounds.width, fs->max_bounds.ascent,
-            fs->max_bounds.descent, fs->max_bounds.attributes);
-     printf("per_char = 0x%lx\n", (unsigned long) fs->per_char);
--    printf("Text: (max) width = %d, height = %d\n", text_map->square_width,
--           text_map->square_height);
-+    printf("Text: (max) width = %d, height = %d\n",
-+           text_map->square_width, text_map->square_height);
- #endif
- 
-     if (fs->min_bounds.width != fs->max_bounds.width)
-@@ -1002,9 +1002,9 @@ struct xwindow *wp;
-  * keyhit buffer
-  */
- #define INBUF_SIZE 64
--int inbuf[INBUF_SIZE];
--int incount = 0;
--int inptr = 0; /* points to valid data */
-+static int inbuf[INBUF_SIZE];
-+static int incount = 0;
-+static int inptr = 0; /* points to valid data */
- 
- /*
-  * Keyboard and button event handler for map window.
-@@ -1249,8 +1249,8 @@ boolean inverted;
-     }
- 
- #ifdef VERBOSE_UPDATE
--    printf("update: [0x%x] %d %d %d %d\n", (int) wp->w, start_row, stop_row,
--           start_col, stop_col);
-+    printf("update: [0x%x] %d %d %d %d\n",
-+           (int) wp->w, start_row, stop_row, start_col, stop_col);
- #endif
-     win_start_row = start_row;
-     win_start_col = start_col;
-@@ -1273,8 +1273,8 @@ boolean inverted;
-                 src_y = (tile / TILES_PER_ROW) * tile_height;
-                 XCopyArea(dpy, tile_pixmap, XtWindow(wp->w),
-                           tile_map->black_gc, /* no grapics_expose */
--                          src_x, src_y, tile_width, tile_height, dest_x,
--                          dest_y);
-+                          src_x, src_y, tile_width, tile_height,
-+                          dest_x, dest_y);
- 
-                 if (glyph_is_pet(glyph) && iflags.hilite_pet) {
-                     /* draw pet annotation (a heart) */
-@@ -1412,10 +1412,8 @@ Dimension cols, rows;
-     }
- 
-     num_args = 0;
--    XtSetArg(args[num_args], XtNwidth, wp->pixel_width);
--    num_args++;
--    XtSetArg(args[num_args], XtNheight, wp->pixel_height);
--    num_args++;
-+    XtSetArg(args[num_args], XtNwidth, wp->pixel_width); num_args++;
-+    XtSetArg(args[num_args], XtNheight, wp->pixel_height); num_args++;
-     XtSetValues(wp->w, args, num_args);
- }
- 
-@@ -1426,10 +1424,10 @@ struct xwindow *wp;
-     struct map_info_t *map_info = wp->map_information;
-     struct text_map_info_t *text_map = &map_info->text_map;
- 
--    (void) memset((genericptr_t) text_map->text, ' ', sizeof(text_map->text));
-+    (void) memset((genericptr_t) text_map->text, ' ', sizeof text_map->text);
- #ifdef TEXTCOLOR
-     (void) memset((genericptr_t) text_map->colors, NO_COLOR,
--                  sizeof(text_map->colors));
-+                  sizeof text_map->colors);
- #endif
- 
-     get_char_info(wp);
--- 
-2.7.1
-

diff --git a/games-roguelike/nethack/metadata.xml b/games-roguelike/nethack/metadata.xml
index 6b590935388..580294582a2 100644
--- a/games-roguelike/nethack/metadata.xml
+++ b/games-roguelike/nethack/metadata.xml
@@ -8,7 +8,4 @@
 	<upstream>
 		<remote-id type="sourceforge">nethack</remote-id>
 	</upstream>
-	<use>
-		<flag name="experimental">Enable experimental features (showscore and status_hilite)</flag>
-	</use>
 </pkgmetadata>

diff --git a/games-roguelike/nethack/nethack-3.6.0-r3.ebuild b/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
deleted file mode 100644
index 0d5d90745b7..00000000000
--- a/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_PV=${PV//.}
-DESCRIPTION="The ultimate old-school single player dungeon exploration game"
-HOMEPAGE="https://www.nethack.org/"
-SRC_URI="mirror://sourceforge/nethack/${PN}-${MY_PV}-src.tgz"
-
-LICENSE="nethack"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-IUSE="experimental X"
-
-RDEPEND="acct-group/gamestat
-	sys-libs/ncurses:0=
-	X? (
-		x11-libs/libXaw
-		x11-libs/libXpm
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	X? (
-		x11-base/xorg-proto
-		x11-apps/bdftopcf
-		>=x11-apps/mkfontscale-1.2.0
-	)"
-
-BINDIR="/usr/bin"
-STATEDIR="/var/games/${PN}"
-
-NETHACK_GROUP="gamestat"
-
-pkg_setup() {
-	HACKDIR="/usr/$(get_libdir)/${PN}"
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-recover.patch"
-	eapply "${FILESDIR}/${P}-x11-color.patch"
-	eapply_user
-
-	cp "${FILESDIR}/${P}-hint-$(usex X x11 tty)" hint || die "Failed to copy hint file"
-	sys/unix/setup.sh hint || die "Failed to run setup.sh"
-}
-
-src_compile() {
-	append-cflags -I../include -DDLB -DSECURE -DLINUX -DTIMED_DELAY -DVISION_TABLES
-	append-cflags '-DCOMPRESS=\"/bin/gzip\"' '-DCOMPRESS_EXTENSION=\".gz\"'
-	append-cflags "-DHACKDIR=\\\"${HACKDIR}\\\"" "-DVAR_PLAYGROUND=\\\"${STATEDIR}\\\""
-	append-cflags "-DDEF_PAGER=\\\"${PAGER}\\\""
-	append-cflags -DSYSCF "-DSYSCF_FILE=\\\"/etc/nethack.sysconf\\\""
-
-	use X && append-cflags -DX11_GRAPHICS -DUSE_XPM
-	use experimental &&
-		append-cflags -DSTATUS_VIA_WINDOWPORT -DSTATUS_HILITES -DSCORE_ON_BOTL
-
-	makeopts=(
-		CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
-		WINTTYLIB="$($(tc-getPKG_CONFIG) --libs ncurses)"
-		HACKDIR="${HACKDIR}" INSTDIR="${D}/${HACKDIR}"
-		SHELLDIR="${D}/${BINDIR}" VARDIR="${D}/${STATEDIR}"
-		)
-
-	emake "${makeopts[@]}" nethack recover Guidebook spec_levs
-
-	# Upstream still has some parallel compilation bugs
-	emake -j1 "${makeopts[@]}" all
-}
-
-src_install() {
-	emake "${makeopts[@]}" install
-
-	exeinto "${BINDIR}"
-	newexe util/recover recover-nethack
-	rm "${D}/${HACKDIR}/recover" || die "Failed to remove HACKDIR/recover"
-
-	doman doc/nethack.6
-	newman doc/recover.6 recover-nethack.6
-	dodoc doc/Guidebook.txt
-
-	insinto /etc
-	newins sys/unix/sysconf nethack.sysconf
-
-	insinto /etc/skel
-	newins "${FILESDIR}/${P}-nethackrc" .nethackrc
-
-	if use X ; then
-		cd "${S}/win/X11" || die "Failed to enter win/X11 directory"
-
-		# copy nethack x application defaults
-		insinto /etc/X11/app-defaults
-		newins NetHack.ad NetHack
-		rm "${D}/${HACKDIR}/NetHack.ad" || die "Failed to remove NetHack.ad"
-
-		newicon nh_icon.xpm nethack.xpm
-		make_desktop_entry ${PN} Nethack
-
-		# install nethack fonts
-		bdftopcf -o nh10.pcf nh10.bdf || die "Converting fonts failed"
-		bdftopcf -o ibm.pcf ibm.bdf || die "Converting fonts failed"
-		insinto "${HACKDIR}/fonts"
-		doins *.pcf
-		cd "${D}/${HACKDIR}/fonts" || die "Failed to enter fonts directory"
-		mkfontdir || die "The action mkfontdir ${HACKDIR}/fonts failed"
-	fi
-
-	rm -r "${D}/${STATEDIR}" || die "Failed to clean STATEDIR"
-	keepdir "${STATEDIR}/save"
-
-	fowners -R "root:${NETHACK_GROUP}" "${STATEDIR}"
-	fperms 770 "${STATEDIR}" "${STATEDIR}/save"
-
-	fowners "root:${NETHACK_GROUP}" "${HACKDIR}/nethack"
-	fperms g+s "${HACKDIR}/nethack"
-}
-
-pkg_postinst() {
-	cd "${ROOT}/${STATEDIR}" || die "Failed to enter ${STATEDIR} directory"
-
-	touch logfile perm record xlogfile || die "Failed to create log files"
-
-	chown -R root:"${NETHACK_GROUP}" . &&
-	chmod -R 660 . &&
-	chmod 770 . save ||
-	die "Adjustment of file permissions in ${ROOT}/${STATEDIR} failed"
-
-	touch -c bones* save/*  # non-critical
-
-	elog "A minimal default .nethackrc has been placed in /etc/skel/"
-	elog "The sysconf file is at /etc/nethack.sysconf"
-
-	if has_version "<${CATEGORY}/${PN}-3.6.0" ; then
-		elog
-		elog "Nethack 3.6 includes many new features."
-		elog "You might want to review your options and local patchset."
-		elog "Have a look at http://www.nethack.org/v360/release.html"
-	fi
-}