gentoo resync : 28.04.2021

6 files changed, 54 insertions, 24 deletions

diff --git a/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch b/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch
index 3be1b3de074b..7afd0019efb4 100644
--- a/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch
+++ b/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch
@@ -7,8 +7,8 @@ structure.  Work around is to assign the submembers instead.
 
 http://bugs.gentoo.org/show_bug.cgi?id=102667
 
---- bsd-games/dm/utmpentry.c
-+++ bsd-games/dm/utmpentry.c
+--- a/dm/utmpentry.c
++++ b/dm/utmpentry.c
 @@ -291,7 +291,8 @@
  	e->line[sizeof(e->line) - 1] = '\0';
  	(void)strncpy(e->host, up->ut_host, sizeof(up->ut_host));
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-bg.patch b/games-misc/bsd-games/files/bsd-games-2.17-bg.patch
index 07dc520b77e4..6503d9afcb5d 100644
--- a/games-misc/bsd-games/files/bsd-games-2.17-bg.patch
+++ b/games-misc/bsd-games/files/bsd-games-2.17-bg.patch
@@ -1,5 +1,5 @@
---- backgammon/common_source/fancy.c.old	2007-05-16 20:16:46.000000000 +0200
-+++ backgammon/common_source/fancy.c	2007-05-16 20:19:00.000000000 +0200
+--- a/backgammon/common_source/fancy.c
++++ b/backgammon/common_source/fancy.c
 @@ -58,7 +58,7 @@
  int     lUP;			/* length of UP */
  int     CO;			/* number of columns */
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch b/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch
index 7de07effc25d..dabb38460a66 100644
--- a/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch
+++ b/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch
@@ -1,5 +1,5 @@
---- trek/getpar.h.orig	2005-08-14 19:45:29.000000000 -0400
-+++ trek/getpar.h	2005-08-14 19:46:33.000000000 -0400
+--- a/trek/getpar.h
++++ b/trek/getpar.h
 @@ -31,6 +31,9 @@
   *	@(#)getpar.h	8.1 (Berkeley) 5/31/93
   */
@@ -16,8 +16,8 @@
  int readdelim(int);
 +
 +#endif /*__GETPAR_H_*/
---- trek/trek.h.orig	2005-08-14 19:45:37.000000000 -0400
-+++ trek/trek.h	2005-08-14 19:48:17.000000000 -0400
+--- a/trek/trek.h
++++ b/trek/trek.h
 @@ -31,6 +31,13 @@
   *	@(#)trek.h	8.1 (Berkeley) 5/31/93
   */
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-headers.patch b/games-misc/bsd-games/files/bsd-games-2.17-headers.patch
deleted file mode 100644
index 953a5d35765a..000000000000
--- a/games-misc/bsd-games/files/bsd-games-2.17-headers.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/128348
-
---- include/stdio.h
-+++ include/stdio.h
-@@ -35,5 +35,11 @@
- #include_next <stdio.h>
- 
- #ifndef HAVE_fgetln
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- extern char *fgetln(FILE *stream, size_t *len);
-+#ifdef __cplusplus
-+}
-+#endif
- #endif
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-rename-getdate-clash.patch b/games-misc/bsd-games/files/bsd-games-2.17-rename-getdate-clash.patch
new file mode 100644
index 000000000000..0618abd0d3dc
--- /dev/null
+++ b/games-misc/bsd-games/files/bsd-games-2.17-rename-getdate-clash.patch
@@ -0,0 +1,33 @@
+--- a/hack/extern.h
++++ b/hack/extern.h
+@@ -583,7 +583,7 @@ int role_index(int);
+ void setrandom(void);
+ struct tm *getlt(void);
+ int getyear(void);
+-char *getdate(void);
++char *get_date(void);
+ int phase_of_the_moon(void);
+ int night(void);
+ int midnight(void);
+--- a/hack/hack.end.c
++++ b/hack/hack.end.c
+@@ -360,7 +360,7 @@ topten()
+ 	(t0->name)[NAMSZ] = 0;
+ 	(void) strncpy(t0->death, killer, DTHSZ);
+ 	(t0->death)[DTHSZ] = 0;
+-	(void) strcpy(t0->date, getdate());
++	(void) strcpy(t0->date, get_date());
+ 
+ 	/* assure minimum number of points */
+ 	if (t0->points < POINTSMIN)
+--- a/hack/hack.unix.c
++++ b/hack/hack.unix.c
+@@ -118,7 +118,7 @@ getyear()
+ }
+ 
+ char           *
+-getdate()
++get_date()
+ {
+ 	static char     datestr[7];
+ 	struct tm      *lt = getlt();
diff --git a/games-misc/bsd-games/files/bsd-games-3.1-no-install-manpages-automatically.patch b/games-misc/bsd-games/files/bsd-games-3.1-no-install-manpages-automatically.patch
new file mode 100644
index 000000000000..590b595afa5f
--- /dev/null
+++ b/games-misc/bsd-games/files/bsd-games-3.1-no-install-manpages-automatically.patch
@@ -0,0 +1,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -20,10 +20,6 @@ $O%.o:	%.c
+ 	echo "    Compiling $< to assembly ..."
+ 	${CC} ${cflags} -S -o $@ -c $<
+ 
+-$O%.6.gz:	%.6
+-	echo "    Compressing $@ ..."
+-	gzip -c9 $< > $@
+-
+ ################ Installation ##########################################
+ 
+ ifdef bindir