public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/nethack/, games-roguelike/nethack/files/
@ 2016-02-09  7:18 Ian Delaney
  0 siblings, 0 replies; 4+ messages in thread
From: Ian Delaney @ 2016-02-09  7:18 UTC (permalink / raw
  To: gentoo-commits

commit:     62b2d784f50ffa5e31a5f51f732bf4ccf656ca17
Author:     Luis Ressel <aranea <AT> aixah <DOT> de>
AuthorDate: Sun Jan 31 19:08:10 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Sun Feb  7 20:48:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62b2d784

games-roguelike/nethack: Remove old versions

 games-roguelike/nethack/Manifest                   |   1 -
 .../nethack/files/3.4.3-X-support.patch            |  26 ---
 games-roguelike/nethack/files/3.4.3-bison.patch    |  18 --
 .../nethack/files/3.4.3-default-options.patch      |  29 ---
 .../nethack/files/3.4.3-gentoo-paths.patch         |  18 --
 games-roguelike/nethack/files/3.4.3-macos.patch    |  11 -
 .../nethack/files/nethack-3.4.3-gibc210.patch      |  13 --
 .../nethack/files/nethack-3.4.3-nethackrc          |  92 ---------
 .../nethack/files/nethack-3.4.3-recover.patch      |  94 ---------
 games-roguelike/nethack/nethack-3.4.3-r5.ebuild    | 229 ---------------------
 games-roguelike/nethack/nethack-3.6.0.ebuild       | 179 ----------------
 11 files changed, 710 deletions(-)

diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest
index 5808cc3..ea5a7c1 100644
--- a/games-roguelike/nethack/Manifest
+++ b/games-roguelike/nethack/Manifest
@@ -1,2 +1 @@
-DIST nethack-343-src.tgz 3497458 SHA256 bb39c3d2a9ee2df4a0c8fdde708fbc63740853a7608d2f4c560b488124866fe4 SHA512 052342c19619219f291571d48cf7799f962eb6ec6f8a276427225c0abbd833eada18abeff9fbd647919f2a9e3bb097d7f154675e283fe48abc4752f24c192d8f WHIRLPOOL 397c787f83149d96ddbfa6a2235c20c3724ed67946889d432774901cb7ddc71b177e2cbd6c3029f4eb0b4df21c81c6a427494dad550fdbace01876a3d9c79d75
 DIST nethack-360-src.tgz 4261282 SHA256 1ade698d8458b8d87a4721444cb73f178c74ed1b6fde537c12000f8edf2cb18a SHA512 92370a3c60a4f6861b9c0f1e1320fc23d91cedc1615d0d09e06a0ee3e13c9c8c0cd931389bfd7a25845ed07ef966d19d9e46e77ae07084a941685dc67f49c813 WHIRLPOOL 14ff7a8bcf06b18e5192a7478f1fcd25eb55ecc149d9fa8b80def95311a498ef8d172ee4ff7e69c62e36b2a190a0f14b4a3d4f61183a48676fa77e2e7268690c

diff --git a/games-roguelike/nethack/files/3.4.3-X-support.patch b/games-roguelike/nethack/files/3.4.3-X-support.patch
deleted file mode 100644
index 6687f88..0000000
--- a/games-roguelike/nethack/files/3.4.3-X-support.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- include/config.h.orig	2003-06-21 20:58:57.000000000 -0400
-+++ include/config.h	2003-06-21 20:59:44.000000000 -0400
-@@ -46 +46 @@
--/* #define X11_GRAPHICS */	/* X11 interface */
-+#define X11_GRAPHICS 1
-@@ -127 +127 @@
--/* # define USE_XPM */		/* Disable if you do not have the XPM library */
-+# define USE_XPM 1
---- Makefile.orig	2003-06-21 21:01:03.000000000 -0400
-+++ Makefile	2003-06-21 21:01:16.000000000 -0400
-@@ -43 +43 @@
--VARDATND = 
-+VARDATND =  x11tiles pet_mark.xbm rip.xpm
---- src/Makefile.orig	2003-06-21 21:02:01.000000000 -0400
-+++ src/Makefile	2003-06-21 21:02:11.000000000 -0400
-@@ -207,2 +207,2 @@
--WINSRC = $(WINTTYSRC)
--WINOBJ = $(WINTTYOBJ)
-+WINSRC = $(WINTTYSRC) $(WINX11SRC)
-+WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
-@@ -228 +228 @@
--WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
-+WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -lXpm
-@@ -248 +248 @@
--WINLIB = $(WINTTYLIB)
-+WINLIB = $(WINTTYLIB) $(WINX11LIB)

diff --git a/games-roguelike/nethack/files/3.4.3-bison.patch b/games-roguelike/nethack/files/3.4.3-bison.patch
deleted file mode 100644
index 0bec63a..0000000
--- a/games-roguelike/nethack/files/3.4.3-bison.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- nethack-3.4.3/util/Makefile	2004-08-21 01:09:06.724326360 +0200
-+++ nethack-3.4.3.new//util/Makefile	2004-08-21 01:08:03.852884272 +0200
-@@ -101,11 +101,11 @@
- 
- # yacc/lex programs to use to generate *_comp.h, *_lex.c, and *_yacc.c.
- # if, instead of yacc/lex you have bison/flex, comment/uncomment the following.
--YACC     = yacc
--LEX      = lex
--# YACC     = bison -y
-+#YACC     = yacc
-+#LEX      = lex
-+ YACC     = bison -y
- # YACC     = byacc
--# LEX      = flex
-+ LEX      = flex
-  
- # these are the names of the output files from YACC/LEX. Under MS-DOS
- # and similar systems, they may differ

diff --git a/games-roguelike/nethack/files/3.4.3-default-options.patch b/games-roguelike/nethack/files/3.4.3-default-options.patch
deleted file mode 100644
index 83ab94a..0000000
--- a/games-roguelike/nethack/files/3.4.3-default-options.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- include/config.h.orig	2003-06-21 20:44:00.000000000 -0400
-+++ include/config.h	2003-06-21 20:46:42.000000000 -0400
-@@ -172,2 +172,2 @@
--#define COMPRESS "/usr/bin/compress"	/* Lempel-Ziv compression */
--#define COMPRESS_EXTENSION ".Z"		/* compress's extension */
-+#define COMPRESS "/bin/bzip2"	/* Lempel-Ziv compression */
-+#define COMPRESS_EXTENSION ".bz2"		/* compress's extension */
-@@ -188 +188 @@
--/* #define DLB */	/* not supported on all platforms */
-+#define DLB 1	/* not supported on all platforms */
-@@ -207 +207 @@
--#  define HACKDIR "/usr/games/lib/nethackdir"
-+#  define HACKDIR "GENTOO_HACKDIR"
-@@ -303 +303 @@
--/* #define VISION_TABLES */ /* use vision tables generated at compile time */
-+#define VISION_TABLES 1 /* use vision tables generated at compile time */
---- include/unixconf.h.orig	2003-06-21 20:47:54.000000000 -0400
-+++ include/unixconf.h	2003-06-21 20:48:39.000000000 -0400
-@@ -40 +40 @@
--/* #define LINUX */	/* Another Unix clone */
-+#define LINUX 1	/* Another Unix clone */
-@@ -135 +135 @@
--/* #define TIMED_DELAY */	/* usleep() */
-+#define TIMED_DELAY 1
---- src/Makefile.orig	2003-06-21 20:55:36.000000000 -0400
-+++ src/Makefile	2003-06-21 20:55:49.000000000 -0400
-@@ -234 +234 @@
--WINTTYLIB = -ltermlib
-+WINTTYLIB = -lncurses

diff --git a/games-roguelike/nethack/files/3.4.3-gentoo-paths.patch b/games-roguelike/nethack/files/3.4.3-gentoo-paths.patch
deleted file mode 100644
index af86cd1..0000000
--- a/games-roguelike/nethack/files/3.4.3-gentoo-paths.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- include/unixconf.h.orig	2003-08-07 23:18:03.070299152 -0400
-+++ include/unixconf.h	2003-08-07 23:18:39.699730632 -0400
-@@ -96,13 +96,13 @@
-  */
- 
- /* #define NO_FILE_LINKS */	/* if no hard links */
--/* #define LOCKDIR "/usr/games/lib/nethackdir" */	/* where to put locks */
-+#define LOCKDIR "GENTOO_STATEDIR"
- 
- /*
-  * If you want the static parts of your playground on a read-only file
-  * system, define VAR_PLAYGROUND to be where the variable parts are kept.
-  */
--/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
-+#define VAR_PLAYGROUND "GENTOO_STATEDIR"
- 
- 
- /*

diff --git a/games-roguelike/nethack/files/3.4.3-macos.patch b/games-roguelike/nethack/files/3.4.3-macos.patch
deleted file mode 100644
index d5aad38..0000000
--- a/games-roguelike/nethack/files/3.4.3-macos.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nethack-3.4.3/win/Qt/qt_win.cpp.orig	2005-11-22 21:24:03.000000000 +0100
-+++ nethack-3.4.3/win/Qt/qt_win.cpp	2005-11-22 21:25:26.000000000 +0100
-@@ -102,7 +102,7 @@
- #include "qt_xpms.h"
- 
- #include <dirent.h>
--#ifdef Q_WS_MACX
-+#ifdef __APPLE__
- #  include <sys/malloc.h>
- #else
- #  include <malloc.h>

diff --git a/games-roguelike/nethack/files/nethack-3.4.3-gibc210.patch b/games-roguelike/nethack/files/nethack-3.4.3-gibc210.patch
deleted file mode 100644
index 20675ca..0000000
--- a/games-roguelike/nethack/files/nethack-3.4.3-gibc210.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- include/unixconf.h.old	2009-10-07 09:37:46.000000000 +0200
-+++ include/unixconf.h	2009-10-07 09:38:05.000000000 +0200
-@@ -293,10 +293,8 @@
- # endif
- #else	/* therefore SYSV */
- # ifndef index	/* some systems seem to do this for you */
--#define index	strchr
- # endif
- # ifndef rindex
--#define rindex	strrchr
- # endif
- #endif
- 

diff --git a/games-roguelike/nethack/files/nethack-3.4.3-nethackrc b/games-roguelike/nethack/files/nethack-3.4.3-nethackrc
deleted file mode 100644
index 5589933..0000000
--- a/games-roguelike/nethack/files/nethack-3.4.3-nethackrc
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# Nethack configuration file.
-#
-# Please read the Guidebook in /usr/share/doc/nethack or at www.nethack.org.
-#
-# Naming this file $(HOME)/.nethackrc or setting the environment
-# variable NETHACKOPTIONS to point to its full path name elsewhere tells
-# NetHack to use X11 windowing (provided the executable was compiled with 
-# that ability).
-#
-# SET YOUR WINDOW TYPE
-# Your windowtype choices are: GENTOO_WINDOWTYPES
-#
-OPTIONS=windowtype:GENTOO_DEFWINDOWTYPE
-#OPTIONS=color
-#OPTIONS=name:player
-#OPTIONS=gender:male
-#OPTIONS=fruit:mango
-#OPTIONS=dogname:Izchak
-#OPTIONS=catname:Chun-Li
-#OPTIONS=horsename:Marlon
-
-# Suggested for qt:
-#OPTIONS=number_pad,menustyle:partial,!time,showexp
-#OPTIONS=hilite_pet,toptenwin,msghistory:200,windowtype:Qt
-
-# The font settings below are for X11 untiled
-#
-# There are 17 object symbols and various graphics symbols.
-# The descriptions of these symbols can be found in dat/opthelp.
-#
-#
-# Font: nh10 (10x20)
-#
-#OBJECTS= 180 183 188 192 181 184 182 189 190 196 \
-#	 191 194 193 187 185 186 195
-#
-#DUNGEON= 032 025 018 013 012 014 011 015 023 024 \
-#	 022 021 128 129 130 131 132 035 035 133 \
-#	 134 135 136 137 145 146 144 124 143 142 \
-#	 141 140 149 150 031 031 147 148 031 161 \
-#	 140
-#
-#TRAPS=	 138 138 138 138 138 138 138 138 138 138 \
-#	 138 138 138 138 138 139 138 138 138 138 \
-#	 138 138
-#
-#EFFECTS= 151 152 153 154 155 156 157 158	 \
-#	 159 160 161 162			 \
-#	 163 164 165 166 167 168 169 170	 \
-#	 171 172 173 174 175 176 177 178 179
-#
-#
-# Font: ibm (8x14)
-#
-#OBJECTS= 207 210 215 219 208 211 209 216 217 223 \
-#	 218 221 220 214 212 213 222
-#
-#DUNGEON= 032 128 129 130 131 132 133 134 135 136 \
-#	  137 138 139 045 124 142 143 035 035 144 \
-#	  145 146 147 148 155 156 227 124 154 153 \
-#	  152 151 159 160 200 200 157 158 250 170 \
-#	  151
-#
-#TRAPS=   149 149 149 149 149 149 149 149 149 149 \
-#	  149 149 149 149 149 150 149 149 149 149 \
-#	  149 149
-#
-#EFFECTS= 161 162 163 164 165 166 167 168	  \
-#	  169 170 171 172			  \
-#	  173 174 175 176 177 178 179 180	  \
-#	  181 182 183 184 185 186 187 188 189
-#
-#
-# Font: a "standard" font like 6x13
-# Note that this version is unlikely to work on a tty on a Unix system because
-# many of these characters are also control characters.
-#
-#DUNGEON = 032 025 018 013 012 014 011 015 023 024 \
-#	   022 021 031 045 124 043 043 035 035 031 \
-#	   035 001 060 062 060 062 019 124 092 035 \
-#	   123 125 031 125 046 046 035 035 046 127 \
-#	   125
-#
-#TRAPS=    094 094 094 094 094 094 094 094 094 094 \
-#	   094 094 094 094 094 002 094 094 094 094 \
-#	   094 094
-#
-#EFFECTS=  124 045 092 047 042 033 041 040	   \
-#	   048 035 064 042			   \
-#	   047 045 092 124 124 092 045 047         \
-#	   047 064 092 064 064 064 092 064 047

diff --git a/games-roguelike/nethack/files/nethack-3.4.3-recover.patch b/games-roguelike/nethack/files/nethack-3.4.3-recover.patch
deleted file mode 100644
index 3ad80b0..0000000
--- a/games-roguelike/nethack/files/nethack-3.4.3-recover.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- doc/recover.6	2003-12-07 18:39:13.000000000 -0500
-+++ doc/nethack-recover.6	2010-03-02 16:03:26.978172561 -0500
-@@ -1,9 +1,9 @@
--.TH RECOVER 6 "9 January 1993"
-+.TH NETHACK-RECOVER 6 "9 January 1993"
- .UC 4
- .SH NAME
--recover \- recover a NetHack game interrupted by disaster
-+nethack-recover \- nethack-recover a NetHack game interrupted by disaster
- .SH SYNOPSIS
--.B recover
-+.B nethack-recover
- [
- .B \-d
- .I directory
-@@ -21,7 +21,7 @@
- The
- .I base
- options tell
--.I recover
-+.I nethack-recover
- which files to process.
- Each base option specifies recovery of a separate game.
- .PP
-@@ -56,24 +56,24 @@
- 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 nethack-recover
- will transform these level files into a save file of the same name as
- .I nethack
- would have used.
- .PP
- Since
--.I recover
-+.I nethack-recover
- 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 nethack-recover
- 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 nethack-recover
- by default.
- .PP
- For a multi-user system,
-@@ -81,22 +81,22 @@
- playground to be fed to recover when the host machine boots,
- and handle game crashes individually.
- If the user population is sufficiently trustworthy,
--.I recover
-+.I nethack-recover
- can be installed with the same permissions the
- .I nethack
- executable has.
- In either case,
--.I recover
-+.I nethack-recover
- is easily compiled from the distribution utility directory.
- .SH NOTES
- .PP
- Like
- .I nethack
- itself,
--.I recover
-+.I nethack-recover
- will overwrite existing savefiles of the same name.
- Savefiles created by
--.I recover
-+.I nethack-recover
- are uncompressed;
- they may be compressed afterwards if desired,
- but even a compression-using
-@@ -106,11 +106,11 @@
- nethack(6)
- .SH BUGS
- .PP
--.I recover
-+.I nethack-recover
- 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 nethack-recover
- should be taught to use the nethack playground locking mechanism to
- avoid conflicts.

diff --git a/games-roguelike/nethack/nethack-3.4.3-r5.ebuild b/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
deleted file mode 100644
index 3746bd9..0000000
--- a/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs flag-o-matic user
-
-MY_PV=${PV//.}
-DESCRIPTION="The ultimate old-school single player dungeon exploration game"
-HOMEPAGE="http://www.nethack.org/"
-SRC_URI="mirror://sourceforge/nethack/${PN}-${MY_PV}-src.tgz"
-
-LICENSE="nethack"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="X"
-
-RDEPEND="sys-libs/ncurses:0=
-	X? (
-		x11-libs/libXaw
-		x11-libs/libXpm
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	X? (
-		x11-proto/xproto
-		x11-apps/bdftopcf
-		x11-apps/mkfontdir
-	)"
-
-BINDIR="/usr/games/bin"
-STATEDIR="/var/games/${PN}"
-
-NETHACK_GROUP="gamestat"
-
-pkg_setup() {
-	HACKDIR="/usr/$(get_libdir)/${PN}"
-
-	enewgroup gamestat 36
-}
-
-src_prepare() {
-	# This copies the /sys/unix Makefile.*s to their correct places for
-	# seding and compiling.
-	cd "sys/unix" || die "Could not go into sys/unix directory"
-	source setup.sh || die
-
-	cd ../.. || die "Failed to get back to main directory"
-	epatch \
-		"${FILESDIR}"/${PV}-gentoo-paths.patch \
-		"${FILESDIR}"/${PV}-default-options.patch \
-		"${FILESDIR}"/${PV}-bison.patch \
-		"${FILESDIR}"/${PV}-macos.patch \
-		"${FILESDIR}"/${P}-gibc210.patch \
-		"${FILESDIR}"/${P}-recover.patch
-
-	epatch_user
-
-	mv doc/recover.6 doc/nethack-recover.6 || die "Could not rename recover.6 to nethack-recover.6"
-
-	sed -i \
-		-e "s:GENTOO_STATEDIR:${STATEDIR}:" include/unixconf.h \
-		|| die "setting statedir"
-	sed -i \
-		-e "s:GENTOO_HACKDIR:${HACKDIR}:" include/config.h \
-		|| die "setting hackdir"
-	# set the default pager from the environment bug #52122
-	if [[ -n "${PAGER}" ]] ; then
-		sed -i \
-			-e "115c\#define DEF_PAGER \"${PAGER}\"" \
-			include/unixconf.h \
-			|| die "setting statedir"
-		# bug #57410
-		sed -i \
-			-e "s/^DATNODLB =/DATNODLB = \$(DATHELP)/" Makefile \
-			|| die "sed Makefile failed"
-	fi
-
-	# sys-libs/ncurses[tinfo]
-	sed -i \
-		-e '/^WINTTYLIB/s| = .*| = '"$(
-				$(tc-getPKG_CONFIG) --libs ncurses
-			)"'|g' \
-		src/Makefile || die
-
-	if use X ; then
-		epatch "${FILESDIR}/${PV}-X-support.patch"
-	fi
-}
-
-src_compile() {
-	local lflags="${LDFLAGS}"
-
-	cd "${S}"/src || die "Failed to enter src directory"
-	append-flags -I../include
-
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LFLAGS="${lflags}" \
-		../util/makedefs
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LFLAGS="${lflags}"
-	cd "${S}"/util || die "Failed to enter util directory"
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LFLAGS="${lflags}" \
-		recover
-}
-
-src_install() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		GAMEPERM=02755 \
-		GAMEUID="root" GAMEGRP="${NETHACK_GROUP}" \
-		PREFIX="${D}/usr" \
-		GAMEDIR="${D}/${HACKDIR}" \
-		SHELLDIR="${D}/${BINDIR}" \
-		install
-
-	# We keep this stuff in STATEDIR instead so tidy up.
-	rm -rf "${D}/${HACKDIR}/"{nethack,recover,save}
-
-	exeinto "${BINDIR}"
-	newexe src/nethack nethack-bin
-	newexe util/recover recover-nethack
-
-	# The final nethack is a sh script.  This fixes the hard-coded
-	# HACKDIR directory so it doesn't point to ${D}/usr/share/nethackdir
-	# and points HACK to BINDIR/nethack-bin (see above)
-	sed -i \
-		-e "s:^\(HACKDIR=\).*$:\1${HACKDIR}:;
-			s:^\(HACK=\).*$:\1${BINDIR}/nethack-bin:" \
-		"${D}/${BINDIR}/nethack" \
-		|| die "sed /${BINDIR}/nethack failed"
-
-	doman doc/*.6
-	dodoc doc/*.txt
-
-	insinto /etc/skel
-	newins "${FILESDIR}/${P}-nethackrc" .nethackrc
-
-	local windowtypes="tty"
-	use X && windowtypes="${windowtypes} x11"
-	set -- ${windowtypes}
-	sed -i \
-		-e "s:GENTOO_WINDOWTYPES:${windowtypes}:" \
-		-e "s:GENTOO_DEFWINDOWTYPE:$1:" \
-		"${D}/etc/skel/.nethackrc" \
-		|| die "sed /etc/skel/.nethackrc failed"
-
-	if use X ; then
-		# install nethack fonts
-		cd "${S}/win/X11" || die "Failed to enter win/X11 directory"
-		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"
-
-		# copy nethack x application defaults
-		cd "${S}/win/X11" || die "Failed to enter win/X11 directory again"
-		insinto /etc/X11/app-defaults
-		newins NetHack.ad NetHack
-		sed -i \
-			-e 's:^!\(NetHack.tile_file.*\):\1:' \
-			"${D}/etc/X11/app-defaults/NetHack" \
-			|| die "sed /etc/X11/app-defaults/NetHack failed"
-
-		newicon nh_icon.xpm nethack.xpm
-		make_desktop_entry ${PN} Nethack
-	fi
-
-	keepdir "${STATEDIR}/save"
-	rm "${D}/${HACKDIR}/"{logfile,perm,record}
-
-	fowners -R "root:${NETHACK_GROUP}" "${STATEDIR}"
-	fperms -R 660 "${STATEDIR}"
-	fperms 770 "${STATEDIR}" "${STATEDIR}/save"
-
-	fowners "root:${NETHACK_GROUP}" ${BINDIR}/nethack-bin
-	fperms g+s ${BINDIR}/nethack-bin
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-3.4.3-r3" ; then
-		migration=true
-
-		# preserve STATEDIR/{logfile,record}
-		# (previous ebuild rev mistakenly removes it)
-		for f in "${ROOT}/${STATEDIR}/"{logfile,record} ; do
-			if [[ -e "$f" ]] ; then
-				cp "$f" "$T" || die "Failed to preserve ${ROOT}/${STATEDIR} files"
-			else
-				touch "$T/$f" || die "Failed to preserve ${ROOT}/${STATEDIR} files"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	cd "${ROOT}/${STATEDIR}" || die "Failed to enter ${STATEDIR} directory"
-
-	if [[ -v migration ]] ; then
-		cp "$T/"{logfile,record} . ||
-		die "Failed to preserve ${ROOT}/${STATEDIR} files"
-
-		chown -R root:"${NETHACK_GROUP}" . &&
-		chmod -R 660 . &&
-		chmod 770 . save ||
-		die "Adjustment of file permissions in ${ROOT}/${STATEDIR} failed"
-	fi
-
-	# we don't want to overwrite existing files, as they contain user data
-	local files="logfile perm record"
-
-	touch $files &&
-	chmod 660 $files &&
-	chown root:"${NETHACK_GROUP}" $files ||
-	die "Adjustment of file permissions in "${ROOT}/${STATEDIR}" failed"
-
-	elog "You may want to look at /etc/skel/.nethackrc for interesting options"
-}

diff --git a/games-roguelike/nethack/nethack-3.6.0.ebuild b/games-roguelike/nethack/nethack-3.6.0.ebuild
deleted file mode 100644
index f627cad..0000000
--- a/games-roguelike/nethack/nethack-3.6.0.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs flag-o-matic user
-
-MY_PV=${PV//.}
-DESCRIPTION="The ultimate old-school single player dungeon exploration game"
-HOMEPAGE="http://www.nethack.org/"
-SRC_URI="mirror://sourceforge/nethack/${PN}-${MY_PV}-src.tgz"
-
-LICENSE="nethack"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="X"
-
-RDEPEND="sys-libs/ncurses:0=
-	X? (
-		x11-libs/libXaw
-		x11-libs/libXpm
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	X? (
-		x11-proto/xproto
-		x11-apps/bdftopcf
-		x11-apps/mkfontdir
-	)"
-
-BINDIR="/usr/bin"
-STATEDIR="/var/games/${PN}"
-
-NETHACK_GROUP="gamestat"
-
-pkg_setup() {
-	HACKDIR="/usr/$(get_libdir)/${PN}"
-
-	enewgroup gamestat 36
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-recover.patch"
-	epatch_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 "-DLOCKDIR=\\\"${STATEDIR}\\\"" "-DDEF_PAGER=\\\"${PAGER}\\\""
-	append-cflags -DSYSCF "-DSYSCF_FILE=\\\"/etc/nethack.sysconf\\\""
-
-	use X && append-cflags -DX11_GRAPHICS -DUSE_XPM
-
-	emake \
-		CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}" \
-		WINTTYLIB="$($(tc-getPKG_CONFIG) --libs ncurses)" \
-		HACKDIR="${HACKDIR}" INSTDIR="${D}/${HACKDIR}" \
-		SHELLDIR="${D}/${BINDIR}" VARDIR="${D}/${STATEDIR}" \
-		nethack recover Guidebook spec_levs
-
-	# Upstream still has some parallel compilation bugs
-	emake -j1 \
-		CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}" \
-		WINTTYLIB="$($(tc-getPKG_CONFIG) --libs ncurses)" \
-		HACKDIR="${HACKDIR}" INSTDIR="${D}/${HACKDIR}" \
-		SHELLDIR="${D}/${BINDIR}" VARDIR="${D}/${STATEDIR}" \
-		all
-}
-
-src_install() {
-	emake \
-		CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}" \
-		WINTTYLIB="$($(tc-getPKG_CONFIG) --libs ncurses)" \
-		HACKDIR="${HACKDIR}" INSTDIR="${D}/${HACKDIR}" \
-		SHELLDIR="${D}/${BINDIR}" VARDIR="${D}/${STATEDIR}" \
-		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}/${PN}-3.4.3-nethackrc" .nethackrc
-
-	local windowtypes="tty"
-	use X && windowtypes="x11 ${windowtypes}"
-	set -- ${windowtypes}
-	sed -i \
-		-e "s:GENTOO_WINDOWTYPES:${windowtypes}:" \
-		-e "s:GENTOO_DEFWINDOWTYPE:$1:" \
-		"${D}/etc/skel/.nethackrc" \
-		|| die "sed /etc/skel/.nethackrc failed"
-
-	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_preinst() {
-	if has_version "<${CATEGORY}/${PN}-3.4.3-r3" ; then
-		migration=true
-
-		# preserve STATEDIR/{logfile,record}
-		# (previous ebuild rev mistakenly removes it)
-		for f in "${ROOT}/${STATEDIR}/"{logfile,record} ; do
-			if [[ -e "$f" ]] ; then
-				cp "$f" "$T" || die "Failed to preserve ${ROOT}/${STATEDIR} files"
-			else
-				touch "$T/$f" || die "Failed to preserve ${ROOT}/${STATEDIR} files"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	cd "${ROOT}/${STATEDIR}" || die "Failed to enter ${STATEDIR} directory"
-
-	if [[ -v migration ]] ; then
-		cp "$T/"{logfile,record} . ||
-		die "Failed to preserve ${ROOT}/${STATEDIR} files"
-	fi
-
-	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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/nethack/, games-roguelike/nethack/files/
@ 2019-12-17 18:59 Stefan Strogin
  0 siblings, 0 replies; 4+ messages in thread
From: Stefan Strogin @ 2019-12-17 18:59 UTC (permalink / raw
  To: gentoo-commits

commit:     957452e266708f0eed02dc4607a61843aeb60ba2
Author:     Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 17 18:51:15 2019 +0000
Commit:     Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Tue Dec 17 18:57:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=957452e2

games-roguelike/nethack: version bump to 3.6.3

Reported-by: Daniel Nilsson <gentoo <AT> daniel-nilsson.com>
Closes: https://bugs.gentoo.org/678648
Closes: https://bugs.gentoo.org/696574
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>

 games-roguelike/nethack/Manifest                   |   1 +
 .../nethack/files/nethack-3.6.3-hint-tty           |  19 +++
 .../nethack/files/nethack-3.6.3-hint-x11           |  23 ++++
 .../nethack/files/nethack-3.6.3-recover.patch      | 132 +++++++++++++++++++++
 games-roguelike/nethack/nethack-3.6.3.ebuild       | 129 ++++++++++++++++++++
 5 files changed, 304 insertions(+)

diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest
index 97ad7b566d2..87ba4b67e93 100644
--- a/games-roguelike/nethack/Manifest
+++ b/games-roguelike/nethack/Manifest
@@ -1,2 +1,3 @@
+DIST nethack-3.6.3.tar.gz 5568657 BLAKE2B f0aa12a27fdf5005f57dcc802af88939b8460cfcfea3dc4d262b15a2807376ed434233dfa85ae0bfd60e50ad5a51ff4b060b5063e393d5859bac1b98364b5359 SHA512 38bc6140b12188397539f28528dd8e34364fb7efeb42dbe36d86fea6cc473e292b7f47fba01db19cf7641414dee86092e33deb3b074afa0e8b811e71be71e1d1
 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.3-hint-tty b/games-roguelike/nethack/files/nethack-3.6.3-hint-tty
new file mode 100644
index 00000000000..626db3f1f7e
--- /dev/null
+++ b/games-roguelike/nethack/files/nethack-3.6.3-hint-tty
@@ -0,0 +1,19 @@
+#-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 symbols $(DATHELP)

diff --git a/games-roguelike/nethack/files/nethack-3.6.3-hint-x11 b/games-roguelike/nethack/files/nethack-3.6.3-hint-x11
new file mode 100644
index 00000000000..b026cea976c
--- /dev/null
+++ b/games-roguelike/nethack/files/nethack-3.6.3-hint-x11
@@ -0,0 +1,23 @@
+#-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 symbols $(DATHELP)
+
+WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -lXpm

diff --git a/games-roguelike/nethack/files/nethack-3.6.3-recover.patch b/games-roguelike/nethack/files/nethack-3.6.3-recover.patch
new file mode 100644
index 00000000000..7abcaca52b7
--- /dev/null
+++ b/games-roguelike/nethack/files/nethack-3.6.3-recover.patch
@@ -0,0 +1,132 @@
+From d8878eddd04cb986d57cc721d719670dc7f4d156 Mon Sep 17 00:00:00 2001
+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
+
+Upstream-Status: Inappropriate [Gentoo-specific]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ doc/nethack.6 |  2 +-
+ doc/recover.6 | 28 ++++++++++++++--------------
+ 2 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/doc/nethack.6 b/doc/nethack.6
+index dda4c89f4..b26a2b493 100644
+--- a/doc/nethack.6
++++ b/doc/nethack.6
+@@ -393,7 +393,7 @@ SHOPTYPE and SPLEVTYPE can be used in debugging (wizard) mode.
+ DEBUGFILES can be used if the program was built with 'DEBUG' enabled.
+ .SH "SEE ALSO"
+ .PP
+-dgn_comp(6), lev_comp(6), recover(6)
++dgn_comp(6), lev_comp(6), recover-nethack(6)
+ .SH BUGS
+ .PP
+ Probably infinite.
+diff --git a/doc/recover.6 b/doc/recover.6
+index 1209d31d3..eee5bbc61 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,24 +83,24 @@ 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,
+@@ -108,22 +108,22 @@ the game administrator may want to arrange for all .0 files in the
+ playground to be fed to recover 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.24.1
+

diff --git a/games-roguelike/nethack/nethack-3.6.3.ebuild b/games-roguelike/nethack/nethack-3.6.3.ebuild
new file mode 100644
index 00000000000..72711dcc6e1
--- /dev/null
+++ b/games-roguelike/nethack/nethack-3.6.3.ebuild
@@ -0,0 +1,129 @@
+# 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"
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/nethack/, games-roguelike/nethack/files/
@ 2020-01-25 11:42 Stefan Strogin
  0 siblings, 0 replies; 4+ messages in thread
From: Stefan Strogin @ 2020-01-25 11:42 UTC (permalink / raw
  To: gentoo-commits

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@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 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@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/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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/nethack/, games-roguelike/nethack/files/
@ 2020-01-28 20:55 Stefan Strogin
  0 siblings, 0 replies; 4+ messages in thread
From: Stefan Strogin @ 2020-01-28 20:55 UTC (permalink / raw
  To: gentoo-commits

commit:     53d5d5bd85451baa1484b39a9861514e07f12c75
Author:     Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 20:53:13 2020 +0000
Commit:     Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 20:54:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53d5d5bd

games-roguelike/nethack: drop old and vulnerable 3.6.1, 3.6.3

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

 games-roguelike/nethack/Manifest                   |   2 -
 .../nethack/files/nethack-3.6.0-hint-tty           |  19 ---
 .../nethack/files/nethack-3.6.0-hint-x11           |  23 ----
 .../nethack/files/nethack-3.6.1-recover.patch      | 115 ------------------
 games-roguelike/nethack/nethack-3.6.1.ebuild       | 128 --------------------
 games-roguelike/nethack/nethack-3.6.3.ebuild       | 129 ---------------------
 6 files changed, 416 deletions(-)

diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest
index 66a24f403d3..db4ca9ec040 100644
--- a/games-roguelike/nethack/Manifest
+++ b/games-roguelike/nethack/Manifest
@@ -1,3 +1 @@
-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-361-src.tgz 4640769 BLAKE2B 3793a753e4012df64335e7e7ec60284de206012d5bb5d30a7ccfb458e456818f30dd0b4bfa9c41b1691bd01ee6aec2e44b57327586f0c9d76a573bf4c9bb00b1 SHA512 bd6e36c163f0d85e1ab1fc659464696b5a02c3864a800ad47e047fdc4a35fff4ef7dd28a9b071fa46f7f67fa45c97fdc77bc1f2bdbad80cc02950d73731d9c30

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 3c250e7e719..00000000000
--- 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 d0d1a8d4cd4..00000000000
--- 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.1-recover.patch b/games-roguelike/nethack/files/nethack-3.6.1-recover.patch
deleted file mode 100644
index c7ad7808a2c..00000000000
--- 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/nethack-3.6.1.ebuild b/games-roguelike/nethack/nethack-3.6.1.ebuild
deleted file mode 100644
index 260b50750f9..00000000000
--- 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 72711dcc6e1..00000000000
--- 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"
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-01-28 20:55 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-28 20:55 [gentoo-commits] repo/gentoo:master commit in: games-roguelike/nethack/, games-roguelike/nethack/files/ Stefan Strogin
  -- strict thread matches above, loose matches on Subject: below --
2020-01-25 11:42 Stefan Strogin
2019-12-17 18:59 Stefan Strogin
2016-02-09  7:18 Ian Delaney

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox