gentoo resync : 05.02.2020

11 files changed, 3 insertions, 869 deletions

diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest
index 3f4076381c33..1c1590638eac 100644
--- a/games-roguelike/nethack/Manifest
+++ b/games-roguelike/nethack/Manifest
@@ -1,18 +1,7 @@
-AUX nethack-3.6.0-hint-tty 258 BLAKE2B f8a00f5a238bb9a1a5a7f94c3a9ef71c7fed0b3e17c7ae09b0ea9922963f66579bea155c83fa881a48c9086c001e5219d1e6d77f2d81b1d298f3802e855d293d SHA512 112769bd68cb65f26604c084a0820eb9ab006a84f3bc754d43122d084b731746238b23beadff0bbd0dcaf39bfe009d466d3d355aeee7ad53939dc1974fe54531
-AUX nethack-3.6.0-hint-x11 412 BLAKE2B 466e716dc691dd99624196addf2d14a4ee7296d55f83093b17a9603f986b7b2ecfebdcda24db6c8d800245ac0175df34a5a6a185c767ffc8b2e1bb5eea39ecfb SHA512 7046791f17f5abc066b378af69f49d045f7533f794337e238400b98b5b5e6b518bb89d86dfe14828b54d0744d5cdd2ff5435fa7f1cacad92f3dd7caf643243ed
 AUX nethack-3.6.0-nethackrc 2458 BLAKE2B a051f476ffed8fb1598c65f243df3aa412a4bb35e904ba1d38059313491e3c36eb87c72a985a2b391760c0be72cd064cd4fef37a393c4dab9baa152b54e92c21 SHA512 9aae0d8ea3352b6335339fe91f5e52eb597f82e8fe50e0a52270e918123a02629610dda173419f6fc6e8f1e68358364bc5d8450e185b64c96d790790b68dddb9
-AUX nethack-3.6.0-recover.patch 3238 BLAKE2B 648e7ab4210efd8465477e6e576f9f0b972743c7ce1dd651661fe1b0e88fc774d613acb97941a7acdf2becd6bd2055c84f3eb2bb5c94e0eb8522b761fbf38831 SHA512 613b33757c1dabf897da77b53a26eb57318387462ff4d34f06411b2aef06d812c730db0ec4fb15b2895266bd914bd8ac11fa91334430834541b8d465c2a484ec
-AUX nethack-3.6.0-x11-color.patch 6828 BLAKE2B 4e8f502b8180e042fed9e829d7bdd3c8a89aa679929aa22e209ae85a9e94ed25c6463b378ae1f9a1649bace9020b638279805f2ac2b846b7434fefc2187514b4 SHA512 074fb2db8962f918f605404d2810bc78c27ea461255bc6ad26ad24bbe65346b27868d9558a9486b334be29bbcc6896a95fafa2e4446045f316201754ea4bdab8
-AUX nethack-3.6.1-recover.patch 3241 BLAKE2B e3f00fc47dc3751c1df93019ea57afd9346ff5cd463d046c03d4fea8b3ea5ea1e6a1080f8910d85dc28892b45e1f335875877dd1a33ca3321b65e19e8630565d SHA512 9ae09828882296015bf776d272b6874e70052d01a5fe2a8a261472f985fb89c0b4d309192262febb7a6848d401d9c1acb9c8e7ff17f45ce41d2185a09ea7dc82
 AUX nethack-3.6.3-hint-tty 266 BLAKE2B b9c3babf39ec3e7a8c5bfaa0efc9da9f91d7a6d31702100de04d93878563d07e8dded475a5f044e251b47404b22a00744f4e28d83e71743013cfe823dd699fe1 SHA512 7aa224680622a1c86ca2fe14aaf48dd202a0104aae108767494a822b29ae110c2b8489234622b1da8e9eafca30b2ccbbec7a8b2dec5d53f44ef21b303daa8c89
 AUX nethack-3.6.3-hint-x11 420 BLAKE2B 42d2681cd36a0bdb81a1d4c61c7be69c4fe85b43daf9e3ad28ed0a867a8e4dcb684fafe4125d4e9d4f7176274bc2def4e83bc086a523ab2d99ed89699b494dcb SHA512 44f48a5f7b5302b9e1deaf5449b3dc67ee59b1eaca14cace5f699cffa17b92f1dbf0d1793ae31dfa0d1ebc77c65ab04d67b3988fd1f934d3ed5620ae2aaeaf21
-AUX nethack-3.6.3-recover.patch 3810 BLAKE2B c9e046063bf86fea39e48a3e849d9613b43233f0824ce69c4e3ca2a7410fef5f20b703d2bf64c1615fb8ecf0950319b4c314a2648f0e289b2ae23af92fa92bf9 SHA512 71c841ad447c05759e1ab8beaa823c8021a1f0693c2a7a546eed64820d79fb2d0f9345ecbdec4e64df18a3fdb18b4d09820072e517ab142c279bcc39bbe914ef
-DIST nethack-3.6.3.tar.gz 5568657 BLAKE2B f0aa12a27fdf5005f57dcc802af88939b8460cfcfea3dc4d262b15a2807376ed434233dfa85ae0bfd60e50ad5a51ff4b060b5063e393d5859bac1b98364b5359 SHA512 38bc6140b12188397539f28528dd8e34364fb7efeb42dbe36d86fea6cc473e292b7f47fba01db19cf7641414dee86092e33deb3b074afa0e8b811e71be71e1d1
+AUX nethack-3.6.3-recover.patch 3795 BLAKE2B b00102072a9f23b7b736d1d18bc6cdc0a77f156ca963bd14bd86dadd92f5f77baee8f518f26f9dfa36fee64df39afab88ebe026da7fff3a8a9602a271e94851c SHA512 7ec01f9485efe679c734b1b8cf0292212bac38a9fdf0622b34262fe88f197c46f09d62679f362b37b36b4cea7b5c89373f32b5277949ebe72c7cf34b7941c007
 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
-EBUILD nethack-3.6.0-r3.ebuild 3987 BLAKE2B 1b7f6568c53ed95ee81890e3f3c4230e5711dcce7f9e5009ce682448f8e4bbab253a256eca0dd8e24c9c4df0f107967640714968df1617bd586cb07eeffbce72 SHA512 cfec956fa77c8c56248463381cf1af9aeb53b37387744e34d647a177608644bcf6dfbd165de008f89ee1d992c6518c0345a5d84f8060b367c1c5fe7fccfab2b9
-EBUILD nethack-3.6.1.ebuild 4334 BLAKE2B b32b9c7bf703753bb828abbc1df677af5a126c079f8a9250298c9ab8b030ca3d02c573cfc8ddbf04ad30eccc26430286b7da37a0ef99f4b87e79ebc828422e66 SHA512 c849bd7811bd6f4109857c7993748283b275fc3154355f5819686fae63e7fab02be28d4d8104014e10b9fc464f6850eec208507e95c940ac92fd831ed19afbba
-EBUILD nethack-3.6.3.ebuild 4366 BLAKE2B da085c940f6fad21fd24593a721aecc6dddd29c331bbf84b56189d487b861337183e99a250cc407b92e1c92588b364465e5a50f5e748f2fd07197ec0bcd863b2 SHA512 6f7acb9808e1fb8c16ba21c8f873f2cff404277e555b500cf4588b114befc10c3f1f13ed31d033ffec05541608ae2314570634eda2ed01c968eb99f73f5aaa2d
 EBUILD nethack-3.6.4.ebuild 4380 BLAKE2B 36e98a498911557d5b1b0468178363a90968356e0f49d7738b0169304259874911f8aeed55ac2b1321b30fb417e57d43951bef1321467a7156464ba35746770f SHA512 64d443add2e1d6d684f745ea5bdf7f846fdd59325eece3c76d60ada167fb7600ca2cb2bbe50fbe7590345f599e064ef690f2a1b0004a92fab93cd0f1611360b3
-MISC metadata.xml 439 BLAKE2B fb558984d37498f09fa3d679d226456bbccc0e42682db97b419f61bfcd03bade592518a451e5495721d84f7c69f03d5849ff4db77b2aa0b67e32f12b3c454b2e SHA512 5107cc3ae592182e800e751977d869fa59b551bc133254be4cdf4f5d6a6f9e9d386d3f9fef31d96e59e7c3882c15e4c85a085af52c9ebc8c30096825f3a87237
+MISC metadata.xml 330 BLAKE2B d9b00291dbb6b3e0464ae34a06844fb9231a62fabaf95dba759aa68c3d5abf5da1472974ff60050f02c20777ff888613daf2a4350d03d8a3f4791d5c6baece3b SHA512 e58684c319e9eac0fac88dfd582731a54ee38f5b058ea2bd5f17439c919edd5c3039e0cc11cbf299aa4908da35a66a10c4c3f032b51265c1e96f5a7ed1567d0b
diff --git a/games-roguelike/nethack/files/nethack-3.6.0-hint-tty b/games-roguelike/nethack/files/nethack-3.6.0-hint-tty
deleted file mode 100644
index 3c250e7e719c..000000000000
--- a/games-roguelike/nethack/files/nethack-3.6.0-hint-tty
+++ /dev/null
@@ -1,19 +0,0 @@
-#-PRE
-
-LINK=$(CC)
-
-WINSRC = $(WINTTYSRC)
-WINOBJ = $(WINTTYOBJ)
-WINLIB = $(WINTTYLIB)
-
-GAMEPERM = 02755
-VARDIRPERM = 0770
-VARFILEPERM = 0660
-CHOWN = true
-CHGRP = true
-
-
-#-POST
-
-# needed for external pager, bug #57410
-DATNODLB = $(VARDATND) license $(DATHELP)
diff --git a/games-roguelike/nethack/files/nethack-3.6.0-hint-x11 b/games-roguelike/nethack/files/nethack-3.6.0-hint-x11
deleted file mode 100644
index d0d1a8d4cd42..000000000000
--- a/games-roguelike/nethack/files/nethack-3.6.0-hint-x11
+++ /dev/null
@@ -1,23 +0,0 @@
-#-PRE
-
-LINK=$(CC)
-
-VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm
-
-WINSRC = $(WINTTYSRC) $(WINX11SRC)
-WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
-WINLIB = $(WINTTYLIB) $(WINX11LIB)
-
-GAMEPERM = 02755
-VARDIRPERM = 0770
-VARFILEPERM = 0660
-CHOWN = true
-CHGRP = true
-
-
-#-POST
-
-# needed for external pager, bug #57410
-DATNODLB = $(VARDATND) license $(DATHELP)
-
-WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -lXpm
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 c7e8ab3dca08..000000000000
--- 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@aixah.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 d34ca029d51a..000000000000
--- 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@nethack.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/files/nethack-3.6.1-recover.patch b/games-roguelike/nethack/files/nethack-3.6.1-recover.patch
deleted file mode 100644
index c7ad7808a2c3..000000000000
--- a/games-roguelike/nethack/files/nethack-3.6.1-recover.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 5d9a3ac6b9eaf63167e5c7c01f0bb33d383dab14 Mon Sep 17 00:00:00 2001
-From: Luis Ressel <aranea@aixah.de>
-Date: Tue, 21 Aug 2018 22:57:09 +0200
-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 1209d31d..c3fdd851 100644
---- a/doc/recover.6
-+++ b/doc/recover.6
-@@ -1,4 +1,4 @@
--.TH RECOVER 6 "14 December 2015" NETHACK
-+.TH RECOVER-NETHACK 6 "14 December 2015" NETHACK
- .de ND
- .ds Nd \\$3
- ..
-@@ -13,9 +13,9 @@
- .NR $NHDT-Revision: 1.9 $
- .ds Na Kenneth Lorber
- .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
-@@ -33,7 +33,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
-@@ -83,47 +83,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
-@@ -133,12 +133,12 @@ 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.
- .SH COPYRIGHT
--- 
-2.18.0
-
diff --git a/games-roguelike/nethack/files/nethack-3.6.3-recover.patch b/games-roguelike/nethack/files/nethack-3.6.3-recover.patch
index 7abcaca52b7a..e496f3918fed 100644
--- a/games-roguelike/nethack/files/nethack-3.6.3-recover.patch
+++ b/games-roguelike/nethack/files/nethack-3.6.3-recover.patch
@@ -3,7 +3,7 @@ From: Stefan Strogin <steils@gentoo.org>
 Date: Tue, 17 Dec 2019 20:20:52 +0200
 Subject: [PATCH] Rename manpage from recover to recover-nethack
 
-Based on the patch by Luis Ressel from https://bugs.gentoo.org/203556
+Based on the patch from https://bugs.gentoo.org/203556
 
 Upstream-Status: Inappropriate [Gentoo-specific]
 Signed-off-by: Stefan Strogin <steils@gentoo.org>
diff --git a/games-roguelike/nethack/metadata.xml b/games-roguelike/nethack/metadata.xml
index 6b5909353887..580294582a2e 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 0d5d90745b73..000000000000
--- 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
-}
diff --git a/games-roguelike/nethack/nethack-3.6.1.ebuild b/games-roguelike/nethack/nethack-3.6.1.ebuild
deleted file mode 100644
index 260b50750f98..000000000000
--- a/games-roguelike/nethack/nethack-3.6.1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop flag-o-matic toolchain-funcs
-
-MY_PV=${PV//.}
-DESCRIPTION="The ultimate old-school single player dungeon exploration game"
-HOMEPAGE="https://www.nethack.org/"
-SRC_URI="https://nethack.org/download/${PV}/nethack-${MY_PV}-src.tgz"
-
-LICENSE="nethack"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="X"
-
-RDEPEND="acct-group/gamestat
-	sys-libs/ncurses:0=
-	X? (
-		x11-libs/libXaw
-		x11-libs/libXpm
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	"
-BDEPEND="virtual/pkgconfig
-	X? (
-		x11-apps/bdftopcf
-		>=x11-apps/mkfontscale-1.2.0
-	)"
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-recover.patch"
-	eapply_user
-
-	cp "${FILESDIR}/${PN}-3.6.0-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 -DTIMED_DELAY -DVISION_TABLES -DDUMPLOG -DSCORE_ON_BOTL
-	append-cflags '-DCOMPRESS=\"${EPREFIX}/bin/gzip\"' '-DCOMPRESS_EXTENSION=\".gz\"'
-	append-cflags "-DHACKDIR=\\\"${EPREFIX}/usr/$(get_libdir)/nethack\\\"" "-DVAR_PLAYGROUND=\\\"${EPREFIX}/var/games/nethack\\\""
-	append-cflags "-DDEF_PAGER=\\\"${PAGER}\\\""
-	append-cflags -DSYSCF "-DSYSCF_FILE=\\\"${EPREFIX}/etc/nethack.sysconf\\\""
-
-	use X && append-cflags -DX11_GRAPHICS -DUSE_XPM
-
-	LOCAL_MAKEOPTS=(
-		CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
-		WINTTYLIB="$($(tc-getPKG_CONFIG) --libs ncurses)"
-		HACKDIR="${EPREFIX}/usr/$(get_libdir)/nethack" INSTDIR="${ED}/usr/$(get_libdir)/nethack"
-		SHELLDIR="${ED}/usr/bin" VARDIR="${ED}/var/games/nethack"
-		)
-
-	emake "${LOCAL_MAKEOPTS[@]}" nethack recover Guidebook spec_levs
-
-	# Upstream still has some parallel compilation bugs
-	emake -j1 "${LOCAL_MAKEOPTS[@]}" all
-}
-
-src_install() {
-	emake "${LOCAL_MAKEOPTS[@]}" install
-
-	mv "${ED}/usr/$(get_libdir)/nethack/recover" "${ED}/usr/bin/recover-nethack" || die "Failed to move recover-nethack"
-
-	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}/${PN}-3.6.0-nethackrc" .nethackrc
-
-	if use X ; then
-		cd "${S}/win/X11" || die "Failed to enter win/X11 directory"
-
-		mkdir -p "${ED}/etc/X11/app-defaults/" || die "Failed to make app-defaults directory"
-		mv "${ED}/usr/$(get_libdir)/nethack/NetHack.ad" "${ED}/etc/X11/app-defaults/" || die "Failed to move 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 "/usr/$(get_libdir)/nethack/fonts"
-		doins *.pcf
-		mkfontdir "${ED}/usr/$(get_libdir)/nethack/fonts" || die "mkfontdir failed"
-	fi
-
-	rm -r "${ED}/var/games/nethack" || die "Failed to clean var/games/nethack"
-	keepdir /var/games/nethack/save
-}
-
-pkg_preinst() {
-	fowners root:gamestat /var/games/nethack /var/games/nethack/save
-	fperms 2770 /var/games/nethack /var/games/nethack/save
-
-	fowners root:gamestat "/usr/$(get_libdir)/nethack/nethack"
-	fperms g+s "/usr/$(get_libdir)/nethack/nethack"
-}
-
-pkg_postinst() {
-	cd "${EROOT}/var/games/nethack" || die "Failed to enter ${EROOT}/var/games/nethack directory"
-
-	# Transition mechanism for <nethack-3.6.1 ebuilds. It's perfectly safe, so we'll just run it unconditionally.
-	chmod 2770 . save || die "Failed to chmod statedir"
-
-	# Those files can't be created earlier because we don't want portage to wipe them during upgrades
-	( umask 007 && touch logfile perm record xlogfile ) || die "Failed to create log files"
-
-	# Instead of using a proper version header in its save files, nethack checks for incompatibilities
-	# by comparing the mtimes of save files and its own binary. This would require admin interaction even
-	# during upgrades which don't change the file format, so we'll just touch the files and warn the admin
-	# manually in case of compatibility issues.
-	(
-		shopt -s nullglob
-		local saves=( bones* save/* )
-		[[ -n "${saves[*]}" ]] && touch -c "${saves[@]}"
-	) # non-fatal
-
-	elog "A minimal default .nethackrc has been placed in /etc/skel/"
-	elog "The sysconf file is at /etc/nethack.sysconf"
-}
diff --git a/games-roguelike/nethack/nethack-3.6.3.ebuild b/games-roguelike/nethack/nethack-3.6.3.ebuild
deleted file mode 100644
index 72711dcc6e1f..000000000000
--- a/games-roguelike/nethack/nethack-3.6.3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop flag-o-matic toolchain-funcs
-
-DESCRIPTION="The ultimate old-school single player dungeon exploration game"
-HOMEPAGE="https://www.nethack.org/"
-SRC_URI="https://nethack.org/download/${PV}/nethack-${PV//.}-src.tgz -> ${P}.tar.gz"
-
-LICENSE="nethack"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="X"
-
-RDEPEND="acct-group/gamestat
-	sys-libs/ncurses:0=
-	X? (
-		x11-libs/libXaw
-		x11-libs/libXpm
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	"
-BDEPEND="virtual/pkgconfig
-	X? (
-		x11-apps/bdftopcf
-		x11-apps/mkfontscale
-	)"
-
-S="${WORKDIR}/NetHack-NetHack-${PV}_Released"
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-recover.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 -DTIMED_DELAY -DVISION_TABLES -DDUMPLOG -DSCORE_ON_BOTL
-	append-cflags '-DCOMPRESS=\"${EPREFIX}/bin/gzip\"' '-DCOMPRESS_EXTENSION=\".gz\"'
-	append-cflags "-DHACKDIR=\\\"${EPREFIX}/usr/$(get_libdir)/nethack\\\"" "-DVAR_PLAYGROUND=\\\"${EPREFIX}/var/games/nethack\\\""
-	append-cflags "-DDEF_PAGER=\\\"${PAGER}\\\""
-	append-cflags -DSYSCF "-DSYSCF_FILE=\\\"${EPREFIX}/etc/nethack.sysconf\\\""
-
-	use X && append-cflags -DX11_GRAPHICS -DUSE_XPM
-
-	LOCAL_MAKEOPTS=(
-		CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
-		WINTTYLIB="$($(tc-getPKG_CONFIG) --libs ncurses)"
-		HACKDIR="${EPREFIX}/usr/$(get_libdir)/nethack" INSTDIR="${ED}/usr/$(get_libdir)/nethack"
-		SHELLDIR="${ED}/usr/bin" VARDIR="${ED}/var/games/nethack"
-		)
-
-	emake "${LOCAL_MAKEOPTS[@]}" nethack recover Guidebook spec_levs
-
-	# Upstream still has some parallel compilation bugs
-	emake -j1 "${LOCAL_MAKEOPTS[@]}" all
-}
-
-src_install() {
-	emake "${LOCAL_MAKEOPTS[@]}" install
-
-	mv "${ED}/usr/$(get_libdir)/nethack/recover" "${ED}/usr/bin/recover-nethack" || die "Failed to move recover-nethack"
-
-	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}/${PN}-3.6.0-nethackrc" .nethackrc
-
-	if use X ; then
-		cd "${S}/win/X11" || die "Failed to enter win/X11 directory"
-
-		mkdir -p "${ED}/etc/X11/app-defaults/" || die "Failed to make app-defaults directory"
-		mv "${ED}/usr/$(get_libdir)/nethack/NetHack.ad" "${ED}/etc/X11/app-defaults/" || die "Failed to move 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 "/usr/$(get_libdir)/nethack/fonts"
-		doins *.pcf
-		mkfontdir "${ED}/usr/$(get_libdir)/nethack/fonts" || die "mkfontdir failed"
-	fi
-
-	rm -r "${ED}/var/games/nethack" || die "Failed to clean var/games/nethack"
-	keepdir /var/games/nethack/save
-}
-
-pkg_preinst() {
-	fowners root:gamestat /var/games/nethack /var/games/nethack/save
-	fperms 2770 /var/games/nethack /var/games/nethack/save
-
-	fowners root:gamestat "/usr/$(get_libdir)/nethack/nethack"
-	fperms g+s "/usr/$(get_libdir)/nethack/nethack"
-}
-
-pkg_postinst() {
-	cd "${EROOT}/var/games/nethack" || die "Failed to enter ${EROOT}/var/games/nethack directory"
-
-	# Transition mechanism for <nethack-3.6.1 ebuilds. It's perfectly safe, so we'll just run it unconditionally.
-	chmod 2770 . save || die "Failed to chmod statedir"
-
-	# Those files can't be created earlier because we don't want portage to wipe them during upgrades
-	( umask 007 && touch logfile perm record xlogfile ) || die "Failed to create log files"
-
-	# Instead of using a proper version header in its save files, nethack checks for incompatibilities
-	# by comparing the mtimes of save files and its own binary. This would require admin interaction even
-	# during upgrades which don't change the file format, so we'll just touch the files and warn the admin
-	# manually in case of compatibility issues.
-	(
-		shopt -s nullglob
-		local saves=( bones* save/* )
-		[[ -n "${saves[*]}" ]] && touch -c "${saves[@]}"
-	) # non-fatal
-
-	elog "A minimal default .nethackrc has been placed in /etc/skel/"
-	elog "The sysconf file is at /etc/nethack.sysconf"
-}