gentoo resync : 29.06.2020

3 files changed, 102 insertions, 3 deletions

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() {