gentoo resync : 02.09.2020

6 files changed, 197 insertions, 75 deletions

diff --git a/games-board/xgammon/Manifest b/games-board/xgammon/Manifest
index b42c73c0c1e4..dd7a0e5590a1 100644
--- a/games-board/xgammon/Manifest
+++ b/games-board/xgammon/Manifest
@@ -1,6 +1,7 @@
-AUX gcc33.patch 3599 BLAKE2B 7004c25311efc2de6ea13068b645608944562ff4a2b88b9531f7bf0744985dc66fad704d7a46a0d5e69d682ab08a7f9b379fb5535010ac39c4d606b71be346e1 SHA512 ad18ff67dd7b7ec0a0cb187e30e6e0f576c5bb0f03a1f5fde28562a673557fb056ab2862ef823e41b61da37461642d40d755ab23e5a1c0fbddbf598a79e77736
-AUX xgammon-0.98-broken.patch 196 BLAKE2B 0005a7f1be80eb8be8b400e0d762cbd8fa83f7508d207f9144e47513be11d1494ce9560a4a3b726a07e557049ff530986a35e591418c0b6ae1f7c9b5b3749575 SHA512 87d6d4250e9a0b3c7276425861f77bbe506fbce6fd5ca5b55a94921ae02a36edebc382eec4eee88ffb33b8fbf41883f63d69dec8c52296e24289640f6ef9ad98
+AUX xgammon-0.98-broken.patch 3796 BLAKE2B d99b3336ccf598755a516f498e1fdb3b76c401df21bf39b57a366dc8e74194b7b4b96be26801d6833c12336ead97f2c4148817aa9d04f0808f3464c514a341b8 SHA512 5cd79e9701ba8489c172ec22f280b39a8ddccbadab855dd2e1cf08d4ffcd374de8419a39ea96a600c13ee54f6637a4b8bc21585bd6562e3ebc33bf046be38c94
 AUX xgammon-0.98-config.patch 655 BLAKE2B 5ef155a55f75482a0a269451ca09a9e78d21de8bfa96e870bd5d3c5f52faffe04c0639c1a629eec940bca98f802b2400e059b759fd824fff89172807561754a6 SHA512 45478fc0a93bcef9a8d47e615333d9496791e8605a164d4527ff42c8e14fddacccbfabf09a684bfae01d468dfb58adb260c616adad71733fd3650ce6df981e21
+AUX xgammon-0.98-fno-common.patch 2284 BLAKE2B 88dcb8c85d4659a7f381ade1b4197ba9cc6c274ca32c66ca48550956bd0d6d91db5f92958a18dfab2ab51d436963fce05c75ec7d2739005178dcfc19f5f3f29a SHA512 d0dafe63ed9ee9c03f9f2ca6b1e9027f275a5ed6c5b5596454b36d6edbb0fe8768677cb4a30456e07caa369ef07a069d6b9fd838b3c146184e1e00a60ffd4f24
+AUX xgammon-0.98-glibc-2.32.patch 440 BLAKE2B 593dfaf0ecea283d5843b8864e9aeee9b1d3f5d8000f938b8dab733b93688e129c04055030446a844021845006e1a41d166d911f7cafd23a91c031e48a8d269b SHA512 d39dd68fcda62a4f1d57dc6a24aca9a5df4f3849ec96460dbcd07b50adfa10db99557e2f713a5b59ed0ad79cd315baaa3212190c635c42088d9111c0dbd3fe67
 DIST xgammon-0.98a.tar.gz 76415 BLAKE2B 617ca76b8ebe22f753f20f94fc536008c119237e24ad1011a88780416405db95c5155759548e6719c328067387e1cbc052b0ebbbc020ad8e028f564cfcd3c3f1 SHA512 1176146d7cf4d5cbf47e911190de329d87650084044d1a2e5a53ed367d2b90ec63c0e906946c4523c2fb21b68df8b86cf0567527a91058e8db66a76086a02092
-EBUILD xgammon-0.98-r1.ebuild 949 BLAKE2B 724a28818381c487e911cacf0067700f6fe5d16a21a12421e6eec95069074b54dbdfe8c2d0d3c9a20fd9857a781002285ca5f36f743c453a5dd39aa15e669c3c SHA512 a6dc0bec5ba59b94d0649bfdf74ed7cc8e4875104b6cfdcde12c11b7500460305aff3889d8ca3cdd0a4a31ace46b92b3b17b73ce554cb7f6b352854377a3d5ad
+EBUILD xgammon-0.98-r1.ebuild 1029 BLAKE2B d5ebde46a139925e99e4d27fcbc91c4846098b9d9a1252334a9cd1adcc117aa221c02567899d299123083d4a1299cc6ab65cd2ead3908a5cedb5223a5ce65634 SHA512 233bcc731e518a1c5ceef5c78f86599cbc802ba9eb8536b084d113152fd91d8912105234a1be3508cc47fc76a61072f4f2ac9cbf0cc9b2e669ca4d0e7e2398ab
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/xgammon/files/gcc33.patch b/games-board/xgammon/files/gcc33.patch
deleted file mode 100644
index 093eaa1f453b..000000000000
--- a/games-board/xgammon/files/gcc33.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/xgammon.c
-+++ b/xgammon.c
-@@ -944,31 +944,31 @@
- 	for (option=1; option<argc; option++) {
- 		if (strcmp (argv[option], "-?") == 0 ||
- 		    strcmp (argv[option], "-help") == 0) {
--puts ("xgammon [-otherdisplay (display)]
--        [-boardgeometry (string)]
--        [-boardcolor (color)] [-bc (color)]
--        [-darkcolor  (color)] [-dc (color)]
--        [-lightcolor (color)] [-lc (color)]
--        [-barcolor   (color)] [-b  (color)]
--        [-whitecolor (color)]        the stone color for \"white\"
--        [-blackcolor (color)]        the stone color for \"black\"
--        [-doublerfont (font)]        sets the (big) font for the doubler dice
--        [-doubling   +doubling]      sets if you wish the computer to double
--        [-h (black|white)]           set the color for the human player
--                                     (implies a human versus computer game)
--        [-gamekind -g (hvc|cvc|hvh)] sets the gamekind to either
--                                     human vs. human computer vs. computer
--                                     or human vs. computer (default)
--        [-winat      (points)]       play a tournament up to \"points\" points
--        [-watchmove  +wachmove]      if you wish to see the flying stones
--        [-buttonmove +buttonmove]    set stones by simply pressing button
--        [-autoplay   +autoplay]      automatic play when only one move
--                                     is possible
--        [-stonesteps (number)]       sets the stepsize the stones fly
--                                     in pixel (implies +watchmove)
--        [-delaytime (tsec.)]         sets the time the cumputer waits
--                                     after each turn (implies -watchmove)
--        [-?] [-help]                 print this string");
-+puts ("xgammon [-otherdisplay (display)]\n"
-+"        [-boardgeometry (string)]\n"
-+"        [-boardcolor (color)] [-bc (color)]\n"
-+"        [-darkcolor  (color)] [-dc (color)]\n"
-+"        [-lightcolor (color)] [-lc (color)]\n"
-+"        [-barcolor   (color)] [-b  (color)]\n"
-+"        [-whitecolor (color)]        the stone color for \"white\"\n"
-+"        [-blackcolor (color)]        the stone color for \"black\"\n"
-+"        [-doublerfont (font)]        sets the (big) font for the doubler dice\n"
-+"        [-doubling   +doubling]      sets if you wish the computer to double\n"
-+"        [-h (black|white)]           set the color for the human player\n"
-+"                                     (implies a human versus computer game)\n"
-+"        [-gamekind -g (hvc|cvc|hvh)] sets the gamekind to either\n"
-+"                                     human vs. human computer vs. computer\n"
-+"                                     or human vs. computer (default)\n"
-+"        [-winat      (points)]       play a tournament up to \"points\" points\n"
-+"        [-watchmove  +wachmove]      if you wish to see the flying stones\n"
-+"        [-buttonmove +buttonmove]    set stones by simply pressing button\n"
-+"        [-autoplay   +autoplay]      automatic play when only one move\n"
-+"                                     is possible\n"
-+"        [-stonesteps (number)]       sets the stepsize the stones fly\n"
-+"                                     in pixel (implies +watchmove)\n"
-+"        [-delaytime (tsec.)]         sets the time the cumputer waits\n"
-+"                                     after each turn (implies -watchmove)\n"
-+"        [-?] [-help]                 print this string");
- 		exit (0);
- 		} else {
- 			fprintf (stderr,"xgammon: unknown option %s (ignored)\n", argv[option]);
diff --git a/games-board/xgammon/files/xgammon-0.98-broken.patch b/games-board/xgammon/files/xgammon-0.98-broken.patch
index 5e334e83aecb..eff5bf509e53 100644
--- a/games-board/xgammon/files/xgammon-0.98-broken.patch
+++ b/games-board/xgammon/files/xgammon-0.98-broken.patch
@@ -1,7 +1,7 @@
 --- a/lib/db.c
 +++ b/lib/db.c
-@@ -259,10 +259,11 @@
-     close(fid);
+@@ -267,10 +267,11 @@
+     fclose(fid);
  }
  
 -void main()
@@ -13,3 +13,62 @@
      set_V_Werte();
 +    return(0);
  }
+--- a/xgammon.c
++++ b/xgammon.c
+@@ -944,31 +944,31 @@
+ 	for (option=1; option<argc; option++) {
+ 		if (strcmp (argv[option], "-?") == 0 ||
+ 		    strcmp (argv[option], "-help") == 0) {
+-puts ("xgammon [-otherdisplay (display)]
+-        [-boardgeometry (string)]
+-        [-boardcolor (color)] [-bc (color)]
+-        [-darkcolor  (color)] [-dc (color)]
+-        [-lightcolor (color)] [-lc (color)]
+-        [-barcolor   (color)] [-b  (color)]
+-        [-whitecolor (color)]        the stone color for \"white\"
+-        [-blackcolor (color)]        the stone color for \"black\"
+-        [-doublerfont (font)]        sets the (big) font for the doubler dice
+-        [-doubling   +doubling]      sets if you wish the computer to double
+-        [-h (black|white)]           set the color for the human player
+-                                     (implies a human versus computer game)
+-        [-gamekind -g (hvc|cvc|hvh)] sets the gamekind to either
+-                                     human vs. human computer vs. computer
+-                                     or human vs. computer (default)
+-        [-winat      (points)]       play a tournament up to \"points\" points
+-        [-watchmove  +wachmove]      if you wish to see the flying stones
+-        [-buttonmove +buttonmove]    set stones by simply pressing button
+-        [-autoplay   +autoplay]      automatic play when only one move
+-                                     is possible
+-        [-stonesteps (number)]       sets the stepsize the stones fly
+-                                     in pixel (implies +watchmove)
+-        [-delaytime (tsec.)]         sets the time the cumputer waits
+-                                     after each turn (implies -watchmove)
+-        [-?] [-help]                 print this string");
++puts ("xgammon [-otherdisplay (display)]\n"
++"        [-boardgeometry (string)]\n"
++"        [-boardcolor (color)] [-bc (color)]\n"
++"        [-darkcolor  (color)] [-dc (color)]\n"
++"        [-lightcolor (color)] [-lc (color)]\n"
++"        [-barcolor   (color)] [-b  (color)]\n"
++"        [-whitecolor (color)]        the stone color for \"white\"\n"
++"        [-blackcolor (color)]        the stone color for \"black\"\n"
++"        [-doublerfont (font)]        sets the (big) font for the doubler dice\n"
++"        [-doubling   +doubling]      sets if you wish the computer to double\n"
++"        [-h (black|white)]           set the color for the human player\n"
++"                                     (implies a human versus computer game)\n"
++"        [-gamekind -g (hvc|cvc|hvh)] sets the gamekind to either\n"
++"                                     human vs. human computer vs. computer\n"
++"                                     or human vs. computer (default)\n"
++"        [-winat      (points)]       play a tournament up to \"points\" points\n"
++"        [-watchmove  +wachmove]      if you wish to see the flying stones\n"
++"        [-buttonmove +buttonmove]    set stones by simply pressing button\n"
++"        [-autoplay   +autoplay]      automatic play when only one move\n"
++"                                     is possible\n"
++"        [-stonesteps (number)]       sets the stepsize the stones fly\n"
++"                                     in pixel (implies +watchmove)\n"
++"        [-delaytime (tsec.)]         sets the time the cumputer waits\n"
++"                                     after each turn (implies -watchmove)\n"
++"        [-?] [-help]                 print this string");
+ 		exit (0);
+ 		} else {
+ 			fprintf (stderr,"xgammon: unknown option %s (ignored)\n", argv[option]);
diff --git a/games-board/xgammon/files/xgammon-0.98-fno-common.patch b/games-board/xgammon/files/xgammon-0.98-fno-common.patch
new file mode 100644
index 000000000000..924f0e549c07
--- /dev/null
+++ b/games-board/xgammon/files/xgammon-0.98-fno-common.patch
@@ -0,0 +1,97 @@
+--- a/allow.c
++++ b/allow.c
+@@ -34,6 +34,8 @@
+ MOVE	     current_move[4] = {{0, 0}, {0, 0},
+ 			        {0, 0}, {0, 0}}; /* global only for un_do() */
+ 
++MOVE possible_moves[8000], *list;
++
+ int  test_move             (void);
+ int  create_possible_moves (int dice_to_set, int *w, int actual_pin);
+ int  move_is_allowed       (int from_pin, int to_pin);
+--- a/gammon.h
++++ b/gammon.h
+@@ -117,12 +117,14 @@
+ 	MoveFunc MoveFunction;
+ 	BOARD board;
+ 	X11SET X11Set;
+-} Player[2];
++};
++extern struct _Player Player[2];
+ 
+ struct  _PinTable {
+         int count;
+         int color;
+-} Pin[29], rollout_position[29];	/* 0, 25 = bar, 1 - 24 = board and 26, 27 finished[color] */
++};
++extern struct _PinTable Pin[29], rollout_position[29];	/* 0, 25 = bar, 1 - 24 = board and 26, 27 finished[color] */
+ 
+ 
+ /* if you have the dice values 1 and 1 and all stones are on different
+@@ -137,7 +139,7 @@
+         int to;
+ } MOVE;
+ 
+-MOVE possible_moves[8000], *list;
++extern MOVE possible_moves[8000], *list;
+ 
+ struct _move_hist {
+ 	int	    from [4];
+@@ -151,16 +153,17 @@
+ struct _Tournament {
+ 	unsigned int   game_number;
+ 	unsigned int   winning_point;
+-} tournament;
++};
++extern struct _Tournament tournament;
+ 
+ struct _RolloutSave {
+ 	int turn;
+ 	int doubler_value;
+ 	int doubler_owner;
+ 	int roll[2];
+-} rollout_save;
++};
+ 
+-FILE *endgame_database;
++extern FILE *endgame_database;
+ 
+ extern void switch_turn();
+ 
+--- a/rollout.c
++++ b/rollout.c
+@@ -48,6 +48,9 @@
+ void   rollout_roll_dice  ();
+ void   exec_rollout       ();
+ 
++struct _PinTable Pin[29], rollout_position[29];
++struct _RolloutSave rollout_save;
++
+ void RollOut (void)
+ {
+ 	Widget toplevel = Player[0].X11Set.toplevel;
+--- a/xgammon.c
++++ b/xgammon.c
+@@ -178,6 +178,10 @@
+ MOVE		*compi_choice;
+ 
+ FILE*		protokol_file = NULL;
++FILE*       endgame_database;
++struct _gammon_resource gammon_resource;
++struct _Tournament tournament;
++struct _Player Player[2];
+ 
+ char * greetings = "Wellcome to xgammon  version 0.98\n   (C) 1994   Lambert Klasen   Detlef Steuer\n    We hope you enjoy it\n\n";
+ 
+--- a/xgammon.h
++++ b/xgammon.h
+@@ -70,7 +70,8 @@
+ 	char	*server;
+ 	int     port;
+ 	int     button_move;
+-} gammon_resource;
++};
++extern struct _gammon_resource gammon_resource;
+ 
+ /* diawin.c */
+ extern void AppendDialogText ();
diff --git a/games-board/xgammon/files/xgammon-0.98-glibc-2.32.patch b/games-board/xgammon/files/xgammon-0.98-glibc-2.32.patch
new file mode 100644
index 000000000000..538f873b4132
--- /dev/null
+++ b/games-board/xgammon/files/xgammon-0.98-glibc-2.32.patch
@@ -0,0 +1,19 @@
+--- a/save.c
++++ b/save.c
+@@ -20,6 +20,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <signal.h>
+ #include <X11/Intrinsic.h>
+ 
+@@ -142,7 +143,7 @@
+ 	fclose(save_file);
+ 
+ #ifndef AIX
+-	fprintf (stderr, "xgammon: %s.  Sorry and bye!\n", sys_siglist[n]);
++	fprintf (stderr, "xgammon: %s.  Sorry and bye!\n", strsignal(n));
+ #else
+ 	fprintf (stderr, "xgammon: Caught signal %d.   Sorry and bye!\n", n);
+ #endif
diff --git a/games-board/xgammon/xgammon-0.98-r1.ebuild b/games-board/xgammon/xgammon-0.98-r1.ebuild
index d00b4f94fe5f..9e8b8fb2d55a 100644
--- a/games-board/xgammon/xgammon-0.98-r1.ebuild
+++ b/games-board/xgammon/xgammon-0.98-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit toolchain-funcs eutils
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="very nice backgammon game for X"
 HOMEPAGE="http://fawn.unibw-hamburg.de/steuer/xgammon/xgammon.html"
@@ -11,19 +12,23 @@ SRC_URI="http://fawn.unibw-hamburg.de/steuer/xgammon/Downloads/${P}a.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="x11-libs/libXaw"
-DEPEND="${RDEPEND}
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXt"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/rman
 	x11-misc/imake"
 
-S=${WORKDIR}/${P}a
+S="${WORKDIR}/${P}a"
 
 PATCHES=(
-	"${FILESDIR}/${P}-broken.patch"
-	"${FILESDIR}/${P}-config.patch"
-	"${FILESDIR}/gcc33.patch"
+	"${FILESDIR}"/${P}-broken.patch
+	"${FILESDIR}"/${P}-config.patch
+	"${FILESDIR}"/${P}-glibc-2.32.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_configure() {
@@ -34,7 +39,7 @@ src_compile() {
 	env PATH=".:${PATH}" emake \
 		EXTRA_LDOPTIONS="${LDFLAGS}" \
 		CDEBUGFLAGS="${CFLAGS}" \
-		CC=$(tc-getCC)
+		CC="$(tc-getCC)"
 }
 
 pkg_postinst() {