gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /games-board
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
59 files changed, 559 insertions, 334 deletions
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 3d12943c2bf7..f9f5b2a4b685 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/ascal/Manifest b/games-board/ascal/Manifest
index ba8f53c53c7e..a49e11594906 100644
--- a/games-board/ascal/Manifest
+++ b/games-board/ascal/Manifest
@@ -1,5 +1,5 @@
-AUX ascal-0.1.1-gcc43.patch 859 BLAKE2B 92b07bf43e9e64f9cdd505b9f048e7bd18ef6f9559242670793f2638d21ff43731bd4acbdda1be179fb04249a63b98bb0f854cd7c0e00d32d7119a0ee18aaa76 SHA512 e4d8b1fb25dda182fdbe9bddfee0157332337f6fa9865fa06b2fd8fa7cd16f03d8a25129ff233ea600dd9be32df93a2b591e47d9597fd547764af765f29dbab7
+AUX ascal-0.1.1-gcc43.patch 643 BLAKE2B 3e992be0a8caff4e469178c375a26dd0f9efdb8eac142aaf50eb1037ad6841947229fa6f0805113dbeeb404b2dad7a5d765ed89b93efe0f7505238c0398a9120 SHA512 8365567cf67577ac65e03d422d46ccfdfbedecacebac50de6487efda98070f4692d150ff3e75b8ba0c711e235bf81a9fa0459421c3d3749fd2f435d64773f1a9
 AUX ascal-0.1.1-install.patch 1738 BLAKE2B 18f5aa5af12d14cd8f5fbf49864922232c1bc5b4cf15b5928bc900aa12bf8129578590f03ce449e8c26a2f44755e331501da9cc753d6964ba54f2738056f20e9 SHA512 a7ac59c7534461fc841ac9a7e60b7151408fe7f92728376a9ee4849c50ca460a67eacc055a67559b4c252b3d8d2f0504f464792a80ead7c5a7ffb325d07cc525
 DIST ascal-0.1.1.tar.bz2 960688 BLAKE2B b65011d9dbd7c6d088dc303312a5159a8e863713c64e10901b1cd34df561612003a9695d723c17c5a59b91e50a306760f3283abeeb333afad87d1fea6f758660 SHA512 4428040396da85dd8598ece34909b1db80fe2f72c36b8e0d23c3f9db5837ee30ec2a10ee74def97a80bafbbf1927cbdb6c598aa5f0a42949d3c490672f8c5165
-EBUILD ascal-0.1.1-r1.ebuild 673 BLAKE2B 0213597bfcd7be4f566f68f38fb58b55de999c4a7bbdb9b5ccc965588ecfe69fb27cdd36721657d6c574e5314905380c05e15770db5964d4ae33ea42e21788a2 SHA512 a46df9297a924eb4adb8c13da154803108dc88c863f3809797b31f2a6833542e5df79dc27310c03937747410dd7ee12995eb8fa1fee15374130f74a0f9d8db4e
+EBUILD ascal-0.1.1-r1.ebuild 665 BLAKE2B c540468adc77391a7ee8d71bc6c4a1c79ad40507eda5076b071132f3238c3600a4a0f30adbfc82910a9dcad5b80026fe90d440beb36f2c2582993ecfd431fe08 SHA512 2821dc51bc31786928a5252419e4a9eabb738cded8050473a8420c176a93050c4430840628c28bd049b027977168a620c0ca66b6a608412add35b2b53b82b1da
 MISC metadata.xml 816 BLAKE2B 8e0ad192aae3d610f2f8d15922134871a049e85c330ab32eefe4948cb903957d90295d94dc6e3f5087ce5b326b4278bd7c62659e580abcf85da21f70005e5aec SHA512 eccb593e64f1dd07427835d43a350796e21445c9fd39df3ef82c01dcf12d008bc4e6551df78637c55191f16849a801f725f57a6368b16372d68013a26a1ff809
diff --git a/games-board/ascal/ascal-0.1.1-r1.ebuild b/games-board/ascal/ascal-0.1.1-r1.ebuild
index 33cafc7a58d9..c1c92f2f28fe 100644
--- a/games-board/ascal/ascal-0.1.1-r1.ebuild
+++ b/games-board/ascal/ascal-0.1.1-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils flag-o-matic
+EAPI=7
+
+inherit autotools flag-o-matic
 
 DESCRIPTION="A game similar to Draughts but with some really cool enhancements"
 HOMEPAGE="http://ascal.sourceforge.net/"
@@ -11,14 +12,13 @@ SRC_URI="mirror://sourceforge/ascal/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	dev-cpp/libglademm
 	dev-cpp/libgnomecanvasmm
 	virtual/libintl"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-install.patch
diff --git a/games-board/ascal/files/ascal-0.1.1-gcc43.patch b/games-board/ascal/files/ascal-0.1.1-gcc43.patch
index b2a55584fb0b..737766a47543 100644
--- a/games-board/ascal/files/ascal-0.1.1-gcc43.patch
+++ b/games-board/ascal/files/ascal-0.1.1-gcc43.patch
@@ -1,5 +1,5 @@
---- a/src/gui.cpp	2009-01-18 21:11:58.000000000 +0100
-+++ b/src/gui.cpp	2009-01-18 21:12:33.000000000 +0100
+--- a/src/gui.cpp
++++ b/src/gui.cpp
 @@ -21,6 +21,7 @@
  #include "shareddata.hpp"
  #include "config.h"
@@ -8,8 +8,8 @@
  
  gui::gui(shareddata *newData): GuiBoard() {
  	//clean, cleaner - pointer ;)
---- a/src/gui_board.cpp	2009-01-18 21:13:30.000000000 +0100
-+++ b/src/gui_board.cpp	2009-01-18 21:13:50.000000000 +0100
+--- a/src/gui_board.cpp
++++ b/src/gui_board.cpp
 @@ -20,6 +20,7 @@
  #include <math.h>
  #include "helper.h"
@@ -18,8 +18,8 @@
  
  
  gui_board::gui_board()   {
---- a/src/board.cpp	2009-01-18 21:14:27.000000000 +0100
-+++ b/src/board.cpp	2009-01-18 21:14:58.000000000 +0100
+--- a/src/board.cpp
++++ b/src/board.cpp
 @@ -15,6 +15,7 @@
  // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
diff --git a/games-board/blokish/Manifest b/games-board/blokish/Manifest
index 1cdedba62685..86c5f48db768 100644
--- a/games-board/blokish/Manifest
+++ b/games-board/blokish/Manifest
@@ -2,5 +2,5 @@ AUX blokish-0.9.4-gcc43.patch 195 BLAKE2B 2b254b8af303b1d224b71e245416305e4fc605
 AUX blokish-0.9.4-underlink.patch 270 BLAKE2B 3849db25e27397a201ffa6bc9ef26b5ff852c1049f2195a0ff5e012fac589bf5e04ae0a1741e54d01e05f802e8193774e29100a5232cd1c4f11d14814d5b5038 SHA512 bc9c725c6c084a0a033c282401f886196421eb9e76fd0298e7a86f7cc3ffa23bb3bcaff483207498afe80c3e78b3a615ea21c6ba156a6a0f47e810bec58e7f92
 AUX blokish-0.9.4-wxgtk.patch 1469 BLAKE2B 2dad1ea91ddc31eff1150283585179bf7a22d8837ee120123ef588bcfc4a838a15453a5e37ef62055d60de0e45ead4ab4b679bf0c663b434aeb21633b4755e53 SHA512 d495bbc120d4a6ebf93dc49e7090fd224946ceccd543570a6fa7f2d41dc6df41586f38a7bcdd06c7fa754c3201d23ca3f770f95531c6ecbd2e29a10595972143
 DIST blokish_v0.9.4.tgz 165215 BLAKE2B 137a82d8833da4459d394a2832fc32de3157c107d2cfcbd3ff93b8274ee1b218a823c44f70a6b256aa6bfa4367c01561829c29638c331cbdf179bfa069278b7a SHA512 f84e5c31999cfca4bc6504907a889561c0e6c986b6c7bbd0d7325cec248d7e5d7834d841326635a605669b7bffd9fdb8c8fe73a216a738dace0385ae8a98cbec
-EBUILD blokish-0.9.4-r3.ebuild 965 BLAKE2B 8d7ecdf958263c7ce510ff16779abfab4f5528de65f7d4a438018582fe75115849c2444f5bc46d994925cea7624760579a1a18bbdb7f798b07efe7598418f9ce SHA512 b18170cb4367dc5fe34d1a23861002c848269914408761f39f6069c081fd7af61a950003a8ee72d0c8745c2315b7e26a603c15afba2eda4d0a6cca0ba9595024
+EBUILD blokish-0.9.4-r3.ebuild 964 BLAKE2B bc9b357ce34916b182c514c53ef4369ede72b9499f28b348c847d94ed63d100eb14eeef8054cf0b6d56be580c5211a041df2d6f953e7bb5b75484745e88ab0ea SHA512 a774f0ce399eaa8710ee9d77a4a63549611a13c898d1f2b946edff9e8b81f30cbe6dd29c7c8693b2a52e1537281d401c8cc77a69363c5f733df1c0f1b18625aa
 MISC metadata.xml 330 BLAKE2B febcfddefec46284254771d629db20864acd22a2dc23ca0c2082386d1270a4f92d549cf8ab9ca0e9690b7e57e90dfbb9cca10e14a1e8ef910a2e8bfe36be1eda SHA512 ab6edc3e5f113ed83a736fae1b3b1460116f684d4fedbc7a84f6d632ad5f977b0f2557c39a7cac99b998df9474b7733ea70ead63fa255aacac3c745c79c0d710
diff --git a/games-board/blokish/blokish-0.9.4-r3.ebuild b/games-board/blokish/blokish-0.9.4-r3.ebuild
index e45372c8a487..7316facb2a61 100644
--- a/games-board/blokish/blokish-0.9.4-r3.ebuild
+++ b/games-board/blokish/blokish-0.9.4-r3.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 WX_GTK_VER="3.0"
-inherit eutils autotools wxwidgets
+inherit autotools desktop wxwidgets
 
 MY_P="${PN}_v${PV}"
+
 DESCRIPTION="Open source clone of the four-player board game Blokus"
 HOMEPAGE="https://sourceforge.net/projects/blokish/"
 SRC_URI="mirror://sourceforge/blokish/${MY_P}.tgz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+RDEPEND="
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 	virtual/glu
 	virtual/opengl"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${PN}
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc43.patch
@@ -45,9 +45,8 @@ src_prepare() {
 
 src_install() {
 	default
+	dodoc -r docs/.
 
 	doicon src/${PN}.xpm
 	make_desktop_entry ${PN} Blokish ${PN}
-
-	dodoc docs/*
 }
diff --git a/games-board/chessx/Manifest b/games-board/chessx/Manifest
index 6bb1705dbc92..dbbc1544d0e7 100644
--- a/games-board/chessx/Manifest
+++ b/games-board/chessx/Manifest
@@ -2,5 +2,5 @@ AUX chessx-1.5.4-install.patch 707 BLAKE2B 00199be5811a78ad2e610dd919a063d84d941
 AUX chessx-1.5.4-missing-translations.patch 1502 BLAKE2B f0b745ceaf0f3b97e59b156515ec286f830b1163164ffd6d63a76d1118b648f9af221e89aa0c22d71a2a1fabc56074b436bd9fad433db1733b8742504559962e SHA512 a922dd05b98ea8ed54f203fa7d7d56c1fb87ef7fe97edde9e05ada37a6e4175f02465bbef2f7d8df3f672d74134722d1706fd6ecf559167ae0f1cd717d0f28cd
 AUX chessx-1.5.4-system-quazip.patch 2237 BLAKE2B 2e94f7d6b6c16dec100e09e6f6bb77185cfafa9dc16f4640212a582e6f267cf78100d8e849f4e762b095ebee7286f1ff0b64d6e975a7679acdab2790b028cba9 SHA512 dc3408200cc27a7d38f90af2136163f91fb1d874673a9645626f4d035312d17e0995bf6b23433fdfc5b28468f823c65f4a8cf7966271f4630526caa7926fa929
 DIST chessx-1.5.4.tgz 3663299 BLAKE2B 3a0f222d2c122e70f66600f15a2b9a9606e56407db364a616515ebc1b7f333e260c131e61e22f59fb3cbd340555bb8c238bfd560fbc23f4c173288cd4b7e7369 SHA512 9f112b185ed8af3690cb50eafead7dfbd7896d3baebc9b10c3d32103a51cc49834703c232c159dffe24fd09601f2b41db02598c435ca56fc1031195fb9762a42
-EBUILD chessx-1.5.4-r3.ebuild 1105 BLAKE2B b023d915e68ee6020ba77cb452f3dd079961de57493735129e8703b49d20ee93605bfb330931c1e8533f5dab940c2e204faa2c6f574570f89593900d04a45a07 SHA512 f0642f36460759b41e3b500a05bd0e9137ec2762180aa4b5f9d4aea7ecc1b378faa798e94c882fd9ff61d35b63b81b0c2f538df8326e945ff6af846493e9a2b6
+EBUILD chessx-1.5.4-r3.ebuild 1089 BLAKE2B 650eddbbbfed569ed2d08fbcfebf77f9b17700438c3a067b0c763ea7c47fb6aa17904a07a6a2359947d2aad0a0bbd0e8f057da825082b1f735b19779ce7ae63b SHA512 f1586b16b81441082949357fd51af8e4f05bde67c06d16610f43c2e989eaac4dfffd5e009b084dbde1cd3a4b4817ca00bdf342309f166d64b2611d4a250c32b0
 MISC metadata.xml 329 BLAKE2B 199a6f1de51ae4a4a1104bbd4419200e7440abafe3fc5dfe40eafc08c00449461c71131cfdf1d60a0b8375f575290bbdd0af6355ae10a9259c38728e3065e6cf SHA512 41215eff9af3f31175db0f20dd13574378e4124dda8a1670440897391a5b66423c953471d6e22984dbfb3e0abef8ea3d56fa3690b45c189fae2a3c26560ec1a8
diff --git a/games-board/chessx/chessx-1.5.4-r3.ebuild b/games-board/chessx/chessx-1.5.4-r3.ebuild
index b3e40f7c587d..37a62ca9b014 100644
--- a/games-board/chessx/chessx-1.5.4-r3.ebuild
+++ b/games-board/chessx/chessx-1.5.4-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="Qt5-based Chess Database Utility"
 HOMEPAGE="http://chessx.sourceforge.net/"
@@ -12,7 +12,6 @@ SRC_URI="https://sourceforge.net/projects/chessx/files/chessx/${PV}/${P}.tgz"
 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+ ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	>=dev-libs/quazip-0.9.1:0=
diff --git a/games-board/domination/Manifest b/games-board/domination/Manifest
index 6e7657db4d3f..997af4ac9351 100644
--- a/games-board/domination/Manifest
+++ b/games-board/domination/Manifest
@@ -1,3 +1,3 @@
 DIST Domination_1.1.1.6.zip 6567410 BLAKE2B 5868011017c9aae937d3d21c8568a541a5170a716c6762e2802e5fdb34a31dd7c4c61a0670278b211e6227f42bc996a81547b04d71533c83dfb2f6045dd190cb SHA512 46f4499f285f86cf94914ef62b25a52aa3b9848721c24900ec172f9b41d846dab07e288c564321486d451caee6049b4f4cb0ab475e378aa6df670e656b5b1fe6
-EBUILD domination-1.1.1.6-r1.ebuild 968 BLAKE2B d2e5f91a6012be2b9a038aea8e09e562aae4f46cc959a879c528ebef7412ccb5c6c7b25d1d5ddbf8683950ebb0ef562e2c82d4ccf77287b2df0682d8e21d0aa9 SHA512 4f1cd681438ded82bfe750b5fb5b84a2eed408ec81867faafd11db504a9ce5b55d33daebaa413e439511b1a1369e28e660ed8d1c529560ca98cb7cb77172f52e
+EBUILD domination-1.1.1.6-r2.ebuild 976 BLAKE2B 3c994a5fbe14d306806e1070464f2c8b325dc13376aa63c9368b225ecf1b31fffbadee6909391f0aa5776ac1be761c33a400a8660d2a0f320b72780f521e06fc SHA512 c5e307e5c8dea7cc000b36b01ab4d0245b2a072c80b424f3eefe65ae3bd6bb2b35d2c3b1b206fc81071f34372bbc17e3204d6989ecf2b226006b644a9ac331ad
 MISC metadata.xml 333 BLAKE2B 2064b61753a5170ad5958694ca7f3e23c53df711aa092e21f920834390a95691b1363a7fe6dade20f9724fe3e6a0968ca9ef30364993ce56731f1bb22750faa8 SHA512 1ced4b2460bea74b56f982156c0088c43f26ae33459771ceb6cf904e8957a4c3bb46c16dbd3de20d9aa9b3b816aeb3e1a741b74a1f246e823d17ae78cb6cca24
diff --git a/games-board/domination/domination-1.1.1.6-r1.ebuild b/games-board/domination/domination-1.1.1.6-r2.ebuild
index e7b92e172bd5..3b6305ecf8a8 100644
--- a/games-board/domination/domination-1.1.1.6-r1.ebuild
+++ b/games-board/domination/domination-1.1.1.6-r2.ebuild
@@ -1,25 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils java-pkg-2 java-ant-2
+EAPI=7
+
+EANT_BUILD_TARGET="game"
+inherit desktop java-pkg-2 java-ant-2
 
 DESCRIPTION="The well-known board game, written in java"
 HOMEPAGE="http://domination.sourceforge.net"
 SRC_URI="mirror://sourceforge/domination/Domination_${PV}.zip"
+S="${WORKDIR}"/Domination
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
 
-S=${WORKDIR}/Domination
-
-EANT_BUILD_TARGET="game"
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+BDEPEND="app-arch/unzip"
 
 pkg_setup() {
 	java-pkg-2_pkg_setup
@@ -33,14 +31,14 @@ src_install() {
 	newbin "${S}"/FlashGUI.sh ${PN}
 	sed -i \
 		-e "s|cd.*|cd \"/usr/share\"/${PN}|" \
-		"${D}/usr/bin"/${PN} \
+		"${ED}"/usr/bin/${PN} \
 		|| die
-	chmod +x "${D}/usr/bin"/${PN} || die
+	chmod +x "${ED}"/usr/bin/${PN} || die
 
-	insinto "/usr/share/${PN}"
+	insinto /usr/share/${PN}
 	doins -r "${S}"/*
-	rm -f "${D}/usr/share"/${PN}/*.cmd || die
-	java-pkg_regjar "${D}//usr/share/${PN}"/*.jar
+	rm -f "${ED}"/usr/share/${PN}/*.cmd || die
+	java-pkg_regjar "${ED}"/usr/share/${PN}/*.jar
 
 	newicon resources/icon.png ${PN}.png
 	make_desktop_entry ${PN} "Domination"
diff --git a/games-board/eboard/Manifest b/games-board/eboard/Manifest
index 1eed9a8242c4..e455a402a426 100644
--- a/games-board/eboard/Manifest
+++ b/games-board/eboard/Manifest
@@ -1,10 +1,10 @@
-AUX eboard-1.1.1-as-needed.patch 726 BLAKE2B 658dabc65b610d4a618ef9e5729c8616904abc6c231495f5c3c10b0c8e476699bb119db632c2a36ff3be8386b848bb25f12b8fda3e165ebc162ea2da716d68d6 SHA512 03543a8439eec92169fdc97adffb6f258332593240904636f69fe46d6cca89c63069ac794c9c2d66df64a3e0da579c89f6d5e6944afda10f7b4760da370ca6d9
+AUX eboard-1.1.1-as-needed.patch 654 BLAKE2B 846dd810ea08d5f9679d3292a3908f374dcd2f395cadb38cac21365ed63c85b28c19fd5b539fbaad6d150a9542fee5cca49e5539687f0b71680afc573c8170d2 SHA512 2bf0ec9f35069deeb0d78fee299fdad868a5bfb7dc67501da7e5e28affec92c06fd4a321db62d82e49a6fbc242f0168569057be9fc1bd8b2fc1b8a7f47504c0d
 AUX eboard-1.1.1-gcc44.patch 186 BLAKE2B e07e005b9cd99fef312baeee5d1d996e51c9c371bd8ff2898e8ebdc48f477e5ea90eb49e047d4a6d6369fd791d0a8c5f3a8d1b49f4c0e98264b1634c203688ab SHA512 74642d5990750fe66b04500d76917c08ba20d387bd86f93b2743881834954e6a2a4eb6c2d1030db620aab2f8754daded3f04140acdc11286bb75c5a7c20aa145
 AUX eboard-1.1.1-libpng15.patch 359 BLAKE2B 23c46aadd1d7e62a7a0c02b0baaf481072f922cd07f8efc455f53f55566b221bc43f943b9add694e4333488b5cb3edb76e9310dfeefd073f539b62d99f94ada5 SHA512 20be6a1173314aec40cd5cb84d759699160dd3542aebe554833c4a8b00c44198ecb72b087fb9f828b972f2c2fa35f47853d1a02af20b280d1c41dfccc3cd6599
-AUX eboard-1.1.1-ovflfix.patch 853 BLAKE2B 3f4aca968eb831227ea369a5e0a0d8091c44bfa7885da2f9e39678a1d25daa4ba7abfbbe6a1e90dc0b440769185f276e536bffaf5ae2343d099f7bef530e748f SHA512 8a2e479d0339516269fa407d6ec84da042aab786f6672ee4dc6d6ac60f9524cd32739fd2e75c0271fba601c852b195bac7017c8226e4a2dd97bf3f4ed47d13a4
+AUX eboard-1.1.1-ovflfix.patch 709 BLAKE2B 3637323a80be6aaf42f4e09c4f6e7d73389e369f695515d105c9e77ab87766cd210a0da2fb71d5dec91368de76bb6993a440469f1d26b290b896ab769e6fb566 SHA512 dfcd64b4b54fd159bfc75988fd5a2e2ebdf30d9ee6eea11e86d649c96a977edee16046ddc36a6939ccf19037a7397f8e4e49db0542b940eb6da2a51af8f381ab
 DIST eboard-1.1.1.tar.bz2 462386 BLAKE2B 93d702b24cd647029e50389eab8a1d34ef564d16e426534d925e4bc9596ed7c1055a6c519280580e19a26ae5c3c316030fa950b129e6c4e8f425d3708683826c SHA512 0e124abc786996070464c3d9ef5eafa107b990df7593d774bf302e01e0d07427f2a67bc33ab61a188d2902aa35abb8cec6356e4e088f4a6b40e189556b588704
 DIST eboard-extras-1pl2.tar.gz 361237 BLAKE2B b82911ea1cc4106f50ccc6a678ca0291d6b92549c2ac9890a29e6ff25b20bb436a60d254493279d9ef81503d57edab35423c18b4762066f851844507e254fcf7 SHA512 82243ef37c655d0a5d4bce9655be9b7cba35f4fe4e4edf9951a61baf5e2e0816cb3d8dea95ed61ed4d9fb9242fd31efeec498e055c2f0e2500acb3c7699b4555
 DIST eboard-extras-2.tar.gz 598909 BLAKE2B 4c1696bfd6fd6dd8926d38ea4c349b9f76ae8f1c00152ba69a54f5d58e286432ee50c0f7395eeafbd49905a15b7e6a46e97693d07e1c12a08de19d3bf8827d2b SHA512 e936a4a847b46c057677c0304dde41f0d365cc5f4bd23db39acdb45c6cb53d48fdc188e4f471ef4938a361e7f823c8c391c2b0324c290e1f2d8b5cfe430bb19b
 DIST eboard_1.1.1-4.1.diff.gz 17247 BLAKE2B 282cb7602d82e512ad8378ecf7e9bca54f539a65c85244a2455f2ac3d882897c7911ca5a94e0df5c3fb26a74bacf6ed6ab840435509e83fc07ada5e57b89259f SHA512 8856a69a2bad8639f38d7da97d7b2464f97101c4c2e38a340f5f8dabacbcc9aa12b200f2b669fc98134655f8c7f6d5b79fb3d5f3582135ef9a9b1fd0917c3e4f
-EBUILD eboard-1.1.1-r2.ebuild 1601 BLAKE2B 609fe6c2bb5759ed0a13c8933e60029c8f317021f3622e7f7968557f1ac391e8d8538618469cd5ff6df90f7e4e6118bf292763eab4ed42b03bd354be37062f3b SHA512 86f6a5c92c6143d89cad02a3a9f55ac7d667164fd7c5f2ccda2deabadee27d23b704e6cc54e9869d2b7125e148f3f93f641cb74f4eca1b5d2fa9eeefb17375b1
+EBUILD eboard-1.1.1-r2.ebuild 1799 BLAKE2B 73b18ae50f2cdb1490de60b492062491ab7a4d18f100eeab18eaafe16062a446ad8514d4068b004ea76323797bf383a66e4aad4745011144150ebddb42cf7856 SHA512 fb8b992f820ba51b781fec23140509b93828786e2779cb8d1fb8243775f7a3634fd007699bc8bfdd59dfa60d8a12dfb6a8da1eafa900a9298641cfbea8329eb9
 MISC metadata.xml 329 BLAKE2B 596a8bbc8fd0317bd18db02f1184fa5d5c9edf8189f095836b329305da0bc2ddf5def4a80b0090c58661bc69aba7cab729655a26a7b4831f30c1487453bd8b5c SHA512 291c53cc59c042c10161d9bd7792899796e58dbe3800962f9155c8b8ea88519b9278f7541a85772cd3425ba15641897392a02451467424e8b59d9e7205f33635
diff --git a/games-board/eboard/eboard-1.1.1-r2.ebuild b/games-board/eboard/eboard-1.1.1-r2.ebuild
index b1bc8ad5f823..78fc1bebf651 100644
--- a/games-board/eboard/eboard-1.1.1-r2.ebuild
+++ b/games-board/eboard/eboard-1.1.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit desktop toolchain-funcs
 
 DEB_V=${PV}-4.1
 EXTRAS1="eboard-extras-1pl2"
@@ -21,11 +21,23 @@ KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="
+	dev-libs/atk
+	dev-libs/glib
+	dev-libs/gobject-introspection
+	media-libs/fontconfig
+	media-libs/freetype
 	media-libs/libpng:0=
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-lang/perl
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${WORKDIR}"/${PN}_${DEB_V}.diff
@@ -60,7 +72,7 @@ src_install() {
 	newicon icon-eboard.xpm ${PN}.xpm
 	make_desktop_entry ${PN} ${PN} ${PN}
 
-	cd "${WORKDIR}"/${EXTRAS1}
+	cd "${WORKDIR}"/${EXTRAS1} || die
 	insinto /usr/share/${PN}
 	doins *.png *.wav
 	newins extras1.conf themeconf.extras1
@@ -68,7 +80,7 @@ src_install() {
 	newdoc README README.extras
 	dodoc CREDITS
 
-	cd "${WORKDIR}"/${EXTRAS2}
+	cd "${WORKDIR}"/${EXTRAS2} || die
 	doins *.png *.wav
 	newins extras2.conf themeconf.extras2
 }
diff --git a/games-board/eboard/files/eboard-1.1.1-as-needed.patch b/games-board/eboard/files/eboard-1.1.1-as-needed.patch
index 199dd0e70a2d..bcd1c4564226 100644
--- a/games-board/eboard/files/eboard-1.1.1-as-needed.patch
+++ b/games-board/eboard/files/eboard-1.1.1-as-needed.patch
@@ -1,5 +1,5 @@
---- a/configure	2009-02-03 14:46:21.000000000 +0100
-+++ b/configure	2009-02-03 14:48:13.000000000 +0100
+--- a/configure
++++ b/configure
 @@ -638,7 +638,7 @@
  
  print CONFIGMAKE "CXX       = $cxx\n";
diff --git a/games-board/eboard/files/eboard-1.1.1-ovflfix.patch b/games-board/eboard/files/eboard-1.1.1-ovflfix.patch
index b09c4dba880f..60c428d3a292 100644
--- a/games-board/eboard/files/eboard-1.1.1-ovflfix.patch
+++ b/games-board/eboard/files/eboard-1.1.1-ovflfix.patch
@@ -1,5 +1,5 @@
---- a/proto_xboard.cc	2010-11-03 16:42:15.000000000 +0100
-+++ b/proto_xboard.cc	2010-11-03 16:43:14.000000000 +0100
+--- a/proto_xboard.cc
++++ b/proto_xboard.cc
 @@ -1084,7 +1084,7 @@
    snprintf(EngineCommandLine,512,"crafty bookpath=%s logpath=%s tbpath=%s",
  	   BookPath,LogPath,LogPath);
@@ -9,8 +9,8 @@
    else
      strcpy(EngineRunDir,"/tmp");
  
---- a/util.cc	2010-11-03 16:42:24.000000000 +0100
-+++ b/util.cc	2010-11-03 16:43:42.000000000 +0100
+--- a/util.cc
++++ b/util.cc
 @@ -783,7 +783,7 @@
    int i,n;
    char cmd[1024];
diff --git a/games-board/gnome-chess/Manifest b/games-board/gnome-chess/Manifest
index 75f013782dca..dcf572dca27a 100644
--- a/games-board/gnome-chess/Manifest
+++ b/games-board/gnome-chess/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-chess-3.36.1.tar.xz 738308 BLAKE2B 14d328b9939afb12f14b513cfa009e3fb197f6c35c5272df107ce844890339caecbb5dafbd0bd28a19d001ebc0574464b33ea2ca10a9f7578b49d1e6f637e190 SHA512 4c89f91fe16323a799cf1eb3fe1f8e37fd506248ca32ad605ca3d5ecd37cf29f046da50383e0d0c3d82acf4e472843f3fd40927283f37e02d42cee5d8c72d8b3
+DIST gnome-chess-40.1.tar.xz 741168 BLAKE2B 3691f7aa03532456f9437588641417af4db45b99ffb0f211eca8dffd7a7ba7cf834c7f1e3e2cf6933df96c05b981edb7db3aac430be2c7256d96fca6ecb73db4 SHA512 aae1690724c068717045d70f4fbd5a6cf1fc169ae0bd5df0ae7f0d7a2609c93c482da545008dd3c5d11e975ec8f2c5fc6f4b0007a8f2a1128a75aec2f3fcb083
 EBUILD gnome-chess-3.36.1.ebuild 1038 BLAKE2B 4af1426f1efe41ac44aed3169d5bbd16da26caf62602cca500afb382e636db4d372025abc072378313be0a6bd7226bbe75cd46e923943a3fda3da4f6d8c6d69d SHA512 5f6b6b3ca6b21f2429d1f52152af42637da78b9cae81c2902ba777dcdee1f7b90854c874d4014a4be17ea687c275f9e26e056214fe8831593bd172954a3417dd
+EBUILD gnome-chess-40.1.ebuild 1085 BLAKE2B 4a00c69855b2a11e713b87463b45b0e7e85db8b301907e78dd68f4ab81610fe719fac840ca0b92f86ddbde42d01b9da6a1c0c735e21f66e861edbc3b0161e7de SHA512 4e435424b8ac4600893b2508f92aceed353533462c87533504c86225bbbbc5db57121524928307f7bf3fbba4520acce197555992da0b332d616e4d6df833bb84
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/gnome-chess/gnome-chess-40.1.ebuild b/games-board/gnome-chess/gnome-chess-40.1.ebuild
new file mode 100644
index 000000000000..d0026406ab65
--- /dev/null
+++ b/games-board/gnome-chess/gnome-chess-40.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+VALA_MIN_API_VERSION="0.52"
+
+inherit gnome.org gnome2-utils meson python-any-r1 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"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	gui-libs/gtk:4
+	>=gnome-base/librsvg-2.46.0:2
+"
+DEPEND="${RDEPEND}
+	gnome-base/librsvg:2[vala]
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(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-mahjongg/Manifest b/games-board/gnome-mahjongg/Manifest
index bd2382a930c4..a200a8525244 100644
--- a/games-board/gnome-mahjongg/Manifest
+++ b/games-board/gnome-mahjongg/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-mahjongg-3.36.2.tar.xz 3049356 BLAKE2B bbb7b67580dc6189a02e2695d5952706911bd64c75c34164c19e70e4ac721b1e6c1af57b5ffd1edeae37f10103a1418e6f1134d327d9befc6bd086948076f62b SHA512 f7ed69e5196b6d5df1f6c207df04af7935f54bb838cdd9cfb802d8ea094929a4cb13afa6748056377ef74c96715a748aaffb9c69075c1b00e9a41c82a47ec070
+DIST gnome-mahjongg-3.38.3.tar.xz 3061860 BLAKE2B c4ba84d2b5ebece56fc2de605c9572f10103323f0af9174538cb9124b617a3268c1c0fa27a5634c54b64188b7f1589ae6f14b02370de5edb44742c1b30553456 SHA512 883ed8e2cc6e5efa87adce2dab0843f8b76e4772174cdbe8a535dede714f486d8493058d822a7b8cccff50995d11f3b6cff25d5f77406e931aee5fd479f23bb5
 EBUILD gnome-mahjongg-3.36.2.ebuild 821 BLAKE2B f79e1771a2c413918c4774465333cf36b1b7ce44a03b332b7d2da14ca36abc82a3974a248e01e99a82c683449c5195e12f26f665fbea395b0422a92ab884d168 SHA512 92fbf6bdf8a161cc0d9a43634a26e99dd402858086e09fdbcdda26a3564db1cf92dcf1d6fa2962acfb65d18e2b2f8a86a6c863cdd166e723a8bd5a3b746c2ae2
+EBUILD gnome-mahjongg-3.38.3.ebuild 948 BLAKE2B 01e9712d67348e6130979fa2a60c0659a1fb25133a42ac7b5e1bf236dd087f29de010d94a4d570cac661f3b1847dd3a30b364c2c3885d169aa0d3646d50a6e54 SHA512 dd125237f44f3bf04a4eab2382c9f34721e2ae41045ec4347f4c1aeff64d57e6023c3cf06dbc7686261eb83f10dd4d03b408b8c6ad6d7b3a8330bbbcfe6f9155
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/gnome-mahjongg/gnome-mahjongg-3.38.3.ebuild b/games-board/gnome-mahjongg/gnome-mahjongg-3.38.3.ebuild
new file mode 100644
index 000000000000..d6dd60a49819
--- /dev/null
+++ b/games-board/gnome-mahjongg/gnome-mahjongg-3.38.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 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
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dcompile-schemas=disabled
+		-Dupdate-icon-cache=disabled
+	)
+	meson_src_configure
+}
+
+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 fdf1cbf0c559..55e51b4fa30c 100644
--- a/games-board/gnome-mines/Manifest
+++ b/games-board/gnome-mines/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-mines-3.36.1.tar.xz 274896 BLAKE2B 355275857ff63df5383f45dfb8161bcde4de7adcc088f00cc016d7564f7afa17362307a642e78d9e087be32e44f178282c49a42df5f8f97d530a75473e50adf2 SHA512 3c1080b949ec3ba620048f2c46f844ecf7a872a9d165c3a3c38b103602cebf05c084763a489d58ffda2be23ec42b6803418570936150974cb302cd4d5e4af189
+DIST gnome-mines-40.0.tar.xz 283016 BLAKE2B b764fbcdd709b3f212137c849a2e174d4e3f8d37f6dd9fd38fa4d5a0ed170695a8954bb17252e50cb643a5dc33e7b2da2b03c8eeb4c3ae4a441f685e1d5c60b0 SHA512 e429d1fc2d535bb9a9b1aba4199217bcc46ec4b9b4c8e7fff2394de508a498f142945f62086a862760cc4e31f368e3d123400c6502f67b8482dbf4d044ca619c
 EBUILD gnome-mines-3.36.1.ebuild 842 BLAKE2B 784d5f4fb6562894fdf040be40e2a88369c20184b9c3be7c106d73ec8b2cfa42dddba4d6e069910fc2baaaa0fd9685eb15996dc58e1ecbb761045c319e48d396 SHA512 e74a13352977fd50ae172c9b9d6636aed62e15820fa0e4b75cba7fd6ebb3ad51b29059119e4207cdce27705c6d6bcf33cc8e08cd5c7e2a4a327eb3fa61ebad58
+EBUILD gnome-mines-40.0.ebuild 907 BLAKE2B ff3d0ccb16dc25f7a768a29c7edb7b28bda81444e42e8650fcdf97be0b02ea467b90e3ac2812a210b4727a7a311283fc1d2479e64b230c31de7026776bc28aa2 SHA512 c5b4baecd225a62e499e41c5fdf2971377ce197f0bbf28a517c5b0034e9fb374d153eeca797cb72a2e1654e64c6fe0f8fdf4d7bdbfd47da6c67d8db9fe47a90c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/gnome-mines/gnome-mines-40.0.ebuild b/games-board/gnome-mines/gnome-mines-40.0.ebuild
new file mode 100644
index 000000000000..547c48b85e1f
--- /dev/null
+++ b/games-board/gnome-mines/gnome-mines-40.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org gnome2-utils meson python-any-r1 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"
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	dev-libs/libgee:0.8
+	>=x11-libs/gtk+-3.24:3
+	>=dev-libs/libgnome-games-support-1.7.1:1=
+	>=gnome-base/librsvg-2.32.0:2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(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/gnuchess-book/Manifest b/games-board/gnuchess-book/Manifest
index 841ac95bb23c..73689631bc5e 100644
--- a/games-board/gnuchess-book/Manifest
+++ b/games-board/gnuchess-book/Manifest
@@ -1,3 +1,3 @@
 DIST book_1.02.pgn.gz 26265281 BLAKE2B 0e9b1d8dcaafa5db974ad61444f327669b5618eea661d73069f448ec5263afaac046d5ae15f9bbf5f1aec5d7e224b07a0820527954a6130d759e5fba00ed4b8c SHA512 2fda39fae66a2afaf0084bd482465de04a65b842276760cde69cb6649c0d3b90c5341e10b4d344e06983bdc97ec8802582d622290bc419b8742d3cd6dd39688a
-EBUILD gnuchess-book-1.02-r1.ebuild 554 BLAKE2B c3cde5f8947b4808fcd80649d91cf906b846b5b049f96014060833f63b06ac345370533a6618aff8df53e2855ad4937d99707d395cd4ff00c27e2c3184cbec48 SHA512 29c0a9a9d860380e68db060e80793ce76833d1beca10a4afdd68a2a920eb7352431207add6b2362fa5f12136acef7c09542766338d93d5453dbda6ee7362b3c6
+EBUILD gnuchess-book-1.02-r1.ebuild 548 BLAKE2B 9369da434b537bc79f0a13366f884df0867ec539c7967bbe7bb428ec9b8705b852c7fbbcbd29cd29dc35cd61552d8f592502e19fc7c676705037e9ce6ef01b38 SHA512 dc162b223674a2ce2d37373299dd53f9da907fff29780217053c569a613d19e117b794394cf88c37ec0594530520e3b365b0473ded7e385feb8ff8cc6c895eba
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gnuchess-book/gnuchess-book-1.02-r1.ebuild b/games-board/gnuchess-book/gnuchess-book-1.02-r1.ebuild
index 47e9b358322c..bba4122489d1 100644
--- a/games-board/gnuchess-book/gnuchess-book-1.02-r1.ebuild
+++ b/games-board/gnuchess-book/gnuchess-book-1.02-r1.ebuild
@@ -1,22 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Opening book for gnuchess"
 HOMEPAGE="https://www.gnu.org/software/chess/chess.html"
 SRC_URI="mirror://gnu/chess/book_${PV}.pgn.gz"
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
 RESTRICT="userpriv" # bug #112898
 
-DEPEND=">=games-board/gnuchess-6.2.3"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}
+BDEPEND=">=games-board/gnuchess-6.2.3"
+RDEPEND="${BDEPEND}"
 
 src_compile() {
 	gnuchess --addbook=book_${PV}.pgn || die
diff --git a/games-board/goatee-gtk/Manifest b/games-board/goatee-gtk/Manifest
index 6aff451a5349..4303e010ca0d 100644
--- a/games-board/goatee-gtk/Manifest
+++ b/games-board/goatee-gtk/Manifest
@@ -1,5 +1,3 @@
-DIST goatee-gtk-0.3.1.1.tar.gz 60560 BLAKE2B f58420c1b625b0be47da43ea006cbe68d465ed2ed44e640ad7ffd9f17d738f612321c42bb9bbf76404b1bfd91ae4baee73381881e5185afe653dd10992417dfc SHA512 d745e981171fb1267d4765d90e4906b51a0cd7e7e3804c7f418feea21cc6f047e5e4e70f86f3ed3abbe11800e91ecd4669d566c194ad9b340941e509e6061f70
 DIST goatee-gtk-0.4.0.tar.gz 60655 BLAKE2B 628a43c4e55f7d5d16052a798c5bf7b829aca08a0c27ae176548dbb908508cb5d8bb24d3ee48d8fc8a96e89b59200672a0ed1ab6d811312c7949cbaec4353fb0 SHA512 cb95f2703d21b83e86a5a31ec2a9896170a18e8e7660c657f72e85779af92beb07dea015f3608a6bab58d2ce745f6338a0a7e8c03f46f300bf357d5392672b68
-EBUILD goatee-gtk-0.3.1.1.ebuild 1148 BLAKE2B d5d6710a13f69b4bddd0b319cfd97ebfca2cd94566d026a6296a12cae230e389e236d31eebb4fe252978c22941d0f2d0b065e6941a0803672269fef43e5e2c3a SHA512 0c0b4fdafdab2f947ed21279557fa9ec3df0747473eeb562246dd1d9eb7f9c59bddd367aed73c29ba8ac61ececc05774766f59456537ca12cb3011cc4f8ff6b8
 EBUILD goatee-gtk-0.4.0.ebuild 1048 BLAKE2B 8d46fadfdfc3bc6df42497c7cb67efdbe7348f00e5cdae11307a466a541e73ff741cdd66be2cea0f33d0718bb0cfd1dbd7a855cb88992dd9ab85b6a21ffeadcc SHA512 35629be6bb0f60611f0e46236687371fa0b4c1c0003013924bd2cb38e9b6818d3da4499a574b7050ea33ff10d7f3fdb76955ee71978343b8b88d56f95d871b32
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/games-board/goatee-gtk/goatee-gtk-0.3.1.1.ebuild b/games-board/goatee-gtk/goatee-gtk-0.3.1.1.ebuild
deleted file mode 100644
index c54f83e965bd..000000000000
--- a/games-board/goatee-gtk/goatee-gtk-0.3.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A monadic take on a 2,500-year-old board game - GTK+ UI"
-HOMEPAGE="http://khumba.net/projects/goatee"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-games/goatee-0.3:=[profile?] <dev-games/goatee-0.4:=[profile?]
-	>=dev-haskell/cairo-0.13:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
-	>=dev-haskell/glib-0.13:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	>=dev-haskell/gtk-0.13:=[profile?] <dev-haskell/gtk-0.15:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'directory >= 1.1 && < 1.3' 'directory >= 1.1'
-}
diff --git a/games-board/grhino/Manifest b/games-board/grhino/Manifest
index 66554cc7896a..7c17e0744ddd 100644
--- a/games-board/grhino/Manifest
+++ b/games-board/grhino/Manifest
@@ -1,3 +1,3 @@
 DIST grhino-0.16.1.tar.gz 1178091 BLAKE2B aa5d0c7aab142aabc39d849cbf18cce5aeb57d42f74ad1e2117c57e735d9a6b383fc284cae82c64d5ed8ac809eb364568133e06f42a1062312512becf87df315 SHA512 17fd5539a9d74a715237a51cbf2f3119feae2bed6a26496b02d7882385d5567571ba4b4c4018554944d07322e5a0c3b3235e141579281621f5a030acbe6480e2
-EBUILD grhino-0.16.1-r2.ebuild 680 BLAKE2B 1a4c7d6dd9ac0ff256b236b51486741cacc1bf3743f1c188b2997f097cdfc7229b92b92dac0d243ea2cb9c0df597b146f438615e0830b0c3729f3130d58d5220 SHA512 f9b5d42d27d5d78e52a8ecac328dea1c7c6a10ed8c7f546746258b5da38d6e54286f047bc5e2d35acef78df0c9db0073d811d8d529fbebc761727452556c4074
+EBUILD grhino-0.16.1-r2.ebuild 673 BLAKE2B 9966d8fa4dbc2c34bee07fc492f4855c7a90edb4cd466c75827a64bc8181eec9e727f00675c83c533750aa64cd824851dc360e6d3f74c52982a43e6b8ab320b9 SHA512 0ea0b20bd5d8d4225edd1663d845803d2a99510f7316f2255078b282c86fa09659e59b6326715dace637309a73e3853aa56a99c956bb7dff315aad5a52877a8b
 MISC metadata.xml 338 BLAKE2B 6f62d894b9cfe33c0e396aa372687c9eceab39340ea738952e3fda8d6cf5bd5a64967f65123c586a8d680f0680c038c415ae0ca0618597cb91ecca2b41adb4b6 SHA512 a0a418fe071435f92bff327caaa996f2be67d0f15462c59c8d9889b06c9dfa6adfa53ddd1692427adc95279408dc6787f7c203bf48eb9652fb81886d4b65cab9
diff --git a/games-board/grhino/grhino-0.16.1-r2.ebuild b/games-board/grhino/grhino-0.16.1-r2.ebuild
index 004aa040e4f2..f9bb6602c366 100644
--- a/games-board/grhino/grhino-0.16.1-r2.ebuild
+++ b/games-board/grhino/grhino-0.16.1-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Reversi game for GNOME, supporting the Go/Game Text Protocol"
 HOMEPAGE="http://rhino.sourceforge.net/"
@@ -16,9 +15,8 @@ IUSE="nls"
 RDEPEND="
 	nls? ( virtual/libintl )
 "
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 src_prepare() {
 	default
diff --git a/games-board/iagno/Manifest b/games-board/iagno/Manifest
index 8d89a341f939..8cc07eb552cf 100644
--- a/games-board/iagno/Manifest
+++ b/games-board/iagno/Manifest
@@ -1,4 +1,6 @@
 AUX 3.36.4-vala-posix.patch 820 BLAKE2B 0b2290caa44c7522a5eec6d901afbb2a7eb13788c6a098152bf0ba8c3396b995161646ace14c4683326fe3664442b2b8ffaa026f9a6e7f65bebbe23e96d76a65 SHA512 558a9d3fbc4f42590d93391abd13e27510c7edc56876c4c2e2667a1d61c3edc4f85b876a80a62bfedab1a4ba21bd3a794568635597cf72d78895660c2c8ad863
 DIST iagno-3.36.4.tar.xz 799480 BLAKE2B 430aa403c974728b929a7715e783dd594f00300dd9b0bf8b6f84da7265e31536a5cae17db94bcbdbebe3ef2690cb05bf18292af158016ec18bb695e58ca20f3d SHA512 43775149f76904a19316e5eac990d8dae0a730c3f6798ad88648892d4795b6892a86fb93b78a72fd30853ad36cc5e4b241e1cbd4067c78d6648f1630543f87be
-EBUILD iagno-3.36.4.ebuild 1011 BLAKE2B 12f4d69a409686f0ad8cedc7fe725f66bc864656026256a4c6cdd2ea5fbaf701fc66289d6257274132973434bbfa3ab28445ad0cf8d5ad1b15228f08c6d65309 SHA512 b4c967c5943ed482015d017357a29d737992a5085ea225e70f7c7bfbd7bd3f606b2f4f9596e5785fa6ce14dc6c3523ad05d555f9b4220f8296cd4c71916cd09c
+DIST iagno-3.38.1.tar.xz 766188 BLAKE2B 1265a9b3480bdf2ed949af9fd1e8eb0a8aa996a267d9e0e7c4300232ed857a5ef37fca9942b5bb50606e1fa9bc7058660d11296443d5a90213f76d2fbeb83cd1 SHA512 d36e445c01487a79df6fb6b1b77991118a978716688cf166d593656e1f8dbc3f872d0e739145b9ea9629563457d441918d7f46241d29edae8bdf74f54174d4f1
+EBUILD iagno-3.36.4.ebuild 1039 BLAKE2B 2cecb81940b6de0d8dff3300c0d81e957e18fa15363ec1aae0b066895c4bed53336cb8066744faed6472372c2a8d2f43e2bada79fd025270b239bdc810665e23 SHA512 987661e4f35a959bc782083789f101af640739db32f7362578d02e9dab81d1d89f7eff9fc69da8c18f0efc5a906a59831e29629608c61a924331659ad50c73ce
+EBUILD iagno-3.38.1.ebuild 982 BLAKE2B cc92ca0facd1137354e0361c60f378723222defe4159a376353a688f1897ad9739e784533013c8dc554755c316c5460cf54d81dba1e8355511aaaa47ceb25e65 SHA512 4f3717d98db50c7614acab7901046944b4ed7eb5b9c68f5014c8c83aeac0c2cfa9b978062fbc58ffeab20ce0b816f4360ed18e9393be0ea5448dde749b885237
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/iagno/iagno-3.36.4.ebuild b/games-board/iagno/iagno-3.36.4.ebuild
index 37d961b52406..571d5c20960c 100644
--- a/games-board/iagno/iagno-3.36.4.ebuild
+++ b/games-board/iagno/iagno-3.36.4.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 VALA_MIN_API_VERSION="0.44"
+VALA_MAX_API_VERSION="0.50"
 
 inherit gnome.org gnome2-utils meson vala xdg
 
diff --git a/games-board/iagno/iagno-3.38.1.ebuild b/games-board/iagno/iagno-3.38.1.ebuild
new file mode 100644
index 000000000000..c501ffdf59d8
--- /dev/null
+++ b/games-board/iagno/iagno-3.38.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.44"
+VALA_MAX_API_VERSION="0.50"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Dominate the board in a classic version of Reversi"
+HOMEPAGE="https://wiki.gnome.org/Apps/Reversi"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.42.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/openyahtzee/Manifest b/games-board/openyahtzee/Manifest
index 19a18da3cb79..65131d16126d 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 947 BLAKE2B 5ae04914efbedd4f760418156b62d62d4af839b26c92a380634b792077fc6e93ff7bf08b2c99316476e150cb170ec6db44d7237a03287ad75d1d31a2ebb24e66 SHA512 8c19ba7a9aa442b623a9ac7f0a73b1e9a10cedf606a386897e2e9b22ead5eb3557a1e893ec193c1f2b3e76b046455578e9b670ad0f6e1e406e9283d7db05022b
+EBUILD openyahtzee-1.9.3-r1.ebuild 887 BLAKE2B 255d04f8a41c65bca944e5c498d9c74a3e0ee5d6dd882b7369862972cdf4050a8d9bd62d22126d2ed2be7fb26c76b9e917b08c519d7593cc4358d03918423c05 SHA512 dc33285ce41f898a408b6aa5810ec34ea0266dbbf1adc29f80a45aae7c7a5146069278d80bb9a19e0c883bd3cf8d9169d0c31032bab68e402fbf667e2755434c
 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-r1.ebuild
index def1007cccb9..9d1c1b6e3896 100644
--- a/games-board/openyahtzee/openyahtzee-1.9.3.ebuild
+++ b/games-board/openyahtzee/openyahtzee-1.9.3-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 WX_GTK_VER="3.0"
-inherit eutils flag-o-matic wxwidgets toolchain-funcs versionator
+inherit flag-o-matic toolchain-funcs wxwidgets
 
 DESCRIPTION="A full-featured wxWidgets version of the classic dice game Yahtzee"
 HOMEPAGE="http://openyahtzee.sourceforge.net/"
@@ -12,19 +13,19 @@ SRC_URI="mirror://sourceforge/openyahtzee/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.6
-	dev-libs/boost"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+"
 
 pkg_pretend() {
 	local ver=4.6
 	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
 
 	if tc-is-gcc ; then
-		if ! version_is_at_least ${ver} $(gcc-version); then
+		if ver_test ${ver} -gt $(gcc-version); then
 			die ${msg}
 		fi
 	else
@@ -34,6 +35,6 @@ pkg_pretend() {
 
 src_configure() {
 	append-cxxflags -std=c++11
-	need-wxwidgets unicode
+	setup-wxwidgets
 	econf --datadir=/usr/share
 }
diff --git a/games-board/peg-e/Manifest b/games-board/peg-e/Manifest
index 8287ecba3975..9d95e203adbc 100644
--- a/games-board/peg-e/Manifest
+++ b/games-board/peg-e/Manifest
@@ -1,4 +1,4 @@
 AUX peg-e-1.2.5-gentoo.patch 253 BLAKE2B e9bb860a02f87bc255b2161e3a98c860cde367fede9d5b9bc8bef52d4934cb959fbccb50fe4a79687670fb9a264ea038a37d67c14b2f60c51a59b4818c1ee602 SHA512 8c5952603a748ba7e156451c2d0338a6dd8b89d7f8485f4360b8d353993cfd7e6c03c7b9976c649059c788f80cc4a48441ff628b342e791ba833f2c700af505a
 DIST peg-e-1.2.8-src.tar.bz2 592285 BLAKE2B 67c996978702ace0b249b83c3ea7159583496386114e0548b5570cb0e29ddf0d58375654b00e112228be812296ad28ad199d59f329fcda34cca8951229e35f5d SHA512 063bfb091b95f0613475e7ff9b5762ac563ede3e3a22e420e14cf098d2f6d9801bb8aaa677bddf693bdc4050b4e4be3292c1072429a294e633e2ca734d88ffa0
-EBUILD peg-e-1.2.8.ebuild 694 BLAKE2B 7d0d5e90250a90d48899c0f89d9b99fcd98f39d50d48cf969adec98295108405e811ce5e623269b575fd59a7b4ce4167b2a87cd05c6d64f46fbed04b9a6b9e9b SHA512 d18aabef225d31a07538305f8937884fbc60e11db16c8541f5aa9188e19b98de6ee004aaf3d928816955c5f64b8dfe6fe2a78ed4eb61a0b3b7bbd0116dfcf38a
+EBUILD peg-e-1.2.8.ebuild 685 BLAKE2B dac5e6d62e270fc9cec903d370fefc809e60ee948ca7b288485aff70b3c487a376735ab2c5d18eb2a3dafed97c43c5a52f599841a04eae54039c57b1f1c4c3ed SHA512 59379db891950de6999302a74e9e2dfc15f0f4bfe7fb3f04fb76da717d57f40ccfe44dcbdf130ce3e7b09c09ddbe9f21fd1706b817422fb2b0f7bc2c4144c7b4
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/peg-e/peg-e-1.2.8.ebuild b/games-board/peg-e/peg-e-1.2.8.ebuild
index 40086cd07d19..9af7c5486a30 100644
--- a/games-board/peg-e/peg-e-1.2.8.ebuild
+++ b/games-board/peg-e/peg-e-1.2.8.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop qmake-utils xdg-utils
+inherit qmake-utils xdg-utils
 
-DESCRIPTION="A peg solitaire game"
+DESCRIPTION="Peg solitaire game"
 HOMEPAGE="https://gottcode.org/peg-e/"
 SRC_URI="https://gottcode.org/peg-e/${P}-src.tar.bz2"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/games-board/pioneers/Manifest b/games-board/pioneers/Manifest
index a4e84c065423..a1bd1aa732fa 100644
--- a/games-board/pioneers/Manifest
+++ b/games-board/pioneers/Manifest
@@ -1,4 +1,4 @@
 AUX pioneers-15.5-fno-common.patch 465 BLAKE2B 1ea0122a77ddb954760067ecae5e2704ea7e76ff221ba13126502dc7217ff89592da64f54df4f2d0f99a3567019d4f7db1e73109f3efbabd4959531a563ffa3c SHA512 b37a07ea641d271ade5a243e38b8be71aa8a144332e99079f2dc50f168e943eb914a86381034aadc679382a521e7247ef3e2965844310dbe527b2a5a168cf404
 DIST pioneers-15.5.tar.gz 4975627 BLAKE2B 8cae5df3e122743819196f0442ba18cedcfd4fee51d9e76ef4137f120e3429456f58ca9d6e537b8e0206c937d882b4a22d76ae333a7d5d7dc69d65f7bbd94b18 SHA512 a3261197348d7e994da81ad4948755520bf29678614a9ea2b2cacc81622093c6460b0cee671a04c125684d88a9ee1deb9206ccb73ab1440be1a1505e24b2ed2a
-EBUILD pioneers-15.5.ebuild 1008 BLAKE2B 4a8675b0a4230e7fc8a72d9fc9aa3838fa0263d489bc42e48aca3435da74d09588fa7803a464d9c25a4d83c3b7b78e62cfdc89087b7a939e8a43eb14c9b16a0d SHA512 58f4b5dcdd6bee422d2444da171b4a3fb88b032326d83923046ea58c74bf282c6a5a4cd17d00fe86fc01a9c43c90d173a201d3a73c140a3bd5c043760d07349c
+EBUILD pioneers-15.5.ebuild 1000 BLAKE2B fbea3987216593c661826a308d0d678f1a112751cc809bb09f2d663d139d7529ff389eef3590e03ad20909040bb9420d6efec61c6ba6b4ea6cc726722a1dded3 SHA512 e1a1e4bd50cbb60c19812b8e49cfd5b451f1a94e6d7efe93cd5fb617320035eb532c4138cc91aeafd4ff7c40e11c6b2d3c5eae9c52546a2b8c76ed12aafc5725
 MISC metadata.xml 410 BLAKE2B f48738bf8713786682fa5faedf3ced41b5799418c30b4ac206380387ba64cabb033cbd24468a355d6bf420a65102e2af84f38eab51d28a06a372dfb4d65e940f SHA512 92f6de9f201427ff4063c7604eb0fb2bf7b75ac6ba53bea290efe317042e7022ccf73bc6bbe6307c247786f7009dca27a710f1f13036d8c837305cde84966189
diff --git a/games-board/pioneers/pioneers-15.5.ebuild b/games-board/pioneers/pioneers-15.5.ebuild
index afd322eae4c7..bb0f050eb110 100644
--- a/games-board/pioneers/pioneers-15.5.ebuild
+++ b/games-board/pioneers/pioneers-15.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,11 +23,12 @@ RDEPEND="
 		help? ( app-text/yelp-tools )
 	)
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
+DEPEND="
+	${RDEPEND}
 	dev-util/gob:2
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
 
 DOCS=( AUTHORS ChangeLog README TODO NEWS )
 
diff --git a/games-board/scid/Manifest b/games-board/scid/Manifest
index e01ded2d8cb3..a8f61f52aebe 100644
--- a/games-board/scid/Manifest
+++ b/games-board/scid/Manifest
@@ -5,5 +5,5 @@ DIST ratings.zip 969347 BLAKE2B 47d050f7c0e00e96aa0371db7f328e699cd0e34eafa36526
 DIST scid-4.6.2.zip 9768139 BLAKE2B 8e9baf2fe67c3566111f23ead005cba34d32f986afbaaed2117dc46aab65190dd8675df721c6fff3e7c5f338a07d7b787265dee63480141258625f6b6f54ec6d SHA512 d33f730857362dfefe55aaf395b0fc42087e190743ed63072128509fc6ac33791a4c2f67f89f03ec39170660fc6b7a6804fea084b383cf97cbb21661ce0569b2
 DIST scidlet40k.zip 242632 BLAKE2B a16c5a3c04f721a40221db33f9ff7192dba724203ff81a61286903c2f4ab8a33b442503882550a7a59ab0a0e6d735a74b3f34bf9dd89f9677f2b7a8b8082d398 SHA512 e8cb4ca276ca94378f224fad972b0659f3e8159668fa395dcae4be1de6cdd9d29082fdddba393bbea6c909bab4f388042ea05c7dff41edf850d731bc7479850d
 DIST spelling.zip 3147998 BLAKE2B 40b33e0c5fab487247af13b0e3fa22d91b17cfb1dbc7d3fafd080db306700e684b30bf46a7222dd7ae16dc1407239973be8de1ee619b31cbcb373684a7f1487c SHA512 394a8835f23336b6f4bebe4e33ab9f64ffa505e9d9bb984de82396e671df0b57b088aab28c5cf648c1a11bc28370b431cb6db54765ac4ab6056a707276ba8f42
-EBUILD scid-4.6.2-r1.ebuild 2028 BLAKE2B a7e6960171849369fa8c36bf32a6a486ac2e92e0ae3cd72bbaff8a7594aabc6a753e5dca1cfa1a10ba6e146c2a9e699d0b89c95bd995e5d475daa6ad0cd841c7 SHA512 2ecadaffdd85efaff2d3815d7d996a5744fa81ba786dc1b003480a87408b1d32cc15c7948af6b6619197eec433e6dc8a8fd7a53897b9701cb41bf82721c7725f
+EBUILD scid-4.6.2-r1.ebuild 2032 BLAKE2B b2d3e717e94fe9bb6a1da0c6fc8fc773cd0ad445d17bb0fb3f6faa4eb180c1ec50d40061c2a401fcca250ae1fb0c06f8c2d0db0b6e3529b62ff9345cde57a7d9 SHA512 0fa7c2b39d324ff1311a8d75763f8a880364e8184011aaebfcc17b826afba0ff9fe9ef13a405deec39f180bb9aadaa5498ee1542f6d64ed8ff211d50f4e6bee1
 MISC metadata.xml 327 BLAKE2B 26037c210c23b4fc0936c22b8ae22f33622b2b19a183bcbb69de69c4ed2b02aec5121198ba555cd7049421ae9a0e9824ed1115725bc0e4c9deff9639f88fcd6b SHA512 b3551509e319eba4e682673f363044c3f3b7973299618405e6aa29f44a86527e0f397a6baaface9d95806da7ec2c361c152729b753741694fb9c13760433e5c1
diff --git a/games-board/scid/scid-4.6.2-r1.ebuild b/games-board/scid/scid-4.6.2-r1.ebuild
index ea0557410a43..c82139d32031 100644
--- a/games-board/scid/scid-4.6.2-r1.ebuild
+++ b/games-board/scid/scid-4.6.2-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 PYTHON_COMPAT=( python3_{7,8} )
-inherit eutils toolchain-funcs gnome2-utils python-any-r1
+inherit desktop edos2unix toolchain-funcs gnome2-utils python-any-r1
 
 DESCRIPTION="a free chess database application"
 HOMEPAGE="http://scid.sourceforge.net/"
@@ -16,7 +17,6 @@ SRC_URI="mirror://sourceforge/scid/${P}.zip
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 CDEPEND="dev-lang/tk:0
 	dev-tcltk/tkimg
diff --git a/games-board/sjeng/Manifest b/games-board/sjeng/Manifest
index 801d02e1960b..d64464605e26 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 948 BLAKE2B c456cdffa555792072cd14738d09f2a889cfc7c274ea25fc245e5019bddefd21eb3e79f72f963aa71aa5aa8557680a8bd485279f80ce9a04b606f27dbed1d74d SHA512 978d6e3d141e254986a617a0c437f8123f6a2f24cd9d57a5b0965f1c8e28384fdd0d42d3a1f4fb52661c8e4dfe2563c17a9b3e68740a6f3cbf1e382b35ee6463
+EBUILD sjeng-11.2_p8_p1.ebuild 934 BLAKE2B 59dd680c4b59e83c85c0fa48e52281984b38f34fc07309ba28bf0f5ea0df53e78a9ee74aec714feebb471626d03a6eb2ef40f382408169baa5fd9390fccbd216 SHA512 b03c1e24c23cdfb8e45d0e3e3f460e06a98cca5a4b9e415c502cda63ef2a2ff35d520db29ab96c2d0e811b157b22670ea1ff2917be750ae9d9792e2ae346279d
 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 a34e7ba861cf..517982050393 100644
--- a/games-board/sjeng/sjeng-11.2_p8_p1.ebuild
+++ b/games-board/sjeng/sjeng-11.2_p8_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,6 @@ SRC_URI="
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE=""
 
 RDEPEND="sys-libs/gdbm:0="
 DEPEND="${RDEPEND}"
@@ -46,6 +45,7 @@ src_install() {
 
 	insinto /etc
 	doins sjeng.rc
+
 	insinto /usr/share/games/sjeng
-	doins books/*.opn || die
+	doins books/*.opn
 }
diff --git a/games-board/tali/Manifest b/games-board/tali/Manifest
index 78fafccb1d0e..b8a14f3ecfd0 100644
--- a/games-board/tali/Manifest
+++ b/games-board/tali/Manifest
@@ -1,7 +1,5 @@
-DIST tali-3.36.4.tar.xz 1765348 BLAKE2B 0d4d8bb3b66d58295ecd13e6f985149efb412a6af420baefaea603c9cb043aaa3d353a4930abb18809f42ed2690c81455954778b1a326ca2e9ce36426d0a4668 SHA512 cd01a93ba96d5c8c264e2a73fba3dc16be72a1a1d50f40555e3ef381d3ab03797f25de2a2c7603bd35ac87568f3d43e3763ee65e95dffebe92eafb59d332a3df
-DIST tali-3.38.2.tar.xz 1579972 BLAKE2B 1196f89b3cabcf1cffb36cba5b5e0c98edf9a07e6461bf39c054c35fbb622f3beabfd4e9563592fc44e81cfa18010343cf711b86c80cae33f4df38ad390736da SHA512 8084a3f82148a99c49423f9fd828732300e4c9283be7dbe235f9f74216862d321f106182f0ed95985f37c67e36b20dda5d48db2063a607b08126f3875dbcaae3
 DIST tali-3.38.3.tar.xz 1608024 BLAKE2B 5ab7e799121003a2c5faa1d54395847a215f695ba0cf5b104840bc5c1f9de48f382b305fe79b4fda69c0ac75e71c715a05c6cc34823cab375578a5598ac9c894 SHA512 dff39b3753db2bd6ad4f44a57de73a6524ff781b96b8f33e50e95cad966d91ed613d17e450c67fe669574e8fec73fc0cfe9d37dea7bb5d583cedb2bc8fd443e3
-EBUILD tali-3.36.4.ebuild 652 BLAKE2B 588e7bf429366457b0f8b70de68889359fb42d4c1dc5b91c50dad0cdddfbefc79ea0f1d126febf18bf58a6079b9e2c64544af65c674153105e33bb45c5de73b9 SHA512 212402bff4f44a927adbb18462b90fcce98594f5961cbec96ddae23641c70427bef5f8675b23075acce183e816294b5c04903c6a9b7e719de551c9cb501c938e
-EBUILD tali-3.38.2.ebuild 690 BLAKE2B e01247ac6b196258a09b8ff39719113502b67dba728a40e7c26196bee638a67b72b2f5685489bae7ef9ccd4c227220e9cf67d112f301bd677f2e8a9519a71c1d SHA512 2ea5fbcea8a73e1e4ede283038fb674446cda70c4efd7e42a5b33624dcd7ce08e2e5565fdee36d2aaeaca922e487af769e7963d70dcff884d89777b1c0ed187a
-EBUILD tali-3.38.3.ebuild 689 BLAKE2B 31b5d62ecdc509759b2d943b2e681a0d6e9bce69c35985a45f4353ca62007b29bece6d9cb098d2b54b07b89361c6f9c05742e80be385cc4ecdd395af2726ebc7 SHA512 2f9f3b397b4116d22d8fad85c58aa94c538cc058edbaae464a59634d16620e3f989b64969ab7b6d3ce9bdd0ea6aba4c21208ff6bbd095e8094851fb9acddec0c
+DIST tali-40.0.tar.xz 1608048 BLAKE2B ca32d2448c264d8202ec9123d7de0b79674b81769f7e45a3872148b0a51d1df680ca9d06da97113ad87665052aa8fb0a6e980840f4ee433c643ec0564fb2c487 SHA512 a448f0f4d4d5655a04990245415630c143a57d0be03d8e8468e0c4203faaabef8bdea1f6406e3804c013d68c7b98db423b8b0296c69383080af0390f7d5b6ab9
+EBUILD tali-3.38.3.ebuild 688 BLAKE2B 47010ab823a74b46850ab22a05f18a5a243b73b4eb2a513eea2e3c764c588aaf435e96fd1c1028bdd3c57a843ddc9459f960d4c3fa89ce0c798bdad64a4128c0 SHA512 50251ebb70da16bc62d3783530ad915810f7f888a36d6d3e38da642216577dc09fbf6d6c87218812fd4ba1dbef540ad388b7307c65ec365cc36ae2b86ffda667
+EBUILD tali-40.0.ebuild 746 BLAKE2B c9bc09d409735e79f76572e9a410ad0a564382d72ed7ea19e83d9038c8aadf74a983f3bd5918a712c234bfb9815c15e3c7a0e6da013937821e91ba40a9def7e8 SHA512 41ebf2de7aa03599598d16051dd438730c38df877726c3ef845695d82d9682e0f5eb04d4a401736d6da0007f73ff63800a3e01112f65fb7568d837885f9b5717
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/tali/tali-3.36.4.ebuild b/games-board/tali/tali-3.36.4.ebuild
deleted file mode 100644
index 63eb85f2a0e9..000000000000
--- a/games-board/tali/tali-3.36.4.ebuild
+++ /dev/null
@@ -1,37 +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 xdg
-
-DESCRIPTION="Beat the odds in a poker-style dice game"
-HOMEPAGE="https://wiki.gnome.org/Apps/Tali"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/glib:2
-	>=x11-libs/gtk+-3.16:3
-"
-RDEPEND="${DEPEND}
-	>=gnome-base/librsvg-2.32:2
-"
-DEPEND="
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-board/tali/tali-3.38.3.ebuild b/games-board/tali/tali-3.38.3.ebuild
index 205a4139c867..968b1b7a7005 100644
--- a/games-board/tali/tali-3.38.3.ebuild
+++ b/games-board/tali/tali-3.38.3.ebuild
@@ -9,7 +9,7 @@ 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="
diff --git a/games-board/tali/tali-3.38.2.ebuild b/games-board/tali/tali-40.0.ebuild
index b9cdede99543..e7d48dcfafe5 100644
--- a/games-board/tali/tali-3.38.2.ebuild
+++ b/games-board/tali/tali-40.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org gnome2-utils meson xdg
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
 
 DESCRIPTION="Beat the odds in a poker-style dice game"
 HOMEPAGE="https://wiki.gnome.org/Apps/Tali"
@@ -10,7 +11,6 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Tali"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
 
 DEPEND="
 	dev-libs/glib:2
@@ -20,7 +20,8 @@ DEPEND="
 RDEPEND="${DEPEND}
 	>=gnome-base/librsvg-2.32:2
 "
-DEPEND="
+BDEPEND="
+	${PYTHON_DEPS}
 	dev-libs/appstream-glib
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
diff --git a/games-board/xfreecell/Manifest b/games-board/xfreecell/Manifest
index 4f1991a9ce12..53cb72c0d25d 100644
--- a/games-board/xfreecell/Manifest
+++ b/games-board/xfreecell/Manifest
@@ -1,7 +1,8 @@
+AUX xfreecell-1.0.5b-ar-ranlib.patch 345 BLAKE2B 9eb89fd601dc17793c544bb41976bff76314e43c9c0a958b9bc445b00dce807e6b69537d8b6760070cd04a76cc28f07db3c18d550dc9aac02c9b1dfe95557f0d SHA512 39aef36982c3a5edcf2616e572781b7a4c1deb30baa34285fef443124e6d85d4cc0cd3ea5afe466e8bf26fc9f78194defca76e4f56e709c55fb087782f9b0cdb
 AUX xfreecell-1.0.5b-gcc43.patch 1124 BLAKE2B e4870d1a21b8322146b839bfbe792c5c2c24c93c825bc50ac15057f3d4186e4f6dd4c49c05d773044bc063a8773a55aad0bf1bb0912248ee8033f98611068cab SHA512 0164962559d0ce135ec08b8f143ef90ee3b70bcc4509057709d505e12e2efb3a70848befc187d228fc99ff225a10e415d81f3841796f2868751a2ce2df308e37
-AUX xfreecell-1.0.5b-gentoo.patch 11060 BLAKE2B 631f75fddd90000aa350a97f8f412341fe39c19b34894dbc2ecd5a0b761af1599157dbd9f52b3cbec37d1c0f9201c395af526b957970d1886c55b6e1500476ae SHA512 8109b5b05a20f36bf54eb8c5bee7b5a9031c82419b9efbea7f2513a0d81083fb959f2267357a73a75b5de5966304c62b5d245d7f1cf1e77730f6565a3a438185
+AUX xfreecell-1.0.5b-gentoo.patch 9018 BLAKE2B 6538f72db74de1a6dd1e6d64675dd9cb4bd560e78dbb5a449d8c9edd99817f78b360e9cf6499395f5eab3eb701d505aec8d645bcb0ef3f873426ef7195a604df SHA512 94a1c095da08c50dd941d6701409b1f7cf802a26aae310175d5d9cf657b3ed61440633a5d13d42767101bc628bd8ced46f0fa9f4019aa9222147d8540799dfc9
 DIST MSNumbers.gz 1212278 BLAKE2B f976aed03fd176407cddc91ecdc42c26a94bc6e8cb09b24dc3f2e577c05d7a2695e7a33e9784e411cdcb30e7d411f5a6712214660ee0dffd732b0136913afc2f SHA512 6a8215f72bb4f10262c41875e1668bc5bb691f9ba2b803162675cf1fb8ce6090f6009727939ecb86301de76264d35d7d10614887b677055ac470975029e55785
 DIST xfreecell-1.0.5b-gcc6.patch.xz 18888 BLAKE2B b0bbba9a093bb00bdc3d21da61375db8d0cd189adae545c149b0816088a595d585df1e15da9da76696df74fe15a23b4b74d298575fc87b9b9a49efaa168982f3 SHA512 08c544d14c43bcfccb4eee7e99d77225297be8274b85de98edcb4fa297060f8b219814729286f90939b99427b4d32725c82134b860939b5894ccbba2e15226d9
 DIST xfreecell-1.0.5b.tgz 49367 BLAKE2B 6a2fd34f025cd86e55a9f8fe3d4294396078b850e014b6df5584b0ee575856d99ceeae7822d0ae33e168003b4b673920bb03dfbbf4130f46adcdc5acc79c25cf SHA512 b4437d9c78d5a6cb5fabd0157528aef85aa1d01b87875314e122d1eafbe5808af67b7b4dbf4db8e70d3d5193b10e61cc20210725b75c01ca6ff6db2b5840a64c
-EBUILD xfreecell-1.0.5b-r1.ebuild 973 BLAKE2B c6eb237433230abaa3ff8cc07a8df1af6672d3383470fcfce56606674b5fc3a998aca95cd85448f07f2c38629eed9539825f4f19226f7e42c3274ed06fb595c0 SHA512 885942c051cb61c0d33e505b532e05d4a6bc5cdf9709a8b96179543e1b98d86e8f0ccfe35c5307f44cd0455aefb326a8d00f5f1b3e81eada091764d9cf4f34b5
+EBUILD xfreecell-1.0.5b-r1.ebuild 1071 BLAKE2B 60df0b8090f7871c8ef3e25ac42f1622c3b7e968a9f67319d919be6ce412a65d40c6fc5bac0319876e9dc291baa79ac968330c24c74e0dceb61e655136c56a29 SHA512 3328386ffee025473e1b33c23adfe30cf3009333b701effedf96f1c405d31b602e78b8c04587810988c64538407b1cf10caf1b6ca94753a55920a02f0ea27cca
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/xfreecell/files/xfreecell-1.0.5b-ar-ranlib.patch b/games-board/xfreecell/files/xfreecell-1.0.5b-ar-ranlib.patch
new file mode 100644
index 000000000000..d2fd441cba17
--- /dev/null
+++ b/games-board/xfreecell/files/xfreecell-1.0.5b-ar-ranlib.patch
@@ -0,0 +1,15 @@
+diff --git a/widget/makefile b/widget/makefile
+index 93b178b..eeedc51 100644
+--- a/widget/makefile
++++ b/widget/makefile
+@@ -16,8 +16,8 @@ tgz:
+ 	tar cvzf widget.tgz *.cpp *.h makefile
+ 
+ dummy: $(OBJECTS)
+-	ar r $(LIBNAME) $(OBJECTS)
+-	ranlib $(LIBNAME)
++	$(AR) r $(LIBNAME) $(OBJECTS)
++	$(RANLIB) $(LIBNAME)
+ 	mv $(LIBNAME) ..
+ 	touch dummy
+ 
diff --git a/games-board/xfreecell/files/xfreecell-1.0.5b-gentoo.patch b/games-board/xfreecell/files/xfreecell-1.0.5b-gentoo.patch
index 85a2e4dd3c41..02cd51bd53c2 100644
--- a/games-board/xfreecell/files/xfreecell-1.0.5b-gentoo.patch
+++ b/games-board/xfreecell/files/xfreecell-1.0.5b-gentoo.patch
@@ -1,6 +1,5 @@
-diff -ru xfreecellg/card.cpp xfreecell/card.cpp
---- xfreecellg/card.cpp	1999-03-27 05:36:28.000000000 -0800
-+++ xfreecell/card.cpp	2004-02-25 02:17:24.000000000 -0800
+--- a/card.cpp
++++ b/card.cpp
 @@ -119,7 +119,7 @@
      int oldy = y();
      int newx = dest_x;
@@ -10,9 +9,8 @@ diff -ru xfreecellg/card.cpp xfreecell/card.cpp
      float curx = (float) oldx;
      float cury = (float) oldy;
  
-diff -ru xfreecellg/freecell.cpp xfreecell/freecell.cpp
---- xfreecellg/freecell.cpp	1999-07-27 07:15:27.000000000 -0700
-+++ xfreecell/freecell.cpp	2004-02-25 02:18:13.000000000 -0800
+--- a/freecell.cpp
++++ b/freecell.cpp
 @@ -64,7 +64,7 @@
  static GameNumberManager* gnManager; 
  static const int PathLength = 256;
@@ -31,9 +29,8 @@ diff -ru xfreecellg/freecell.cpp xfreecell/freecell.cpp
  
    if (home == NULL) {
      fprintf(stderr, "Cannot get $HOME. Assuming I am at home directory now.\n");
-diff -ru xfreecellg/gnmanager.cpp xfreecell/gnmanager.cpp
---- xfreecellg/gnmanager.cpp	1999-07-27 07:18:05.000000000 -0700
-+++ xfreecell/gnmanager.cpp	2004-02-25 02:17:24.000000000 -0800
+--- a/gnmanager.cpp
++++ b/gnmanager.cpp
 @@ -16,7 +16,7 @@
  GameNumberManager::GameNumberManager()
  {
@@ -61,9 +58,8 @@ diff -ru xfreecellg/gnmanager.cpp xfreecell/gnmanager.cpp
  {
    FILE* fp = fopen(file.c_str(), "w+");
  
-diff -ru xfreecellg/gnmanager.h xfreecell/gnmanager.h
---- xfreecellg/gnmanager.h	1999-03-29 05:07:19.000000000 -0800
-+++ xfreecell/gnmanager.h	2004-02-25 02:17:24.000000000 -0800
+--- a/gnmanager.h
++++ b/gnmanager.h
 @@ -2,7 +2,13 @@
  #define GNManager_H
  
@@ -98,9 +94,8 @@ diff -ru xfreecellg/gnmanager.h xfreecell/gnmanager.h
  
    hash_set<int> msWonGames;
    hash_set<int> msLostGames;
-diff -ru xfreecellg/makefile xfreecell/makefile
---- xfreecellg/makefile	1999-04-03 05:42:49.000000000 -0800
-+++ xfreecell/makefile	2004-02-25 02:17:48.000000000 -0800
+--- a/makefile
++++ b/makefile
 @@ -1,16 +1,15 @@
  OBJECTS=card.o freecell.o option.o stack.o subwindows.o undo.o util.o gnmanager.o random.o
 -CC=g++
@@ -146,9 +141,8 @@ diff -ru xfreecellg/makefile xfreecell/makefile
 -#	install ms-compatible/MSNumbers $(DESTDIR)/usr/local/lib/xfreecell
 \ No newline at end of file
 +#	install ms-compatible/MSNumbers $(DESTDIR)/usr/share/xfreecell
-diff -ru xfreecellg/option.h xfreecell/option.h
---- xfreecellg/option.h	1999-03-27 11:39:17.000000000 -0800
-+++ xfreecell/option.h	2004-02-25 02:17:24.000000000 -0800
+--- a/option.h
++++ b/option.h
 @@ -22,7 +22,7 @@
    void readPrefs();
    void writePrefs();
@@ -158,9 +152,8 @@ diff -ru xfreecellg/option.h xfreecell/option.h
  
    static int _speedup;
    static bool _queryWindow;
-diff -ru xfreecellg/stack.h xfreecell/stack.h
---- xfreecellg/stack.h	1999-03-02 10:20:02.000000000 -0800
-+++ xfreecell/stack.h	2004-02-25 02:17:24.000000000 -0800
+--- a/stack.h
++++ b/stack.h
 @@ -28,7 +28,7 @@
    int _next_x, _next_y;
  
@@ -170,9 +163,8 @@ diff -ru xfreecellg/stack.h xfreecell/stack.h
  };
  
  class PlayStack : public Stack {
-diff -ru xfreecellg/subwindows.h xfreecell/subwindows.h
---- xfreecellg/subwindows.h	1999-03-15 15:09:49.000000000 -0800
-+++ xfreecell/subwindows.h	2004-02-25 02:17:24.000000000 -0800
+--- a/subwindows.h
++++ b/subwindows.h
 @@ -76,7 +76,7 @@
    int _undos;
    int _totalScore;
@@ -182,9 +174,8 @@ diff -ru xfreecellg/subwindows.h xfreecell/subwindows.h
  
    bool exitPressed;
  
-diff -ru xfreecellg/undo.cpp xfreecell/undo.cpp
---- xfreecellg/undo.cpp	1999-03-25 07:48:40.000000000 -0800
-+++ xfreecell/undo.cpp	2004-02-25 02:17:24.000000000 -0800
+--- a/undo.cpp
++++ b/undo.cpp
 @@ -22,7 +22,7 @@
    c->moveToStack(from, false, false);
  }
@@ -194,9 +185,8 @@ diff -ru xfreecellg/undo.cpp xfreecell/undo.cpp
  
  void undoClearMoves()
  {
-diff -ru xfreecellg/widget/container.cpp xfreecell/widget/container.cpp
---- xfreecellg/widget/container.cpp	1999-03-03 09:34:52.000000000 -0800
-+++ xfreecell/widget/container.cpp	2004-02-25 02:17:24.000000000 -0800
+--- a/widget/container.cpp
++++ b/widget/container.cpp
 @@ -61,18 +61,18 @@
  
  void NSContainer::remove(NSComponent* nsc)
@@ -233,9 +223,8 @@ diff -ru xfreecellg/widget/container.cpp xfreecell/widget/container.cpp
        if (nscVec.size() == 0) {
  	_width = 0; _height = 0;
        } else {
-diff -ru xfreecellg/widget/makefile xfreecell/widget/makefile
---- xfreecellg/widget/makefile	1999-03-17 21:54:57.000000000 -0800
-+++ xfreecell/widget/makefile	2004-02-25 02:17:59.000000000 -0800
+--- a/widget/makefile
++++ b/widget/makefile
 @@ -1,15 +1,13 @@
  OBJECTS=window.o plate.o string.o button.o label.o textfield.o container.o frame.o util.o scrollbar.o font.o main.o
 -#C=/usr/local/gcc-2.8.1/bin/g++
@@ -255,17 +244,15 @@ diff -ru xfreecellg/widget/makefile xfreecell/widget/makefile
  
  clean:
  	rm -f *.o *~ a.out .nfs* dummy
-diff -ru xfreecellg/widget/textfield.cpp xfreecell/widget/textfield.cpp
---- xfreecellg/widget/textfield.cpp	1999-03-03 09:34:52.000000000 -0800
-+++ xfreecell/widget/textfield.cpp	2004-02-25 02:17:24.000000000 -0800
+--- a/widget/textfield.cpp
++++ b/widget/textfield.cpp
 @@ -1,3 +1,4 @@
 +#include <cctype>
  #include "widget.h"
  
  GC NSTextField::gc;
-diff -ru xfreecellg/widget/widget.h xfreecell/widget/widget.h
---- xfreecellg/widget/widget.h	1999-03-15 08:29:32.000000000 -0800
-+++ xfreecell/widget/widget.h	2004-02-25 02:17:24.000000000 -0800
+--- a/widget/widget.h
++++ b/widget/widget.h
 @@ -114,7 +114,7 @@
      Elt(NSWindow* nw, Window w) { nswindow = nw; window = w; }
    };
@@ -302,9 +289,8 @@ diff -ru xfreecellg/widget/widget.h xfreecell/widget/widget.h
  };
  
  // ##### NSHContainer #####
-diff -ru xfreecellg/widget/window.cpp xfreecell/widget/window.cpp
---- xfreecellg/widget/window.cpp	1999-03-03 09:34:52.000000000 -0800
-+++ xfreecell/widget/window.cpp	2004-02-25 02:17:24.000000000 -0800
+--- a/widget/window.cpp
++++ b/widget/window.cpp
 @@ -2,7 +2,7 @@
  
  bool NSWindow::windowInitialized = false;
diff --git a/games-board/xfreecell/xfreecell-1.0.5b-r1.ebuild b/games-board/xfreecell/xfreecell-1.0.5b-r1.ebuild
index b5e38916ce0a..309d1fc0d90a 100644
--- a/games-board/xfreecell/xfreecell-1.0.5b-r1.ebuild
+++ b/games-board/xfreecell/xfreecell-1.0.5b-r1.ebuild
@@ -1,39 +1,49 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="A freecell game for X"
 HOMEPAGE="http://www2.giganet.net/~nakayama/"
 SRC_URI="http://www2.giganet.net/~nakayama/${P}.tgz
 	http://www2.giganet.net/~nakayama/MSNumbers.gz
 	https://dev.gentoo.org/~dilfridge/distfiles/${P}-gcc6.patch.xz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="HPND"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="media-fonts/font-misc-misc
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
 
-S=${WORKDIR}/${PN}
+RDEPEND="
+	media-fonts/font-misc-misc
+	x11-libs/libXext
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-gcc43.patch
 	"${WORKDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-ar-ranlib.patch
 )
 
+src_configure() {
+	tc-export AR CXX RANLIB
+}
+
 src_install() {
 	dobin xfreecell
+
 	insinto /usr/share/${PN}
 	doins "${WORKDIR}"/MSNumbers
 	dodoc CHANGES README mshuffle.txt
 	doman xfreecell.6
+
 	make_desktop_entry xfreecell XFreecell
 }
 
diff --git a/games-board/xgammon/Manifest b/games-board/xgammon/Manifest
index 18686ad8a419..72588c9e9256 100644
--- a/games-board/xgammon/Manifest
+++ b/games-board/xgammon/Manifest
@@ -3,5 +3,5 @@ AUX xgammon-0.98-fno-common.patch 2284 BLAKE2B 88dcb8c85d4659a7f381ade1b4197ba9c
 AUX xgammon-0.98-glibc-2.32.patch 440 BLAKE2B 593dfaf0ecea283d5843b8864e9aeee9b1d3f5d8000f938b8dab733b93688e129c04055030446a844021845006e1a41d166d911f7cafd23a91c031e48a8d269b SHA512 d39dd68fcda62a4f1d57dc6a24aca9a5df4f3849ec96460dbcd07b50adfa10db99557e2f713a5b59ed0ad79cd315baaa3212190c635c42088d9111c0dbd3fe67
 AUX xgammon-0.98-r2-config.patch 819 BLAKE2B c9a31a1592065f439cedb89c9ca29da0c55e47e8621788dcc8b2c3c3aa4a6cf8ab509a40cf74b550725ecf248653f354dc10db74957adeaa489baae42f41c16a SHA512 f76d5217409b39e998f6f172a7dacaff400272e13b837ea3a839e463d46eeabd5bab0e88d6ad7d3133d3e66300e6f4f1ed7880abada4cf0071f740475574ed78
 DIST xgammon-0.98a.tar.gz 76415 BLAKE2B 617ca76b8ebe22f753f20f94fc536008c119237e24ad1011a88780416405db95c5155759548e6719c328067387e1cbc052b0ebbbc020ad8e028f564cfcd3c3f1 SHA512 1176146d7cf4d5cbf47e911190de329d87650084044d1a2e5a53ed367d2b90ec63c0e906946c4523c2fb21b68df8b86cf0567527a91058e8db66a76086a02092
-EBUILD xgammon-0.98-r2.ebuild 1032 BLAKE2B 8da2da5fd782326edfb6ea0cbd16d3e28df858478cd001975ad7c6ffebdf9a5b0304861ffc075a1d47a65c262343abf4520fe94bc472e9e2d832a1dbf633f42b SHA512 5e5c01794d10c22353d6c83774236f7b14efec78673d0c6678ef6e731573840a6e49988883455414601a9417eae75786650ca32653047d2b49a621c8b9310b66
+EBUILD xgammon-0.98-r3.ebuild 1282 BLAKE2B 079c3573289f328ffaf0eda65399bdf2f1174eac20abd43f078da589b99e93386531e58fca28db7c0227cd8b9e46e20069fd8c847552efc4c1e41e1488cfad36 SHA512 6a9842265431b6b737d79793df9f0af4434b371f90d2d8ed3cbc3d777ae4a60ccbae2e5c5422236f23d7703bdda05f9fc5015a31f371cdee7fd08de06d8bba8b
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/xgammon/xgammon-0.98-r2.ebuild b/games-board/xgammon/xgammon-0.98-r3.ebuild
index bc9581d4f527..6b1305059c62 100644
--- a/games-board/xgammon/xgammon-0.98-r2.ebuild
+++ b/games-board/xgammon/xgammon-0.98-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,11 +16,12 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXaw
-	x11-libs/libXt"
+	x11-libs/libXt
+	!<x11-terms/kterm-6.2.0-r7"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-text/rman
-	x11-misc/imake"
+	>=x11-misc/imake-1.0.8-r1"
 
 S="${WORKDIR}/${P}a"
 
@@ -32,7 +33,8 @@ PATCHES=(
 )
 
 src_configure() {
-	xmkmf || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_compile() {
@@ -42,6 +44,12 @@ src_compile() {
 		CC="$(tc-getCC)"
 }
 
+src_install() {
+	default
+	# remove link to avoid collision (bug #668892)
+	rm "${ED}"/usr/$(get_libdir)/X11/app-defaults || die
+}
+
 pkg_postinst() {
 	einfo "xgammon need helvetica fonts"
 	einfo "They can be loaded emerging media-fonts/font-adobe-100dpi"
diff --git a/games-board/xmille/Manifest b/games-board/xmille/Manifest
index 6c1ce9b0d9bd..6ee2c542463a 100644
--- a/games-board/xmille/Manifest
+++ b/games-board/xmille/Manifest
@@ -1,4 +1,4 @@
 DIST xmille_2.0-13.diff.gz 6276 BLAKE2B bf136bc25d3aea56b671b6ff475717d162f0620a1c8c07d3b96b9d7a4b9b9f3ccae1039fc24827048686c631312c36e450a8bd989c32e9d26ab1c594ffc317d9 SHA512 d9e4448942738a105255d9aa77e2e66cb9edc8b35fd8278d1c810dbdca4a5b8a4916bf48c8d6a16e282db0c0fa058a0b281c168976529edeedb6caf53af7cd15
 DIST xmille_2.0.orig.tar.gz 68178 BLAKE2B bd6ab40a8868b90bfc1b045a2be797c8eab49e676b695f521ceaf8646de9c01a07806c0ce029e4959a339e2ab48668635abd5b842c90e33c2cb5fd359eb971b8 SHA512 028740785dfc13b4088810855358b9dab75fbb79221dd4218ef0c19550c2180fe92e553d0a474bf45091b4008988e1a093a6d5bac99fe1ccafcaec3429cd0e8b
-EBUILD xmille-2.0-r4.ebuild 961 BLAKE2B bca35cf3d6969e3d97e10e678af4deda476be1916faed0b37f0d6349ade52bb3a8344b5a27b25f7505b8cf68d1a3fcd5ffcc278603a0b868f053f055e65b3481 SHA512 043fce7e5f67b30bcc16b47c078022bdc8fac92d34a58eb2870c05f9a42b796b4d3ad5946d63b776091bb0f51d16b7f0705ca6bff42b0653a0e67ffa34da60d3
+EBUILD xmille-2.0-r4.ebuild 1052 BLAKE2B 283bf16e95bfc428ebe2b058b974f01fc610014564acd72d95b37b17b949cf60e82f56c89a9fb0d05c08ba816e88153cb4599b3f3e555b889de2d2ec5899ef73 SHA512 ffd569dcebf81830d8168f7579088edd7edfa046e7b24d0d1a8372db0116d9a25e9231a63627d95f992f97b8ad881a44351532cd772d4b020a91c8f68715cf35
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/xmille/xmille-2.0-r4.ebuild b/games-board/xmille/xmille-2.0-r4.ebuild
index 4ca1f38b7603..966fec4aec02 100644
--- a/games-board/xmille/xmille-2.0-r4.ebuild
+++ b/games-board/xmille/xmille-2.0-r4.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 
 BDEPEND="
 	app-text/rman
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 "
 RDEPEND="x11-libs/libXext"
 DEPEND="${RDEPEND}"
@@ -29,12 +29,13 @@ src_prepare() {
 }
 
 src_configure() {
-	xmkmf || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_compile() {
 	emake -j1 \
-		AR="$(tc-getAR) clq" \
+		AR="$(tc-getAR) cq" \
 		RANLIB="$(tc-getRANLIB)" \
 		CC="$(tc-getCC)" \
 		CDEBUGFLAGS="${CFLAGS}" \
diff --git a/games-board/xscrabble/Manifest b/games-board/xscrabble/Manifest
index 7600f8356bde..4a9f853c836e 100644
--- a/games-board/xscrabble/Manifest
+++ b/games-board/xscrabble/Manifest
@@ -1,7 +1,8 @@
-AUX xscrabble-2.10-build.patch 305 BLAKE2B a1663515d317f57f534ed94eaea2059b80583826e9b1d831972d8d7eef635cc9c0182f81f70e42d7df6f521ece481d10d7f20b158257f0efee4c08870cb38019 SHA512 f62fba061b464ae9ff4f4e5c15196ac921760e7f6bfe7432a33c157e405a4784ebaa45a08e67ee191faf62f0dc447559df8f73b91d819d4f6d4e3470c335c07e
-AUX xscrabble-2.10-path-fixes.patch 1106 BLAKE2B 4730587df34bc407403624659d9f6d43c0fa2c6aa46fe06f615ed390590c468780c9521d14ec312b429f2a41d60e6dbdb712a52f1e5fb27b9c3e9449b1f1d1af SHA512 50be14204d8b8c4f13153bcdab855c0fac27639d7a09844a5aae794bf3dbdaf1da6b8aa15ac065d2d35f47c47dfa0bec89e4c9f6231a4a7f2b9a095710c912d4
+AUX xscrabble-2.10-build.patch 309 BLAKE2B 99b1e6b3b361f7343560e39b6a3114f8d6de71077dd54de53488937bb404290101dd9b2e5f148947f1c4c82a91f52c3337c547be2f64a8c4e0679fd5ec70bc32 SHA512 4b5a5c88d41400ca82549d1b01fea64d1cce5cc8f3cb1c4d6c1be9bd028c814d3aa14583c56786917757e09cb3c18898a0059f82f4c979f423b746a896de7dc6
+AUX xscrabble-2.10-implicit-declaration.patch 244 BLAKE2B 8fe268dbd47e643fb8438218dc69a4edbbcef7e55c5e482e14ac79e78b53bf6c74a63c6915ecf92611e85cc12f6a34345ce03adb8609e702674ef697683cd002 SHA512 403ff36897f7de466acaa95e4e8adf7dc096c73c1b0d90988962487465c0ee4078a2905d6a92d3740867cd5fbfdf5c6ec5eeec3a58c55dd2dbe249a20344c01f
+AUX xscrabble-2.10-path-fixes.patch 1098 BLAKE2B d0144aa6d8d81a30d43f6359bc4562a3d62aca10bcfc243efcec562c598bd67ba509889e1e68facbbf66cb5e1e2739fd6d04e3829ada60798e3bf3cc368be09f SHA512 0c33331e6704f384341e27356dd0974a26316b38a54f23f6370b989c85b7c080a90ad1ae7fd7aed776a66fbfa8a4a4abb5c37ee3cb63403913b8134ee0a88baa
 DIST xscrabble-2.10.tgz 83575 BLAKE2B 0a7ac0713e8b48eaf770d11d8ddf5fc383f870437dbc12b6e90df3fb4c28559e28523f46461e306dde59a68cebf58e854959e58ec688201223eec9825e3c5e7a SHA512 38137b3dfd3156c3748719136a30fbc7f04910538bdbdec3e9d50e3efe326ab7119a45171e0fa2cd95cd81f0642070e2e011c165284766eb7a14bd7d2aa660db
 DIST xscrabble_en.tgz 393527 BLAKE2B 3f5b9d8030ba2711e64b2cc015f8662bdcfc2d3155d34b17be243a57e8c7dc3e4ad5fc6414c745654a8ea5771a9914d38bf5ce95b42e9b7daa70907bd9105b06 SHA512 05e4bca6ec2a9b7698f5c266bf5cede574cbef87883d7cac6dc35084fa2976dcd23f3a2215b674b9f36d7c170e6af021c3ec0884f06c9803cd67ec300651ac41
 DIST xscrabble_fr.tgz 810737 BLAKE2B 26f5601f5d09232a5145c66d1d359c7a6b389a83f10c1ebcddc7579160d417e0b0b9e5bccf7322128451f3941cdeb2177b26f4ddf9a8224ffd551d95f4a83d72 SHA512 f5425fa8bffec57e6eff16a3d33ae4569fc00343e0ed5e4f4e1e189ed02a5be7416c1549b1978042e030efbfb3a484abcac9479e7fe43de929b11d8ccf8ea3e1
-EBUILD xscrabble-2.10-r2.ebuild 1421 BLAKE2B 2e5785de0a18a84a4c1a5bae22df2c71a2c257b5f3b263c6fa6cdfe13a886417989bc57b8a3181366495ff350851b91bc4d1fae285379c1698e51169d654e2d8 SHA512 5aaa92eb29a78257e9c1f1908b2ef22798896ac2902169e5eb05eb50b881c7daa1187c316285e9b2e7b40f7944667784ce124b3bc2b8adf576a78540f963317e
+EBUILD xscrabble-2.10-r4.ebuild 2019 BLAKE2B 2abd60909f97c7f184246e9cd6ffb609a091ce3d1d94d403aa12159df2ff7d0c829a3a31bbb370539c6f11c8213e691dda1851f47aeb0d33f9ba8311ef006bfd SHA512 7b23fff9af603d63a0978f3089f80dae71fd768d6417a23222c56abb29a3f6e20ff8e0894704d5a854f09faa9d0524d1ae4d7f318cc98750d08621d71024a10b
 MISC metadata.xml 330 BLAKE2B 12712dc48fa06f3a64f7e994b853cc26c78eec98d147e1eba89bfd0ae58a134090376b18738090e3d929835cd596afc6fb9efe13dfe631cd8e8444b890470fdf SHA512 eb06666ebcaeac24c97b66c25652551043abae3bcd2764cd95f1d94ab8422a178fb5358d2aa655b75d254462120d36a87e64a2decb0c8a7ac255015ec1ee057e
diff --git a/games-board/xscrabble/files/xscrabble-2.10-build.patch b/games-board/xscrabble/files/xscrabble-2.10-build.patch
index 7d5214c7db34..c290475e482b 100644
--- a/games-board/xscrabble/files/xscrabble-2.10-build.patch
+++ b/games-board/xscrabble/files/xscrabble-2.10-build.patch
@@ -1,7 +1,7 @@
 respect compiler, ldflags and cflags
 
---- build
-+++ build
+--- a/build
++++ b/build
 @@ -36,7 +36,7 @@
  #define RULES_FILE \"$LIBDIR/en/scrabble_rules\"
  " > src/config.h
diff --git a/games-board/xscrabble/files/xscrabble-2.10-implicit-declaration.patch b/games-board/xscrabble/files/xscrabble-2.10-implicit-declaration.patch
new file mode 100644
index 000000000000..88c9cd680e99
--- /dev/null
+++ b/games-board/xscrabble/files/xscrabble-2.10-implicit-declaration.patch
@@ -0,0 +1,12 @@
+diff --git a/src/xutils.c b/src/xutils.c
+index 25478df..26e3277 100644
+--- a/src/xutils.c
++++ b/src/xutils.c
+@@ -22,6 +22,7 @@
+ #include <X11/Xaw/Simple.h>
+ #include <X11/xpm.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #include "xutils.h"
+ 
diff --git a/games-board/xscrabble/files/xscrabble-2.10-path-fixes.patch b/games-board/xscrabble/files/xscrabble-2.10-path-fixes.patch
index 27a18689b1ed..5a0fe1a7e7d5 100644
--- a/games-board/xscrabble/files/xscrabble-2.10-path-fixes.patch
+++ b/games-board/xscrabble/files/xscrabble-2.10-path-fixes.patch
@@ -1,5 +1,5 @@
---- build
-+++ build
+--- a/build
++++ b/build
 @@ -1,9 +1,10 @@
  #!/bin/sh
  
@@ -9,8 +9,8 @@
 -LIBDIR=/usr/games/lib/scrabble
 +APPDEFAULTS=$DESTDIR/usr/$LIBDIR/X11/app-defaults
 +REAL_APPDEFAULTS=/usr/$LIBDIR/X11/app-defaults
-+BINDIR=$DESTDIR/usr/games/bin
-+LIBDIR=$DESTDIR/usr/share/games/xscrabble
++BINDIR=$DESTDIR/usr/bin
++LIBDIR=$DESTDIR/usr/share/xscrabble
  
  # Version (don't modify without knowing!!)
  MAJOR=2
diff --git a/games-board/xscrabble/xscrabble-2.10-r2.ebuild b/games-board/xscrabble/xscrabble-2.10-r2.ebuild
deleted file mode 100644
index 2ea0730cfc70..000000000000
--- a/games-board/xscrabble/xscrabble-2.10-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib games
-
-DESCRIPTION="An X11 clone of the well-known Scrabble"
-HOMEPAGE="http://freshmeat.net/projects/xscrabble/?topic_id=80"
-SRC_URI="ftp://ftp.ac-grenoble.fr/ge/educational_games/${P}.tgz
-	l10n_fr? ( ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_fr.tgz )
-	ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_en.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="l10n_fr"
-
-RDEPEND="x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	x11-misc/gccmakedep
-	x11-misc/imake"
-
-src_unpack() {
-	unpack ${P}.tgz
-	cp "${DISTDIR}"/xscrabble_en.tgz .
-	use l10n_fr && cp "${DISTDIR}"/xscrabble_fr.tgz .
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-path-fixes.patch \
-		"${FILESDIR}"/${P}-build.patch
-	sed -i '/install/s/-s //' build || die "sed failed"
-}
-
-src_compile() {
-	./build bin || die "build failed"
-}
-
-src_install() {
-	local f
-	export DESTDIR="${D}" LIBDIR="$(get_libdir)"
-	./build install || die "install failed"
-	if use l10n_fr ; then
-		./build lang fr || die "fr failed"
-	fi
-	./build lang en || die "en failed"
-	for f in "${D}"/usr/"${LIBDIR}"/X11/app-defaults/* ; do
-		[[ -L ${f} ]] && continue
-		sed -i \
-			-e "s:/usr/games/lib/scrabble/:${GAMES_DATADIR}/${PN}/:" \
-			-e "s:fr/eng:fr/en:" \
-			${f} || die "sed ${f} failed"
-	done
-	dodoc CHANGES README
-	prepgamesdirs
-}
diff --git a/games-board/xscrabble/xscrabble-2.10-r4.ebuild b/games-board/xscrabble/xscrabble-2.10-r4.ebuild
new file mode 100644
index 000000000000..f60f7b5ce43f
--- /dev/null
+++ b/games-board/xscrabble/xscrabble-2.10-r4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="An X11 clone of the well-known Scrabble"
+HOMEPAGE="http://freshmeat.net/projects/xscrabble/?topic_id=80"
+SRC_URI="ftp://ftp.ac-grenoble.fr/ge/educational_games/${P}.tgz
+	l10n_fr? ( ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_fr.tgz )
+	ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_en.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="l10n_fr"
+
+DEPEND="x11-libs/libXaw"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+	!<x11-terms/kterm-6.2.0-r7
+"
+BDEPEND="
+	x11-misc/gccmakedep
+	>=x11-misc/imake-1.0.8-r1
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-path-fixes.patch
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-implicit-declaration.patch
+)
+
+src_unpack() {
+	unpack ${P}.tgz
+	cp "${DISTDIR}"/xscrabble_en.tgz . || die
+
+	if use l10n_fr ; then
+		cp "${DISTDIR}"/xscrabble_fr.tgz . || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Don't strip binaries
+	sed -i '/install/s/-s //' build || die
+	# Respect AR, RANLIB
+	sed -i 's/CC="${CC}"/& AR="${AR} cq" RANLIB="${RANLIB}"/' build || die
+}
+
+src_configure() {
+	tc-export AR CC LD RANLIB
+	export IMAKECPP=${IMAKECPP:-$(tc-getCPP)}
+}
+
+src_compile() {
+	./build bin || die "build failed"
+}
+
+src_install() {
+	export DESTDIR="${ED}" LIBDIR="$(get_libdir)"
+
+	./build install || die "install failed"
+
+	if use l10n_fr ; then
+		./build lang fr || die "fr failed"
+	fi
+
+	./build lang en || die "en failed"
+
+	local f
+	for f in "${ED}/usr/$(get_libdir)"/X11/app-defaults/* ; do
+		[[ -L ${f} ]] && continue
+		sed -i \
+			-e "s:/usr/games/lib/scrabble/:/usr/share/${PN}/:" \
+			-e "s:fr/eng:fr/en:" \
+			${f} || die "sed ${f} failed"
+	done
+
+	dodoc CHANGES README
+
+	local paths=( /usr/share/${PN}/en/scrabble_scores )
+	if use l10n_fr ; then
+		paths+=( /usr/share/${PN}/fr/scrabble_scores )
+	fi
+
+	local path
+	for path in ${paths[@]} ; do
+		fowners root:gamestat ${path}
+		fperms 660 ${path}
+	done
+
+	fperms g+s /usr/bin/${PN}
+}
diff --git a/games-board/xskat/Manifest b/games-board/xskat/Manifest
index e7e4ab1a4649..bc6cf486eec0 100644
--- a/games-board/xskat/Manifest
+++ b/games-board/xskat/Manifest
@@ -1,3 +1,3 @@
 DIST xskat-4.0.tar.gz 179059 BLAKE2B 0494db798eadd17b4b35256560aa82ad8ec239b08f7adcdd86621088676cbc4c7cae0d0a53bb15525d56319ba0549406038cc1e64cdcfefd280d379ffc326a96 SHA512 508d83886063be01aef509fa8050110e599e0120025a94747717fcbae38e2196e8db041296b984fe37895c211519f511cf75dfa6b948c5789e6b37064f3d0c0d
-EBUILD xskat-4.0-r1.ebuild 786 BLAKE2B de831e59e9180898684b1f2ba41adb63a4bb86cda0eec38eac70979ceaca9efafa1761665d58054747b74d957f1fd51b2aece84b9321d5400fe9bbff6daf274e SHA512 17402d201360565001c527201b2153fef04dd848f040e7691eed35c54d86e53848a9cd627d9111e9a3e8e77019c13e052d5126d342c46d0e761eff18a8457a7e
+EBUILD xskat-4.0-r1.ebuild 910 BLAKE2B 069fbf23cf7d3a3c4de217261f23fec4db0362b650e722a67fea5cad8a4ce612c81f90aa4e396b0940b8ccf83b419da1d5c73bf1b9761bbd348e531e2f4a93f0 SHA512 0e4bc398d478c1306d32b25ab47b17b88d04fb1c246434319911e1fd5a9f4814e1fcc308bec9cd81ac153145511ba02781c0d437441616247f8bb4331caa05ab
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/xskat/xskat-4.0-r1.ebuild b/games-board/xskat/xskat-4.0-r1.ebuild
index 517567ee1cf1..99f4b01f2de0 100644
--- a/games-board/xskat/xskat-4.0-r1.ebuild
+++ b/games-board/xskat/xskat-4.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit toolchain-funcs eutils
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Famous german card game"
 HOMEPAGE="http://www.xskat.de/xskat.html"
@@ -11,28 +12,34 @@ SRC_URI="http://www.xskat.de/${P}.tar.gz"
 LICENSE="freedist"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
 
-RDEPEND="media-fonts/font-misc-misc
+RDEPEND="
+	media-fonts/font-misc-misc
 	x11-libs/libX11"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	x11-base/xorg-proto
 	x11-misc/gccmakedep
-	x11-misc/imake"
+	>=x11-misc/imake-1.0.8-r1"
 
-src_prepare() {
-	default
-	xmkmf -a || die
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
 }
 
 src_compile() {
-	emake CDEBUGFLAGS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}" CC="$(tc-getCC)"
+	local myemakeargs=(
+		CC="$(tc-getCC)"
+		CDEBUGFLAGS="${CFLAGS}"
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+	)
+	emake "${myemakeargs[@]}"
 }
 
 src_install() {
 	dobin xskat
 	newman xskat.man xskat.6
-	dodoc CHANGES README{,.IRC}
 	newicon icon.xbm ${PN}.xbm
 	make_desktop_entry ${PN} XSkat /usr/share/pixmaps/${PN}.xbm
+	einstalldocs
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /games-board
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)