gentoo resync : 14.07.2018

5 files changed, 132 insertions, 0 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
new file mode 100644
index 000000000000..3be1b3de074b
--- /dev/null
+++ b/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch
@@ -0,0 +1,21 @@
+About utmpentry.c:
+
+the utmpx structure defines the ut_tv member a little differently on 
+64bit hosts so that a 32bit and 64bit structure can be shared.  So the 
+ut_tv is a custom 32bit structure rather than the native 64bit timeval 
+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
+@@ -291,7 +291,8 @@
+ 	e->line[sizeof(e->line) - 1] = '\0';
+ 	(void)strncpy(e->host, up->ut_host, sizeof(up->ut_host));
+ 	e->name[sizeof(e->host) - 1] = '\0';
+-	e->tv = up->ut_tv;
++	e->tv.tv_sec = up->ut_tv.tv_sec;
++	e->tv.tv_usec = up->ut_tv.tv_usec;
+ 	adjust_size(e);
+ }
+ #endif
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
new file mode 100644
index 000000000000..07dc520b77e4
--- /dev/null
+++ b/games-misc/bsd-games/files/bsd-games-2.17-bg.patch
@@ -0,0 +1,22 @@
+--- 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
+@@ -58,7 +58,7 @@
+ int     lUP;			/* length of UP */
+ int     CO;			/* number of columns */
+ int     LI;			/* number of lines */
+-int    *linect;			/* array of lengths of lines on screen (the
++static int linect[25];		/* array of lengths of lines on screen (the
+ 				 * actual screen is not stored) */
+ 
+  /* two letter codes */
+@@ -728,10 +728,5 @@
+ 		lND = strlen(ND);
+ 	if (LI < 24 || CO < 72 || !(CL && UP && ND))
+ 		return (0);
+-	linect = (int *) calloc(LI + 1, sizeof(int));
+-	if (linect == NULL) {
+-		write(2, "\r\nOut of memory!\r\n", 18);
+-		getout(0);
+-	}
+ 	return (1);
+ }
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
new file mode 100644
index 000000000000..7de07effc25d
--- /dev/null
+++ b/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch
@@ -0,0 +1,34 @@
+--- trek/getpar.h.orig	2005-08-14 19:45:29.000000000 -0400
++++ trek/getpar.h	2005-08-14 19:46:33.000000000 -0400
+@@ -31,6 +31,9 @@
+  *	@(#)getpar.h	8.1 (Berkeley) 5/31/93
+  */
+ 
++#ifndef __GETPAR_H_
++#define __GETPAR_H_
++
+ typedef void (*cmdfun)(int);
+ struct cvntab		/* used for getcodpar() parameter list */
+ {
+@@ -51,3 +54,5 @@
+ int testnl(void);
+ void skiptonl(int);
+ 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
+@@ -31,6 +31,13 @@
+  *	@(#)trek.h	8.1 (Berkeley) 5/31/93
+  */
+ 
++/* For struct cvntab definition, which is now required for
++ * Skitab and Lentab below.  gcc 4.0 and later will emit
++ * "array type has incomplete element type" errors otherwise.
++ * -- Jason Bucata (jbucata@tulsaconnect.com), 12-AUG-2005
++ */
++#include "getpar.h"
++
+ /*
+ **  Global Declarations
+ **
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
new file mode 100644
index 000000000000..953a5d35765a
--- /dev/null
+++ b/games-misc/bsd-games/files/bsd-games-2.17-headers.patch
@@ -0,0 +1,16 @@
+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/config.params-gentoo b/games-misc/bsd-games/files/config.params-gentoo
new file mode 100644
index 000000000000..9d246d1865e9
--- /dev/null
+++ b/games-misc/bsd-games/files/config.params-gentoo
@@ -0,0 +1,39 @@
+
+# This file is read by configure for the Gentoo ebuild 
+
+# Don't run configure interactively.
+bsd_games_cfg_non_interactive=y
+
+bsd_games_cfg_install_prefix=${D}
+
+# For gentoo, 
+#   banner used to be in util-linux.  Gentoo might have an ebuild
+#   fortune is "app-games/fortune-mod"
+#   factor is in "sys-apps/sh-utils"
+#   dm is not installed by debian, I don't know why
+bsd_games_cfg_no_build_dirs="dm banner fortune factor"
+
+# Gentoo's games eclass want everything in these places
+bsd_games_cfg_gamesdir=${GAMES_BINDIR}
+bsd_games_cfg_sbindir=${GAMES_BINDIR}
+bsd_games_cfg_sharedir=${GAMES_DATADIR}/${PN}
+bsd_games_cfg_varlibdir=${GAMES_STATEDIR}
+
+# We'll control all the permissions during install (via games eclass) 
+bsd_games_cfg_do_chown=n
+
+# .so or symlink??? (Debian perfers symlinks for manpages)
+bsd_games_cfg_use_dot_so=symlinks
+
+# Gentoo'll handle manpage compressing.
+bsd_games_cfg_gzip_manpages=n
+
+# sys-apps/less is in system (even though more is in /bin)
+bsd_games_cfg_pager=/usr/bin/less
+
+# sys-apps/miscfiles might have too many words for boggle
+bsd_games_cfg_dictionary_src=/usr/share/dict/words
+
+# Acronym file for "wft"
+bsd_games_cfg_wtf_acronymfile=${GAMES_DATADIR}/${PN}/acronyms
+