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

2022-10-16 Thread Ionen Wolkens 
commit: 8a3473c6b639d633ba9517468e01e5a268d99b14
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Oct 16 16:27:06 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Oct 16 16:59:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a3473c6

games-roguelike/nethack: fix build w/ clang16, pass -std=gnu89

wrt -Wno-error, this has the same problem as net-misc/vncrec
for which there's not much that can reasonably be done about
here (and is harmless).

Closes: https://bugs.gentoo.org/874462
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../nethack/files/nethack-3.6.6-clang16.patch  | 10 ++
 ...ethack-3.6.6.ebuild => nethack-3.6.6-r1.ebuild} | 22 +-
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/games-roguelike/nethack/files/nethack-3.6.6-clang16.patch 
b/games-roguelike/nethack/files/nethack-3.6.6-clang16.patch
new file mode 100644
index ..b8a67644b80e
--- /dev/null
+++ b/games-roguelike/nethack/files/nethack-3.6.6-clang16.patch
@@ -0,0 +1,10 @@
+https://bugs.gentoo.org/874462
+--- a/win/tty/wintty.c
 b/win/tty/wintty.c
+@@ -26,2 +26,6 @@
+ 
++#ifdef DEF_PAGER
++#include 
++#endif
++
+ #ifndef NO_TERMS

diff --git a/games-roguelike/nethack/nethack-3.6.6.ebuild 
b/games-roguelike/nethack/nethack-3.6.6-r1.ebuild
similarity index 88%
rename from games-roguelike/nethack/nethack-3.6.6.ebuild
rename to games-roguelike/nethack/nethack-3.6.6-r1.ebuild
index 1d26ceda38ae..7c457f11ab98 100644
--- a/games-roguelike/nethack/nethack-3.6.6.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.6-r1.ebuild
@@ -8,6 +8,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"
+S="${WORKDIR}/NetHack-NetHack-${PV}_Released"
 
 LICENSE="nethack"
 SLOT="0"
@@ -18,6 +19,7 @@ RDEPEND="
acct-group/gamestat
sys-libs/ncurses:0=
X? (
+   x11-libs/libX11
x11-libs/libXaw
x11-libs/libXpm
x11-libs/libXt
@@ -36,25 +38,35 @@ BDEPEND="
)
 "
 
-S="${WORKDIR}/NetHack-NetHack-${PV}_Released"
+PATCHES=(
+   "${FILESDIR}/${PN}-3.6.3-recover.patch"
+   "${FILESDIR}/${PN}-3.6.6-wunused-result.patch" # bug 830556
+   "${FILESDIR}/${PN}-3.6.6-clang16.patch"
+)
 
 src_prepare() {
-   eapply "${FILESDIR}/${PN}-3.6.3-recover.patch"
-   eapply "${FILESDIR}/${PN}-3.6.6-wunused-result.patch" # bug 830556
-   eapply_user
+   default
 
cp "${FILESDIR}/${PN}-3.6.3-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 -std=gnu89 # old codebase, incompatible with c2x
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
+   if use X; then
+   append-cflags -DX11_GRAPHICS -DUSE_XPM
+
+   # XtErrorHandler usage seems right, but headers "may" add 
((noreturn))
+   # giving an incompatible type error with clang-16 (could 
alternatively
+   # use private _X_NORETURN but this may be fragile)
+   append-cflags -Wno-error=incompatible-pointer-types #874462
+   fi
 
LOCAL_MAKEOPTS=(
CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"

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

2022-04-14 Thread Matthew Smith 
commit: ae4313336418605be6ab3cea43c49297008284fd
Author: Matthew Smith  gentoo  org>
AuthorDate: Thu Apr 14 16:45:51 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Thu Apr 14 16:45:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae431333

games-roguelike/nethack: don't redefine warn_unused_result

Apply patch that should land in NetHack 3.6.7. No revbump as fixes build
failure.

Closes: https://bugs.gentoo.org/830556
Signed-off-by: Matthew Smith  gentoo.org>

 .../files/nethack-3.6.6-wunused-result.patch   | 37 ++
 games-roguelike/nethack/nethack-3.6.6.ebuild   |  3 +-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/games-roguelike/nethack/files/nethack-3.6.6-wunused-result.patch 
b/games-roguelike/nethack/files/nethack-3.6.6-wunused-result.patch
new file mode 100644
index ..e26d1190fda3
--- /dev/null
+++ b/games-roguelike/nethack/files/nethack-3.6.6-wunused-result.patch
@@ -0,0 +1,37 @@
+From 1cb5dc04605daa45f1c6a647c17442ed7ff2fe4e Mon Sep 17 00:00:00 2001
+From: nhmall 
+Date: Tue, 4 Jan 2022 08:24:08 -0500
+Subject: [PATCH] work around ubuntu 20.10 build issue
+
+NetHack was trying to suppress warn_unused_result
+in include/tradstdc.h, by defining warn_unused_result
+to an empty string. That began causing a build error
+in a system-supplied header file cdefs.h
+when using 20.10 ubuntu impish.
+
+Try skipping that in tradstdc.h for any linux, unless
+the NetHack build defines GCC_URWARN to force it into
+play.
+---
+ include/tradstdc.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/tradstdc.h b/include/tradstdc.h
+index 09decb4b15..8c33d55e0a 100644
+--- a/include/tradstdc.h
 b/include/tradstdc.h
+@@ -405,12 +405,14 @@ typedef genericptr genericptr_t; /* (void *) or (char *) 
*/
+ #if __GNUC__ >= 3
+ #define UNUSED __attribute__((unused))
+ #define NORETURN __attribute__((noreturn))
++#if !defined(__linux__) || defined(GCC_URWARN)
+ /* disable gcc's __attribute__((__warn_unused_result__)) since explicitly
+discarding the result by casting to (void) is not accepted as a 'use' */
+ #define __warn_unused_result__ /*empty*/
+ #define warn_unused_result /*empty*/
+ #endif
+ #endif
++#endif
+ 
+ #ifndef PRINTF_F
+ #define PRINTF_F(f, v)

diff --git a/games-roguelike/nethack/nethack-3.6.6.ebuild 
b/games-roguelike/nethack/nethack-3.6.6.ebuild
index 7d315c7ecad2..1d26ceda38ae 100644
--- a/games-roguelike/nethack/nethack-3.6.6.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,6 +40,7 @@ S="${WORKDIR}/NetHack-NetHack-${PV}_Released"
 
 src_prepare() {
eapply "${FILESDIR}/${PN}-3.6.3-recover.patch"
+   eapply "${FILESDIR}/${PN}-3.6.6-wunused-result.patch" # bug 830556
eapply_user
 
cp "${FILESDIR}/${PN}-3.6.3-hint-$(usex X x11 tty)" hint || die "Failed 
to copy hint file"

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

2021-03-16 Thread Sam James 
commit: 035163233084e19477ae3db472454d625cac6802
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 17 05:51:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 17 05:57:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03516323

games-roguelike/nethack: add yacc BDEPEND

Closes: https://bugs.gentoo.org/724768
Signed-off-by: Sam James  gentoo.org>

 games-roguelike/nethack/nethack-3.6.6.ebuild | 21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/games-roguelike/nethack/nethack-3.6.6.ebuild 
b/games-roguelike/nethack/nethack-3.6.6.ebuild
index 1dc2a67dd6c..2106af647a7 100644
--- a/games-roguelike/nethack/nethack-3.6.6.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.6.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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"
@@ -13,21 +14,27 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="X"
 
-RDEPEND="acct-group/gamestat
+RDEPEND="
+   acct-group/gamestat
sys-libs/ncurses:0=
X? (
x11-libs/libXaw
x11-libs/libXpm
x11-libs/libXt
-   )"
-DEPEND="${RDEPEND}
+   )
+"
+DEPEND="
+   ${RDEPEND}
X? ( x11-base/xorg-proto )
-   "
-BDEPEND="virtual/pkgconfig
+"
+BDEPEND="
+   virtual/pkgconfig
+   virtual/yacc
X? (
x11-apps/bdftopcf
x11-apps/mkfontscale
-   )"
+   )
+"
 
 S="${WORKDIR}/NetHack-NetHack-${PV}_Released"

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

2020-03-29 Thread Mikle Kolyada 
commit: 99ac822df309e7805ae6c557055f79a3532d06f4
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Mar 29 11:44:05 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Mar 29 11:45:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99ac822d

games-roguelike/nethack: Version bump 3.6.6

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada  gentoo.org>

 games-roguelike/nethack/Manifest |   1 +
 games-roguelike/nethack/nethack-3.6.6.ebuild | 129 +++
 2 files changed, 130 insertions(+)

diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest
index db4ca9ec040..bb6a02c753e 100644
--- a/games-roguelike/nethack/Manifest
+++ b/games-roguelike/nethack/Manifest
@@ -1 +1,2 @@
 DIST nethack-3.6.4.tar.gz 5573777 BLAKE2B 
4e5a48bbf521406f17bc699643dd9f9d912381cc91ab2228affc6f54ad2b84ea7c946ab2d5936c274752a36920440d34001b13f28ce4c8f35844300d596086a7
 SHA512 
c951f939d50027b4468ebd2e32f79771e696035df0918b814bf02899f5c1e89d462ebc3f63155c23f5c627e66ca74244512d666b102c380242df1500a2c0afa9
+DIST nethack-3.6.6.tar.gz 5577633 BLAKE2B 
7b4b12f3a711785c86208dab83f9de725c33470e056ee57e6d96c3a68f06c1d0d98343ed82eca669986361d0663ddbe56d9a74d9cb45b42bf005c2f323b3cd79
 SHA512 
579fde93a37a1b5df637d5bac2601194beeb455c175fbe3ef89342122c8567bb8221ce60d8a6168e6b45c67ade7d7b09c86bf202c8cbe2d6294d276be3e53055

diff --git a/games-roguelike/nethack/nethack-3.6.6.ebuild 
b/games-roguelike/nethack/nethack-3.6.6.ebuild
new file mode 100644
index 000..1dc2a67dd6c
--- /dev/null
+++ b/games-roguelike/nethack/nethack-3.6.6.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 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}/${PN}-3.6.3-recover.patch"
+   eapply_user
+
+   cp "${FILESDIR}/${PN}-3.6.3-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

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

2020-03-29 Thread Mikle Kolyada 
commit: ac2c30327e98c5d15c0fa0e94d11a6cabd997683
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Mar 29 11:44:58 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Mar 29 11:45:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac2c3032

games-roguelike/nethack: Security cleanup

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada  gentoo.org>

 games-roguelike/nethack/Manifest |   1 -
 games-roguelike/nethack/nethack-3.6.4.ebuild | 129 ---
 2 files changed, 130 deletions(-)

diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest
index bb6a02c753e..a635bab6643 100644
--- a/games-roguelike/nethack/Manifest
+++ b/games-roguelike/nethack/Manifest
@@ -1,2 +1 @@
-DIST nethack-3.6.4.tar.gz 5573777 BLAKE2B 
4e5a48bbf521406f17bc699643dd9f9d912381cc91ab2228affc6f54ad2b84ea7c946ab2d5936c274752a36920440d34001b13f28ce4c8f35844300d596086a7
 SHA512 
c951f939d50027b4468ebd2e32f79771e696035df0918b814bf02899f5c1e89d462ebc3f63155c23f5c627e66ca74244512d666b102c380242df1500a2c0afa9
 DIST nethack-3.6.6.tar.gz 5577633 BLAKE2B 
7b4b12f3a711785c86208dab83f9de725c33470e056ee57e6d96c3a68f06c1d0d98343ed82eca669986361d0663ddbe56d9a74d9cb45b42bf005c2f323b3cd79
 SHA512 
579fde93a37a1b5df637d5bac2601194beeb455c175fbe3ef89342122c8567bb8221ce60d8a6168e6b45c67ade7d7b09c86bf202c8cbe2d6294d276be3e53055

diff --git a/games-roguelike/nethack/nethack-3.6.4.ebuild 
b/games-roguelike/nethack/nethack-3.6.4.ebuild
deleted file mode 100644
index 1dc2a67dd6c..000
--- a/games-roguelike/nethack/nethack-3.6.4.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 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}/${PN}-3.6.3-recover.patch"
-   eapply_user
-
-   cp "${FILESDIR}/${PN}-3.6.3-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

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

2020-01-28 Thread Stefan Strogin 
commit: 53d5d5bd85451baa1484b39a9861514e07f12c75
Author: Stefan Strogin  gentoo  org>
AuthorDate: Tue Jan 28 20:53:13 2020 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Tue Jan 28 20:54:28 2020 +
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  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..000
--- 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..000
--- 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..000
--- 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 
-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

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

2020-01-25 Thread Stefan Strogin 
commit: b39eded42c33d781a289e361cc2a23bf2b429a7c
Author: Stefan Strogin  gentoo  org>
AuthorDate: Sat Jan 25 11:39:04 2020 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Sat Jan 25 11:41:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b39eded4

games-roguelike/nethack: fix patch description

Signed-off-by: Stefan Strogin  gentoo.org>

 games-roguelike/nethack/files/nethack-3.6.3-recover.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 7abcaca52b7..e496f3918fe 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 
 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

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

2020-01-25 Thread Stefan Strogin 
commit: 7f96879d0ec152ef151d0555d68be3d7c8641a19
Author: Stefan Strogin  gentoo  org>
AuthorDate: Sat Jan 25 11:36:59 2020 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Sat Jan 25 11:41:45 2020 +
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  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..000
--- 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 
-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

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

2020-01-25 Thread Stefan Strogin 
commit: 2ed9103effd31e645b9405b52507cb88aaa7ef6d
Author: Stefan Strogin  gentoo  org>
AuthorDate: Sat Jan 25 10:54:46 2020 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Sat Jan 25 10:55:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ed9103e

games-roguelike/nethack: version bump to 3.6.4

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

 games-roguelike/nethack/Manifest |   1 +
 games-roguelike/nethack/nethack-3.6.4.ebuild | 129 +++
 2 files changed, 130 insertions(+)

diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest
index 87ba4b67e93..a95fbc6ee0b 100644
--- a/games-roguelike/nethack/Manifest
+++ b/games-roguelike/nethack/Manifest
@@ -1,3 +1,4 @@
 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/nethack-3.6.4.ebuild 
b/games-roguelike/nethack/nethack-3.6.4.ebuild
new file mode 100644
index 000..1dc2a67dd6c
--- /dev/null
+++ b/games-roguelike/nethack/nethack-3.6.4.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 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}/${PN}-3.6.3-recover.patch"
+   eapply_user
+
+   cp "${FILESDIR}/${PN}-3.6.3-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

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

2019-12-17 Thread Stefan Strogin 
commit: 4c62811cd7057058c5e23250b35d5a42b38f9523
Author: Stefan Strogin  gentoo  org>
AuthorDate: Tue Dec 17 18:56:53 2019 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Tue Dec 17 18:57:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c62811c

games-roguelike/nethack: add games@ to maintainers

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Stefan Strogin  gentoo.org>

 games-roguelike/nethack/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/games-roguelike/nethack/metadata.xml 
b/games-roguelike/nethack/metadata.xml
index b4c23c3cf2d..03051c1c15b 100644
--- a/games-roguelike/nethack/metadata.xml
+++ b/games-roguelike/nethack/metadata.xml
@@ -1,6 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+   
+   ga...@gentoo.org
+   Gentoo Games Project
+   

ara...@aixah.de
Luis Ressel

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

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

games-roguelike/nethack: version bump to 3.6.3

Reported-by: Daniel Nilsson  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  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 000..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 000..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 000..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 
+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 
+---
+ 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

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/nethack/, games-roguelike/hengband/, games-roguelike/zangband/, ...

2019-10-11 Thread Michał Górny 
commit: 09b8830cc263f23130d566d1dcb8da1220c04e56
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Oct 11 15:35:34 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Oct 11 15:35:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09b8830c

games-roguelike: Remove *-fbsd KEYWORDS

Signed-off-by: Michał Górny  gentoo.org>

 games-roguelike/hengband/hengband-1.6.2-r1.ebuild | 2 +-
 games-roguelike/moria/moria-5.7.10.ebuild | 2 +-
 games-roguelike/nethack/nethack-3.6.0-r3.ebuild   | 2 +-
 games-roguelike/nethack/nethack-3.6.1.ebuild  | 2 +-
 games-roguelike/zangband/zangband-2.7.4c.ebuild   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/games-roguelike/hengband/hengband-1.6.2-r1.ebuild 
b/games-roguelike/hengband/hengband-1.6.2-r1.ebuild
index 8559444d707..553ac14cee2 100644
--- a/games-roguelike/hengband/hengband-1.6.2-r1.ebuild
+++ b/games-roguelike/hengband/hengband-1.6.2-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://hengband.sourceforge.jp/en/;
 SRC_URI="mirror://sourceforge.jp/hengband/10331/${P}.tar.bz2
mirror://gentoo/${P}-mispellings.patch.gz"
 
-KEYWORDS="~x86 ~x86-fbsd"
+KEYWORDS="~x86"
 LICENSE="Moria"
 SLOT="0"
 IUSE="X l10n_ja"

diff --git a/games-roguelike/moria/moria-5.7.10.ebuild 
b/games-roguelike/moria/moria-5.7.10.ebuild
index 73142dad797..5261c3d90c4 100644
--- a/games-roguelike/moria/moria-5.7.10.ebuild
+++ b/games-roguelike/moria/moria-5.7.10.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/dungeons-of-moria/umoria/archive/v${PV}.tar.gz -> ${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~m68k ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~m68k ~x86"
 IUSE=""
 
 RDEPEND="acct-group/gamestat

diff --git a/games-roguelike/nethack/nethack-3.6.0-r3.ebuild 
b/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
index 834881ef5f2..e925cc23d4b 100644
--- a/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/nethack/${PN}-${MY_PV}-src.tgz"
 
 LICENSE="nethack"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 IUSE="experimental X"
 
 RDEPEND="acct-group/gamestat

diff --git a/games-roguelike/nethack/nethack-3.6.1.ebuild 
b/games-roguelike/nethack/nethack-3.6.1.ebuild
index b2a450c706d..96361cc4c99 100644
--- a/games-roguelike/nethack/nethack-3.6.1.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://nethack.org/download/${PV}/nethack-${MY_PV}-src.tgz;
 
 LICENSE="nethack"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="X"
 
 RDEPEND="acct-group/gamestat

diff --git a/games-roguelike/zangband/zangband-2.7.4c.ebuild 
b/games-roguelike/zangband/zangband-2.7.4c.ebuild
index e04a2836fb7..23fcdc425c0 100644
--- a/games-roguelike/zangband/zangband-2.7.4c.ebuild
+++ b/games-roguelike/zangband/zangband-2.7.4c.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/${P}.tar.gz;
 
 LICENSE="Moria"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
 IUSE="tk"
 
 RDEPEND="

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

2019-07-16 Thread Ulrich Müller 
commit: a5ee35fc40cdacf5be0d25082c65806d24347861
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jul  8 08:48:47 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Jul 16 09:15:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5ee35fc

games-roguelike/nethack: Depend on acct-group/gamestat.

Bug: https://bugs.gentoo.org/689464
Acked-by: Luis Ressel  aixah.de>
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Ulrich Müller  gentoo.org>

 games-roguelike/nethack/nethack-3.6.0-r3.ebuild | 9 -
 games-roguelike/nethack/nethack-3.6.1.ebuild| 7 +++
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/games-roguelike/nethack/nethack-3.6.0-r3.ebuild 
b/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
index fa9302932cb..834881ef5f2 100644
--- a/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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 user
+inherit eutils toolchain-funcs flag-o-matic
 
 MY_PV=${PV//.}
 DESCRIPTION="The ultimate old-school single player dungeon exploration game"
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x86-fbsd"
 IUSE="experimental X"
 
-RDEPEND="sys-libs/ncurses:0=
+RDEPEND="acct-group/gamestat
+   sys-libs/ncurses:0=
X? (
x11-libs/libXaw
x11-libs/libXpm
@@ -35,8 +36,6 @@ NETHACK_GROUP="gamestat"
 
 pkg_setup() {
HACKDIR="/usr/$(get_libdir)/${PN}"
-
-   enewgroup gamestat 36
 }
 
 src_prepare() {

diff --git a/games-roguelike/nethack/nethack-3.6.1.ebuild 
b/games-roguelike/nethack/nethack-3.6.1.ebuild
index 783a9ec4f64..b2a450c706d 100644
--- a/games-roguelike/nethack/nethack-3.6.1.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit desktop flag-o-matic toolchain-funcs user
+inherit desktop flag-o-matic toolchain-funcs
 
 MY_PV=${PV//.}
 DESCRIPTION="The ultimate old-school single player dungeon exploration game"
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="X"
 
-RDEPEND="sys-libs/ncurses:0=
+RDEPEND="acct-group/gamestat
+   sys-libs/ncurses:0=
X? (
x11-libs/libXaw
x11-libs/libXpm
@@ -96,8 +97,6 @@ src_install() {
 }
 
 pkg_preinst() {
-   enewgroup gamestat 36
-
fowners root:gamestat /var/games/nethack /var/games/nethack/save
fperms 2770 /var/games/nethack /var/games/nethack/save

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

2019-04-17 Thread Aaron Bauman 
commit: ced7d7d78e6fa9fb2309391231b65af6a66f6ddc
Author: Andrius Štikonas  stikonas  eu>
AuthorDate: Sat Oct 27 18:34:12 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu Apr 18 03:29:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ced7d7d7

games-roguelike/nethack: Add ~arm64 keyword

Signed-off-by: Andrius Štikonas  stikonas.eu>
Signed-off-by: Aaron Bauman  gentoo.org>

 games-roguelike/nethack/nethack-3.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/nethack/nethack-3.6.1.ebuild 
b/games-roguelike/nethack/nethack-3.6.1.ebuild
index 67fdfa59144..783a9ec4f64 100644
--- a/games-roguelike/nethack/nethack-3.6.1.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://nethack.org/download/${PV}/nethack-${MY_PV}-src.tgz;
 
 LICENSE="nethack"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="X"
 
 RDEPEND="sys-libs/ncurses:0=

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

2019-03-13 Thread Sergei Trofimovich 
commit: ef8ebb723233ce9a9943d391da265ad515b6cbe3
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Mar 13 22:20:19 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Mar 13 22:20:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef8ebb72

games-roguelike/nethack: keyworded 3.6.1 for ppc/ppc64, bug #676630

Tested-by: ernsteiswuerfel
Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-roguelike/nethack/nethack-3.6.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-roguelike/nethack/nethack-3.6.1.ebuild 
b/games-roguelike/nethack/nethack-3.6.1.ebuild
index b965ddbd5ef..67fdfa59144 100644
--- a/games-roguelike/nethack/nethack-3.6.1.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 
SRC_URI="https://nethack.org/download/${PV}/nethack-${MY_PV}-src.tgz;
 
 LICENSE="nethack"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="X"
 
 RDEPEND="sys-libs/ncurses:0=

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

2018-08-23 Thread Michał Górny 
commit: e367f0b4675fd083c8c21fa47b15b4c3390f8c15
Author: Luis Ressel  aixah  de>
AuthorDate: Tue Aug 21 21:11:34 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Aug 23 20:10:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e367f0b4

games-roguelike/nethack: Update to the newest PR version

Accidentally merged an old version.  Fixing it up.

Pull-Request: https://github.com/gentoo/gentoo/pull/9661

 games-roguelike/nethack/nethack-3.6.1.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/games-roguelike/nethack/nethack-3.6.1.ebuild 
b/games-roguelike/nethack/nethack-3.6.1.ebuild
index 3c6526d8c1c..b965ddbd5ef 100644
--- a/games-roguelike/nethack/nethack-3.6.1.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.1.ebuild
@@ -118,9 +118,10 @@ pkg_postinst() {
# 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
+   (
+   shopt -s nullglob
local saves=( bones* save/* )
-   test ${#saves[@]} -gt 0 && touch -c "${saves[@]}"
+   [[ -n "${saves[*]}" ]] && touch -c "${saves[@]}"
) # non-fatal
 
elog "A minimal default .nethackrc has been placed in /etc/skel/"

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

2018-08-23 Thread Michał Górny 
commit: c9efdc6e013f8e2fdaf9b83e39e4f1339b793387
Author: Luis Ressel  aixah  de>
AuthorDate: Tue Aug 21 21:11:34 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Aug 23 19:50:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9efdc6e

games-roguelike/nethack: Bump to 3.6.1

* Bump to EAPI 7
* Update SRC_URI
* (Hopefully?) support prefix builds
* Various improvements suggested by mgorny
* Set SGID on the /var/games/nethack directory to avoid a potential
  privilege escalation during package upgrades
* Don't redefine LINUX and STATUS_HILITES
* Unconditionally enable DUMPLOG and SCORE_ON_BOTL per upstream
  recommendations
* Remove obsolete STATUS_VIA_WINDOWPORT and the now empty "experimental"
  USE flag

Thanks-to: Michał Górny  gentoo.org>
Thanks-to: Laurent Bercot
Closes: https://github.com/gentoo/gentoo/pull/9661

 games-roguelike/nethack/Manifest   |   1 +
 .../nethack/files/nethack-3.6.1-recover.patch  | 115 ++
 games-roguelike/nethack/nethack-3.6.1.ebuild   | 128 +
 3 files changed, 244 insertions(+)

diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest
index 8acf7589107..97ad7b566d2 100644
--- a/games-roguelike/nethack/Manifest
+++ b/games-roguelike/nethack/Manifest
@@ -1 +1,2 @@
 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.1-recover.patch 
b/games-roguelike/nethack/files/nethack-3.6.1-recover.patch
new file mode 100644
index 000..c7ad7808a2c
--- /dev/null
+++ b/games-roguelike/nethack/files/nethack-3.6.1-recover.patch
@@ -0,0 +1,115 @@
+From 5d9a3ac6b9eaf63167e5c7c01f0bb33d383dab14 Mon Sep 17 00:00:00 2001
+From: Luis Ressel 
+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

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

2018-06-10 Thread Matt Turner 
commit: f6acaba5f0b61b1d6922e34d56da2d1d0142da41
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jun 11 01:48:39 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jun 11 01:48:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6acaba5

games-roguelike/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto)

 games-roguelike/nethack/nethack-3.6.0-r3.ebuild | 2 +-
 games-roguelike/zangband/zangband-2.7.4c.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-roguelike/nethack/nethack-3.6.0-r3.ebuild 
b/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
index 5db6d1311c5..fa9302932cb 100644
--- a/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
@@ -23,7 +23,7 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}
virtual/pkgconfig
X? (
-   x11-proto/xproto
+   x11-base/xorg-proto
x11-apps/bdftopcf
x11-apps/mkfontdir
)"

diff --git a/games-roguelike/zangband/zangband-2.7.4c.ebuild 
b/games-roguelike/zangband/zangband-2.7.4c.ebuild
index dbc6bc7e6b9..90b697ebbc8 100644
--- a/games-roguelike/zangband/zangband-2.7.4c.ebuild
+++ b/games-roguelike/zangband/zangband-2.7.4c.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
)
x11-libs/libXaw"
 DEPEND="${RDEPEND}
-   x11-proto/xextproto"
+   x11-base/xorg-proto"
 
 S=${WORKDIR}/${PN}

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

2018-02-11 Thread Michał Górny 
commit: beeae902e95195a08bae420442c94a902dd7899e
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Feb 11 10:47:22 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb 11 10:52:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beeae902

games-roguelike/nethack: Remove useless maintainer 

Remove useless/redundant maintainer . It does not benefit
bug wrangling, and only wastes developer's time on reading it. Few tips:

- assignee/CC is implied by ordering, there is no reason to repeat it,
- we know that maintainer is maintainer (la la la la la),
- most of adjectives for maintainer are of no value and/or are obvious.

 games-roguelike/nethack/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/games-roguelike/nethack/metadata.xml 
b/games-roguelike/nethack/metadata.xml
index e845c650af5..b4c23c3cf2d 100644
--- a/games-roguelike/nethack/metadata.xml
+++ b/games-roguelike/nethack/metadata.xml
@@ -4,7 +4,6 @@

ara...@aixah.de
Luis Ressel
-   Proxied maintainer; set to assignee in all 
bugs


proxy-ma...@gentoo.org

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

2017-12-14 Thread Jeroen Roovers 
commit: 61efe539810ff47a438e3b0ab7d9bb638fca4cfc
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Dec 15 07:36:05 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Dec 15 07:36:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61efe539

games-roguelike/nethack: Update HOMEPAGE.

Package-Manager: Portage-2.3.18, Repoman-2.3.6

 games-roguelike/nethack/nethack-3.6.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/nethack/nethack-3.6.0-r3.ebuild 
b/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
index d0d3208f15f..5db6d1311c5 100644
--- a/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
@@ -6,7 +6,7 @@ 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/;
+HOMEPAGE="https://www.nethack.org/;
 SRC_URI="mirror://sourceforge/nethack/${PN}-${MY_PV}-src.tgz"
 
 LICENSE="nethack"

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

2016-02-12 Thread Ian Delaney 
commit: 69f0831c1243d1b889f38a2d5261420664ee59c9
Author: Luis Ressel  aixah  de>
AuthorDate: Fri Feb 12 14:50:47 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Fri Feb 12 14:50:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69f0831c

games-roguelike/nethack: Fix map colors in x11 interface

Gentoo-Bug: 573598
X-Upstream-Commit: a41382d

 .../nethack/files/nethack-3.6.0-x11-color.patch| 186 +
 games-roguelike/nethack/nethack-3.6.0-r3.ebuild| 144 
 2 files changed, 330 insertions(+)

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
new file mode 100644
index 000..d34ca02
--- /dev/null
+++ b/games-roguelike/nethack/files/nethack-3.6.0-x11-color.patch
@@ -0,0 +1,186 @@
+From f92bf2b495450d323e157eb41130c79a3d369239 Mon Sep 17 00:00:00 2001
+From: PatR 
+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 = _info->text_map.text[y][x];
+-
+-#ifdef TEXTCOLOR
+-co_ptr = _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 = _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, _info->text_map.copy_gc,
++set_gc(wp->w, font, XtNforeground, bgpixel,
++   _info->text_map.copy_gc,
+_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,

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

2016-02-12 Thread Ian Delaney 
commit: f8b1c7507715e398c8e853083aac69867788baa4
Author: Luis Ressel  aixah  de>
AuthorDate: Fri Feb 12 14:53:56 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Fri Feb 12 14:53:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8b1c750

games-roguelike/nethack: Remove old ebuilds

 games-roguelike/nethack/nethack-3.6.0-r1.ebuild | 164 
 games-roguelike/nethack/nethack-3.6.0-r2.ebuild | 143 -
 2 files changed, 307 deletions(-)

diff --git a/games-roguelike/nethack/nethack-3.6.0-r1.ebuild 
b/games-roguelike/nethack/nethack-3.6.0-r1.ebuild
deleted file mode 100644
index 01e66e8..000
--- a/games-roguelike/nethack/nethack-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,164 +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="experimental 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 "-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_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

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

2016-02-08 Thread Ian Delaney 
commit: 02e9d16e5d21bf1673872e106d90408a835db43a
Author: Luis Ressel  aixah  de>
AuthorDate: Sun Jan 31 19:26:03 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sun Feb  7 20:48:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02e9d16e

games-roguelike/nethack: Bump to EAPI 6

 games-roguelike/nethack/nethack-3.6.0-r2.ebuild | 164 
 1 file changed, 164 insertions(+)

diff --git a/games-roguelike/nethack/nethack-3.6.0-r2.ebuild 
b/games-roguelike/nethack/nethack-3.6.0-r2.ebuild
new file mode 100644
index 000..c87adad
--- /dev/null
+++ b/games-roguelike/nethack/nethack-3.6.0-r2.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+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="experimental 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() {
+   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 -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_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
+

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

2016-02-08 Thread Ian Delaney 
commit: 62b2d784f50ffa5e31a5f51f732bf4ccf656ca17
Author: Luis Ressel  aixah  de>
AuthorDate: Sun Jan 31 19:08:10 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sun Feb  7 20:48:58 2016 +
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..000
--- 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.0 -0400
-+++ include/config.h   2003-06-21 20:59:44.0 -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.0 -0400
-+++ Makefile   2003-06-21 21:01:16.0 -0400
-@@ -43 +43 @@
--VARDATND = 
-+VARDATND =  x11tiles pet_mark.xbm rip.xpm
 src/Makefile.orig  2003-06-21 21:02:01.0 -0400
-+++ src/Makefile   2003-06-21 21:02:11.0 -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..000
--- a/games-roguelike/nethack/files/3.4.3-bison.patch
+++ /dev/null
@@ -1,18 +0,0 @@
 nethack-3.4.3/util/Makefile2004-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..000
--- 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.0 -0400
-+++ include/config.h   2003-06-21 20:46:42.0 -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

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

2016-02-08 Thread Ian Delaney 
commit: 7509d4487c35ed81569f4a66d7174ff8b877641b
Author: Luis Ressel  aixah  de>
AuthorDate: Sun Jan 31 19:30:07 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sun Feb  7 20:48:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7509d448

games-roguelike/nethack: Remove migration code

Remove the migration logic handling updates from <3.4.3-r3. It's been in
place for over six months, that should be enough.

 games-roguelike/nethack/nethack-3.6.0-r2.ebuild | 21 -
 1 file changed, 21 deletions(-)

diff --git a/games-roguelike/nethack/nethack-3.6.0-r2.ebuild 
b/games-roguelike/nethack/nethack-3.6.0-r2.ebuild
index c87adad..7f8d2be 100644
--- a/games-roguelike/nethack/nethack-3.6.0-r2.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.0-r2.ebuild
@@ -119,30 +119,9 @@ src_install() {
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}" . &&

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

2016-02-08 Thread Ian Delaney 
commit: 66896d25192ffef085c822494a5408560991866a
Author: Luis Ressel  aixah  de>
AuthorDate: Thu Feb  4 20:09:33 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sun Feb  7 20:48:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66896d25

games-roguelike/nethack: Update metadata.xml

Use a more verbose maintainer , as preferred by the
proxy-maint project.

 games-roguelike/nethack/metadata.xml | 30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/games-roguelike/nethack/metadata.xml 
b/games-roguelike/nethack/metadata.xml
index 26addb7..e845c65 100644
--- a/games-roguelike/nethack/metadata.xml
+++ b/games-roguelike/nethack/metadata.xml
@@ -1,19 +1,19 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-ara...@aixah.de
-Luis Ressel
-Maintainer
-  
-  
-proxy-ma...@gentoo.org
-Proxy Maintainers
-  
-  
-nethack
-  
-  
-Enable experimental features (showscore and 
status_hilite)
-  
+   
+   ara...@aixah.de
+   Luis Ressel
+   Proxied maintainer; set to assignee in all 
bugs
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   nethack
+   
+   
+   Enable experimental features 
(showscore and status_hilite)
+

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

2016-01-15 Thread Ian Delaney 
commit: 25e3062c437cb3447d3440a62a23b7f4007ec83c
Author: Luis Ressel  aixah  de>
AuthorDate: Wed Jan 13 19:19:01 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Wed Jan 13 22:12:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25e3062c

games-roguelike/nethack: Store make options in variable

Also, drop LOCKDIR, it's unneccessary.

 games-roguelike/nethack/nethack-3.6.0-r1.ebuild | 171 
 1 file changed, 171 insertions(+)

diff --git a/games-roguelike/nethack/nethack-3.6.0-r1.ebuild 
b/games-roguelike/nethack/nethack-3.6.0-r1.ebuild
new file mode 100644
index 000..319bb0f
--- /dev/null
+++ b/games-roguelike/nethack/nethack-3.6.0-r1.ebuild
@@ -0,0 +1,171 @@
+# 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 "-DDEF_PAGER=\\\"${PAGER}\\\""
+   append-cflags -DSYSCF "-DSYSCF_FILE=\\\"/etc/nethack.sysconf\\\""
+
+   use X && append-cflags -DX11_GRAPHICS -DUSE_XPM
+
+   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}/dot.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
+

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

2016-01-15 Thread Ian Delaney 
commit: 28f8771b0895f2fd3117f60b9c69e562c983ef44
Author: Luis Ressel  aixah  de>
AuthorDate: Wed Jan 13 20:18:41 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Wed Jan 13 22:12:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28f8771b

games-roguelike/nethack: Improved nethackrc for 3.6

 .../{dot.nethackrc => nethack-3.4.3-nethackrc} |   0
 .../nethack/files/nethack-3.6.0-nethackrc  | 103 +
 games-roguelike/nethack/nethack-3.4.3-r5.ebuild|   2 +-
 games-roguelike/nethack/nethack-3.6.0-r1.ebuild|  11 +--
 games-roguelike/nethack/nethack-3.6.0.ebuild   |   2 +-
 5 files changed, 106 insertions(+), 12 deletions(-)

diff --git a/games-roguelike/nethack/files/dot.nethackrc 
b/games-roguelike/nethack/files/nethack-3.4.3-nethackrc
similarity index 100%
rename from games-roguelike/nethack/files/dot.nethackrc
rename to games-roguelike/nethack/files/nethack-3.4.3-nethackrc

diff --git a/games-roguelike/nethack/files/nethack-3.6.0-nethackrc 
b/games-roguelike/nethack/files/nethack-3.6.0-nethackrc
new file mode 100644
index 000..33c9806
--- /dev/null
+++ b/games-roguelike/nethack/files/nethack-3.6.0-nethackrc
@@ -0,0 +1,103 @@
+## This is an example nethackrc file (courtesy of nethack.alt.org).
+##
+## You should edit it to suit your needs.
+## Please read the Guidebook in /usr/share/doc/nethack or at www.nethack.org.
+##
+## Options which are enabled by default (like autoopen) can be disabled
+## by prefixing them with a !
+
+## If USE=X is enabled, this can be changed to x11
+#OPTIONS=windowtype:tty
+
+## Custom fruit and pet names
+#OPTIONS=fruit:mango
+#OPTIONS=dogname:Izchak
+#OPTIONS=catname:Chun-Li
+#OPTIONS=horsename:Marlon
+
+## Colored output
+#OPTIONS=color
+
+## Automatically dig if you are wielding a digging tool and moving
+## into a place that can be dug
+#OPTIONS=autodig
+
+## Walking into a door attempts to open it
+#OPTIONS=autoopen
+
+## Automatically pick up stuff
+#OPTIONS=autopickup
+
+## Only use autopickup for these item types
+#OPTIONS=pickup_types:$!?/"=
+
+## Allow saving and loading bones files.
+#OPTIONS=bones
+
+## Show out-of-sight areas of lit rooms
+#OPTIONS=dark_room
+
+## Use inverse for pets
+#OPTIONS=hilite_pet
+
+## Use inverse for piles of items
+#OPTIONS=hilite_pile
+
+## Show experience
+#OPTIONS=showexp
+
+## Show elapsed game time (in turns)
+#OPTIONS=time
+
+## How recalled messages (ctrl-p) are displayed.
+#OPTIONS=msg_window:reversed
+
+## use IBMgraphics or DECgraphics
+#OPTIONS=symset:DECgraphics
+#OPTIONS=symset:IBMgraphics
+
+## If you don't like some default glyphs, these can be changed
+#SYMBOLS=S_boulder:0
+#SYMBOLS=S_lava:~
+#SYMBOLS=S_pool:~
+#SYMBOLS=S_water:~
+#SYMBOLS=S_ghost:8
+#SYMBOLS=S_golem:7
+
+## Sort items by name. One of "none", "loot", or "full"
+#OPTIONS=sortloot:full
+
+## Require explicit yes for some prompts
+#OPTIONS=paranoid_confirmation:Confirm quit attack pray wand Remove
+
+## Conducts
+#OPTIONS=nudist
+#OPTIONS=blind
+
+
+## Colored menus. Regular expressions allowed.
+#OPTIONS=menucolors
+#MENUCOLOR=" blessed "=green
+#MENUCOLOR=" holy "=green
+#MENUCOLOR=" cursed "=red
+#MENUCOLOR=" unholy "=red
+#MENUCOLOR=" cursed .* (being worn)"=orange
+
+
+## Messagetypes
+
+## displacing pets. hide the message.
+#MSGTYPE=hide "You swap places with your .*"
+
+## items on floor. don't repeat the message.
+#MSGTYPE=norep "You see here a .*"
+#MSGTYPE=norep "You see here an .*"
+
+## delayed instadeaths. always prompt for -more-
+#MSGTYPE=stop "You are slowing down."
+#MSGTYPE=stop "You find it hard to breathe."
+#MSGTYPE=stop "You are turning a little .*"
+
+## moving up or down stairs
+#MSGTYPE=hide "You descend .*"
+#MSGTYPE=hide "You (climb|fly) (up|down) .*"

diff --git a/games-roguelike/nethack/nethack-3.4.3-r5.ebuild 
b/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
index 6762a44..3746bd9 100644
--- a/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
+++ b/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
@@ -143,7 +143,7 @@ src_install() {
dodoc doc/*.txt
 
insinto /etc/skel
-   newins "${FILESDIR}/dot.nethackrc" .nethackrc
+   newins "${FILESDIR}/${P}-nethackrc" .nethackrc
 
local windowtypes="tty"
use X && windowtypes="${windowtypes} x11"

diff --git a/games-roguelike/nethack/nethack-3.6.0-r1.ebuild 
b/games-roguelike/nethack/nethack-3.6.0-r1.ebuild
index 3696d05..01e66e8 100644
--- a/games-roguelike/nethack/nethack-3.6.0-r1.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.0-r1.ebuild
@@ -87,16 +87,7 @@ src_install() {
newins sys/unix/sysconf nethack.sysconf
 
insinto /etc/skel
-   newins "${FILESDIR}/dot.nethackrc" .nethackrc
-
-   local windowtypes="tty"
-   use X && windowtypes="x11 ${windowtypes}"
-   set -- ${windowtypes}
-   sed -i \
-   -e "s:GENTOO_WINDOWTYPES:${windowtypes}:" \
-   -e "s:GENTOO_DEFWINDOWTYPE:$1:" \
-

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

2016-01-15 Thread Ian Delaney 
commit: 0464f764bc743e9903ed5a34df0b00b61b43f00c
Author: Luis Ressel  aixah  de>
AuthorDate: Wed Jan 13 19:27:57 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Wed Jan 13 22:12:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0464f764

games-roguelike/nethack: Add "experimental" USE flag

This toggles support for the showscore and status_hilite features
considered experimental by upstream.

 games-roguelike/nethack/metadata.xml| 3 +++
 games-roguelike/nethack/nethack-3.6.0-r1.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/games-roguelike/nethack/metadata.xml 
b/games-roguelike/nethack/metadata.xml
index 28f26f2..5570ca3 100644
--- a/games-roguelike/nethack/metadata.xml
+++ b/games-roguelike/nethack/metadata.xml
@@ -10,4 +10,7 @@
   
 nethack
   
+  
+Enable experimental features (showscore and 
status_hilite)
+  
 

diff --git a/games-roguelike/nethack/nethack-3.6.0-r1.ebuild 
b/games-roguelike/nethack/nethack-3.6.0-r1.ebuild
index 319bb0f..3696d05 100644
--- a/games-roguelike/nethack/nethack-3.6.0-r1.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/nethack/${PN}-${MY_PV}-src.tgz"
 LICENSE="nethack"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="X"
+IUSE="experimental X"
 
 RDEPEND="sys-libs/ncurses:0=
X? (
@@ -56,6 +56,8 @@ src_compile() {
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}"

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

2015-12-31 Thread Patrice Clement 
commit: 9d33d1d4b8e9578da5466ab11e9b162b80c357c4
Author: Luis Ressel  aixah  de>
AuthorDate: Sat Dec 26 00:18:44 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Dec 30 00:20:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d33d1d4

games-roguelike/nethack: Bump to 3.6.0

Thorough ebuild rewrite.

Gentoo-Bug: 567762

 games-roguelike/nethack/Manifest   |   1 +
 .../nethack/files/nethack-3.6.0-hint-tty   |  19 +++
 .../nethack/files/nethack-3.6.0-hint-x11   |  23 +++
 .../nethack/files/nethack-3.6.0-recover.patch  | 110 +
 games-roguelike/nethack/nethack-3.6.0.ebuild   | 179 +
 5 files changed, 332 insertions(+)

diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest
index 8776166..5808cc3 100644
--- a/games-roguelike/nethack/Manifest
+++ b/games-roguelike/nethack/Manifest
@@ -1 +1,2 @@
 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/nethack-3.6.0-hint-tty 
b/games-roguelike/nethack/files/nethack-3.6.0-hint-tty
new file mode 100644
index 000..3c250e7
--- /dev/null
+++ b/games-roguelike/nethack/files/nethack-3.6.0-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 $(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
new file mode 100644
index 000..d0d1a8d
--- /dev/null
+++ b/games-roguelike/nethack/files/nethack-3.6.0-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 $(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
new file mode 100644
index 000..c7e8ab3
--- /dev/null
+++ b/games-roguelike/nethack/files/nethack-3.6.0-recover.patch
@@ -0,0 +1,110 @@
+From c15cf56e61c908ce756d698a8afa3064030761b3 Mon Sep 17 00:00:00 2001
+From: Luis Ressel 
+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

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

2015-10-24 Thread Patrice Clement 
commit: 086d1d11426f1e2e8cb9d817a8d3724511f28ccf
Author: Luis Ressel  aixah  de>
AuthorDate: Thu Oct 15 11:44:09 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Oct 19 11:35:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=086d1d11

games-roguelike/nethack: Move HACKDIR to /usr/lib

Move nethack's HACKDIR (containing its static data) from /usr/share to
/usr/lib because its contents are architecture-dependent. /usr/lib is
the location recommended by upstream and also used by other distros.

X-Gentoo-Bug: 97557

 games-roguelike/nethack/nethack-3.4.3-r5.ebuild | 232 
 1 file changed, 232 insertions(+)

diff --git a/games-roguelike/nethack/nethack-3.4.3-r5.ebuild 
b/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
new file mode 100644
index 000..40ffcfc
--- /dev/null
+++ b/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
@@ -0,0 +1,232 @@
+# 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-5.2-r5
+   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}" \
+   LFLAGS="-L/usr/X11R6/lib" \
+   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

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

2015-10-24 Thread Patrice Clement 
commit: 4f28038d4ce6cfa11a205e2c86730796a98c3b25
Author: Luis Ressel  aixah  de>
AuthorDate: Thu Oct 15 22:42:02 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Oct 19 11:35:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f28038d

games-roguelike/nethack: Minor cleanup

* Drop \ after && and ||
* Drop reference to old X11 libdir

 games-roguelike/nethack/nethack-3.4.3-r5.ebuild | 15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/games-roguelike/nethack/nethack-3.4.3-r5.ebuild 
b/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
index b8cfdfd..6762a44 100644
--- a/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
+++ b/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
@@ -116,7 +116,6 @@ src_install() {
emake \
CC="$(tc-getCC)" \
CFLAGS="${CFLAGS}" \
-   LFLAGS="-L/usr/X11R6/lib" \
GAMEPERM=02755 \
GAMEUID="root" GAMEGRP="${NETHACK_GROUP}" \
PREFIX="${D}/usr" \
@@ -209,21 +208,21 @@ pkg_postinst() {
cd "${ROOT}/${STATEDIR}" || die "Failed to enter ${STATEDIR} directory"
 
if [[ -v migration ]] ; then
-   cp "$T/"{logfile,record} . || \
+   cp "$T/"{logfile,record} . ||
die "Failed to preserve ${ROOT}/${STATEDIR} files"
 
-   chown -R root:"${NETHACK_GROUP}" . && \
-   chmod -R 660 . && \
-   chmod 770 . save || \
+   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 || \
+   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"

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

2015-10-24 Thread Patrice Clement 
commit: 8e58531836b56d583d3fb9fb8ffbba8befa7b46b
Author: Luis Ressel  aixah  de>
AuthorDate: Thu Oct 15 19:28:22 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Oct 19 11:35:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e585318

games-roguelike/nethack: Add subslot operator to ncurses dep

 games-roguelike/nethack/nethack-3.4.3-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/nethack/nethack-3.4.3-r5.ebuild 
b/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
index fde14db..b8cfdfd 100644
--- a/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
+++ b/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE="X"
 
-RDEPEND=">=sys-libs/ncurses-5.2-r5
+RDEPEND="sys-libs/ncurses:0=
X? (
x11-libs/libXaw
x11-libs/libXpm

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

2015-10-24 Thread Patrice Clement 
commit: e8e425e079768209108543a8ed5fcc64dbf16a68
Author: Luis Ressel  aixah  de>
AuthorDate: Thu Oct 15 11:49:13 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Oct 19 11:35:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8e425e0

games-roguelike/nethack: Install nethack menu icon

X-Gentoo-Bug: 132754

 games-roguelike/nethack/nethack-3.4.3-r5.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/games-roguelike/nethack/nethack-3.4.3-r5.ebuild 
b/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
index 40ffcfc..48ba257 100644
--- a/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
+++ b/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
@@ -177,11 +177,13 @@ src_install() {
-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}
-   make_desktop_entry nethack "Nethack"
 
fowners -R "root:${NETHACK_GROUP}" "${STATEDIR}"
fperms -R 660 "${STATEDIR}"

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

2015-10-24 Thread Patrice Clement 
commit: 959193878972c00effb34d93af332751e051474a
Author: Luis Ressel  aixah  de>
AuthorDate: Thu Oct 15 17:02:11 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Oct 19 11:35:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95919387

games-roguelike/nethack: Don't install dot.nethackrc to HACKDIR

It's only a default config file to be used by users, there's another
copy in /etc/skel, and there's an elog message to point users to the
version in /etc/skel, so we really don't need this in $HACKDIR.

 games-roguelike/nethack/nethack-3.4.3-r5.ebuild | 12 
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/games-roguelike/nethack/nethack-3.4.3-r5.ebuild 
b/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
index 48ba257..fde14db 100644
--- a/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
+++ b/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
@@ -143,10 +143,8 @@ src_install() {
doman doc/*.6
dodoc doc/*.txt
 
-   # Can be copied to ~/.nethackrc to set options
-   # Add this to /etc/.skel as well, thats the place for default configs
-   insinto "${HACKDIR}"
-   doins "${FILESDIR}/dot.nethackrc"
+   insinto /etc/skel
+   newins "${FILESDIR}/dot.nethackrc" .nethackrc
 
local windowtypes="tty"
use X && windowtypes="${windowtypes} x11"
@@ -154,10 +152,8 @@ src_install() {
sed -i \
-e "s:GENTOO_WINDOWTYPES:${windowtypes}:" \
-e "s:GENTOO_DEFWINDOWTYPE:$1:" \
-   "${D}${HACKDIR}/dot.nethackrc" \
-   || die "sed ${HACKDIR}/dot.nethackrc failed"
-   insinto /etc/skel
-   newins "${D}/${HACKDIR}/dot.nethackrc" .nethackrc
+   "${D}/etc/skel/.nethackrc" \
+   || die "sed /etc/skel/.nethackrc failed"
 
if use X ; then
# install nethack fonts

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

2015-10-24 Thread Patrice Clement 
commit: 824393e2fca2997956887f9cf21cec26ac69c01a
Author: Luis Ressel  aixah  de>
AuthorDate: Thu Oct 15 19:19:51 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Oct 19 11:35:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=824393e2

games-roguelike/nethack: Remove old revisions

 games-roguelike/nethack/nethack-3.4.3-r3.ebuild | 218 --
 games-roguelike/nethack/nethack-3.4.3-r4.ebuild | 231 
 2 files changed, 449 deletions(-)

diff --git a/games-roguelike/nethack/nethack-3.4.3-r3.ebuild 
b/games-roguelike/nethack/nethack-3.4.3-r3.ebuild
deleted file mode 100644
index c4a490f..000
--- a/games-roguelike/nethack/nethack-3.4.3-r3.ebuild
+++ /dev/null
@@ -1,218 +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-5.2-r5
-   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"
-HACKDIR="/usr/share/games/${PN}"
-STATEDIR="/var/games/${PN}"
-
-NETHACK_GROUP="gamestat"
-
-pkg_setup() {
-   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}" \
-   LFLAGS="-L/usr/X11R6/lib" \
-   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}/"{recover,save}
-
-   exeinto "${BINDIR}"
-   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
-   sed -i \
-   -e