gentoo resync : 29.06.2020

16 files changed, 180 insertions, 94 deletions

diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index b7d4c0363beb..2fe8db159540 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/cockatrice/Manifest b/games-board/cockatrice/Manifest
index 058264043609..0f81b3052ccf 100644
--- a/games-board/cockatrice/Manifest
+++ b/games-board/cockatrice/Manifest
@@ -1,4 +1,5 @@
+AUX cockatrice-20190304-qt-5.15.patch 691 BLAKE2B 60e82838530df13436d8409263565a37e730bafe2eb1d94dc13dcd77ba830d3b01f032e8e69725fa7e94de15e027852bc468ee9e82ed6d6e47a846b40cda424b SHA512 791b9228d9c1d0be23bebee9fe9eeae7ade906e1f6c68f4d0520778528c05576c59562d8986d5abad498df9771a8aee341fdb23a27424de0cbf3b5718969f9ee
 AUX use-ccache.patch 950 BLAKE2B e514c416c7c8821f79a195f968ae9804b83cd9a4a23be3391967a758cca12443e9acf5ee1d568f2b5b1536a9f351df4393a5dc91a08d865d3e038608989df916 SHA512 1140d2dc007474cf192a0a1fa2f9388c8cbd68214a31bc8c5d02f6ced0fd440400f0632a3b76ce1e172ed4ffd481c76b8e3d6a28c8aefa7816b3292c78182a1c
 DIST cockatrice-20190304.tar.gz 8464830 BLAKE2B 6e6b41593d7eddc8599fa894eed63f993fb69888c57fdfc4a45d71e6e7990d7d716663b69902139f5fd7ead455acdba76ac1d649977e26dceb2948293c34b74e SHA512 6a76e5de2aa7a4d2c9943bee9225ebf01aca7679bcd2542450b7e8b919e401992019f5bfb69597e8845bb2d8db568d7a6549600b85b576f9fb29be712bbfc9e5
-EBUILD cockatrice-20190304-r1.ebuild 1607 BLAKE2B 1e3e52c1691020bc554fb47d97ce9b73f607fd5167ec86b8fe871a40ca0fece23582d142e5883be162fa68b2acbda630ce3ee37420b63f3366a5806337f71379 SHA512 e5e10ffe2398c3128d60c1f8b10da287ca88ef5c7278c30094f42b3ede30928593a4207f9e74a7e6735f748a033e4346c291e8f62bbc69718e2b113c0bc15974
+EBUILD cockatrice-20190304-r1.ebuild 1590 BLAKE2B 775a2e1130296784552ebe202d302216cf67a5d15c57df197e2b85b7743f69589b4ae62dea46d61f52ef9bbd30f78ca8c0e15fd01fc809ca541f5c6c0a53112b SHA512 98ef6cc95424d8bc041c0e81fb0c7ba129eca7bc39531bbc266725dc0394516902aa827f0f2f20055d1032817033d401002d0cec39124b9823f395ee9ae4d42c
 MISC metadata.xml 1187 BLAKE2B b04809289e20d3d8e98c474cf7673c4620ee337edaf7a61b94fdb0e56a1957b459350032a725a25bce4fd262768bb1f09937320450902966698d6140978a9656 SHA512 cc3711f5230ae38cdeca3da9d1ed9f23a71f4790567433fc1a60e5035412c2259633fb3a5200d248b0247bc282903fa0f2e8d741900bde1b990ef0ce56f38b0b
diff --git a/games-board/cockatrice/cockatrice-20190304-r1.ebuild b/games-board/cockatrice/cockatrice-20190304-r1.ebuild
index 39f89707cad8..50792e3ce5f8 100644
--- a/games-board/cockatrice/cockatrice-20190304-r1.ebuild
+++ b/games-board/cockatrice/cockatrice-20190304-r1.ebuild
@@ -17,23 +17,21 @@ IUSE="+client +oracle server"
 
 RDEPEND="
 	dev-qt/qtconcurrent:5
-	dev-qt/qtprintsupport:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
 	dev-qt/qtwebsockets:5
 	dev-qt/qtwidgets:5
 	client? (
 		dev-libs/protobuf:=
 		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
 		dev-qt/qtsvg:5
 	)
 	oracle? ( sys-libs/zlib )
 	server? (
 		dev-libs/protobuf:=
 		dev-qt/qtsql:5
-		dev-qt/qtwebsockets:5
 	)
 "
 BDEPEND="
@@ -41,8 +39,7 @@ BDEPEND="
 	client? ( dev-libs/protobuf )
 	server? ( dev-libs/protobuf )
 "
-DEPEND="${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 
 # As the default help/about display the sha1 we need it
 SHA1='294b433'
@@ -51,6 +48,7 @@ S="${WORKDIR}/Cockatrice-${MY_PV}"
 
 PATCHES=(
 	"${FILESDIR}"/use-ccache.patch
+	"${FILESDIR}"/${P}-qt-5.15.patch
 )
 
 src_configure() {
diff --git a/games-board/cockatrice/files/cockatrice-20190304-qt-5.15.patch b/games-board/cockatrice/files/cockatrice-20190304-qt-5.15.patch
new file mode 100644
index 000000000000..878a8d428246
--- /dev/null
+++ b/games-board/cockatrice/files/cockatrice-20190304-qt-5.15.patch
@@ -0,0 +1,20 @@
+From 7fa1936d0f4efffa16ae28d6bd3f9e727e207046 Mon Sep 17 00:00:00 2001
+From: ebbit1q <ebbit1q@gmail.com>
+Date: Fri, 19 Jun 2020 16:50:09 +0200
+Subject: [PATCH] qt 5.15 compatibility (#4027)
+
+---
+ cockatrice/src/replay_timeline_widget.cpp      |  1 +
+ 27 files changed, 101 insertions(+), 39 deletions(-)
+
+diff --git a/cockatrice/src/replay_timeline_widget.cpp b/cockatrice/src/replay_timeline_widget.cpp
+index 6d04dce80..e79ad5f5c 100644
+--- a/cockatrice/src/replay_timeline_widget.cpp
++++ b/cockatrice/src/replay_timeline_widget.cpp
+@@ -1,6 +1,7 @@
+ #include "replay_timeline_widget.h"
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPalette>
+ #include <QTimer>
+ #include <cmath>
diff --git a/games-board/gnuchess/Manifest b/games-board/gnuchess/Manifest
index f387d90ea48a..34b7b4e89e05 100644
--- a/games-board/gnuchess/Manifest
+++ b/games-board/gnuchess/Manifest
@@ -1,7 +1,3 @@
-DIST gnuchess-6.2.4.tar.gz 757985 BLAKE2B bbb83a9fe7a7ace155b869deebdb67474d6c23538e7852167e846d5570bcd878634b0b2576f3ee33407913976103c637d3b024a8b81f290325c88c84d573d85c SHA512 53546d3319cd6a7bc70be5cc11c29cf33c71b747de2244a7d8d4aff6b00318ad35ee0e27058b40a265c62ef02c188d2e34cba9bbf439306220796e7332904d42
-DIST gnuchess-6.2.5.tar.gz 782359 BLAKE2B d9ae979023ea6265e89a25223935df3847adfc52d46df2a9fe96700081f613f7817b4add22e3a63aa4e035adea9c1f4856cb1e9b80d751c3ee63818b5924c388 SHA512 f3f65a85eb4c93f6f10c7058bde7ee7f4a48c2f465b24a7cc0d5bcafe4df186b434ce23bf8c032d012efffba39c6c3c60ada484ff22d87114ce2be5dd0da6835
 DIST gnuchess-6.2.7.tar.gz 802863 BLAKE2B 2fea825cdf0e629b3c2e9965d16f432edff81ceac8e7fbfd99b7be93f7281f813b10b91a62b3823acbf8967af538b04d2d87f93abde4a580e659e1fbdc5966e9 SHA512 1ed9e9344fbfc8e78504290a44e2710acab53f211c4349cafb7b64cc9a1fa923fbef4b4cbe3dd96438049b1da21415db3eb81fe663a94551c30105207086e343
-EBUILD gnuchess-6.2.4.ebuild 436 BLAKE2B bd1be6c822b90e0af3b3a6751ef813e9548837da149589a9b30ef6525f60abf5aa7338e24a1abb5fb4f73ad49d03c271016383fd0d34381a39289ad437e818ed SHA512 545ca9057cc22f01ffca401e32db9a1bbe5bb0e89d1712e2a6743a5668a19d44a8bd7925853e5414a871333041dc3005a91d250b3e392ddcbd9039808af7e61c
-EBUILD gnuchess-6.2.5.ebuild 443 BLAKE2B 8cfd191557073ef39505219bde801f90d28f6ff785a44446d5aa68f0d6365ca35773d2194dfb0240f6b0c04725a1c39f23d3142f7219c7b9656b2feb1e6e808d SHA512 40bcb82fa16ed49715eb105e2351822bf69b18aaedc05ef3b1efed3cdca534788304373eb5f54349132eed2fa26c566e81592b1a974e8b5231de1c29e9d71bae
-EBUILD gnuchess-6.2.7.ebuild 380 BLAKE2B 66db1c83f76ee2f208f68a1eb73d4c8db5b06d4a5fee431d07985511a9d95c7092b4cb346595cf49829285859c638e717d9e1556a4cff1505728cbc67a1e995c SHA512 373120d5df32bd7cf5dc9ac37701f53cc2d3b45271df17fc6c9b37e362853fc8f027d4b65c4f6faed908c63c927fd9c199c4d3ed13db4101e4f04bf339e6f187
+EBUILD gnuchess-6.2.7.ebuild 379 BLAKE2B 40744e6f5027920c0b3b9689f8eef8343fa152ff3af013772389aa7bcb04563364a00579b71e345da527ae3f6393a5520d543f7da7d870ab02b558a0afa7b3c0 SHA512 ad55b40e15bce4b2d77f29d64582b76412a99f82e1224e58efa805285889de13abf545196ed6c88342db943a1a5bef9d339bd2449c007d2be2562a341e46b1fb
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gnuchess/gnuchess-6.2.4.ebuild b/games-board/gnuchess/gnuchess-6.2.4.ebuild
deleted file mode 100644
index 09272e6f0341..000000000000
--- a/games-board/gnuchess/gnuchess-6.2.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Console based chess interface"
-HOMEPAGE="https://www.gnu.org/software/chess/chess.html"
-SRC_URI="mirror://gnu/chess/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-src_configure() {
-	strip-flags # bug #199097
-	econf --without-readline # bug 491088
-}
diff --git a/games-board/gnuchess/gnuchess-6.2.5.ebuild b/games-board/gnuchess/gnuchess-6.2.5.ebuild
deleted file mode 100644
index e368ad19a379..000000000000
--- a/games-board/gnuchess/gnuchess-6.2.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Console based chess interface"
-HOMEPAGE="https://www.gnu.org/software/chess/chess.html"
-SRC_URI="mirror://gnu/chess/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-src_configure() {
-	strip-flags # bug #199097
-	econf --without-readline # bug 491088
-}
diff --git a/games-board/gnuchess/gnuchess-6.2.7.ebuild b/games-board/gnuchess/gnuchess-6.2.7.ebuild
index a79c72f20cb7..37bd1f102543 100644
--- a/games-board/gnuchess/gnuchess-6.2.7.ebuild
+++ b/games-board/gnuchess/gnuchess-6.2.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/chess/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 src_configure() {
 	econf --without-readline # bug 491088
diff --git a/games-board/gnugo/Manifest b/games-board/gnugo/Manifest
index ee0822387eb5..2652507211c4 100644
--- a/games-board/gnugo/Manifest
+++ b/games-board/gnugo/Manifest
@@ -1,6 +1,7 @@
+AUX gnugo-3.9.1-autotools.patch 171 BLAKE2B 158e2fa553952be116466eae58ea1f7f9793a9cd22e763afd8479d26c693b8137f88d039ebcaf25a54d6c4185536f6de71ee4ed230716d26130c40ecc34db86b SHA512 5b29b62d7d2b6bf80b3d863931c8bad46fa005cd1a183a96dbdc229d47fd4fc44279f66b5659dbb27a69e4811e60fef573df767b7a37d9b9a05a6295b208c706
+AUX gnugo-3.9.1-fno-common.patch 635 BLAKE2B 922834d23e953bf5fb28b74c22e59a764c92098b72abc6cda9bbbc0965e53487c15a7cfce0cac3236768ca6b0b1ee740bb9ea66a9c7d9713ce888ff5756073bc SHA512 2677082b6e5ab78444c600e240f5a06a36d8f9cdc201db1e29a10f0cda8dd83e703d7d6181f9ac4c3de32e08f16e72e25063c7b76c304eed95fb2be6032e98f4
 AUX gnugo-3.9.1-format-security.patch 1943 BLAKE2B 2dd1c6f7b69da62baac53336e1b017136b16392b85a343aeb41d47fd10f5464a98eee1c8383e31531b21f72456a037bf72fb206752818f2fb39939d46bccb35a SHA512 5d53c53173980c9e73ce1f19c5c5e9228308cb00a61a623e942a3cc8598b73cc188ef24fda0b44feddcf0f381dbebdccf85716a187de730a9bb6412d1f9d61a7
 AUX gnugo-3.9.1-invalid-move.patch 727 BLAKE2B 5c5a13e3b00175627a45a4ef1d32b4a3dc049114281219ec70a22985c2deb027938b2e4ee1c0a58c1da8759800fdd9f98d6bb4981405f51af6269e0a01dedb74 SHA512 a1f20761e714670e2173b36390492304252bf30e46f93e37dee3cc72de346a59a8daaaaa6f0cf2e20834637598831f0f55d4c6c0825021d6fd00055a57db2bdb
 DIST gnugo-3.9.1.tar.gz 3207748 BLAKE2B 4251e125eac20188926210db8640f1ae4ff2b79f6a59b429af9e10fcfd6b0d34f9bf180b32194c519a7b59905a4b5e8bc1a2e45a071a8b8696bf16dd04f6a342 SHA512 b2b215fb8c1ebb0b58e54d14dcc02af3b76bde3a1b84a842a11a0a6018c77a2464c44b26fe0e7ad73b2b2e7fa22005466821bf762108c2c2e04428d3d459af97
-EBUILD gnugo-3.9.1-r1.ebuild 662 BLAKE2B 48296b632f9c05b031b7550e76af9a25217e21c7503a17f65fd859b4170ef8436251fa8ec911278cf4c469c5544f41c79975a197612c0938169211a89554de73 SHA512 287f9f4e6b7a7daa14cbfa7efe45d8f784c08fd4805a1b6f249e269156d9320a9d490ae1204a7c7bf52881e4bfd3b9e4982b3428a73f1cbae2f4db45f452fc58
-EBUILD gnugo-3.9.1-r2.ebuild 631 BLAKE2B c3d6006c4c0d1204237e44e81665b7cb9d8255f0e51a883ce78474eef683c4e4b208af7167c170164eebac16f15c7572b031681932cf1b5d2c0ac5dae362508c SHA512 2822f4e6e0c11a8bbd1d8b8c0c23bb500f874ba5d23671222deae93174e1b8b5e1e422beee4d18f164333193898a9ba35e7cb6973e4b6c4cadb10943ea1d9e51
+EBUILD gnugo-3.9.1-r2.ebuild 792 BLAKE2B f43cfd7efea54f57086f24f526818e36a924d8b62172f33dfc6800227ed8919665d06fe61cba563a28e43bbbb74b5c04b586e53f6d206c1a47b3c306f32187bd SHA512 8acf607deae33d1b9c8d8589c3b57ed1130a726bc8980ccd2b50723dfc7ab17009d50e407dbad5b9848a3e399748400ccda01605a6920d2f0f0c989b8a8f05df
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gnugo/files/gnugo-3.9.1-autotools.patch b/games-board/gnugo/files/gnugo-3.9.1-autotools.patch
new file mode 100644
index 000000000000..79e28fa9b7bf
--- /dev/null
+++ b/games-board/gnugo/files/gnugo-3.9.1-autotools.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -151,6 +151,7 @@
+ 
+ AC_PROG_CPP
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ dnl required since we use SUBDIRS in Makefile.am
+ AC_PROG_MAKE_SET
diff --git a/games-board/gnugo/files/gnugo-3.9.1-fno-common.patch b/games-board/gnugo/files/gnugo-3.9.1-fno-common.patch
new file mode 100644
index 000000000000..db8215ecf90f
--- /dev/null
+++ b/games-board/gnugo/files/gnugo-3.9.1-fno-common.patch
@@ -0,0 +1,25 @@
+--- a/engine/globals.c
++++ b/engine/globals.c
+@@ -136,6 +136,9 @@
+ 				 * move generation is enabled.
+ 				 */
+ 
++int meaningless_white_moves[BOARDMAX];
++int meaningless_black_moves[BOARDMAX];
++
+ float best_move_values[10];
+ int   best_moves[10];
+ float white_score;
+--- a/engine/liberty.h
++++ b/engine/liberty.h
+@@ -859,8 +859,8 @@
+ extern struct worm_data worm[BOARDMAX];
+ 
+ /* Unconditionally meaningless moves. */
+-int meaningless_black_moves[BOARDMAX];
+-int meaningless_white_moves[BOARDMAX];
++extern int meaningless_black_moves[BOARDMAX];
++extern int meaningless_white_moves[BOARDMAX];
+ 
+ /* Surround cache (see surround.c) */
+ 
diff --git a/games-board/gnugo/gnugo-3.9.1-r1.ebuild b/games-board/gnugo/gnugo-3.9.1-r1.ebuild
deleted file mode 100644
index aba4225ac342..000000000000
--- a/games-board/gnugo/gnugo-3.9.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="A Go-playing program"
-HOMEPAGE="https://www.gnu.org/software/gnugo/devel.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="readline"
-
-DEPEND="readline? ( sys-libs/readline:0= )
-	>=sys-libs/ncurses-5.2-r3:0="
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-invalid-move.patch
-}
-
-src_configure() {
-	egamesconf \
-		$(use_with readline) \
-		--enable-cache-size=32
-}
-
-src_install() {
-	default
-	prepgamesdirs
-}
diff --git a/games-board/gnugo/gnugo-3.9.1-r2.ebuild b/games-board/gnugo/gnugo-3.9.1-r2.ebuild
index cfcbcca0fbbb..b0bf4b8a8278 100644
--- a/games-board/gnugo/gnugo-3.9.1-r2.ebuild
+++ b/games-board/gnugo/gnugo-3.9.1-r2.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A Go-playing program"
 HOMEPAGE="https://www.gnu.org/software/gnugo/devel.html"
@@ -14,15 +16,22 @@ IUSE="readline"
 
 RDEPEND="
 	readline? ( sys-libs/readline:0= )
-	>=sys-libs/ncurses-5.2-r3:0=
-"
+	>=sys-libs/ncurses-5.2-r3:0="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-invalid-move.patch
 	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_with readline) \
diff --git a/games-board/scid/Manifest b/games-board/scid/Manifest
index 364a8d1e5348..cda07e75b971 100644
--- a/games-board/scid/Manifest
+++ b/games-board/scid/Manifest
@@ -1,8 +1,9 @@
 AUX scid-4.6.2-gentoo.patch 4508 BLAKE2B ea08a9b215e7e80a33912db552cf3d5e79c8c252f6c9dc557d997b9df43f4dffcd9e74aa06a9a7eca064ec1304b66b3d9495ef152cebb0bd30a507641b321006 SHA512 52a32a6250b293a0fe145ebd45cf6b4d283f3d883cffa278e9599e36a57c129e0b6ccc2a637f200b5fa1e4b8c8a7956fa63a60ceb5d83ba877ca54920346de83
+AUX scid-4.6.2-pgnfix-python3.patch 3475 BLAKE2B 45da2f9c0c3f4d7db045d00e0bb9028b383ae4067c2ce5e104bb9a54d9e6831e90dd0015a40a87ee481f37a039ad7ccca1d71ad91f6413a9f962157bc045d8c4 SHA512 620f9610675236c688b818274bbb2f1b5e6dc7ed7e984721e84318a6fc35ce921dce3c3c8e76b53b89a04d0e6cfa6b46035f6de64ff3d7828e2e1606da1b90e1
 DIST photos.zip 1007488 BLAKE2B 8b0f9b0402d9102bda4cfe1333cafdf048592004b2b8cb7f8f085eacc10b6b89811afd39c3d849a4f6288ad63145fc760e60bcd70867ae339459a451c537cbf3 SHA512 c04fc810b457d4dbd9a9cfaac90feaa8c32a2abee05e28a79042ae81cb01e8580e2a1cf0abeff230ec2928da883f862b8901d679cb1448fd9ca0923323fbddd6
 DIST ratings.zip 969347 BLAKE2B 47d050f7c0e00e96aa0371db7f328e699cd0e34eafa3652664f00df7fe08b98adc4197c5235303d6df2c5bcf7ea568c753d23ac5fffe3616de6db9dae21a31a3 SHA512 9b2a7280a7e72e2b464cc3da6be82ec9825b11d3c7e2219ab03a711c69f185f7d954eb3acdd441bff210e9296613df79a7e147a2ccbb4ed37b50af762abbd243
 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 1986 BLAKE2B 994e81c6e581857d50870aadda8fba830f0859a7cf20d40da40c16981a6864ddbfb904053ee533d81d8a4476578b373c2621c7f372c320a71d0cc6f4191c42f8 SHA512 ba0364fb05c468a6048fdad1fe0462ed0b6d1c979d601de30a7d9b363893b262c89cf86b3a6afac65997e91c3ad26a4e7d5ee47b19073db72ddbc1ec22cf78ee
+EBUILD scid-4.6.2-r1.ebuild 2030 BLAKE2B c479cc958780e594ca850faad1b61876670b4e93588224bf7eee9b3a6ac1089058dabda1a04f4c132a5f8ffc6c164618e18af0b35654f01f15c3d73922d34dc9 SHA512 02c9a37b7334a5a935d3e4dcdcda71596fee5a6dfb8b3de4abd1d5731a8d02b389af8ead6681180dec1f135f11fe37d10146526fdaeaa681851be572e7973eeb
 MISC metadata.xml 327 BLAKE2B 26037c210c23b4fc0936c22b8ae22f33622b2b19a183bcbb69de69c4ed2b02aec5121198ba555cd7049421ae9a0e9824ed1115725bc0e4c9deff9639f88fcd6b SHA512 b3551509e319eba4e682673f363044c3f3b7973299618405e6aa29f44a86527e0f397a6baaface9d95806da7ec2c361c152729b753741694fb9c13760433e5c1
diff --git a/games-board/scid/files/scid-4.6.2-pgnfix-python3.patch b/games-board/scid/files/scid-4.6.2-pgnfix-python3.patch
new file mode 100644
index 000000000000..79b64e5ef6f3
--- /dev/null
+++ b/games-board/scid/files/scid-4.6.2-pgnfix-python3.patch
@@ -0,0 +1,97 @@
+--- a/scripts/pgnfix.py
++++ b/scripts/pgnfix.py
+@@ -12,7 +12,6 @@
+ # put in the Site or Event field, and move them to the Date field.
+ 
+ import sys
+-import string
+ import re
+ 
+ if len(sys.argv) < 2:
+@@ -69,16 +68,16 @@
+             if match:
+                 full = match.group(0)
+                 last, first = match.groups()
+-                first = string.strip(first)
+-                full  = string.strip(full)
+-                last  = string.strip(last)
++                first = str.strip(first)
++                full  = str.strip(full)
++                last  = str.strip(last)
+                 if first:
+                     for name in (full, last,
+                                  last + " " + first,
+                                  last + ", " + first[0],
+                                  last + " " + first[0]):
+-                        name = string.lower(name)
+-                        if spelling.has_key(name):
++                        name = str.lower(name)
++                        if name in spelling:
+                             del spelling[name]
+                         else:
+                             spelling[name] = full
+@@ -107,16 +106,16 @@
+                 if error:
+                     out = sys.stderr
+                     error = 0
+-                out.write(string.join(current, ""))
++                out.write("".join(current))
+                 current = []
+                 bad_lines = []
+         else:
+             if headers:
+                 for field, value in specials.items():
+-                    if not headers.has_key(field):
++                    if not field in headers:
+                         headers[field] = value
+                 for field in order:
+-                    if headers.has_key(field):
++                    if field in headers:
+                         current.append('[%s "%s"]\n' % (field, headers[field]))
+                         del headers[field]
+                 for field, value in headers.items():
+@@ -172,7 +171,7 @@
+                 specials["Date"] = "%04d.%02d.%02d" % (year, month, day)
+                 value = re.sub("\(?([0-9]+)/([0-9]+)/([0-9]+)\)?", "", value)
+ 
+-        value = string.strip(value)
++        value = str.strip(value)
+ 
+         if field in ("White", "Black"):
+             name = re.sub("[MW][0-9]{5}", "", value)
+@@ -193,21 +192,21 @@
+                     name = re.sub("_", " ", name)
+                     name = re.sub("\.", "", name)
+                     name = re.sub("([A-Za-z])([0-9])", "\\1 \\2", name)
+-                    name = string.strip(name)
++                    name = str.strip(name)
+                     name = re.sub("^([A-Z]+?)\s*([A-Z][a-z].+)", "\\2, \\1",
+                                   name)
+ 
+                 name = re.sub(",\s*([GI]M)?$", "", name)
+ 
+-            name = string.strip(name)
+-            t = string.lower(name)
++            name = str.strip(name)
++            t = str.lower(name)
+ 
+-            if spelling.has_key(t):
++            if t in spelling:
+                 name = spelling[t]
+ 
+             headers[field] = name
+ 
+-        elif not bogus.has_key(field) or not re.search(bogus[field], value):
++        elif not field in bogus or not re.search(bogus[field], value):
+             headers[field] = value
+ 
+ if current:
+@@ -215,7 +214,7 @@
+     if error:
+         out = sys.stderr
+         error = 0
+-    out.write(string.join(current, ""))
++    out.write("".join(current))
+     current = []
+     bad_lines = []
+ 
diff --git a/games-board/scid/scid-4.6.2-r1.ebuild b/games-board/scid/scid-4.6.2-r1.ebuild
index f31b6be08e89..9a9a52b97b9a 100644
--- a/games-board/scid/scid-4.6.2-r1.ebuild
+++ b/games-board/scid/scid-4.6.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit eutils toolchain-funcs gnome2-utils python-any-r1
 
 DESCRIPTION="a free chess database application"
@@ -38,6 +38,7 @@ src_unpack() {
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-pgnfix-python3.patch
 )
 
 src_prepare() {