gentoo resync : 25.11.2020

51 files changed, 220 insertions, 906 deletions

diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 5e0ba3abc4e3..d7b1b84fa62d 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/ace/Manifest b/games-board/ace/Manifest
index 28e3d8d5a6e2..bde386561847 100644
--- a/games-board/ace/Manifest
+++ b/games-board/ace/Manifest
@@ -1,8 +1,10 @@
 AUX ace-1.4-CC.patch 662 BLAKE2B abc2e95dc31d2dc4d887dc54d62ca6dec6c6b7d0f1b857be549b3a9d70944a213b3c0cfa90467c724c2274774f663297855912dca0f608faab2a014186f79087 SHA512 5ff66c1ff2dc913cc7ba7fe4fecd890819789299a2ced5a12058d6616cf892d8dadf76185c9d8d60f54f148e361c892d18e8cc1c6646ffab61257208d7b43a08
 AUX ace-1.4-clang.patch 340 BLAKE2B 2387de1b53557adcd4d70004fe41038d36b8c37945fdd60d73ef9b2756e95f6c30851bac425ae2c6aebc3edbca9b863fb17da36ec85906fd35611a90a35abf03 SHA512 df2f335d7d4e6e0e349c8724678a2cf8592e9435cc184bbdd906cb9b099b01c7b4e9ab8e2f4af257b4dde695649def75a2612df62fd2101411561c17cbca2d0f
+AUX ace-1.4-gcc10.patch 441 BLAKE2B e146ad1a434f96e2baa4cdcdef283cfb5fdeee76f1280681b458d475d2765b00c7a7790998bc58df3bc9c618dd1f268712b27a5ec2fa3ad66261bd417e3f67a6 SHA512 b4800e284aa5c0cfc39d7f0b1f330a508622907951ee7f45d959230b0b6ea1322da77cf2b2f4c06b923ab0249c9a030f1c2f1f30b59e3518aacbf7726ba86e6c
 AUX ace-1.4-gold.patch 3339 BLAKE2B 904aa238a703730ac9d188025d6ecaddd79e3683d43ec231b11e28c33094d45ccc6346f322418bde5d7aa22e56056680666cf835adf748bccef5bbad24f43c84 SHA512 907a2c6378bf9bc6aeba0c0945ef4e1a60a2403c491d6a54faaf6c90561375787afb3fba15faf05d28e04eb9478ece1357b9f0e91c2f9b4cef33909f59b70d37
 AUX ace-1.4-libpng15.patch 853 BLAKE2B ffbcda5c4d25fd404291f0b2d3e98e53f50108b6b6ef7ea135949087402e656b21a21da82cf3def5f12fc75e7a412becd46f4363aa604a184ddb0c20562ab84c SHA512 f746ad95efac927d55dff5122d759de4c8a3947a85b960642e6967e6ef8362e45d05fe5504b159b97bebeb92e2d86f4fea4f00e50fa7c59a8861d9aca8f62013
+AUX ace-1.4-malloc.patch 280 BLAKE2B 792af19b77bfa002c2ff4ce76a3d44eeeb8d7f08b0490230668e8385ff9d1b36d7c4c643e50b0cc8e1981386b7c4a68ff87e3c9afd0c1e05e39d0c60bb045f3a SHA512 565ffcb334eae020ced4630807bb4b1fd4cf46385fbb47271ab7d80eff93006330771139fce305ce331863aca4971c15dd928251ed0862ce37225e4f123bb0ff
 AUX ace-1.4-no-xpm.patch 571 BLAKE2B 009d9c7efc8b26e25905f4562c019b7cab1bd0b9df853b256042dbeb869b8be0252fba6275331772dc080f43066fe8b3fffc797a7962c9bf5e665605ef2a2f9a SHA512 1316313302dbc2a2456f4ba3afcba1e35a0f12c3907b04ae55c5e246254886693633b3bd04defd718ad9e2ac04d7d02c80eec89089f7624615e74d18229764b5
 DIST ace-1.4.tar.gz 530490 BLAKE2B 62d32bcada9a945d0a409757ca24c8c5c032e905528d56a51b95f82844c6c8057d39763016fa05015877f23313d842effeaaa362507bb049816d7cf6bdf01a1a SHA512 cd382db95dc17d75a76809c7f1e096e14f5863c1166aa5db7f93204ce949a9ed21979212946b9d3a09667f4a93b30f4cc44a220940f9b5dd8996f28ecb4a6dcc
-EBUILD ace-1.4-r1.ebuild 968 BLAKE2B ba98eff8fea59d109ef6b2f71b20c03df8e7129f71e06ee66c22a5a2a047eb1488b4ab2af539b44dde5a5896e26befad27af9cb5121800e1c226b1d866227102 SHA512 0199ed734756903d0c3279a87b8386346aed6b30b5ab02f5667b6e388e7074efb9d0638777d0cb95f00c7fac7d6f2cdc9ea978cc6c54b15975c29defa689b8f9
+EBUILD ace-1.4-r2.ebuild 1077 BLAKE2B 4ad326f612ee61131b85719810df70221d0824894588e125d300a3e8576ac662ac5ed9319f37cde4bd92d58dd130fbd6f24af7281aaf0e3f973462c405bf34b8 SHA512 70b489e389e819893af5b164ece058268b1600c029243844a5d84b0fcf7df06c52a1f017d5f331973fdc8268c30fca35fcfb70fdcb857afea9cb8ab8abc307af
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/ace/ace-1.4-r1.ebuild b/games-board/ace/ace-1.4-r2.ebuild
index 66185f9eb84a..920a746e1706 100644
--- a/games-board/ace/ace-1.4-r1.ebuild
+++ b/games-board/ace/ace-1.4-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils
+EAPI=7
+
+inherit autotools desktop
 
 DESCRIPTION="DJ Delorie's Ace of Penguins solitaire games"
 HOMEPAGE="http://www.delorie.com/store/ace/"
@@ -11,20 +12,21 @@ SRC_URI="http://www.delorie.com/store/ace/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
-	media-libs/libpng:0
+	media-libs/libpng:0=
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-no-xpm.patch
-	"${FILESDIR}"/${P}-libpng15.patch
-	"${FILESDIR}"/${P}-gold.patch
-	"${FILESDIR}"/${P}-CC.patch
-	"${FILESDIR}"/${P}-clang.patch
+	"${FILESDIR}/${P}-no-xpm.patch"
+	"${FILESDIR}/${P}-libpng15.patch"
+	"${FILESDIR}/${P}-gold.patch"
+	"${FILESDIR}/${P}-CC.patch"
+	"${FILESDIR}/${P}-clang.patch"
+	"${FILESDIR}/${P}-gcc10.patch"
+	"${FILESDIR}/${P}-malloc.patch"
 )
 
 src_prepare() {
@@ -43,12 +45,14 @@ src_configure() {
 src_install() {
 	default
 
+	rm "${ED}/usr/$(get_libdir)/libcards.la" || die
+
 	dodoc docs/*
 	newicon docs/as.gif ${PN}.gif
-	cd "${D}/usr/bin" || die
+
+	cd "${ED}/usr/bin" || die
 	local p
-	for p in *
-	do
+	for p in *; do
 		make_desktop_entry $p "Ace ${p/ace-/}" /usr/share/pixmaps/${PN}.gif
 	done
 }
diff --git a/games-board/ace/files/ace-1.4-gcc10.patch b/games-board/ace/files/ace-1.4-gcc10.patch
new file mode 100644
index 000000000000..23324d585a04
--- /dev/null
+++ b/games-board/ace/files/ace-1.4-gcc10.patch
@@ -0,0 +1,16 @@
+Author: Reiner Herrmann <reiner@reiner-h.de>
+Description: Fix FTBFS with GCC 10
+ Use extern keyword, as linker otherwise sees multiple definitions.
+Bug-Debian: https://bugs.debian.org/956976
+
+--- a/lib/table.c
++++ b/lib/table.c
+@@ -53,7 +53,7 @@
+ static int graphics_disabled = 1;
+ 
+ OptionDesc *app_options;
+-OptionDesc *xwin_options;
++extern OptionDesc *xwin_options;
+ static OptionDesc *options[5];
+ 
+ static OptionDesc ace_options[] = {
diff --git a/games-board/ace/files/ace-1.4-malloc.patch b/games-board/ace/files/ace-1.4-malloc.patch
new file mode 100644
index 000000000000..da9b3b24f82c
--- /dev/null
+++ b/games-board/ace/files/ace-1.4-malloc.patch
@@ -0,0 +1,10 @@
+Avoid warning about implicit malloc()
+
+diff -r 587fa6195b61 lib/imagelib.c
+--- a/lib/imagelib.c	Mon Oct 05 22:08:52 2020 +0000
++++ b/lib/imagelib.c	Mon Oct 05 22:09:12 2020 +0000
+@@ -1,3 +1,4 @@
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include "imagelib.h"
diff --git a/games-board/biloba/Manifest b/games-board/biloba/Manifest
index 1a5c751bd25e..71d996f1a69b 100644
--- a/games-board/biloba/Manifest
+++ b/games-board/biloba/Manifest
@@ -1,5 +1,6 @@
+AUX biloba-0.9.3-gcc-10.patch 656 BLAKE2B 04bc76ecbd5002c7d7848e303ea932fe254689afd7034457d98ab00606c4ba372720eec45ce60b9978887cc7b57b4d5c37e060f1da85db61944d4b383b2100a9 SHA512 5d47ff448cb56e02ed73500ce25dc03d904cf1855cceab924c4e02e2c92189a64063d1ae82eb275b8a94cf43af068649ae8412ca11050609503d1b6825267df1
 AUX biloba-0.9.3-no-X11-dep.patch 427 BLAKE2B 1aef6c3df05c53c01e4a4ec1f4064e2be21dabe847106da9c8f5d11483d14e5cdb904c8bc20a32b8b359d21ab0e2580dbb4713294576546a01cb996e9c1d4753 SHA512 21d4af601433eecca31f82926fb94791b4ef2193c3c16fadd210c9fdf0acdfdad562ac93b27811186d1736242e88638a2110e9264d0e2c54facd938bcece9a67
 AUX biloba-0.9.3-not-windows.patch 615 BLAKE2B d706e4624334e4e9137ddfb1a2f30bf878a4b7251ad7d3f1093725c1cb6ed24be06b3dd76d7b7191f6c35c5d463fc94725523f6512ba1d948d0ffa1f81d78a8a SHA512 21d6be2dcba0c12e11bf8e3d086c6e8c90e30eaebcd8a7d758eb64c343f60e90e8a332ae2b988950086d044554cdd2bfd5ea8fefade3494e529875199899a832
 DIST biloba-0.9.3.tar.gz 3162976 BLAKE2B 878e63d188066dbd07499bbfe9c3aaf5f5eb562729844ed648ff73e8eb5b2632faf3533b7a1133b1959cbe2b7d37a38995d453055d91597916d6d19169c7383a SHA512 8729299bb37e05b7c27e0d77d022228c385d3d3c475c77b9b8eb81a6df2c2513ea0055b52b65715922fd964e4bab875e3ab5bec58746095346bf0c96d0cf6bc5
-EBUILD biloba-0.9.3-r1.ebuild 999 BLAKE2B 4480e03225eac1910b5ec6ff58b7cd56d0dc07be9eff8539fc45777c4546eba9399f300ce02dea879c8639801050a5ff8513bd130e12aa7b93af52787a81740b SHA512 ae0e2abd3d3db7e4ff4b0414ca23e1abe9e78be7112015a11517b7a666ba6fd95d129b3b6b328b28149178004d02892b07791c859f26d93bb2326be5d9b71d22
+EBUILD biloba-0.9.3-r2.ebuild 889 BLAKE2B 812ca108f3b02a7af05510f69d970e5c99bc643e86977ccc6efb337839bf3570f2d490b68a0358540344c27272da844d5da19f7bbbe88cd47fbef3f3d5bd4de3 SHA512 ea4c65308b40024b5c5d6adc017189d239d1fff0483195882cf831f5208517ecb73cf909088873f19af6c63f8d44784f7122f1235b3d935597b8e10fa50e9b98
 MISC metadata.xml 329 BLAKE2B af2f4cc4fc9c266f2e2250e7068a1f86ba353f647058bc0e74339d24198ae5e302873d36cec6f2b05b13be04439c51eb4174c0a92e0fe6af66d5e81643a264ad SHA512 f182ec126a8585569dc2b3c285edc90a9d2b0656391c490f8f1d86b49b70a67e8b06e3f49e623961c3a350f380672664d93d2cab7bdd9d7f26184e3b7a7d555c
diff --git a/games-board/biloba/biloba-0.9.3-r1.ebuild b/games-board/biloba/biloba-0.9.3-r2.ebuild
index d002df044589..cadf7ee1e240 100644
--- a/games-board/biloba/biloba-0.9.3-r1.ebuild
+++ b/games-board/biloba/biloba-0.9.3-r2.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 autotools eutils gnome2-utils
+EAPI=7
+
+inherit autotools desktop xdg
 
 DESCRIPTION="a board game, up to 4 players, with AI and network"
 HOMEPAGE="http://biloba.sourceforge.net/"
@@ -11,24 +12,24 @@ SRC_URI="mirror://sourceforge/biloba/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="media-libs/libsdl:0[X,video,sound]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	# X11 headers are checked but not used, everything is done through SDL
 	"${FILESDIR}"/${P}-not-windows.patch
 	"${FILESDIR}"/${P}-no-X11-dep.patch
+	"${FILESDIR}/${P}-gcc-10.patch"
 )
 
 src_prepare() {
 	default
 
 	# "missing" file is old, and warns about --run not being supported
-	rm -f missing
+	rm missing || die
 	eautoreconf
 }
 
@@ -37,15 +38,3 @@ src_install() {
 	newicon -s 64 biloba_icon.png ${PN}.png
 	make_desktop_entry biloba Biloba
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-board/biloba/files/biloba-0.9.3-gcc-10.patch b/games-board/biloba/files/biloba-0.9.3-gcc-10.patch
new file mode 100644
index 000000000000..69d27f9aa7b6
--- /dev/null
+++ b/games-board/biloba/files/biloba-0.9.3-gcc-10.patch
@@ -0,0 +1,30 @@
+Description: Fix FTBFS with gcc 10
+Author: Ricardo Mones <mones@debian.org>
+Bug-Debian: https://bugs.debian.org/957039
+Last-Update: 2020-08-29
+
+diff --git a/src/utils.c b/src/utils.c
+index 73bbd05..c51365d 100644
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -53,6 +53,7 @@
+ 
+ char *progpath = NULL;
+ char *langpath = NULL;
++SDL_Surface * screen;
+ 
+ /**
+  * Get an object's X coordinate as pixels
+diff --git a/src/utils.h b/src/utils.h
+index 9b0b155..2018969 100644
+--- a/src/utils.h
++++ b/src/utils.h
+@@ -87,7 +87,7 @@
+ extern char *progpath;
+ extern char *langpath;
+ 
+-SDL_Surface * screen;
++extern SDL_Surface * screen;
+ 
+ int get_x(int x);
+ int get_y(int y);
diff --git a/games-board/four-in-a-row/Manifest b/games-board/four-in-a-row/Manifest
index ad29db4ca9e3..85fe9591a028 100644
--- a/games-board/four-in-a-row/Manifest
+++ b/games-board/four-in-a-row/Manifest
@@ -1,5 +1,3 @@
-DIST four-in-a-row-3.34.4.tar.xz 508780 BLAKE2B 4528642e82438c52706d068d01f5d167f83f4b6dc0a9883bd95a046d9c9772ac642f27f0b1b1197a4ce81b3b5a5a14ce7f9ed8eacbaca189692c0a3c34faeda1 SHA512 7bdfbf1c8953175af8dccbe0514215349a48246f949723628a940db6e5b1e3d89990aa57b5994e5460a79db19ba207de939fe81da53d5782a762695d1588776f
 DIST four-in-a-row-3.36.4.tar.xz 558244 BLAKE2B 63a61de3150fe067faebffc021f78398a267b0788e5353d6953dbf6b6836a21901f9bb8f498872a083b1d8c9ccd9dfe2a58c529e2655959084a64102f2ac4d3b SHA512 5f73f2b2548c9b9dfdf1310cdb22c65e7f96135367d55e113b1c779ed21aab5ed01eaaa009c346035a222fa8c87c6224334d546407963a90f068b5ca8ae1b58d
-EBUILD four-in-a-row-3.34.4.ebuild 905 BLAKE2B b98c3d4d1c69dc03409b09349ca2fabe7dedacda7515650279fa3c487f841ba8b16f2c0de1a75fbe5e7a6b63d642c738666c458af52cc4ece0905272d3ca4a5e SHA512 b5f803e151b6b5ee4015c2c417ef698ca90c18098dc543bdb25d02a4307452c19ea0bf09ff372099f3e6c802326698edc27e2bf42c5d6332b3b94354341c6f12
 EBUILD four-in-a-row-3.36.4.ebuild 934 BLAKE2B 1df0ef48fd99b8b77af105be86dc7e1635b30e5d07c553fd2c3b3a12cb24c155defb5a61c23428d3591acba61dae5924759bc1cb8d84e81ae5c91b51e4741360 SHA512 b5624d550927698301651981135070b51891f6ce078f4ab3cb97a6d3d515f4992de7cbc1cabb4fb7722f3ac1894da9016fc5b23d41ad452e2418fdc17374230b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/four-in-a-row/four-in-a-row-3.34.4.ebuild b/games-board/four-in-a-row/four-in-a-row-3.34.4.ebuild
deleted file mode 100644
index 2621f6461808..000000000000
--- a/games-board/four-in-a-row/four-in-a-row-3.34.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Make lines of the same color to win"
-HOMEPAGE="https://wiki.gnome.org/Apps/Four-in-a-row"
-
-# Code and most themes are GPL-3+, CC-BY-SA-3.0 is user help license in v3.32.0
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	>=media-libs/gsound-1.0.2
-	>=x11-libs/gtk+-3.13.2:3
-	>=gnome-base/librsvg-2.32.0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	media-libs/gsound[vala]
-	gnome-base/librsvg[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-board/gnome-chess/Manifest b/games-board/gnome-chess/Manifest
index 14500a9b1d69..75f013782dca 100644
--- a/games-board/gnome-chess/Manifest
+++ b/games-board/gnome-chess/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-chess-3.34.0.tar.xz 648464 BLAKE2B c06474fbdaeb9dfc26fbadaa6f5dc83179cdc6d09b8007b2dfcd88a4af4a6113913cffa8f00ada7a788585d723c5917f7ad7944bf466411119e7979545f40f29 SHA512 dcd4c2cfb0ebb5d3481bb6f722ac847cb8976e31352286a245457a62291445f50ad86ce26a37c222112801dc807bb567ed4d71d2d6ccb1628c2cab0767445012
 DIST gnome-chess-3.36.1.tar.xz 738308 BLAKE2B 14d328b9939afb12f14b513cfa009e3fb197f6c35c5272df107ce844890339caecbb5dafbd0bd28a19d001ebc0574464b33ea2ca10a9f7578b49d1e6f637e190 SHA512 4c89f91fe16323a799cf1eb3fe1f8e37fd506248ca32ad605ca3d5ecd37cf29f046da50383e0d0c3d82acf4e472843f3fd40927283f37e02d42cee5d8c72d8b3
-EBUILD gnome-chess-3.34.0.ebuild 1038 BLAKE2B 0bfd04d1981eb5b20525ee9061a775757a71cc41fe41859eda8dc51721d6d75fbdaccbf375efd324b27a98fda021ff6acefdd1a6d267ecba65f6cf566833df71 SHA512 c4c6b5def2103422d604edfee8c3cfe1c8561143368bd243860e3df76b1632f0297f9487fe89af4bd7714bbe1fa3b4039470edbb6cd42fb77d26c4465181414a
 EBUILD gnome-chess-3.36.1.ebuild 1038 BLAKE2B 4af1426f1efe41ac44aed3169d5bbd16da26caf62602cca500afb382e636db4d372025abc072378313be0a6bd7226bbe75cd46e923943a3fda3da4f6d8c6d69d SHA512 5f6b6b3ca6b21f2429d1f52152af42637da78b9cae81c2902ba777dcdee1f7b90854c874d4014a4be17ea687c275f9e26e056214fe8831593bd172954a3417dd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/gnome-chess/gnome-chess-3.34.0.ebuild b/games-board/gnome-chess/gnome-chess-3.34.0.ebuild
deleted file mode 100644
index 21d3657db2a1..000000000000
--- a/games-board/gnome-chess/gnome-chess-3.34.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 vala xdg
-
-DESCRIPTION="Play the classic two-player boardgame of chess"
-HOMEPAGE="https://wiki.gnome.org/Apps/Chess"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.20.0:3
-	>=gnome-base/librsvg-2.32.0:2
-"
-DEPEND="${RDEPEND}
-	gnome-base/librsvg:2[vala]
-"
-BDEPEND="
-	$(vala_depend)
-	dev-util/itstool
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="To be able to play against a computer you will need
-to install a chess engine package, for example games-board/gnuchess"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-board/gnome-hearts/Manifest b/games-board/gnome-hearts/Manifest
deleted file mode 100644
index 88067b9c887c..000000000000
--- a/games-board/gnome-hearts/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gnome-hearts-0.3.1-drop-libgnomeui.patch 2530 BLAKE2B 5e4789ff0f2ca68ba70801ba2f0206844ba15920592e82ef369228570d77111687e9baad67846e79fcc1f044a2a8184eedcd9833600f7677fde52edf714eefba SHA512 784bd6ebfce24fa6691caa1f11bca28a8719854510064a137254f34f26176bccd95753bac870268e4970f1218b6b80970e7495377d85aa2a6e1bb5d450b6a15f
-DIST gnome-hearts-0.3.1.tar.gz 637916 BLAKE2B 6aa4a0c1d0d91316a896cd144e23b9a46066cd2d2c2a69d1fa1eb34094b5742810c5484c5950322a9c5b066ae72c974f9c4f0642baa7986df637654717669114 SHA512 5528c92bba80cc97ce1f51e3b2652b5d6b30c0e90e7a8f023dcdf5c3420b2d1fbab29fc3d974884d8cb351a44b8b97c05242f26b70d5e1d02d593a17452ad19f
-EBUILD gnome-hearts-0.3.1-r2.ebuild 912 BLAKE2B eceb54ae082995dac0932c3dbab0afe2be99c0e4d2d0b15cc6b05358de6fe48f6bdd3db126a24155bbab1d15f1a5a4620f09662c5af2b87a6862348a6b21f4fc SHA512 770f214651adad3f9324fd717e5762201e0c85e7d31925b62be6562bffc945fc9a851a3dc56dec7e42ad79bde96d9fd47e2db62632080bbe69246ce051a91c64
-MISC metadata.xml 359 BLAKE2B 433bc74150d0b0d3ef0e89aa88f6216b9ef37c78e508d954f417fbedbca513d2754a7ddc2f5e8dde26c6053ad1d30ec06a6210b150fbf8713d9eea09588e482e SHA512 486453048dbb364dbe94b263c4d79dc95f28f8f10e83b9731949b5033002a7d60408d2e9e8afcc73c40425aa1a45a5053b0ffc66e9cebc067a3e6d0322d426e0
diff --git a/games-board/gnome-hearts/files/gnome-hearts-0.3.1-drop-libgnomeui.patch b/games-board/gnome-hearts/files/gnome-hearts-0.3.1-drop-libgnomeui.patch
deleted file mode 100644
index 21c4e7b0896a..000000000000
--- a/games-board/gnome-hearts/files/gnome-hearts-0.3.1-drop-libgnomeui.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Naur gnome-hearts-0.3.1.orig/configure.in gnome-hearts-0.3.1/configure.in
---- gnome-hearts-0.3.1.orig/configure.in	2013-06-09 15:05:11.000000000 +0200
-+++ gnome-hearts-0.3.1/configure.in	2017-01-20 23:20:35.677689797 +0100
-@@ -23,7 +23,7 @@
- fi
- 
- # Check for libraries. gmodule is required to make sure --export-dynamic is used and glade works
--PKG_CHECK_MODULES(GNOME_HEARTS, [libgnomeui-2.0 gtk+-2.0 libglade-2.0 glib-2.0 gmodule-2.0])
-+PKG_CHECK_MODULES(GNOME_HEARTS, [gtk+-2.0 libglade-2.0 glib-2.0 gmodule-2.0])
- AC_SUBST(GNOME_HEARTS_CFLAGS)
- AC_SUBST(GNOME_HEARTS_LIBS)
- 
-diff -Naur gnome-hearts-0.3.1.orig/src/events.c gnome-hearts-0.3.1/src/events.c
---- gnome-hearts-0.3.1.orig/src/events.c	2013-06-09 15:01:08.000000000 +0200
-+++ gnome-hearts-0.3.1/src/events.c	2017-01-20 23:35:17.428651148 +0100
-@@ -71,13 +71,13 @@
- /* Open the help file */
- void on_help(GtkWidget *widget, gpointer data)
- {
--	gnome_help_display("gnome-hearts.xml", NULL, NULL);
-+	gtk_show_uri(NULL, "ghelp:gnome-hearts", GDK_CURRENT_TIME, NULL);
- }
- 
- /* Open the preferences help file */
- void on_preferences_help(GtkWidget *widget, gpointer data)
- {
--	gnome_help_display("gnome-hearts.xml", "hearts-prefs", NULL);
-+	gtk_show_uri(NULL, "ghelp:gnome-hearts?hearts-prefs", GDK_CURRENT_TIME, NULL);
- }
- 
- /* About menu item */
-diff -Naur gnome-hearts-0.3.1.orig/src/hearts.c gnome-hearts-0.3.1/src/hearts.c
---- gnome-hearts-0.3.1.orig/src/hearts.c	2013-06-09 15:01:08.000000000 +0200
-+++ gnome-hearts-0.3.1/src/hearts.c	2017-01-20 23:20:21.447210208 +0100
-@@ -534,15 +534,11 @@
- 		setlocale(LC_ALL, "");
- 	#endif
- 
--	/* Initialize GNOME */
-+	/* Initialize GTK+ */
- 	GOptionContext *option_context = g_option_context_new(_("- Play a game of hearts"));
- 	g_option_context_add_main_entries(option_context, option_entries, GETTEXT_PACKAGE);
- 
--	gnome_program_init(PACKAGE, VERSION, LIBGNOMEUI_MODULE,
--			argc, argv,
--			GNOME_PARAM_GOPTION_CONTEXT, option_context,
--			GNOME_PARAM_APP_DATADIR, PACKAGE_DATA_DIR,
--			GNOME_PARAM_NONE);
-+	gtk_init(&argc, &argv);
- 	
- 	/* init the game's global variables */
- 	game_score_labels = NULL;
-diff -Naur gnome-hearts-0.3.1.orig/src/hearts.h gnome-hearts-0.3.1/src/hearts.h
---- gnome-hearts-0.3.1.orig/src/hearts.h	2013-06-09 15:01:08.000000000 +0200
-+++ gnome-hearts-0.3.1/src/hearts.h	2017-01-20 23:22:33.691604109 +0100
-@@ -26,7 +26,7 @@
- /* headers */
- #include <glib/gi18n.h>
- #include <dirent.h>
--#include <gnome.h>
-+#include <gtk/gtk.h>
- #include <glade/glade.h>
- #include "cards.h"
- #include "cfg.h"
diff --git a/games-board/gnome-hearts/gnome-hearts-0.3.1-r2.ebuild b/games-board/gnome-hearts/gnome-hearts-0.3.1-r2.ebuild
deleted file mode 100644
index 3152898e365f..000000000000
--- a/games-board/gnome-hearts/gnome-hearts-0.3.1-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="A clone of classic hearts card game"
-HOMEPAGE="https://www.jejik.com/gnome-hearts/"
-SRC_URI="https://www.jejik.com/files/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	x11-libs/gtk+:2
-	>=gnome-base/libglade-2
-"
-DEPEND="${RDEPEND}
-	app-text/rarian
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# make src_test work
-	echo gnome-hearts.desktop.in >> po/POTFILES.skip
-
-	sed -i \
-		-e '/No name/d' \
-		-e '/^Icon/s/.png//' \
-		-e '/^Encoding/d' \
-		gnome-hearts.desktop.in || die
-
-	eapply "${FILESDIR}"/${P}-drop-libgnomeui.patch
-
-	mv configure.in configure.ac || die
-	gnome2_src_prepare
-}
diff --git a/games-board/gnome-hearts/metadata.xml b/games-board/gnome-hearts/metadata.xml
deleted file mode 100644
index ea35640ff889..000000000000
--- a/games-board/gnome-hearts/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/gnome-mahjongg/Manifest b/games-board/gnome-mahjongg/Manifest
index 8d02f0993b89..bd2382a930c4 100644
--- a/games-board/gnome-mahjongg/Manifest
+++ b/games-board/gnome-mahjongg/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-mahjongg-3.34.0.tar.xz 3065320 BLAKE2B a0e706a6e12c9cea7fa35a106b6b9f104af42fecc01b5f84aa07b1d12ccd9fe80e06accbe64681676fb2a081fc6dd232807f0f3e1b3f49cac46529194128a2ba SHA512 3dbd1953f88cd454ddfa84e9976ca5848dbac0d0fc426738d2e98117d12fe90b1875365071fc4299c02bd298ce27ecfcae709aa2ef7399c41f217a2548521f61
 DIST gnome-mahjongg-3.36.2.tar.xz 3049356 BLAKE2B bbb7b67580dc6189a02e2695d5952706911bd64c75c34164c19e70e4ac721b1e6c1af57b5ffd1edeae37f10103a1418e6f1134d327d9befc6bd086948076f62b SHA512 f7ed69e5196b6d5df1f6c207df04af7935f54bb838cdd9cfb802d8ea094929a4cb13afa6748056377ef74c96715a748aaffb9c69075c1b00e9a41c82a47ec070
-EBUILD gnome-mahjongg-3.34.0.ebuild 821 BLAKE2B a5b31bf91dc34da5ae10315987910c2cb52956fcbf17220329a3a58bd3bbf60961afd54a576f8565de9b9152a0a55ee317a87af67ebea3538b4ba3f39ae20539 SHA512 864aa19bbda24fe8bcded0cdf97937171cb8b5f5887781d38b176aa99c3d3bbbee5f461f5a59871eef19feb408df519b8603231ae3ecd027208792eac71f9eb7
 EBUILD gnome-mahjongg-3.36.2.ebuild 821 BLAKE2B f79e1771a2c413918c4774465333cf36b1b7ce44a03b332b7d2da14ca36abc82a3974a248e01e99a82c683449c5195e12f26f665fbea395b0422a92ab884d168 SHA512 92fbf6bdf8a161cc0d9a43634a26e99dd402858086e09fdbcdda26a3564db1cf92dcf1d6fa2962acfb65d18e2b2f8a86a6c863cdd166e723a8bd5a3b746c2ae2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/gnome-mahjongg/gnome-mahjongg-3.34.0.ebuild b/games-board/gnome-mahjongg/gnome-mahjongg-3.34.0.ebuild
deleted file mode 100644
index 01b38e5831dd..000000000000
--- a/games-board/gnome-mahjongg/gnome-mahjongg-3.34.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Disassemble a pile of tiles by removing matching pairs"
-HOMEPAGE="https://wiki.gnome.org/Apps/Mahjongg"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	>=x11-libs/gtk+-3.13.2:3
-	>=gnome-base/librsvg-2.32.0:2
-"
-DEPEND="${RDEPEND}
-	gnome-base/librsvg:2[vala]
-"
-BDEPEND="
-	$(vala_depend)
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-board/gnome-mines/Manifest b/games-board/gnome-mines/Manifest
index 11fad1f124f6..fdf1cbf0c559 100644
--- a/games-board/gnome-mines/Manifest
+++ b/games-board/gnome-mines/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-mines-3.34.0.tar.xz 272448 BLAKE2B 9c290293117ff7a843794636f5af90bc0a9956d39c4cfd5fa516b8f6ffff99165d60cc93bf0e7c5fa1b92c4c0e8c4a9c6801d5f9ad9fda5e4d151949d6c530a8 SHA512 90486f28427d51b9c1a4f959bd3f0f41087c881486d9cd3e130fd3371a4375c844ca650d9850c43878da6e95d366137ca99003b5a9ae7699f17e1d7719f81ce1
 DIST gnome-mines-3.36.1.tar.xz 274896 BLAKE2B 355275857ff63df5383f45dfb8161bcde4de7adcc088f00cc016d7564f7afa17362307a642e78d9e087be32e44f178282c49a42df5f8f97d530a75473e50adf2 SHA512 3c1080b949ec3ba620048f2c46f844ecf7a872a9d165c3a3c38b103602cebf05c084763a489d58ffda2be23ec42b6803418570936150974cb302cd4d5e4af189
-EBUILD gnome-mines-3.34.0.ebuild 842 BLAKE2B 784d5f4fb6562894fdf040be40e2a88369c20184b9c3be7c106d73ec8b2cfa42dddba4d6e069910fc2baaaa0fd9685eb15996dc58e1ecbb761045c319e48d396 SHA512 e74a13352977fd50ae172c9b9d6636aed62e15820fa0e4b75cba7fd6ebb3ad51b29059119e4207cdce27705c6d6bcf33cc8e08cd5c7e2a4a327eb3fa61ebad58
 EBUILD gnome-mines-3.36.1.ebuild 842 BLAKE2B 784d5f4fb6562894fdf040be40e2a88369c20184b9c3be7c106d73ec8b2cfa42dddba4d6e069910fc2baaaa0fd9685eb15996dc58e1ecbb761045c319e48d396 SHA512 e74a13352977fd50ae172c9b9d6636aed62e15820fa0e4b75cba7fd6ebb3ad51b29059119e4207cdce27705c6d6bcf33cc8e08cd5c7e2a4a327eb3fa61ebad58
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/gnome-mines/gnome-mines-3.34.0.ebuild b/games-board/gnome-mines/gnome-mines-3.34.0.ebuild
deleted file mode 100644
index 05b1d54cccd7..000000000000
--- a/games-board/gnome-mines/gnome-mines-3.34.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Clear hidden mines from a minefield"
-HOMEPAGE="https://wiki.gnome.org/Apps/Mines"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	dev-libs/libgee:0.8
-	>=x11-libs/gtk+-3.12:3
-	dev-libs/libgnome-games-support:1=
-	>=gnome-base/librsvg-2.32.0:2
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(vala_depend)
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gnome-base/librsvg:2[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-board/gnushogi/Manifest b/games-board/gnushogi/Manifest
index ae083d846cd7..49d6489ea308 100644
--- a/games-board/gnushogi/Manifest
+++ b/games-board/gnushogi/Manifest
@@ -1,3 +1,4 @@
+AUX gnushogi-1.4.1-fno-common.patch 366 BLAKE2B a84ecad2b955c0866ae0bb71bb7efe3c234d3a796ea94b07449e390a1839a52cc0ceb5f4b679cfc03ab20f30e2212c2cde652872ec6045e6e821795473ef3014 SHA512 61a53e379720b7b841f0fbb28972ef0f776c8f34efb45e86741fc023f6f3e439304ac180e116ebf038f99419b60f169c2032c88becbaaa170d4dc06bb9d3c3c8
 DIST gnushogi-1.4.1.tar.gz 542301 BLAKE2B bc2c0c89ca63d4cc617914771f9439d1e99ef89c87d46b3649fde97d521b874c74f049fe5340a5ccab603e7f532441821b7785aef2b50609903e926905d75ba9 SHA512 b997f309bfba85553465ceb262094aa0a9a53dc7ad970f77c0eb0c1558ba12f9dd15b42a6abfc85f5ac08bbfecc7816a6e3e4fb0efe2caabb043fb343b1ebecd
-EBUILD gnushogi-1.4.1-r1.ebuild 1008 BLAKE2B d8cfb1c28cc479e601f74cd71780325c5a7d0a0c9513c70f6c447bf5c73c39ed83dc8c00628af1107d4a7ce08cacc42d7b71834e957821ef2ff30a8f4fd7eecc SHA512 81d6ee8e19542475e1b79c445ed95357aa395bec68d3972f869c3c59c2d1626967740c89068027c387406c81e794c84ed2e43f5a4556c2dc525ed396678e3030
+EBUILD gnushogi-1.4.1-r1.ebuild 1080 BLAKE2B 8484290f582100bcdf648b815e45213f430173d5b4abc1267be1a6d26368a1ee38cfd0938df076c234a253f1208dbd1def2aff18cd5d16c0c8221865ed487e81 SHA512 d7e7ec093b03a11091142f672c8dee5049fd6dce1dc797f1627b4935d0a76d61b01d9090f31d04bdeb0b4f7bd73def71790bc33b58a4397809f3c8fc18a2f074
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gnushogi/files/gnushogi-1.4.1-fno-common.patch b/games-board/gnushogi/files/gnushogi-1.4.1-fno-common.patch
new file mode 100644
index 000000000000..510590b82c09
--- /dev/null
+++ b/games-board/gnushogi/files/gnushogi-1.4.1-fno-common.patch
@@ -0,0 +1,20 @@
+--- a/gnushogi/cursesdsp.c
++++ b/gnushogi/cursesdsp.c
+@@ -71,7 +71,6 @@
+ 
+ unsigned short MV[MAXDEPTH];
+ int MSCORE;
+-char *DRAW;
+ 
+ /* Forward declarations. */
+ /* FIXME: change this name, puh-leeze! */
+--- a/gnushogi/rawdsp.c
++++ b/gnushogi/rawdsp.c
+@@ -48,7 +48,6 @@
+ int MSCORE;
+ 
+ int mycnt1, mycnt2;
+-char *DRAW;
+ extern char *InPtr;
+ extern short pscore[];
+ 
diff --git a/games-board/gnushogi/gnushogi-1.4.1-r1.ebuild b/games-board/gnushogi/gnushogi-1.4.1-r1.ebuild
index ebef0138a0f3..7d1bde2639a8 100644
--- a/games-board/gnushogi/gnushogi-1.4.1-r1.ebuild
+++ b/games-board/gnushogi/gnushogi-1.4.1-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 eutils
+EAPI=7
+
+inherit desktop
 
 DESCRIPTION="Japanese version of chess (commandline + X-Version)"
 HOMEPAGE="https://www.gnu.org/software/gnushogi/"
@@ -13,12 +14,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
-RDEPEND="sys-libs/ncurses:0
+RDEPEND="
+	sys-libs/ncurses:0=
 	X? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=sys-devel/bison-1.34
 	>=sys-devel/flex-2.5"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.4.1-fno-common.patch )
+
 src_prepare() {
 	default
 
@@ -40,11 +45,13 @@ src_install() {
 	dobin gnushogi/gnushogi
 	doman doc/gnushogi.6
 	doinfo doc/gnushogi.info
-	if use X ; then
+
+	if use X; then
 		dobin xshogi/xshogi
 		doman doc/xshogi.6
 		make_desktop_entry xshogi XShogi
 	fi
-	dolib gnushogi/gnushogi.bbk
+
+	dolib.a gnushogi/gnushogi.bbk
 	dodoc README NEWS CONTRIB doc/gnushogi/*.html
 }
diff --git a/games-board/gtkatlantic/Manifest b/games-board/gtkatlantic/Manifest
index ab11c3be8b69..a10a082df6e7 100644
--- a/games-board/gtkatlantic/Manifest
+++ b/games-board/gtkatlantic/Manifest
@@ -1,4 +1,3 @@
-AUX gtkatlantic-0.6.1-warnings.patch 161 BLAKE2B 90c51beb2323480c1987a3c79e857cb39b03e596b0ebe55e9b9ec46c4c0a9a8da9ba707377fff3e334d8c0158fa5b092fb62b585870511cecb9683328d2ac161 SHA512 9ccfc0ea087484cf837bff5b29f824ab63f69a8b7599690f3db8fbb2ebe83865fdf8764869b7c973e35901dc6839109b9e6266a606aedc47c063947e71d80f93
-DIST gtkatlantic-0.6.1.tar.bz2 505701 BLAKE2B 5580b6bba4836e99d6c06cda4b3bef9236adf828cfd909497082922a8b3cfe158f4240a399ea879f6700f9c66f29d81926963cbf145af20bd28e2bed33241e8a SHA512 8388cbdd4c73d56eacb18a645bdd2d1f6e1fa8d21be972eaba1c4d6af6d0681a2a54909a82d6846ddd785b46b0ad99193e5afea528c5662956ff89a1e6e366df
-EBUILD gtkatlantic-0.6.1-r1.ebuild 961 BLAKE2B cbbe539ce1fc32805db49e376784966b7ab9589538103706fe243903b1b25670242ae0ee49ec93781a8eea401eac8589ef3496e461bab233a9673f41c8aaa928 SHA512 95cbc7f780cae82fa443aa0681990275357f3d9276f58572728898b8c031a97c4565bfe08faa0abf319ff451d434f687259a92ec2670d1ee8f02b834f37475d9
+DIST gtkatlantic-0.6.3.tar.bz2 546656 BLAKE2B e444f19e9757d5a276ede28f868f226e8cc0b4ed3806af54d56721e20d11df6b9b33265b6f51cd5a24608df8ce9c88ccc4ac0c093b1c3c6bd32f35a4e7cc5565 SHA512 2cca71492f4aac1a3c3a55e51eb389a8f1481a51b4e0be00dfb6c2317eba320a30f4e9d555375300ff56ddd65d2f313e8356a7ec3dab38963904b9a52f3138c6
+EBUILD gtkatlantic-0.6.3.ebuild 604 BLAKE2B b2ca8e6fa6a683877d4c7cb22eda03fbb28abdc3915dfc21bdce9a3766a5fc36b84b10f066b7bd7a7ca5679cdab61cdb32e6dad16af858e9117a4c6b4bbf6cc3 SHA512 42e9e3944cc6acf10a77a4d6ebbffd41e89de9db9f51a45bf0b9aea4a6efbfebcba60679c7d525959045ced0bca8ba6382d2bc9480e50979d2455a1051baa5f3
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gtkatlantic/files/gtkatlantic-0.6.1-warnings.patch b/games-board/gtkatlantic/files/gtkatlantic-0.6.1-warnings.patch
deleted file mode 100644
index a55c7ac7e132..000000000000
--- a/games-board/gtkatlantic/files/gtkatlantic-0.6.1-warnings.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/readpng.c
-+++ b/src/readpng.c
-@@ -23,6 +23,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <glib.h>
- 
- #include <png.h>
diff --git a/games-board/gtkatlantic/gtkatlantic-0.6.1-r1.ebuild b/games-board/gtkatlantic/gtkatlantic-0.6.1-r1.ebuild
deleted file mode 100644
index a4f03258084b..000000000000
--- a/games-board/gtkatlantic/gtkatlantic-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="Monopoly-like game that works with the monopd server"
-HOMEPAGE="http://gtkatlantic.gradator.net/"
-SRC_URI="http://download.tuxfamily.org/gtkatlantic/downloads/v0.6/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libxml2
-	media-libs/libpng:0
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-warnings.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's:$(datadir):/usr/share:' {,data/}Makefile.am || die
-	sed -i -e 's/configure.in/configure.ac/' configure.in || die
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-icons-path=/usr/share/icons/hicolor
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-board/gtkatlantic/gtkatlantic-0.6.3.ebuild b/games-board/gtkatlantic/gtkatlantic-0.6.3.ebuild
new file mode 100644
index 000000000000..8e58e3fb30f6
--- /dev/null
+++ b/games-board/gtkatlantic/gtkatlantic-0.6.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="Monopoly-like game that works with the monopd server"
+HOMEPAGE="http://gtkatlantic.gradator.net/"
+SRC_URI="http://download.tuxfamily.org/gtkatlantic/downloads/v$(ver_cut 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2:=
+	media-libs/libpng:0=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/games-board/iagno/Manifest b/games-board/iagno/Manifest
index 5b0db1b2b554..8d89a341f939 100644
--- a/games-board/iagno/Manifest
+++ b/games-board/iagno/Manifest
@@ -1,8 +1,4 @@
 AUX 3.36.4-vala-posix.patch 820 BLAKE2B 0b2290caa44c7522a5eec6d901afbb2a7eb13788c6a098152bf0ba8c3396b995161646ace14c4683326fe3664442b2b8ffaa026f9a6e7f65bebbe23e96d76a65 SHA512 558a9d3fbc4f42590d93391abd13e27510c7edc56876c4c2e2667a1d61c3edc4f85b876a80a62bfedab1a4ba21bd3a794568635597cf72d78895660c2c8ad863
-DIST iagno-3.34.5.tar.xz 563824 BLAKE2B 6933c1ca3ab5a31eebf285be1fa0ba6da18c5564589ec7a3083426dd22d0f050fbf87ef75c5cdc1b5e93822aba58d576e10f12c81785689739abb81fee659467 SHA512 5994d834302e52072e540ac882e8a5e39197a9ddd04972209362965d841565d942d341c91decedd1d11289c09336e13157414209c8d2d5c6816365d17e8f9379
-DIST iagno-3.34.8.tar.xz 565656 BLAKE2B cf06f9259b8f31d69c6f734c0239dc89432cd7a4082bcd451a9e02efe882bc6f5245454d7ab5e89e69d171a9e27f88c927435c06a48454e4a88bdbcfdd193a23 SHA512 b966b4d5baafe517de7e09a585703c1642139348d1b178702afbb8a31be1433f2bf3c20869525835e8d9e0bd3ed3cf6306e50eb453a5f78f2ac1189cf0c3e90b
 DIST iagno-3.36.4.tar.xz 799480 BLAKE2B 430aa403c974728b929a7715e783dd594f00300dd9b0bf8b6f84da7265e31536a5cae17db94bcbdbebe3ef2690cb05bf18292af158016ec18bb695e58ca20f3d SHA512 43775149f76904a19316e5eac990d8dae0a730c3f6798ad88648892d4795b6892a86fb93b78a72fd30853ad36cc5e4b241e1cbd4067c78d6648f1630543f87be
-EBUILD iagno-3.34.5.ebuild 929 BLAKE2B e8fea8bf42ec33050ae200298bf41a9424262799f44f3fa9b85baeeefc7e13e7cd67c9d3372eb1cf15e99219104b23af1442975a1001dacd5d9fe24bb37c398d SHA512 447d87f833e112306e3d61c522001b767b1eb1326f5592a5944c9b1a577f364f1f1f310aae5bc322b8f8c4f8824af966a05437b6ffa14f03a559a1a03a5aef17
-EBUILD iagno-3.34.8.ebuild 931 BLAKE2B 847a74e955715be6106768e12e5ee1b934bb813d401a0f3ca247fa995633fc7e4e5fde3b48ec2c704fd3c964bfea436b3d28af4da75fd4273f254112e3a6bfc6 SHA512 e010ad0aa85a5c1b405230a0a5389d00866e6b546452301742392c1961b29bfb551322e4d58d9fdb262d0768674dca8daae10709831d1b2fe89599d7192b34b2
 EBUILD iagno-3.36.4.ebuild 1011 BLAKE2B 12f4d69a409686f0ad8cedc7fe725f66bc864656026256a4c6cdd2ea5fbaf701fc66289d6257274132973434bbfa3ab28445ad0cf8d5ad1b15228f08c6d65309 SHA512 b4c967c5943ed482015d017357a29d737992a5085ea225e70f7c7bfbd7bd3f606b2f4f9596e5785fa6ce14dc6c3523ad05d555f9b4220f8296cd4c71916cd09c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/iagno/iagno-3.34.5.ebuild b/games-board/iagno/iagno-3.34.5.ebuild
deleted file mode 100644
index 627e9c25853b..000000000000
--- a/games-board/iagno/iagno-3.34.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Dominate the board in a classic version of Reversi"
-HOMEPAGE="https://wiki.gnome.org/Apps/Iagno"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	>=media-libs/gsound-1.0.2
-	>=x11-libs/gtk+-3.24.0:3
-	>=gnome-base/librsvg-2.32.0:2
-"
-DEPEND="${RDEPEND}"
-# libxml2:2 needed for glib-compile-resources xml-stripblanks attributes
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	media-libs/gsound[vala]
-	gnome-base/librsvg:2[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-board/iagno/iagno-3.34.8.ebuild b/games-board/iagno/iagno-3.34.8.ebuild
deleted file mode 100644
index 96b715c67b8d..000000000000
--- a/games-board/iagno/iagno-3.34.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Dominate the board in a classic version of Reversi"
-HOMEPAGE="https://wiki.gnome.org/Apps/Iagno"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	>=media-libs/gsound-1.0.2
-	>=x11-libs/gtk+-3.24.0:3
-	>=gnome-base/librsvg-2.32.0:2
-"
-DEPEND="${RDEPEND}"
-# libxml2:2 needed for glib-compile-resources xml-stripblanks attributes
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	media-libs/gsound[vala]
-	gnome-base/librsvg:2[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-board/mah-jong/Manifest b/games-board/mah-jong/Manifest
index c873e9d44562..104427689e51 100644
--- a/games-board/mah-jong/Manifest
+++ b/games-board/mah-jong/Manifest
@@ -1,3 +1,3 @@
-DIST mj-1.14-src.tar.gz 414414 BLAKE2B 88aa315e629dd6c1155de38897925c99a742054778721f23c4e95b0b82667ad737246a92a1e9e18aa72e8e5b118d7c5bc5e8eb7ac9d0aab51b946a154627a584 SHA512 b4c631ce388041475b877cd4b413fda200932aea19212c00cb606d2ef0bb6a498fe12b7b52b04ef744b296c37c531bc44d9e35f9aed44edf89651580acde91e5
-EBUILD mah-jong-1.14-r1.ebuild 1219 BLAKE2B ba5e9fb1fffb94dd03ffc11d2c2edd281aa78d65d3c86032e7f7d27ad102aeeb13a85ea79144242a3b8f04c832b16f6193d036a1398b0b893c53d8b9575f505a SHA512 283b0885ac17f19f76cc78047f2387c4085c92ee2c6382363f66a6efc87118ec823b7373e59a053fa1951bf17bafb069eab92d6abd2f92e6a386e312b74d72ee
+DIST mj-1.16-src.tar.gz 403981 BLAKE2B fe04caa61c6b2b16be1799903ba222fe4ea6b177fa68c76c66a24fbf3ac8c02420f32a253fc1f7bc7fdb9bd371b294c2debd0492ae1071570f28dc69f22ba5f4 SHA512 9a4a4947670facaea6230aa9b143dab4bc7546b6e8b9c85726ac0b5e4d1f1760736072a27075cf2cce82cd8fdf2eb031f81e604fa0da6c05c7ac68c7da4b497e
+EBUILD mah-jong-1.16.ebuild 1181 BLAKE2B 71e3574f1f2a8f9c484d31b17cd1c8fa10739d1b33d2decc1cc275ca664b4bc5293d60b9731dc39b14396ccb29ed01637768fec09e09da7c4bd1565b82b2941a SHA512 8af4b75a3b8ee8cc7d28a3acebaff55172c03fef80f18e3576ec1afe4abe29e598f9e9676038e976e9b574f9508ab13f85dc19c13301b133bb431af5adf377d5
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/mah-jong/mah-jong-1.14-r1.ebuild b/games-board/mah-jong/mah-jong-1.14-r1.ebuild
deleted file mode 100644
index 3f7a81b7f8e5..000000000000
--- a/games-board/mah-jong/mah-jong-1.14-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-MY_P="mj-${PV}-src"
-DESCRIPTION="A networked Mah Jong program, together with a computer player"
-HOMEPAGE="http://www.stevens-bradfield.com/MahJong/"
-SRC_URI="http://mahjong.julianbradfield.org/Source/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	sed -i -e '/^.TH/ s/1/6/' xmj.man || die
-	sed -i \
-		-e "/^DESTDIR =/ s:=.*:= ${D}:" \
-		-e "/^BINDIR =/ s:=.*:= /usr/bin:" \
-		-e '/^MANDIR =/ s:man/man1:/usr/share/man/man6:' \
-		-e '/^MANSUFFIX =/ s:1:6:' \
-		-e "/^CC =/ s:gcc:$(tc-getCC):" \
-		-e "/^CFLAGS =/ s:=:= ${CFLAGS}:" \
-		-e "/^LDLIBS =/ s:$:${LDFLAGS}:" \
-		-e '/^INSTPGMFLAGS =/ s:-s::' \
-		-e '/^CDEBUGFLAGS =/d' \
-		-e "/^TILESETPATH=/ s:NULL:\"/usr/share/${PN}/\":" Makefile || die
-}
-
-src_install() {
-	emake install install.man
-	insinto /usr/share/${PN}
-	doins -r fallbacktiles/ tiles-numbered/ tiles-small/
-	newicon tiles-v1/tongE.xpm ${PN}.xpm
-	make_desktop_entry xmj Mah-Jong ${PN}
-	dodoc CHANGES ChangeLog *.txt
-}
diff --git a/games-board/mah-jong/mah-jong-1.16.ebuild b/games-board/mah-jong/mah-jong-1.16.ebuild
new file mode 100644
index 000000000000..0d457c6c2d37
--- /dev/null
+++ b/games-board/mah-jong/mah-jong-1.16.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs xdg
+
+MY_P="mj-${PV}-src"
+DESCRIPTION="A networked Mah Jong program, together with a computer player"
+HOMEPAGE="https://mahjong.julianbradfield.org/"
+SRC_URI="https://mahjong.julianbradfield.org/Source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+	sed -i -e '/^.TH/ s/1/6/' xmj.man || die
+}
+
+src_compile() {
+	# TILESETPATH value is passed as "char*" into "gui.c"
+	emake \
+		CC="$(tc-getCC)" \
+		EXTRA_CFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" \
+		CDEBUGFLAGS= \
+		TILESETPATH="\"${EPREFIX}/usr/share/${PN}/\""
+}
+
+src_install() {
+	emake \
+		DESTDIR="${ED}" \
+		BINDIR="/usr/bin" \
+		MANDIR="/usr/share/man/man6" \
+		MANSUFFIX=6 \
+		INSTPGMFLAGS= \
+		install install.man
+
+	insinto "/usr/share/${PN}"
+	doins -r fallbacktiles/ tiles-numbered/ tiles-small/
+	newicon tiles-v1/tongE.xpm "${PN}.xpm"
+	make_desktop_entry xmj Mah-Jong "${PN}"
+	dodoc CHANGES ChangeLog *.txt
+}
diff --git a/games-board/openyahtzee/Manifest b/games-board/openyahtzee/Manifest
index 752f744eefbe..19a18da3cb79 100644
--- a/games-board/openyahtzee/Manifest
+++ b/games-board/openyahtzee/Manifest
@@ -1,3 +1,3 @@
 DIST openyahtzee-1.9.3.tar.xz 178868 BLAKE2B 0cb5b87f8d4f9cdfbc81918f937ec783fef2488146f5497de0d01d6b50eeeef2edc308ca4230f1103b5770a03ccb74740e5c42b2ea01bd67705ed2aff6667d99 SHA512 7e696141d8f567247300c7f4924889b0a2f88866c70a10ad7619709990cacb726ec0af28bcee62a9f0d607d7f83ca5bb62d7275b2cc6e0343004f9125e4fb506
-EBUILD openyahtzee-1.9.3.ebuild 937 BLAKE2B dbc52d1d309360507c5260c151bc48a881be4925b5fc48e185264a7136565aea3fbd30cddf1a67375f1176dc18e58e7e328649c07dbe6ba3a8ddfe39df1a0453 SHA512 c213cf1063433df039abe8daf8f74e6f378c0f6f9353d80c12b5caa32c1a8c604570d9e54f269f0ce554adf83a644fccb90be40454faec1759ca4fe027d201f0
+EBUILD openyahtzee-1.9.3.ebuild 947 BLAKE2B 5ae04914efbedd4f760418156b62d62d4af839b26c92a380634b792077fc6e93ff7bf08b2c99316476e150cb170ec6db44d7237a03287ad75d1d31a2ebb24e66 SHA512 8c19ba7a9aa442b623a9ac7f0a73b1e9a10cedf606a386897e2e9b22ead5eb3557a1e893ec193c1f2b3e76b046455578e9b670ad0f6e1e406e9283d7db05022b
 MISC metadata.xml 334 BLAKE2B d17964abf906122fe1b2a687f8dee77dc967a68a7c811da0684ab2c9d5cc5b8accfc768879d74fb43c147cf58ac7c94525e8f652c4c9882181d4f347696abaed SHA512 076b161fdb89bf31c17ec83a56755311dce65c1929ccbbf90aaade3810778f4aee966298408bfb7a5f6853a7f4906ca409c34f306d407309236bd3cfb0534f6c
diff --git a/games-board/openyahtzee/openyahtzee-1.9.3.ebuild b/games-board/openyahtzee/openyahtzee-1.9.3.ebuild
index 35b4ee304f5e..def1007cccb9 100644
--- a/games-board/openyahtzee/openyahtzee-1.9.3.ebuild
+++ b/games-board/openyahtzee/openyahtzee-1.9.3.ebuild
@@ -1,9 +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
 WX_GTK_VER="3.0"
-inherit eutils wxwidgets toolchain-funcs versionator
+inherit eutils flag-o-matic wxwidgets toolchain-funcs versionator
 
 DESCRIPTION="A full-featured wxWidgets version of the classic dice game Yahtzee"
 HOMEPAGE="http://openyahtzee.sourceforge.net/"
diff --git a/games-board/pouetchess/Manifest b/games-board/pouetchess/Manifest
deleted file mode 100644
index 6e7bad05bcb8..000000000000
--- a/games-board/pouetchess/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX pouetchess-0.2.0-fix-sdl-version-list.patch 334 BLAKE2B fdf1f6bc91b022690d881749530a94a6f71cea7db80a75b8de7fcd80b0803816352341d5bee1076f144cbe6a47da4e3fec29cf7c9c456e9c114a604e9fb4eecb SHA512 3e236be94a6e29967d4d81516f3a72b240b4fe7168070d7fbb8ffe4ca69c734d98cd5331d7d1415eb7438a81816be5df6e7f42529bae0eb397e636f6d797c938
-AUX pouetchess-0.2.0-gcc43.patch 313 BLAKE2B 536e890776d1bfa1395fb64ef971846e42f946f6bfccd46ba3af8dd150d99530ba1b4feedba8add1955e5244cac4aa44518e085f88a6868950202f98cb5d4bfa SHA512 56d4ac831b478e1f30eeadb6aad1e8d862e6e10bc453e0770bcd1f322844eb1caded2db367b111ce3d3d8da1d9138df26cd1d435e7a012fa15f1b744cb7874db
-AUX pouetchess-0.2.0-gcc6-cmath.patch 492 BLAKE2B f11e15025ba94524f60dbac08f4f737ff91fa6a1ab21025e06badea2014519c7654db3bc1dd43fa0d82a539a4f7c429e350721b8be8e9bde09bd3c47fc8eda4b SHA512 fafd23c9d4791857cc65e370d43057576ac9ca0cf5930ce0cafe1df5e520e535e0c6141b707bf7a1d83884b4353b5321ce0f976dd15a857e2e9f2fc7fd00a3b8
-AUX pouetchess-0.2.0-nvidia_glext.patch 377 BLAKE2B 99aeb53d912511181ffe1c587932f075cda29b268df28a24ce3713f9329903123552deaa9f76968a670463a708b970c20844b4363c3a02f7456707ef4a523c5f SHA512 e3cad1eabdac6387c7218c02b0be53ac90d4ef9ecea37fdc4750daad2c1d7214b28902ce9b2b840f6a6f01e4cd55ee58295311533d4f8f4ec72362e6c67c03ac
-AUX pouetchess-0.2.0-sconstruct-sandbox.patch 759 BLAKE2B a7157ba8d65c03225bbfb0a2bd21d29b35f9b196958beda9d2584e2f0e002ffbbdcf7c780e9f5e6d7a3c75b6ad7255f35d7781e2b5fd704a2281aa3a99650c6b SHA512 8a45aa66e11a70b2f3114a58d1651e444f26a02016d2e9ef8caa425ecc8387b9c0339c605f36cca15fc9d743906b9b6a9ac0574ad60620c901c12e930156672d
-AUX pouetchess-0.2.0-segfaults.patch 1634 BLAKE2B eb56a2b33480022cc2ee095463de355028d56e632ab4382504e3a2839f55d80eff133fdaaa0cb34b6f2efea549c8141891dd74769a82e7a555f577321d5ec29c SHA512 fde86799926cfb5f51ad38fa8d0e9e4e2c14f3aed28cf102f5f4089c98b19b2fa7b65de798b64a43961dc2831a6818e4ceae65f4cba1bdafe37492f6ac2ab891
-DIST pouetchess_src_0.2.0.tar.gz 1055338 BLAKE2B 745db7e85966ecd999b62d91270bd5faa5cfa6ffd52738b8754b8e54197744fb8e826ec792b4363ed8735e043e6c417f8dc7c80033d5d723c9ccf79b88a367c7 SHA512 20d9b2edc3e3998716eddd38b82226f5c1298b9bf5cabc56a545bee602ce3e7a9106f130265f2b0d31ee56d728da2cc54a79623faa6841732cde0d7d94c33acf
-EBUILD pouetchess-0.2.0-r2.ebuild 1325 BLAKE2B 021dd4a1e469c79e5aaaa42619a1767a6c3d373d451ab09e9774e757cb8928b81d7979b34650cfb7af720e48ab8522cf9c35fb1a1c26fb0f44a046b4766c8800 SHA512 ca17289f8d97771d314a1ef1f809d4cf4d8691629e449cf15c6df3ed899609c3f017c96a90448268663db6b4adb4b7441353d903866d0c02e89fc32f3c802c1c
-MISC metadata.xml 333 BLAKE2B 72ac3670a55c7fc6021dc7548612397ef34b57e960f59adfbfb97025825828fb861d4eaab136da5235ec0d9b20f85bc672928365507959af3e06dd76d107e303 SHA512 9b5083cd658d82538d59352800f0386b7834af5a717eded245f4042a332b255d871eee485cb01f4c2d5735f06bd4b659816a1edc8bdeeaa655933d92f6edb523
diff --git a/games-board/pouetchess/files/pouetchess-0.2.0-fix-sdl-version-list.patch b/games-board/pouetchess/files/pouetchess-0.2.0-fix-sdl-version-list.patch
deleted file mode 100644
index 06b9aff2c2d8..000000000000
--- a/games-board/pouetchess/files/pouetchess-0.2.0-fix-sdl-version-list.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/pouetChess.py
-+++ b/pouetChess.py
-@@ -228,7 +228,7 @@
- 		sdlver = sdlobj.read()
- 		sdlerr = sdlobj.close()
- 		print sdlver,
--		if sdlver.split('.') >= ['1','2','8']:
-+		if sdlver.split('.') >= [1,2,8]:
- 			env.ParseConfig(sdlcfg+" --cflags --libs")
- 		else:
- 			print "You need LibSDL version 1.2.8 or greater for this program"
diff --git a/games-board/pouetchess/files/pouetchess-0.2.0-gcc43.patch b/games-board/pouetchess/files/pouetchess-0.2.0-gcc43.patch
deleted file mode 100644
index ef2ba1575825..000000000000
--- a/games-board/pouetchess/files/pouetchess-0.2.0-gcc43.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/sxmlgui/XMLUtils.h.orig	2008-06-14 14:50:16.000000000 +0000
-+++ b/src/sxmlgui/XMLUtils.h	2008-06-14 14:50:33.000000000 +0000
-@@ -38,6 +38,8 @@
- #include <stdio.h>

- #include <assert.h>

- #include <fstream>

-+#include <cstring>

-+

- 

- // Help out windows:

- #if defined( _DEBUG ) && !defined( DEBUG )

-
diff --git a/games-board/pouetchess/files/pouetchess-0.2.0-gcc6-cmath.patch b/games-board/pouetchess/files/pouetchess-0.2.0-gcc6-cmath.patch
deleted file mode 100644
index 4853eee81e1d..000000000000
--- a/games-board/pouetchess/files/pouetchess-0.2.0-gcc6-cmath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- pouetchess_src_0.2.0/src/sxmlgui/MathUtils.h.old	2006-05-26 21:22:57.000000000 -0400
-+++ pouetchess_src_0.2.0/src/sxmlgui/MathUtils.h	2017-03-21 18:01:15.569181229 -0400
-@@ -27,10 +27,13 @@
-   return (x < min) ? min : (x > max) ? max : x;

- }

- 

-+// Not used anywhere and conflicts with C++11 std::round(float)

-+#if __cplusplus < 201103L

- inline int round(float f)

- {

-   return int(f + 0.5f);

- }

-+#endif

- 

- inline float getNextRandom(){

-   return (float)rand()/(RAND_MAX + 1);

diff --git a/games-board/pouetchess/files/pouetchess-0.2.0-nvidia_glext.patch b/games-board/pouetchess/files/pouetchess-0.2.0-nvidia_glext.patch
deleted file mode 100644
index b7077feb6a38..000000000000
--- a/games-board/pouetchess/files/pouetchess-0.2.0-nvidia_glext.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/sxmlgui/GenUtils.h	2006-05-27 03:22:57.000000000 +0200
-+++ b/src/sxmlgui/GenUtils.h.new	2006-06-12 20:35:32.000000000 +0200
-@@ -5,6 +5,9 @@
- #include <iostream>

- #include <fstream>

- #include <vector>

-+#ifndef GL_GLEXT_PROTOTYPES

-+#define GL_GLEXT_PROTOTYPES 1

-+#endif

- #include <SDL/SDL_opengl.h>

- 

- #define deleteObject(A){ if(A){ delete   A; A = NULL; } }

diff --git a/games-board/pouetchess/files/pouetchess-0.2.0-sconstruct-sandbox.patch b/games-board/pouetchess/files/pouetchess-0.2.0-sconstruct-sandbox.patch
deleted file mode 100644
index 8378a1d7223d..000000000000
--- a/games-board/pouetchess/files/pouetchess-0.2.0-sconstruct-sandbox.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -22,14 +22,24 @@
- 
- 
- 
--import os,glob
-+import os,glob,SCons.Util
- 
- 
-+# https://dev.gentoo.org/~vapier/scons-blows.txt
- 
- # create build environment
- 
-+env = Environment()
-+env.SConsignFile()
- env = Environment(tools = ['default', 'pouetChess'], toolpath = ['.'])
--env.AppendUnique(CXXFLAGS = ['-Wall'])
-+env['CC'] = os.environ['CC']
-+env['CXX'] = os.environ['CXX']
-+if os.environ.has_key('CFLAGS'):
-+	env['CCFLAGS'] = SCons.Util.CLVar(os.environ['CFLAGS'])
-+if os.environ.has_key('CXXFLAGS'):
-+	env['CXXFLAGS'] = SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+if os.environ.has_key('LDFLAGS'):
-+	env['LINKFLAGS'] = SCons.Util.CLVar(os.environ['LDFLAGS'])
- 
- # gather a list of source files
- SOURCES =  glob.glob('src/*.cpp')
diff --git a/games-board/pouetchess/files/pouetchess-0.2.0-segfaults.patch b/games-board/pouetchess/files/pouetchess-0.2.0-segfaults.patch
deleted file mode 100644
index 346ee1248ab3..000000000000
--- a/games-board/pouetchess/files/pouetchess-0.2.0-segfaults.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/src/faile/search.c
-+++ b/src/faile/search.c
-@@ -805,6 +805,7 @@
-       for (j = 0; j < indent; j++) {
- 	fputc (' ', output);
-       }
-+      void print_move (move_s moves[], int m, FILE *stream);
-       print_move (&moves[0], i, output);
-       fprintf (output, "\n");
- 
---- a/src/faile/utils.c
-+++ b/src/faile/utils.c
-@@ -125,7 +125,7 @@
-       rank (target) < 1 || rank (target) > 8 ||
-       file (target) < 1 || file (target) > 8) 
-   {
--	sprintf (str, "*** FAILE INTERNAL ERROR ***");
-+	sprintf (str, "xxxx");
-     return;
-   }
-   
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -184,6 +184,9 @@
- 	// first scene is SCENE_INIT.
- 	pGlobalInfos->SetCurrentScene(GAME_SCENE_INIT);
- 
-+    /* @FB 02/08/06 */
-+    pGlobalInfos->ReleaseKeys();
-+
- 	// main game loop
- 	while( pGlobalInfos->IsGameRunning() )
- 	{
---- a/src/scene_main_game.cpp
-+++ b/src/scene_main_game.cpp
-@@ -245,7 +245,7 @@
- 	
- 	if (pGlobalInfos->OnLeftMouseButtonDown())
- 	{	
--		if (chessboard->clickOnChessBoard(mouseX,mouseY,&sqX,&sqY));
-+		if (chessboard->clickOnChessBoard(mouseX,mouseY,&sqX,&sqY))
- 		{
- 			// if a piece was already selected, this means the player want to move this piece
- 			if (SquareXSelected>-1 && SquareZSelected>-1)
---- a/src/graphic_chessboard.cpp
-+++ b/src/graphic_chessboard.cpp
-@@ -122,8 +122,8 @@
- 	
- 	for(int i=0;i<6;i++)
- 	{
--		char texture_filename[50];
--		sprintf(texture_filename,PC_DATA_TEXTURE_SKYBOX,i),
-+		char texture_filename[256];
-+		snprintf(texture_filename,sizeof(texture_filename),PC_DATA_TEXTURE_SKYBOX,i),
- 		texture_skybox[i] = new CBasicTexture;
- 		if (false==texture_skybox[i]->load(texture_filename,false))
- 		{
diff --git a/games-board/pouetchess/metadata.xml b/games-board/pouetchess/metadata.xml
deleted file mode 100644
index 3ba0656ee96e..000000000000
--- a/games-board/pouetchess/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">pouetchess</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/pouetchess/pouetchess-0.2.0-r2.ebuild b/games-board/pouetchess/pouetchess-0.2.0-r2.ebuild
deleted file mode 100644
index abb3f5a86b34..000000000000
--- a/games-board/pouetchess/pouetchess-0.2.0-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils scons-utils toolchain-funcs
-
-MY_PN=${PN/c/C}
-
-DESCRIPTION="3D and open source chess game"
-HOMEPAGE="http://pouetchess.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_src_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	media-libs/libsdl:0[opengl,video]
-	media-libs/sdl-image[jpeg,png]
-	virtual/glu
-	virtual/opengl"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${PN}_src_${PV}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sconstruct-sandbox.patch
-	"${FILESDIR}"/${P}-nvidia_glext.patch
-	"${FILESDIR}"/${P}-segfaults.patch
-	"${FILESDIR}"/${P}-gcc43.patch
-	"${FILESDIR}"/${P}-gcc6-cmath.patch
-	# Fix for LibSDL >= 1.2.10 detection
-	"${FILESDIR}"/${P}-fix-sdl-version-list.patch
-)
-
-src_configure() {
-	tc-export CC CXX
-
-	# turn off the hackish optimization setting code (bug #230127)
-	scons configure \
-		strip=false \
-		optimize=false \
-		prefix="${EPREFIX}"/usr \
-		datadir="${EPREFIX}"/usr/share/${PN} \
-		$(use debug && echo debug=1) || die
-}
-
-src_compile() {
-	escons
-}
-
-src_install() {
-	dobin bin/${MY_PN}
-
-	insinto /usr/share/${PN}
-	doins -r data/.
-
-	einstalldocs
-
-	doicon data/icons/${MY_PN}.png
-	make_desktop_entry ${MY_PN} ${MY_PN} ${MY_PN} "KDE;Qt;Game;BoardGame"
-}
diff --git a/games-board/sjeng/Manifest b/games-board/sjeng/Manifest
index 93f5861efb86..3d1a243209a5 100644
--- a/games-board/sjeng/Manifest
+++ b/games-board/sjeng/Manifest
@@ -1,4 +1,4 @@
 DIST Sjeng-Free-11.2.tar.gz 174019 BLAKE2B c50f312ce4f569b17cf7f240fe27e9d6d27e83e260c7549ba13ee612a357700b1642c2b274637af3e0e0f45c35e46f088cdcd5dce6bb62591ef600b97d8c6d6b SHA512 cda3409d732ac1b07e83ccc0d3063d24497651097c633500dfca66fbb3021532053082ac57a5e23909dd1016a2bae07f166e56b82c4ce834749a101c9ee444b8
 DIST sjeng_11.2-8.1.diff.gz 13341 BLAKE2B 187cb85e504511504ee9ed8bc2c6d6c19815e3e267099f1e98ea8964145e81074e2dd6b298dba76e91e2824dec1b4c6ac3d43b24f1ab970362c3bf07da87541d SHA512 2d470e0bee12a5f06808653ab3607301622d8e4f802295c04853b973c553074850c1fed278fe4696a652773af71dcac461d428d7f776d5a967256c4f39c627c9
-EBUILD sjeng-11.2_p8_p1.ebuild 1047 BLAKE2B 3d147b61058bbeabd7d7aba02b8959307a30b875cf5adf44dd52f90c64b1cbef0c61978611da31ae598594894a2cd88be7e5c610a69787131314c201a63f4bc3 SHA512 90fcc07244978779a71b8dd682bab317afa4f4ed5694fc2976ebfbc9017a4961ecddfd713840c6e608b9aba8c08a3d03e978c845d305075351af11ab5e1254c4
+EBUILD sjeng-11.2_p8_p1.ebuild 1034 BLAKE2B 4f2d57c769d123f695fdddf57409d3aab8567698059ed7dff7fef853d46850a0a77b496e27cdc24291561e186c939880cf5bf599fea9cbea0df5500c84c1fbb4 SHA512 49d59de5ad69f5199207c8bc2e21d2f4106083f004d442ffd04a8cdcd8c2704a6adc8e7050e5d50f25035301d8d7fa9fff1462c8f4ab0422ca479a4ec8279794
 MISC metadata.xml 328 BLAKE2B a01f3dc1b89d082ffb3e813bbadc30aec1d774322215d6aac79934e8e6e4b139beeeea052d46e075c7694a5fe2c3de80a418671fd339eb24afa51331051c41f3 SHA512 54f4f8c4089f82b019be4e1cc7f8ce10221142ff020c992f37cbcd3a9e87a43e4b61a1c5dca23edfcc1e5060fe0db19292d4f63319414d4994b91f517153c68d
diff --git a/games-board/sjeng/sjeng-11.2_p8_p1.ebuild b/games-board/sjeng/sjeng-11.2_p8_p1.ebuild
index dc0f65449a07..f23bf3d1d6b2 100644
--- a/games-board/sjeng/sjeng-11.2_p8_p1.ebuild
+++ b/games-board/sjeng/sjeng-11.2_p8_p1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Console based chess interface"
 HOMEPAGE="http://sjeng.sourceforge.net/"
 SRC_URI="
 	mirror://sourceforge/sjeng/Sjeng-Free-${MY_PV}.tar.gz
-	http://deb.debian.org/debian/pool/main/s/sjeng/sjeng_${MY_DEB_PV}.diff.gz
+	mirror://debian/pool/main/s/sjeng/sjeng_${MY_DEB_PV}.diff.gz
 "
 
 LICENSE="GPL-2"
diff --git a/games-board/spider/Manifest b/games-board/spider/Manifest
deleted file mode 100644
index f6622132a4d8..000000000000
--- a/games-board/spider/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST spider_1.2-4.diff.gz 2882 BLAKE2B 3016e4d6a7f4aa6e4f47e7abb78b12d70d5cee400a4e61b514e8fbbfdb7ad8484f84c1c1006447f3c6ab8a5897dfc4d4af5304eeaea716203c5c5440f9084b3b SHA512 e1e6eb4d5b14de7c32e1537877a3d26470c032bea567aa679c8a3744d62ab6b12d81bf05120679a273d98b6fd976c32d24ce9c54b720d006c51464f7ff6d5e75
-DIST spider_1.2.orig.tar.gz 168209 BLAKE2B 3a1163099ba9ce4faa9bc7c3424a2a2105c6fe001487822898dba7598dc5dc8d43cab2a3d7685fb71b1d19ff1b667397a41a3ba03fca4abf5d700308b19dc202 SHA512 a1d01f15ca37c8abdcc9f7c3dac925b1726f9b58ce51eb4096a9248abe0a55086ccdd5cc5ec358c2ee609ff089978676a3e3c669062a522ed7f1d4ea1ce33ab0
-EBUILD spider-1.2_p4-r2.ebuild 1604 BLAKE2B 2c1e8f6c6da9778ad9d6e50b8f2106270f673c3bb54e3a0f8bd8e9105430f09fe7ab45dc28598a0f53733f642c639f83eb7f19ba8df0553ec41b5f49414c5112 SHA512 eed7419df57dc9cb833f87c33dddcd8b99aa8da45a93c0a2ad30a224df0fcf1be68283ad4bc4241c88e3feeb7c1d22e7e06477ebca267ea95a5229476f9adab2
-MISC metadata.xml 327 BLAKE2B 60eff6a4428512cda35daa5d6d02f55f946b5e7840a9ff866a1f76014a837c25fa5c4e142187270a5b25b1c38c96a61cf3e7a229f39caf70d830731565b9222e SHA512 e55a8b00c37c88331de81c2c28e9a187c1a28d4fd64c5fcafd9e01c8cdfbdbd455ded19f523d1806506a1652a5eecaf09b5f8097a42ac40bb36821b92bd3c4b9
diff --git a/games-board/spider/metadata.xml b/games-board/spider/metadata.xml
deleted file mode 100644
index 9f9b26e3cb66..000000000000
--- a/games-board/spider/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="athena">Enable athena widgets</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-board/spider/spider-1.2_p4-r2.ebuild b/games-board/spider/spider-1.2_p4-r2.ebuild
deleted file mode 100644
index e6d741852790..000000000000
--- a/games-board/spider/spider-1.2_p4-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop epatch gnome2-utils
-
-MY_P="${P%%_*}"
-MY_P="${MY_P/-/_}"
-DEB_V="${P##*_p}"
-
-DESCRIPTION="Spider Solitaire"
-HOMEPAGE="https://packages.debian.org/stable/games/spider"
-SRC_URI="mirror://debian/pool/main/s/spider/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/s/spider/${MY_P}-${DEB_V}.diff.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="athena"
-
-RDEPEND="
-	x11-libs/libXext
-	athena? ( x11-libs/libXaw )
-	x11-libs/libXmu
-	x11-libs/libXt
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-misc/imake
-"
-
-S="${WORKDIR}/${MY_P/_/-}.orig"
-
-src_prepare() {
-	default
-	epatch "${WORKDIR}"/${MY_P}-${DEB_V}.diff
-	sed -i \
-		-e '/MKDIRHIER/s:/X11::' \
-		*Imakefile \
-		|| die "sed failed"
-	rm Makefile
-}
-
-src_configure() {
-	xmkmf \
-		-DSmallCards=NO \
-		-DRoundCards \
-		$(use athena && echo "-DCompileXAW=YES" || echo "-DCompileXlibOnly=YES") \
-		|| die "imake failed"
-	sed -i \
-		-e '/CC = /d' \
-		-e "s/CDEBUGFLAGS = .*$/CDEBUGFLAGS = ${CFLAGS}/" \
-		-e '/LDOPTIONS = /s/$/$(LDFLAGS)/' \
-		Makefile \
-		|| die "sed failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		BINDIR="/usr/bin" \
-		MANSUFFIX="6" \
-		MANDIR="/usr/share/man/man6" \
-		HELPDIR="/usr/share/doc/${PF}" \
-		install install.doc install.man
-
-	einstalldocs
-	newicon icons/Spider.png ${PN}.png
-	newicon -s 32 icons/Spider32x32.png ${PN}.png
-	make_desktop_entry spider Spider
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-board/tali/Manifest b/games-board/tali/Manifest
index df856e466b60..b092cc6af977 100644
--- a/games-board/tali/Manifest
+++ b/games-board/tali/Manifest
@@ -1,5 +1,5 @@
-DIST tali-3.32.1.tar.xz 1636032 BLAKE2B 2d8ea2bac7c0a74833a3cd6768bb5cd394c4b02ee5a7fad151d662f417a536b5cc4784ad4338435d80bdc9db025da2a258c05cbb54b7edd038a37b0c990889ca SHA512 78abdfca84a86100be94a1509f0bd00bb84d9f97bfed87f6378e55adedb0c8d7349a9ebead6d8eac8b9c52b52ae6e7b2a868ac9a2262dffafc4e5ad23a455e7d
 DIST tali-3.36.4.tar.xz 1765348 BLAKE2B 0d4d8bb3b66d58295ecd13e6f985149efb412a6af420baefaea603c9cb043aaa3d353a4930abb18809f42ed2690c81455954778b1a326ca2e9ce36426d0a4668 SHA512 cd01a93ba96d5c8c264e2a73fba3dc16be72a1a1d50f40555e3ef381d3ab03797f25de2a2c7603bd35ac87568f3d43e3763ee65e95dffebe92eafb59d332a3df
-EBUILD tali-3.32.1.ebuild 652 BLAKE2B 3a56bce9d44b48ee7ad4c11e8c050044a77836e4f473155e2475cc86c8772e49b51424d361a1d9c915c8f4196f5a440ab3034a8bf18c958751cde20e09c7524d SHA512 6fb9ee7efbb1122fb2caa966729b85ced4a05a09e742acb0e70868b761ce826d26b0367aa327137a5d6fed1f91602a09bfc996d21f6f9dbac98e5f366adfd8b8
+DIST tali-3.38.2.tar.xz 1579972 BLAKE2B 1196f89b3cabcf1cffb36cba5b5e0c98edf9a07e6461bf39c054c35fbb622f3beabfd4e9563592fc44e81cfa18010343cf711b86c80cae33f4df38ad390736da SHA512 8084a3f82148a99c49423f9fd828732300e4c9283be7dbe235f9f74216862d321f106182f0ed95985f37c67e36b20dda5d48db2063a607b08126f3875dbcaae3
 EBUILD tali-3.36.4.ebuild 652 BLAKE2B 588e7bf429366457b0f8b70de68889359fb42d4c1dc5b91c50dad0cdddfbefc79ea0f1d126febf18bf58a6079b9e2c64544af65c674153105e33bb45c5de73b9 SHA512 212402bff4f44a927adbb18462b90fcce98594f5961cbec96ddae23641c70427bef5f8675b23075acce183e816294b5c04903c6a9b7e719de551c9cb501c938e
+EBUILD tali-3.38.2.ebuild 690 BLAKE2B e01247ac6b196258a09b8ff39719113502b67dba728a40e7c26196bee638a67b72b2f5685489bae7ef9ccd4c227220e9cf67d112f301bd677f2e8a9519a71c1d SHA512 2ea5fbcea8a73e1e4ede283038fb674446cda70c4efd7e42a5b33624dcd7ce08e2e5565fdee36d2aaeaca922e487af769e7963d70dcff884d89777b1c0ed187a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/tali/tali-3.32.1.ebuild b/games-board/tali/tali-3.38.2.ebuild
index 2e7bb5d65dbc..b9cdede99543 100644
--- a/games-board/tali/tali-3.32.1.ebuild
+++ b/games-board/tali/tali-3.38.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,12 +9,13 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Tali"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
 	dev-libs/glib:2
 	>=x11-libs/gtk+-3.16:3
+	dev-libs/libgnome-games-support:1=
 "
 RDEPEND="${DEPEND}
 	>=gnome-base/librsvg-2.32:2