fix naming of recover man page (bug #203556)

(Portage version: 2.1.7.17/cvs/Linux i686)

4 files changed, 105 insertions, 23 deletions

diff --git a/games-roguelike/nethack/ChangeLog b/games-roguelike/nethack/ChangeLog
index c27edcf7a57a..926caa2d3077 100644
--- a/games-roguelike/nethack/ChangeLog
+++ b/games-roguelike/nethack/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-roguelike/nethack
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.33 2010/03/02 20:57:16 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.34 2010/03/02 21:10:39 mr_bones_ Exp $
+
+  02 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/3.4.3-QT-support.patch, nethack-3.4.3-r1.ebuild,
+  +files/nethack-3.4.3-recover.patch:
+  fix naming of recover man page (bug #203556)
 
   02 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org>
   nethack-3.4.3-r1.ebuild:
diff --git a/games-roguelike/nethack/files/3.4.3-QT-support.patch b/games-roguelike/nethack/files/3.4.3-QT-support.patch
deleted file mode 100644
index 8f8d867be6a8..000000000000
--- a/games-roguelike/nethack/files/3.4.3-QT-support.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- include/config.h.orig	2003-06-21 21:03:14.000000000 -0400
-+++ include/config.h	2003-06-21 21:03:20.000000000 -0400
-@@ -47 +47 @@
--/* #define QT_GRAPHICS */	/* Qt interface */
-+#define QT_GRAPHICS
-@@ -91 +90,0 @@
--# define USE_XPM		/* Use XPM format for images (required) */
---- src/Makefile.orig	2003-06-21 21:04:41.000000000 -0400
-+++ src/Makefile	2003-06-21 21:04:58.000000000 -0400
-@@ -189 +189 @@
--WINQTOBJ = qt_win.o qt_clust.o qttableview.o tile.o
-+WINQTOBJ = qt_win.o qt_clust.o qttableview.o
-@@ -217,2 +217,2 @@
--WINSRC = $(WINTTYSRC) $(WINX11SRC)
--WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
-+WINSRC = $(WINTTYSRC) $(WINX11SRC) $(WINQTSRC)
-+WINOBJ = $(WINTTYOBJ) $(WINX11OBJ) $(WINQTOBJ)
-@@ -258 +258 @@
--WINLIB = $(WINTTYLIB) $(WINX11LIB)
-+WINLIB = $(WINTTYLIB) $(WINX11LIB) $(WINQTLIB)
diff --git a/games-roguelike/nethack/files/nethack-3.4.3-recover.patch b/games-roguelike/nethack/files/nethack-3.4.3-recover.patch
new file mode 100644
index 000000000000..3ad80b072bfc
--- /dev/null
+++ b/games-roguelike/nethack/files/nethack-3.4.3-recover.patch
@@ -0,0 +1,94 @@
+--- doc/recover.6	2003-12-07 18:39:13.000000000 -0500
++++ doc/nethack-recover.6	2010-03-02 16:03:26.978172561 -0500
+@@ -1,9 +1,9 @@
+-.TH RECOVER 6 "9 January 1993"
++.TH NETHACK-RECOVER 6 "9 January 1993"
+ .UC 4
+ .SH NAME
+-recover \- recover a NetHack game interrupted by disaster
++nethack-recover \- nethack-recover a NetHack game interrupted by disaster
+ .SH SYNOPSIS
+-.B recover
++.B nethack-recover
+ [
+ .B \-d
+ .I directory
+@@ -21,7 +21,7 @@
+ The
+ .I base
+ options tell
+-.I recover
++.I nethack-recover
+ which files to process.
+ Each base option specifies recovery of a separate game.
+ .PP
+@@ -56,24 +56,24 @@
+ or "xlock" if the number of concurrent players is being limited.
+ It may be necessary to look in the playground to find the correct
+ base name of the interrupted game.
+-.I recover
++.I nethack-recover
+ will transform these level files into a save file of the same name as
+ .I nethack
+ would have used.
+ .PP
+ Since
+-.I recover
++.I nethack-recover
+ must be able to read and delete files from the playground
+ and create files in the save directory,
+ it has interesting interactions with game security.
+ Giving ordinary players access to
+-.I recover
++.I nethack-recover
+ through setuid or setgid is tantamount to leaving the playground
+ world-writable,
+ with respect to both cheating and messing up other players.
+ For a single-user system, this of course does not change anything,
+ so some of the microcomputer ports install
+-.I recover
++.I nethack-recover
+ by default.
+ .PP
+ For a multi-user system,
+@@ -81,22 +81,22 @@
+ playground to be fed to recover when the host machine boots,
+ and handle game crashes individually.
+ If the user population is sufficiently trustworthy,
+-.I recover
++.I nethack-recover
+ can be installed with the same permissions the
+ .I nethack
+ executable has.
+ In either case,
+-.I recover
++.I nethack-recover
+ is easily compiled from the distribution utility directory.
+ .SH NOTES
+ .PP
+ Like
+ .I nethack
+ itself,
+-.I recover
++.I nethack-recover
+ will overwrite existing savefiles of the same name.
+ Savefiles created by
+-.I recover
++.I nethack-recover
+ are uncompressed;
+ they may be compressed afterwards if desired,
+ but even a compression-using
+@@ -106,11 +106,11 @@
+ nethack(6)
+ .SH BUGS
+ .PP
+-.I recover
++.I nethack-recover
+ makes no attempt to find out if a base name specifies a game in progress.
+ If multiple machines share a playground, this would be impossible to
+ determine.
+ .PP
+-.I recover
++.I nethack-recover
+ should be taught to use the nethack playground locking mechanism to
+ avoid conflicts.
diff --git a/games-roguelike/nethack/nethack-3.4.3-r1.ebuild b/games-roguelike/nethack/nethack-3.4.3-r1.ebuild
index 50b390cdffff..d120ac45458a 100644
--- a/games-roguelike/nethack/nethack-3.4.3-r1.ebuild
+++ b/games-roguelike/nethack/nethack-3.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.26 2010/03/02 20:57:16 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.27 2010/03/02 21:10:39 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs flag-o-matic games
@@ -42,7 +42,10 @@ src_prepare() {
 		"${FILESDIR}"/${PV}-default-options.patch \
 		"${FILESDIR}"/${PV}-bison.patch \
 		"${FILESDIR}"/${PV}-macos.patch \
-		"${FILESDIR}"/${P}-gibc210.patch
+		"${FILESDIR}"/${P}-gibc210.patch \
+		"${FILESDIR}"/${P}-recover.patch
+
+	mv doc/recover.6 doc/nethack-recover.6
 
 	sed -i \
 		-e "s:GENTOO_STATEDIR:${GAMES_STATEDIR}/${PN}:" include/unixconf.h \