From 8f71b891c90b612c276b62a58b50f0a3362133a7 Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Tue, 2 Mar 2010 21:10:40 +0000 Subject: [PATCH] fix naming of recover man page (bug #203556) Package-Manager: portage-2.1.7.17/cvs/Linux i686 --- games-roguelike/nethack/ChangeLog | 7 +- games-roguelike/nethack/Manifest | 6 +- .../nethack/files/3.4.3-QT-support.patch | 20 ---- .../nethack/files/nethack-3.4.3-recover.patch | 94 +++++++++++++++++++ .../nethack/nethack-3.4.3-r1.ebuild | 7 +- 5 files changed, 108 insertions(+), 26 deletions(-) delete mode 100644 games-roguelike/nethack/files/3.4.3-QT-support.patch create mode 100644 games-roguelike/nethack/files/nethack-3.4.3-recover.patch 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 + -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 nethack-3.4.3-r1.ebuild: diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest index 1cbbb9f76e61..e5c7f0c97068 100644 --- a/games-roguelike/nethack/Manifest +++ b/games-roguelike/nethack/Manifest @@ -1,4 +1,3 @@ -AUX 3.4.3-QT-support.patch 792 RMD160 2338e103a24a2284ac1af33f22dc914f506d13e7 SHA1 d1789562e39ba5f101939c2bd3974c0b74f35398 SHA256 2e3a72bb31c8b0fe3afaa9933f64cd1858b4f32d6188273586062953b92ae97a AUX 3.4.3-X-support.patch 920 RMD160 1cad76af263fa640097ef6f67f1298886df098ea SHA1 3fe24974e6e1df078a4a0992c9313f59e2f0c662 SHA256 e1d3a7110c97b80b1d3e3bd4204f1ea018fbbc03d2a937efdb292cc1f611f525 AUX 3.4.3-bison.patch 603 RMD160 0fd71789e69640ac8c14183edd5974938d5e6f66 SHA1 2705d64f5c2692a4f1f561c90b816dce5dbe27b0 SHA256 8b8eab414c4dfeb20ab60dc543eb023eac90da0a9e1c8a2375833fdf61baec7f AUX 3.4.3-default-options.patch 1262 RMD160 10bdb2cbe10a7396a8f88052d6a61e62629c26d8 SHA1 678a7d263649b77b25a55290f68074042a64961a SHA256 5ba428f0c4d476c41b5ab94fb52737e39d32b7944d46755195745d97f14f38bd @@ -6,7 +5,8 @@ AUX 3.4.3-gentoo-paths.patch 576 RMD160 84319d80353e1c029d4130a73ae65b18680f2c91 AUX 3.4.3-macos.patch 307 RMD160 460ef1f4279e5c0e09de3cfe77b7984fbab0dede SHA1 a96ef11b97a9cbf08c9207144986d4355a27e6b1 SHA256 2df99fde20c8ff4b919da95bb4a36222b9eac564cfc2e02233da95dcbc25bb17 AUX dot.nethackrc 2717 RMD160 0e9868a1b8f017337d8c37e740399e25512bdb5b SHA1 27c973b8c336355012e2e2c4f0007bce9cce9f84 SHA256 19d692014e1b053439f5f818291e32a971942490ca7e3d2b7912b43a4563f98c AUX nethack-3.4.3-gibc210.patch 330 RMD160 18a1bca6e71c7dc7930039fcb330f0c1791e31ce SHA1 45663beda1b67529886f1839f96be45021623c54 SHA256 5c74be994e8c5622b0c97f6178ef123ef614c9a1e2b4005da7fd36692f1df47e +AUX nethack-3.4.3-recover.patch 2542 RMD160 393d6e4d141df1f836af083f96dd5bdd8e91d5dd SHA1 14c9117fcab1c200fa241988049a22203ef5422f SHA256 ce309d4b1d4ebb2c865754de905e5e16470f05c19460fc9491d98386a8015f63 DIST nethack-343-src.tgz 3497458 RMD160 42f600d24715a0b7e631b357c135761410b3ca95 SHA1 c26537093c38152bc0fbcec20468d975b35f59fd SHA256 bb39c3d2a9ee2df4a0c8fdde708fbc63740853a7608d2f4c560b488124866fe4 -EBUILD nethack-3.4.3-r1.ebuild 4512 RMD160 22cf029cf3f3b1cf4d90529c66b49ea6f2043c60 SHA1 a0911aab011111934ff0f11ef3bc4651be9e1f93 SHA256 3302256333fc8353f6dc6d763bbc477b602e1f79318805063019a2dfff860a91 -MISC ChangeLog 7118 RMD160 3ae22271363a67d38fde5c74d54dea611c60297c SHA1 4de4a154d050dc9f956d18a744d65f252e96984c SHA256 0e0ad31515f6346512a9661a83f36455e885b2f134abc515aff76b5aaf73b64b +EBUILD nethack-3.4.3-r1.ebuild 4590 RMD160 a1b8768eae3ec46670fc9a33e00a106b534cee90 SHA1 6ff4df3b3a8ef100c9988b68311b200084b2632a SHA256 f3efbcc94612147c4a12737353a19420258aa1629acd78c293b146badaa77fa4 +MISC ChangeLog 7317 RMD160 d9383379048458eee44b99b42f25f88931c65375 SHA1 5d6dc0c742b0a0c84b8c72f1ff909e008a1f613e SHA256 75e08d26ae3077c16b4500a949d4634fc7ce319d73e150ba407dbca709f72669 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 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 \ -- 2.26.2