gentoo (leap year) resync : 29.02.2020

36 files changed, 492 insertions, 219 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index be7af118a565..428fe508fece 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/deltup/Manifest b/app-portage/deltup/Manifest
index c03f973e6edf..6135b02e1b60 100644
--- a/app-portage/deltup/Manifest
+++ b/app-portage/deltup/Manifest
@@ -1,5 +1,5 @@
 AUX deltup-0.4.6-cxx.patch 659 BLAKE2B 1005ff5439b96eda1f8106dc3620a00e343fd4df6f1736b9ca1b5fe6f06f8bafcc332852f7e51565179fccf8994515ce8dff19c6eb89b8263253e71132cdfdd5 SHA512 fae1d6c90a7458b0c4a7795a16ac794a506e2bd002be0be9e0772ef7a9f5174aeef35422d6ee1cca69e4dccc49b36dc732a3408d92d0c960e229935318d0033c
 AUX deltup-0.4.6-ldflags.patch 241 BLAKE2B 43091ce7b06d5b554183248b3e26732a00c0a7eccaaeaa7aa5dcdd4b2d11ca4f6cde707941545b9ecc13367152efd85e086f5ee94d8816ac967a79e5d29e01ad SHA512 e8b705bd581928b15523e6692648fb89f2bb0c15c565a7dee4d45292fae8aad88e9c6e83b29672825943c2bc15d8b151e57f603dd1c6577a62203249f1e96316
 DIST deltup-0.4.6.tar.gz 14869 BLAKE2B d0332eca70da268f0f85718bf08f8b19da7e7e8a1868d6bb4b2edd386d498f61342538234defebbc0430cc176da13b57efc11ecd62f300eef960b62e738d3147 SHA512 196be319f31860d89654c23241edde503d4194064617970d87cb0d0a66544959bc666dd34a3bf1a42e69ddb5927420728a1e208b7bb848e935e99f3a090ffa7a
-EBUILD deltup-0.4.6-r1.ebuild 915 BLAKE2B 1651ccaa2f0a066f166d75417f532100bc4aca577e17b82dcfbea34f4f4026417d9b0b8dd327e381422441ede4b3b2bc07f0876bcbd52a2ff424d46b2f15ba1d SHA512 e41bb9abe643fb6961f6b99081b318208430b6f03ada7e196bad9dd388ed7ea4a1a31b94fd12bcda1dae212c125a40c075efb8a0208a69667833e82ef032a46f
+EBUILD deltup-0.4.6-r1.ebuild 910 BLAKE2B 65481b8a3acdea5d12056c14ab8d796ac05694ad10d79967b1aab1365c65bb2ea1759a60017ebe074f7fcda1ae62c9bf3adf1782dace5d5c1611979fe289f9e0 SHA512 cdbd7ba84716721a97cf62a992e9380e5a786d3f8f70bed32ce86e48e4b569de3d53f62b8f6f0f58bb79bd6a2226e97e6c865b114924bb285fcb153bfb0229d8
 MISC metadata.xml 529 BLAKE2B 32728c366ecf7e40a84e875ba3dc2e6e181faa241939ed343e23257ac7120008ec86718495a4e7866aa7037b99143360df13253bd4f8fbffd6abc78aecda7fb9 SHA512 453e074a02cbd112c17da0b4726a15f4f98ae3dd1d73b454dd09775c2db4d792a9687920c0a647940e810e4bce623b59f793dc66bf9f33d697ed3bb8cdc77790
diff --git a/app-portage/deltup/deltup-0.4.6-r1.ebuild b/app-portage/deltup/deltup-0.4.6-r1.ebuild
index 9c4ebf21a658..635dc23ba668 100644
--- a/app-portage/deltup/deltup-0.4.6-r1.ebuild
+++ b/app-portage/deltup/deltup-0.4.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,11 +31,11 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.4.6-cxx.patch
 )
 
-src_compile () {
+src_compile() {
 	emake CXX=$(tc-getCXX)
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" PREFIX=/usr install
 	dodoc "${S}"/../{README,ChangeLog}
 	doman "${S}"/../deltup.1
diff --git a/app-portage/distpatch/Manifest b/app-portage/distpatch/Manifest
index dbad45f122ec..96a8adc8de1c 100644
--- a/app-portage/distpatch/Manifest
+++ b/app-portage/distpatch/Manifest
@@ -1,3 +1,4 @@
+AUX distpatch-python3-support.patch 15542 BLAKE2B bd0e0ca9d1c77c0ddcfa254f723488ce44002258988854b5a4d911e6d919d93653d07a66f43dec63ede94d914ea98e72e8fba4f7f2510e2bae23f75447cb71ae SHA512 1384cbe023f8cbf6dd67990c1a2bc6b80c9ef9a19082e76353dc3079dbdd4e2e330b344e7292cece4587e1dccabba58fdeb4aa1cadaf2425fe143fec223c23ee
 DIST distpatch-0.1.2.tar.gz 19998 BLAKE2B 1ede140e1b427df8f35011a025dc81b614c1a372668e41a26bbd02a3ab084b97c504a5de8e288a9d16d75439d0e3393ac13ef8cf49d55620babcee79fd137699 SHA512 f4dd08fd69a5b2030e0b912c1153994bcc03f40af65fff185231a220c110d0e7b5a4acf402d116e9dbfef86b13d17036ca563d0fefd89bc62809e1ecc9acf1ed
-EBUILD distpatch-0.1.2-r1.ebuild 635 BLAKE2B 96618d42a93a603a5b7e563d1887859ad20abb38e5783221236a6311a32abced86e835f2cb35489d1dd17dfd450b8c05d497e91d78d7ebc4bd5dc2eedabee928 SHA512 ef959c8e830250459274b17318722cf826a539bc07dc88e2f086c3021bbb32bf8401d9a21eeaa07e260f1768024514603bfcdf7cd25d10abb545a2a583e7a913
+EBUILD distpatch-0.1.2-r2.ebuild 662 BLAKE2B 124ab94ba6c49b11da24a465c86424abe8dae68d97da04b3c27895152c44fc2e091493d2d1ac8b920c77c8cec11794be035dd17304cb933bde025a226fe61cdd SHA512 b33e3dea9cdbe572cd3fed82175b00eff1af453aba2acf317a72a8dcf2a8b758c0182405e5bc647e590a54598a576a63daa47575505512de2c9340a9558c5de6
 MISC metadata.xml 489 BLAKE2B 8e711ca92c6c71f69ad71dbe4253ea4ff8444c5122e408c404d0adfa9b0cbcbe61df31a9ef7f58564109a4a655bcf3fe9d4cbb1e1c5b3d5b7bfff0318355f149 SHA512 bf9e190068b60e9bcf3a857a38a155c7189d0ea00a098e2df94b152218157c03f936ab15e00038edc09aa9583cba1711a57e1a9ef17edb794fef59372b35f08a
diff --git a/app-portage/distpatch/distpatch-0.1.2-r1.ebuild b/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
index f54a61631051..1a7f003bbd19 100644
--- a/app-portage/distpatch/distpatch-0.1.2-r1.ebuild
+++ b/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
 
@@ -16,10 +17,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-CDEPEND="
+PATCHES=( "${FILESDIR}/${PN}-python3-support.patch" )
+
+DEPEND="
 	>=sys-apps/portage-2.1.8.3[${PYTHON_USEDEP}]
 	dev-python/snakeoil[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
 	>=dev-util/diffball-1.0.1"
diff --git a/app-portage/distpatch/files/distpatch-python3-support.patch b/app-portage/distpatch/files/distpatch-python3-support.patch
new file mode 100644
index 000000000000..eec335633d77
--- /dev/null
+++ b/app-portage/distpatch/files/distpatch-python3-support.patch
@@ -0,0 +1,420 @@
+From 0274956acf4479b7346ac441fe09f2e56d575c47 Mon Sep 17 00:00:00 2001
+From: "Rafael G. Martins" <rafael@rafaelmartins.eng.br>
+Date: Wed, 26 Feb 2020 18:22:06 +0100
+Subject: [PATCH] python3 support
+
+---
+ distdiffer           | 46 ++++++++++++++++++++++----------------------
+ distpatch/chksums.py | 12 ++++++------
+ distpatch/deltadb.py |  4 ++--
+ distpatch/diff.py    | 12 ++++++------
+ distpatch/package.py |  6 +++---
+ distpatch/patch.py   |  4 ++--
+ distpatch/stats.py   |  6 +++---
+ distpatcher          | 32 +++++++++++++++---------------
+ distpatchq           | 28 +++++++++++++--------------
+ 9 files changed, 75 insertions(+), 75 deletions(-)
+
+diff --git a/distdiffer b/distdiffer
+index a2b933d..6975b5c 100755
+--- a/distdiffer
++++ b/distdiffer
+@@ -73,39 +73,39 @@ def main():
+         return
+ 
+     if args.verbose:
+-        print '>>> Starting distdiffer ...\n'
++        print('>>> Starting distdiffer ...\n')
+ 
+     for package in packages:
+         if args.verbose:
+-            print '>>> Package: %s' % package
++            print('>>> Package: %s' % package)
+         pkg = Package(db)
+         try:
+             pkg.diff(package)
+-        except Exception, err:
+-            print >> sys.stderr, str(err)
++        except Exception as err:
++            print(str(err), file=sys.stderr)
+         if args.verbose:
+-            print '    >>> Versions:'
++            print('    >>> Versions:')
+             for cpv in pkg.ebuilds:
+-                print '        %s' % cpv
+-            print '    >>> Deltas:'
++                print('        %s' % cpv)
++            print('    >>> Deltas:')
+             if len(pkg.diffs) == 0:
+-                print '        None\n'
++                print('        None\n')
+             else:
+                 for diff in pkg.diffs:
+-                    print '        %s -> %s' % (diff.src.fname,
+-                                                diff.dest.fname)
++                    print('        %s -> %s' % (diff.src.fname,
++                                                diff.dest.fname))
+         if len(pkg.diffs) == 0:
+             continue
+         if args.verbose:
+-            print '    >>> Fetching distfiles:'
++            print('    >>> Fetching distfiles:')
+         try:
+             pkg.fetch_distfiles()
+-        except Exception, err:
+-            print >> sys.stderr, str(err)
+-            print
++        except Exception as err:
++            print(str(err), file=sys.stderr)
++            print()
+             continue
+         if args.verbose:
+-            print '    >>> Generating deltas:'
++            print('    >>> Generating deltas:')
+         for diff in pkg.diffs:
+             if args.verbose:
+                 sys.stdout.write('        %s -> %s ... ' % (diff.src.fname,
+@@ -116,20 +116,20 @@ def main():
+                               not args.no_compress, args.force)
+             except DiffExists:
+                 if args.verbose:
+-                    print 'up2date!'
+-                    print '            %s' % os.path.basename(diff.diff_file)
+-            except Exception, err:
++                    print('up2date!')
++                    print('            %s' % os.path.basename(diff.diff_file))
++            except Exception as err:
+                 if args.verbose:
+-                    print 'failed!'
+-                    print '            %s: %s' % (err.__class__.__name__, str(err))
++                    print('failed!')
++                    print('            %s: %s' % (err.__class__.__name__, str(err)))
+             else:
+                 if args.verbose:
+-                    print 'done!'
+-                    print '            %s' % os.path.basename(diff.diff_file)
++                    print('done!')
++                    print('            %s' % os.path.basename(diff.diff_file))
+                 db.add(diff.dbrecord)
+             diff.cleanup()
+         if args.verbose:
+-            print
++            print()
+ 
+ if __name__ == '__main__':
+     main()
+diff --git a/distpatch/chksums.py b/distpatch/chksums.py
+index 808dc59..d3dffab 100644
+--- a/distpatch/chksums.py
++++ b/distpatch/chksums.py
+@@ -26,16 +26,16 @@ class ChksumValue(object):
+         self._handler = get_handler(algorithm)
+ 
+     def to_str(self):
+-        if isinstance(self.value, basestring):
++        if isinstance(self.value, str):
+             return self.value
+-        elif isinstance(self.value, long):
++        elif isinstance(self.value, int):
+             return self._handler.long2str(self.value)
+         raise ChksumException('Invalid value: %s' % self.value)
+ 
+     def to_long(self):
+-        if isinstance(self.value, long):
++        if isinstance(self.value, int):
+             return self.value
+-        elif isinstance(self.value, basestring):
++        elif isinstance(self.value, str):
+             return self._handler.str2long(self.value)
+         raise ChksumException('Invalid value: %s' % self.value)
+ 
+@@ -69,11 +69,11 @@ class Chksum(object):
+                 raise ChksumException('File not found: %s' % fname)
+ 
+             values = get_chksums(fname, *self.algorithms)
+-            chksums = zip(self.algorithms, values)
++            chksums = list(zip(self.algorithms, values))
+ 
+         # if provided checksums, use them
+         else:
+-            chksums = chksums.items()
++            chksums = list(chksums.items())
+ 
+         # validate checksums, and set attributes
+         tmp_algorithms = list(self.algorithms)
+diff --git a/distpatch/deltadb.py b/distpatch/deltadb.py
+index 77d8c21..345077d 100644
+--- a/distpatch/deltadb.py
++++ b/distpatch/deltadb.py
+@@ -40,7 +40,7 @@ import os
+ 
+ from collections import OrderedDict
+ from fcntl import lockf, LOCK_EX, LOCK_UN
+-from itertools import izip
++
+ from shutil import rmtree
+ from snakeoil.chksum import get_handler
+ from snakeoil.fileutils import AtomicWriteFile
+@@ -171,7 +171,7 @@ class DeltaDB(list):
+         pieces = line.split()
+         chksums = OrderedDict()
+         uchksums = OrderedDict()
+-        for key, value in izip(pieces[::2], pieces[1::2]):
++        for key, value in zip(pieces[::2], pieces[1::2]):
+             key = key.lower()[:]
+             mykey = key[0] == 'u' and key[1:] or key
+             myvalue = get_handler(mykey).str2long(value.strip())
+diff --git a/distpatch/diff.py b/distpatch/diff.py
+index d5818f1..eeaf8a6 100644
+--- a/distpatch/diff.py
++++ b/distpatch/diff.py
+@@ -37,11 +37,11 @@ class DiffUnsupported(Exception):
+ 
+ 
+ _supported_formats = [
+-    u'.tar',
+-    u'.tar.gz', u'.tgz', u'.gz',
+-    u'.tar.bz2', u'.tbz2', u'.bz2',
+-    u'.tar.xz', u'.xz',
+-    u'.tar.lzma', u'.ĺzma',
++    '.tar',
++    '.tar.gz', '.tgz', '.gz',
++    '.tar.bz2', '.tbz2', '.bz2',
++    '.tar.xz', '.xz',
++    '.tar.lzma', '.ĺzma',
+ ]
+ 
+ 
+@@ -152,7 +152,7 @@ class Diff(object):
+         try:
+             patch = Patch(self.dbrecord)
+             patch.reconstruct(output_dir, tmp_dir, False)
+-        except PatchException, err:
++        except PatchException as err:
+             if clean_sources:
+                 os.unlink(self.diff_file)
+             raise DiffException('Delta reconstruction failed: %s' % str(err))
+diff --git a/distpatch/package.py b/distpatch/package.py
+index 553fc18..3c834cc 100644
+--- a/distpatch/package.py
++++ b/distpatch/package.py
+@@ -35,17 +35,17 @@ class Package(object):
+         diffs = []
+         taken = {}
+         for ebuild_id in range(len(self.ebuilds) - 1):
+-            cpvs = self.ebuilds.keys()
++            cpvs = list(self.ebuilds.keys())
+             src_cpv = cpvs[ebuild_id]
+             dest_cpv = cpvs[ebuild_id + 1]
+             src_ebuild = self.ebuilds[src_cpv]
+             dest_ebuild = self.ebuilds[dest_cpv]
+-            for src_distfile in src_ebuild.src_uri_map.keys():
++            for src_distfile in list(src_ebuild.src_uri_map.keys()):
+                 avg_distfile = None
+                 avg_ebuild = None
+                 max_avg = 0.0
+                 avgs = {}
+-                for dest_distfile in dest_ebuild.src_uri_map.keys():
++                for dest_distfile in list(dest_ebuild.src_uri_map.keys()):
+                     prefix = ''
+                     suffix = ''
+                     for i in range(min(len(src_distfile), len(dest_distfile))):
+diff --git a/distpatch/patch.py b/distpatch/patch.py
+index c210a5e..83eb3d6 100644
+--- a/distpatch/patch.py
++++ b/distpatch/patch.py
+@@ -14,7 +14,7 @@ import portage
+ import posixpath
+ import re
+ 
+-from itertools import izip
++
+ from portage.package.ebuild.fetch import fetch
+ from shutil import move
+ from subprocess import call
+@@ -96,7 +96,7 @@ class Patch(object):
+         if self.src != DeltaDBFile(src):
+             raise PatchException('Bad checksum for source: %s' % \
+                                  self.src.fname)
+-        for delta, delta_record in izip(deltas, self.dbrecords):
++        for delta, delta_record in zip(deltas, self.dbrecords):
+             if delta_record.delta != DeltaDBFile(delta):
+                 raise PatchException('Bad checksum for delta: %s' % \
+                                      delta_record.delta.fname)
+diff --git a/distpatch/stats.py b/distpatch/stats.py
+index 187f926..7716e07 100644
+--- a/distpatch/stats.py
++++ b/distpatch/stats.py
+@@ -48,7 +48,7 @@ class Stats(object):
+             delta = float(record.delta.chksums['size'])
+             dest = float(record.dest.chksums['size'])
+             ratio.append(100 - ((delta / dest) * 100))
+-        pyplot.plot(range(1, len(ratio) + 1), sorted(ratio))
++        pyplot.plot(list(range(1, len(ratio) + 1)), sorted(ratio))
+         pyplot.axes()
+         pyplot.xlabel('Deltas (total: %i)' % len(ratio))
+         pyplot.ylabel('Percentage of savings (for compressed files)')
+@@ -60,6 +60,6 @@ class Stats(object):
+         for record in self.deltadb:
+             dest.append(int(record.dest.chksums['size']))
+             delta.append(int(record.delta.chksums['size']))
+-        pyplot.plot(range(len(dest)), dest)
+-        pyplot.plot(range(len(delta)), delta)
++        pyplot.plot(list(range(len(dest))), dest)
++        pyplot.plot(list(range(len(delta))), delta)
+         pyplot.show()
+diff --git a/distpatcher b/distpatcher
+index 05980e2..984e4c2 100755
+--- a/distpatcher
++++ b/distpatcher
+@@ -69,35 +69,35 @@ def main():
+         return
+ 
+     if args.verbose:
+-        print '>>> Starting distpatcher ...\n'
++        print('>>> Starting distpatcher ...\n')
+ 
+     for cpv in cpv_list:
+         if args.verbose:
+             if args.distfile:
+-                print '>>> Distfile: %s' % cpv
++                print('>>> Distfile: %s' % cpv)
+             else:
+-                print '>>> CPV: %s' % cpv
++                print('>>> CPV: %s' % cpv)
+         pkg = Package(db)
+         if args.distfile:
+             pkg.patch_distfile(cpv, args.output_dir)
+         else:
+             pkg.patch(cpv, args.output_dir)
+         if args.verbose:
+-            print '    >>> Deltas:'
++            print('    >>> Deltas:')
+             if len(pkg.patches) == 0:
+-                print '        None\n'
++                print('        None\n')
+             else:
+                 for patch in pkg.patches:
+-                    print '        %s' % '\n            -> '.join(
+-                        [i.delta.fname for i in patch.dbrecords])
++                    print('        %s' % '\n            -> '.join(
++                        [i.delta.fname for i in patch.dbrecords]))
+         if len(pkg.patches) == 0:
+             continue
+         if args.verbose:
+-            print '    >>> Fetching deltas:'
++            print('    >>> Fetching deltas:')
+         for patch in pkg.patches:
+             patch.fetch_deltas(args.root_url, args.input_dir)
+         if args.verbose:
+-            print '    >>> Reconstructing distfiles:'
++            print('    >>> Reconstructing distfiles:')
+         for patch in pkg.patches:
+             if args.verbose:
+                 sys.stdout.write('        %s ... ' % '\n            -> '.join(
+@@ -106,17 +106,17 @@ def main():
+             try:
+                 patch.reconstruct(args.input_dir, args.output_dir,
+                                   not args.no_compress)
+-            except PatchException, err:
++            except PatchException as err:
+                 if args.verbose:
+-                    print 'failed!'
+-                    print '            %s' % str(err)
++                    print('failed!')
++                    print('            %s' % str(err))
+             else:
+                 if args.verbose:
+-                    print 'done!'
+-                    print '            %s' % \
+-                          os.path.basename(patch.dest.fname)
++                    print('done!')
++                    print('            %s' % \
++                          os.path.basename(patch.dest.fname))
+         if args.verbose:
+-            print
++            print()
+ 
+ if __name__ == '__main__':
+     main()
+diff --git a/distpatchq b/distpatchq
+index 902f6c0..e6bcebe 100755
+--- a/distpatchq
++++ b/distpatchq
+@@ -48,7 +48,7 @@ def delta_fetch_size(pkg, filename, distfiles_dir=None, deltas_dir=None):
+     except OSError:
+         pass
+     if filename in distfiles:
+-        print 0
++        print(0)
+         return 0
+     pkg.patch_distfile(filename, distfiles_dir)
+     if len(pkg.patches) == 0:
+@@ -62,7 +62,7 @@ def delta_fetch_size(pkg, filename, distfiles_dir=None, deltas_dir=None):
+         if dbrecord.delta.fname in deltas:
+             continue
+         fetch_size += int(dbrecord.delta.chksums.size.to_long())
+-    print fetch_size
++    print(fetch_size)
+ 
+ 
+ def delta_verify_checksums(pkg, filename, distfiles_dir=None):
+@@ -96,20 +96,20 @@ def delta_verify_checksums(pkg, filename, distfiles_dir=None):
+     return 0 if dest_record.uchksums == _Chksum(usrc) else 4
+ 
+ 
+-commands = sorted(i for i in globals().keys() if not i.startswith('_'))
++commands = sorted(i for i in list(globals().keys()) if not i.startswith('_'))
+ 
+ 
+ def usage(argv):
+-    print '>>> distpatch information query tool'
+-    print '>>> Usage: distpatchq <command> [<option> ...]'
+-    print
+-    print 'Available commands:'
++    print('>>> distpatch information query tool')
++    print('>>> Usage: distpatchq <command> [<option> ...]')
++    print()
++    print('Available commands:')
+     for name in commands:
+         function = globals()[name]
+         if function.__doc__ is None:
+-            print '   ' + name
+-            print '      MISSING DOCUMENTATION!'
+-            print
++            print('   ' + name)
++            print('      MISSING DOCUMENTATION!')
++            print()
+             continue
+ 
+         # introspect command arguments
+@@ -120,14 +120,14 @@ def usage(argv):
+             args.append('<%s>' % arg)
+         for arg in spec.args[-opt:]:
+             args.append('[%s]' % arg)
+-        print '   ' + name + ' ' + ' '.join(args)
++        print('   ' + name + ' ' + ' '.join(args))
+         lines = function.__doc__.split('\n')
+         if len(argv) > 1:
+             for line in lines:
+-                print "      " + line.strip()
++                print("      " + line.strip())
+ 
+     if len(argv) == 1:
+-        print "\nRun distpatchq with --help for info"
++        print("\nRun distpatchq with --help for info")
+ 
+ if __name__ == '__main__':
+     if len(_sys.argv) < 2:
+@@ -150,7 +150,7 @@ if __name__ == '__main__':
+     req = len(spec.args) - opt
+ 
+     if len(_sys.argv) < req + 2:
+-        print "Invalid number of arguments!!"
++        print("Invalid number of arguments!!")
+         _sys.exit(2)
+ 
+     dbfile = _sys.argv[2]
+-- 
+2.21.0
+
diff --git a/app-portage/g-octave/Manifest b/app-portage/g-octave/Manifest
index 836d8373c290..3b104639d0fc 100644
--- a/app-portage/g-octave/Manifest
+++ b/app-portage/g-octave/Manifest
@@ -1,7 +1,5 @@
-AUX g-octave-0.4.1-add_cave_support.patch 3289 BLAKE2B 9b41991021ea4bcc49b3458bf911b73386ffdecbdf61d1208b54db5b74c2aa5a515a68f26a56152420393bd266a51a5d60b5ded0f2dc3da695e7d9b86d6780fa SHA512 2903550b2f61940d3a141ed59af5ae19a2d03dcaffb3b143c66247be8e8e5262b29f2693b884c8a2b7cf6c9e1885a5e6564286dfdee77d3a34ed3a2e86ab97db
-AUX g-octave-0.4.1-fix-Makefile.patch 491 BLAKE2B c2deff7f9ff544a62ae6877ec229ddaf5c817f46c51b7f66d4200daa47b5224986dca24877ecc4c2490a2adde068b2734f44d4d173c604fa651bb04182399750 SHA512 d11269f703fa887ca6a5c42773f8891c28036d0890818a233504e4827c3221e2b69ea80ce02023c3bfe279a17318ba4084b137d2f92f281abacf5aa218492ce4
-AUX g-octave-0.4.1-fix-sourceforge-svn-root.patch 1441 BLAKE2B 89ddb026eb2b0f133ba508c3f351bc32fe7968d91034416559b7ec80319473b3a323f72a9fd5cfb7b88603b1176b91ba312580acbb7930b6f07ecde335f05037 SHA512 637a3f0a7be6cacde645768bc2f576ceccb163fa00dae60520ff0de876f8414b75568e33a04bbc225520ef05258e4339930f748577620cb9588cfcbf961fce1b
 DIST g-octave-0.4.1.tar.gz 52285 BLAKE2B d1e39931471c527c5542683c976487c56bca2a4666a437e110fa41b504287c0dd87aad94bf98298544c374c6d3faa0722fb3fab43228c56425be19b450ae0dd4 SHA512 424b95e626981aa5685795ffb3df1a1d608e5293adba074cc67f7dcf08d4a0c94a0174005f97a8da1ba1ae4233299e6a530af96ba3b9fd0d8b224915e947efb3
 DIST g-octave-db-bdf02cb.tar.gz 39836 BLAKE2B fadc374e69bbf785f9e9ecae02eeba6f1c048d11503e5d97db2b4cc65c820ec829615be72ce823ef44ecb0e59e1b68dd40f7310d19d0b7706a2ff47ab95c0851 SHA512 5eae00e18b6d4633ed0feda3a2eea6b36da049c133bcd49e54481443ff435bfcab0f303ab9f0e8c3f48fad707625ee13b4564c510d89fa196e737c7599ea5fa6
-EBUILD g-octave-0.4.1-r6.ebuild 2330 BLAKE2B 7e51bc73453bd626633e96023c17f4266eadc394bb43325fbca967c8e5e41c91b2e665d876f62e5b51a4244dbed1016beb4eef125d54cf98d355455eff89860c SHA512 e5676924d209ed69b02daed849765ce0ada06ef8678c6f62fbe8bf3685c24c6d27611d6413013b208e2bbbecdf01fe3b43b9d6dd76565b6cce24afd6b6c02652
+DIST g-octave-patches-0.4.1-r7.tar.xz 8800 BLAKE2B 514b154d7cbb816f15d88a2efe0d0b8503a5a09dedfcc79ab61fdb2fca8be193752ffb477ad7ea7be167e341a91e8d83c5b70fa20ed9d55da6f668acc8743e6c SHA512 cb03afd16bb7f2f0ddf2c4f11bdde2748b8ee0124642cfed4697e19adda30b141b3217afa55e996acf3e295d06af0636ba235a631039e65ca7920eef3243e267
+EBUILD g-octave-0.4.1-r7.ebuild 2431 BLAKE2B 927217b7a28d0b5471ff7e71dc71ce3cd923cc04e7b6fe4e407dbd795744a8c1ce877722e3979c6112402e408d15018a2ab16e42935d11573b374c730ec69f95 SHA512 14ae597435bf525773dc78b9a01cbe4cb9a635581f2fbf14806aab07148c09d46829001566dd5218467500c01c138ccbb511af7216aeec8d4865cb9574123258
 MISC metadata.xml 953 BLAKE2B c7df56688e694e153043051b897de819f4b43441399ce338d7b65a2bffa689c0c68bd03fed1ce10a5111e422e4e38c796387c8e52758d47b06a369fea10b22fa SHA512 2e9160dc06169653737491b25ac4f1e4ad4416a3a6d9789078021c8a501d67c07294a6360762beea1815608d1d2e92a089bcac4614113bfa8c9d312723bda20f
diff --git a/app-portage/g-octave/files/g-octave-0.4.1-add_cave_support.patch b/app-portage/g-octave/files/g-octave-0.4.1-add_cave_support.patch
deleted file mode 100644
index 27468c1bba5a..000000000000
--- a/app-portage/g-octave/files/g-octave-0.4.1-add_cave_support.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- g-octave-0.4.1/g_octave/package_manager.py	2010-10-23 23:37:26.000000000 +0200
-+++ g-octave-0.4.1/g_octave/package_manager.py	2011-05-25 12:52:10.510019006 +0200
-@@ -15,6 +15,7 @@
-     'Portage',
-     'Pkgcore',
-     'Paludis',
-+    'Cave',
- ]
- 
- import grp
-@@ -243,3 +244,56 @@
-                 packages.append(line.strip())
-         return packages
- 
-+class Cave(Base):
-+    
-+    _client = '/usr/bin/cave'
-+    _group = 'paludisbuild'
-+    
-+    post_uninstall = [
-+        'You may want to remove the dependencies too, using:',
-+        '# cave purge',
-+    ]
-+    
-+    def __init__(self, ask=False, verbose=False, pretend=False, oneshot=False, nocolor=False):
-+        self._fullcommand = [self._client]
-+        self._cmd = ['-z']
-+        oneshot and self._cmd.append('-1')
-+        not pretend and self._cmd.append('-x')
-+        #if verbose:
-+        #    self._fullcommand += [
-+        #        '--show-descriptions', 'all',
-+        #        '--show-option-descriptions', 'all',
-+        #    ]
-+        #cave doesn't support '--ask'
-+        #cave doesn't support '--no-color'
-+    
-+    def run_command(self, command):
-+        return subprocess.call(self._fullcommand + command + self._cmd)
-+    
-+    def install_package(self, pkgatom, catpkg):
-+        return self.run_command(['resolve'] + [pkgatom])
-+
-+    def uninstall_package(self, pkgatom, catpkg):
-+        return self.run_command(['uninstall'] + [pkgatom])
-+    
-+    def update_package(self, pkgatom=None, catpkg=None):
-+        cmd = ['-1','-K','s','-k','s']
-+        if pkgatom is None:
-+            pkgatom = self.installed_packages()
-+        else:
-+            pkgatom = [pkgatom]
-+        self.do_ebuilds(pkgatom)
-+        return self.run_command(['resolve'] + cmd + pkgatom)
-+    
-+    def installed_packages(self):
-+        packages = []
-+        p = subprocess.Popen([
-+            'cave',
-+            'print-ids',
-+            '--matching', 'g-octave/*::installed',
-+            '--format', '%c/%p\n',
-+        ], stdout=subprocess.PIPE)
-+        if p.wait() == os.EX_OK:
-+            for line in p.stdout:
-+                packages.append(line.strip())
-+        return packages
---- g-octave-0.4.1/scripts/g-octave	2011-05-25 12:00:25.740019020 +0200
-+++ g-octave-0.4.1/scripts/g-octave	2011-05-25 12:00:39.434019008 +0200
-@@ -217,7 +217,7 @@
-             return os.EX_DATAERR
-         return os.EX_OK
- 
--    from g_octave.package_manager import Portage, Pkgcore, Paludis
-+    from g_octave.package_manager import Portage, Pkgcore, Paludis, Cave
- 
-     if conf_prefetch.package_manager == 'portage':
-         log.info('Your package manager is: Portage')
-@@ -228,6 +228,9 @@
-     elif conf_prefetch.package_manager == 'paludis':
-         log.info('Your package manager is: Paludis')
-         pkg_manager = Paludis(options.ask, options.verbose, options.pretend, options.oneshot, not options.colors)
-+    elif conf_prefetch.package_manager == 'cave':
-+        log.info('Your package manager is: Paludis (Cave)')
-+        pkg_manager = Cave(options.ask, options.verbose, options.pretend, options.oneshot, not options.colors)
-     else:
-         log.error('Invalid package manager: %s' % conf_prefetch.package_manager)
-         out.eerror('Invalid package manager: %s' % conf_prefetch.package_manager)
diff --git a/app-portage/g-octave/files/g-octave-0.4.1-fix-Makefile.patch b/app-portage/g-octave/files/g-octave-0.4.1-fix-Makefile.patch
deleted file mode 100644
index af56b4f75d96..000000000000
--- a/app-portage/g-octave/files/g-octave-0.4.1-fix-Makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- g-octave-0.4.1/share/g-octave.eclass	2013-05-30 19:01:07.980521612 +0200
-+++ g-octave-0.4.1/share/g-octave.eclass.new	2013-05-30 19:03:38.933514388 +0200
-@@ -48,6 +48,9 @@
- 	for filename in Makefile configure; do
- 		cp "${DISTDIR}/g-octave_${filename}" "${S}/${filename}"
- 	done
-+
-+	sed -i -e 's@libexec@lib@g' "${S}/Makefile" || die 'sed failed.'
-+
- 	chmod 0755 "${S}/configure"
- 	if [ -e "${S}"/src/autogen.sh ]; then
- 		cd "${S}"/src && ./autogen.sh || die 'failed to run autogen.sh'
diff --git a/app-portage/g-octave/files/g-octave-0.4.1-fix-sourceforge-svn-root.patch b/app-portage/g-octave/files/g-octave-0.4.1-fix-sourceforge-svn-root.patch
deleted file mode 100644
index 2700f3b100dc..000000000000
--- a/app-portage/g-octave/files/g-octave-0.4.1-fix-sourceforge-svn-root.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/contrib/manage_pkgdb.py
-+++ b/contrib/manage_pkgdb.py
-@@ -50,7 +50,7 @@ class SfUpdates:
-     # feed url from 'http://sourceforge.net/projects/octave/files/Octave%20Forge%20Packages/Individual%20Package%20Releases/'
-     feed_url = u'http://sourceforge.net/api/file/index/project-id/2888/mtime/desc/rss?path=%2FOctave%20Forge%20Packages%2FIndividual%20Package%20Releases'
- 
--    svnroot_url = u'https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/'
-+    svnroot_url = u'http://svn.code.sf.net/p/octave/code/trunk/octave-forge'
-     categories = [u'main', u'extra', u'language', u'nonfree']
- 
-     _timestamp = None
---- a/g_octave/description.py
-+++ b/g_octave/description.py
-@@ -269,7 +269,7 @@ def __getattr__(self, name):
- 
- class SvnDescription(Description):
-     
--    _url = 'https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge'
-+    _url = 'http://svn.code.sf.net/p/octave/code/trunk/octave-forge'
-     
-     def __init__(self, category, package):
-         temp_desc = config_file = tempfile.mkstemp()[1]
---- a/share/g-octave.eclass
-+++ b/share/g-octave.eclass
-@@ -13,7 +13,7 @@
- G_OCTAVE_CAT="${G_OCTAVE_CAT:-main}"
- 
- 
--REPO_URI="https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge"
-+REPO_URI="http://svn.code.sf.net/p/octave/code/trunk/octave-forge"
- if [[ ${PV} = 9999* ]]; then
- 	inherit subversion autotools
- 	ESVN_REPO_URI="${REPO_URI}/${G_OCTAVE_CAT}/${PN}"
--- 
-1.7.10
-
diff --git a/app-portage/g-octave/g-octave-0.4.1-r6.ebuild b/app-portage/g-octave/g-octave-0.4.1-r7.ebuild
index dbf8ea63a922..6597908c6119 100644
--- a/app-portage/g-octave/g-octave-0.4.1-r6.ebuild
+++ b/app-portage/g-octave/g-octave-0.4.1-r7.ebuild
@@ -1,9 +1,10 @@
-# 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
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=no
 
 DB_COMMIT="bdf02cbf0a8d017c6c1bddeffd6f03d5d90695ed"
 DB_DIR="rafaelmartins-${PN}-db-${DB_COMMIT:0:7}"
@@ -14,8 +15,9 @@ DESCRIPTION="A tool that generates and installs ebuilds for Octave-Forge"
 HOMEPAGE="https://github.com/rafaelmartins/g-octave"
 
 SRC_URI="https://github.com/downloads/rafaelmartins/${PN}/${P}.tar.gz
-	https://github.com/rafaelmartins/${PN}-db/tarball/${DB_COMMIT} ->
-		${PN}-db-${DB_COMMIT:0:7}.tar.gz"
+	https://github.com/rafaelmartins/${PN}-db/archive/${DB_COMMIT}.tar.gz ->
+		${PN}-db-${DB_COMMIT:0:7}.tar.gz
+	https://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-patches-${PVR}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,11 +29,7 @@ DEPEND="doc? ( >=dev-python/sphinx-1.0 )"
 RDEPEND="sys-apps/portage"
 
 python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-add_cave_support.patch"
-		"${FILESDIR}/${P}-fix-sourceforge-svn-root.patch"
-		"${FILESDIR}/${P}-fix-Makefile.patch"
-	)
+	eapply "${WORKDIR}/${PN}-patches-${PVR}"
 	sed -i -e 's/^has_fetch.*$/has_fetch = False/' scripts/g-octave \
 		|| die 'failed to patch the g-octave main script'
 	distutils-r1_python_prepare_all
@@ -50,6 +48,8 @@ python_install_all() {
 		mv docs/_build/{html,sphinx} || die 'mv failed.'
 		HTML_DOCS+=( docs/_build/sphinx )
 	fi
+	insinto /usr/share/g-octave
+	doins "${DISTDIR}/${PN}-db-${DB_COMMIT:0:7}.tar.gz"
 	distutils-r1_python_install_all
 }
 
@@ -74,7 +74,7 @@ pkg_config() {
 	local db="$(g-octave --config db)"
 	mkdir -p "${db}" || die 'mkdir failed.'
 	einfo "Extracting g-octave database files to: ${db}"
-	tar -xzf "${DISTDIR}/${PN}-db-${DB_COMMIT:0:7}.tar.gz" -C "${db}" || die 'tar failed.'
+	tar -xzf "${EROOT}/usr/share/g-octave/${PN}-db-${DB_COMMIT:0:7}.tar.gz" -C "${db}" || die 'tar failed.'
 	rm -rf "${db}"/{patches,octave-forge,info.json,manifest.json,timestamp} || die 'rm db files failed.'
 	mv -f "${db}/${DB_DIR}"/* "${db}" || die 'mv failed.'
 	rm -rf "${db}/${DB_DIR}" || die 'rm db dir failed.'
diff --git a/app-portage/g-sorcery/Manifest b/app-portage/g-sorcery/Manifest
index dc49576e7486..1fc872c8bc4b 100644
--- a/app-portage/g-sorcery/Manifest
+++ b/app-portage/g-sorcery/Manifest
@@ -1,4 +1,4 @@
 DIST g-sorcery-0.2.1.tar.gz 55546 BLAKE2B 56fb8a766c17c220a8279d2288f5de5c6976dc8fb380ac695bcf891616aa8a284f6b07c9be79c3c819c69faf7fcf9a7a826ee8b8b955db007c00e23d6417f2f8 SHA512 42c34ed8addaf721583029d5056751810b0a77546f798081c7c605223342fa2a99bd2e30f20f004a8606ccf847108f0e2ef2c479f3cbb55f2fe6648d4ffc075e
-EBUILD g-sorcery-0.2.1-r1.ebuild 952 BLAKE2B 5abb7b88be4ec392ffa753fc2ba022a7136f023b7e92fa47e2b97f75480551d774087c1642db8b629bf169eeaa3e38cc29b14fa1da46babfdd56fbb499527d16 SHA512 c9c8e18cf16c3653080f8277c39d665c7d9ba169340d8870be158d8ecfa23d7f27832a2b86426715393f915ead211839bf1b0b563c603d3a12e25fc2cc1da937
-EBUILD g-sorcery-9999.ebuild 869 BLAKE2B a4e54c03822bedeae5537554891338766e9be01d751b17214b0042714f083ce9cca166e9758f5abe3aca036cf068594f4b6de1f08d682d734e86583d1abe3da8 SHA512 807411103956aaed6fb5bc60e98a93032d3f29ea5197fcda3fcb5974455935cb2673294f0be78a5b5c02782a28637e22221b31cebdaa8b87c4b160f7dc27625f
+EBUILD g-sorcery-0.2.1-r1.ebuild 946 BLAKE2B 177e21f41214deed8c5b4a684a98492fed689954760fb87fdcacb27fad21ed417d153cfa2e1cc1c063152f7c2317c37ba2c2c021a29d179cafe44bc8f174eaf1 SHA512 c3f11f75cc31575aad2b31a7988a63aab826ea3f066c1ef1c8cd2fbd21f3d9794ab0f2fb85faea0615aa2ff3449bc25fbea19515aad46a93c1b469e73f00d850
+EBUILD g-sorcery-9999.ebuild 863 BLAKE2B 7082478f3614ef7cb55a51d5a1e916cf7d27e84d2978d60ce62df71080faf0df7a9c4639a4d96d73841a60382f703e4e410ddc2db95bd9f7fab4c6b8a327554f SHA512 673a78a06387d002a27271476fe12e61726bf9b7c7f949ae53d3d049a67ef7ca3a513ba2f791af44f9845970e4abb64ed03ecd6473b73e9d39ca3e0652a8751e
 MISC metadata.xml 416 BLAKE2B d1009974d29bf69e2938899e03cc44942f86476c92ba3dde3f3a56e7253f77307bcb30771ba2a860e2c84e5daa1a16039a69aade1227c0739668ceb766ef9134 SHA512 63d03d46ad0f346591ea9208c55d186da8419fbd8cb1ba9ec68dcd8484cfd6dec0200e46004829cc8a1c411e13e4cdfeeef8e8c9ac05679f8d595cf306d49f54
diff --git a/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
index 71d2921aa27f..6bb6f3199cc5 100644
--- a/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
+++ b/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=(python{2_7,3_6})
+PYTHON_COMPAT=(python3_6)
 
 inherit distutils-r1 prefix
 
diff --git a/app-portage/g-sorcery/g-sorcery-9999.ebuild b/app-portage/g-sorcery/g-sorcery-9999.ebuild
index 77a7ae95cd11..f511341ccb9a 100644
--- a/app-portage/g-sorcery/g-sorcery-9999.ebuild
+++ b/app-portage/g-sorcery/g-sorcery-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python{2_7,3_6})
+PYTHON_COMPAT=(python3_6)
 
 inherit distutils-r1 git-r3
 
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 78e8366d61c8..66241362b149 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,4 +1,4 @@
 DIST gemato-14.3.tar.gz 71325 BLAKE2B d42a5182c12bcc0281df47ddb6b933bb332b9b842b2a5c874c3fa4030ab5a8a16759ee289609d428a3fc1338078cd73d234060354513be88c184d5a6bbec545d SHA512 99904b1a38b8a05ff7bf7c265aa463a56ea3aa6c77dd844dc2d154faae5460e3535f4e9799e8863fda256ee6cd374e051ed98193c9b1fc52dc30c9c2655010cd
-EBUILD gemato-14.3.ebuild 1347 BLAKE2B 3c025e4c28c50d9933ab42131efd56ecb3b4400e2fa4dd1a0e32c3042087b60425256c6b89d9051d514b743a7ffa1847b9c4834a184765f0d5a3ae029cca23fe SHA512 55cf8ac45fb041067a002b09ebe756012f907c779bd13ef80d87a31f4ed2853deca45d518e050463853d5458546fa4e08de58645cf53a3f2777dbcfc84c26116
-EBUILD gemato-9999.ebuild 1253 BLAKE2B e7ec95e09ae89f9637f12456f27fbca524a6065e8d497874bd9d01feb42d91ec2abf95ec8940c5ca5ed138f8587d2970bdd02175b8a1edc73bea438c9ce8f18b SHA512 42f14a37f272d02bb910bd3ce42b3e81ebcc18c8b7bf46ef4d1ed4791c5c5ee9a28bc65b81144b5bc177d5e0e59f4c67e31d9db69e0537d118f1949ce5014025
+EBUILD gemato-14.3.ebuild 1187 BLAKE2B 1232ba399701e147cb5e450f6b41cf974de27c72a591782fb05f0c4f0ee3e78b1d8ce36d14f944691decf8b62bed1685f842bcb3da05076f50dfebc1c8a2a76b SHA512 a9eb6e3b068f3b9888fafc8cb2f0c0a1cfa290a916660997329cea9d53256ef6c99945443c24aefe9e1fd67b75f3f5f08ea7b08988d3419324aa234e6ff95289
+EBUILD gemato-9999.ebuild 1125 BLAKE2B a49efe2a16ad0d96457d76f75795b0f6777a4b277148db9eef515cd0239c91659387e8e58a70f45feed1605b7c6e5bbe9eb3693436fc97a02c2c212db7952998 SHA512 2b1471e8edcd22d39cd00b053c26e90434e4498805d86ceb2d719817be987aebca98499d9bd8de4568945950229ffa3a9889fb457a1eb8fb99e2f9d1ce19056e
 MISC metadata.xml 814 BLAKE2B 1e6845b23a861560cb0972f787a14f7ade2b471d98ff28f2ae3153e99011d98f2751d720d312a6006554117e3241e5ea8557211073f8d03bbfb751c23565c390 SHA512 d2367bd897e76939768a3cf8f173723e773ec5d12b7144793a69843a3a18aec50bcdb593956cce6644d45f27c263ebf1893ac375e5d4ee3d894dcb0bd4aa6d9e
diff --git a/app-portage/gemato/gemato-14.3.ebuild b/app-portage/gemato/gemato-14.3.ebuild
index 1c2e6cc874a7..7903d882e703 100644
--- a/app-portage/gemato/gemato-14.3.ebuild
+++ b/app-portage/gemato/gemato-14.3.ebuild
@@ -3,8 +3,10 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
 PYTHON_REQ_USE='threads(+)'
+
 inherit distutils-r1
 
 DESCRIPTION="Stand-alone Manifest generation & verification tool"
@@ -14,24 +16,16 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
-RESTRICT="!test? ( test )"
+IUSE="+blake2 bzip2 +gpg lzma sha3 tools"
 
-MODULE_RDEPEND="
+RDEPEND="
 	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )
 	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
 	gpg? ( app-crypt/gnupg )
 	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
 	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy) )"
 
-RDEPEND="${MODULE_RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}]
-	test? ( ${MODULE_RDEPEND} )"
-
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests setup.py
 
 python_install_all() {
 	distutils-r1_python_install_all
diff --git a/app-portage/gemato/gemato-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild
index 840a8c6afc7b..a52943c5d571 100644
--- a/app-portage/gemato/gemato-9999.ebuild
+++ b/app-portage/gemato/gemato-9999.ebuild
@@ -3,8 +3,10 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
 PYTHON_REQ_USE='threads(+)'
+
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Stand-alone Manifest generation & verification tool"
@@ -18,21 +20,14 @@ KEYWORDS=""
 IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
 RESTRICT="!test? ( test )"
 
-MODULE_RDEPEND="
+RDEPEND="
 	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )
 	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
 	gpg? ( app-crypt/gnupg )
 	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
 	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy) )"
 
-RDEPEND="${MODULE_RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}]
-	test? ( ${MODULE_RDEPEND} )"
-
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests setup.py
 
 python_install_all() {
 	distutils-r1_python_install_all
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 1f73bcf1b466..6ed189539f18 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,6 +1,6 @@
 DIST gentoolkit-0.4.6.tar.gz 3205641 BLAKE2B 7da91a313c8a9263eb7b4abd6207ece9dd602a5069a87f1e78ada13fc9f396e1f2afddaf0637c473445034cf57b5ca7631e209361a88fa3892d302b20f4cc986 SHA512 3aa3c9af7e994313400607943b9090fd813227ddd6d550b50fbcf7eeb4053da8bcdb41c9ef2579d957d2f279fdcc4e2f2ceca1091c5fd457df4204dd11792d6e
 DIST gentoolkit-0.4.7.tar.gz 3205669 BLAKE2B e5f64b85546bc10ad16e7fa42d288965539177375e8796b40df699859efa13fb98bb86aec58e60363c955b2d5e4b2e6379a7597252ee4fdbeec49559de67b328 SHA512 0fab600b4323d23e12009eeb4ade595950880a88b05bcfbfeada1a9b9af615b96d31c568285629bf6e5de7b45ed857bdf98b6261dc54974fbaf70c924e093c76
-EBUILD gentoolkit-0.4.6.ebuild 2302 BLAKE2B e5fa8c8aa6942d5416de606fe109c10b523095bedb4d4f09b0ad54cbbc76adc6243abe0a2eda4dd2b6300834f19c269ae89232285d4013e479214cafa65c8a43 SHA512 9f4d3e89740831e5d82a70cc5e2bd9f727729b7decff3278b98d5045ce9148cc631684de22247f0603bcc6c1542f604a5282e782673d73c05e1ab5c60f83a36e
-EBUILD gentoolkit-0.4.7.ebuild 2320 BLAKE2B 6e6c6685bd40aadfa6b4c0e4d842bc7266bfabed29ba9c627bf0b06347501440da9d6eb0f0541ea08086c2ff6ec78090adb182fedfbf898cf22d9bd93c63f862 SHA512 9118a094bb40519649abc49848a2137b5a32dd13cc856f4adac96262e1f5adfddc06fa1a623434ea4ee9cb967aa8089794b16745b6253ed29428ed72bfd33b80
-EBUILD gentoolkit-9999.ebuild 2089 BLAKE2B 21934a450e077df0ffd71dd975a6ee488fa49d6776a3b6c949832286dd8b094e167198475098a716f216cb30fbef2e08fb5f4782da67bf6b5e8b73b794c489e2 SHA512 7cfefb8d7f661390fbc8695d34946d2d4c2b1a7be3c44b858986b73d1238a6f3ba07af52166ce7934ff30e6bd635ba5fcf122f445dc0ec7ef4bf191a6c01e84b
+EBUILD gentoolkit-0.4.6.ebuild 2292 BLAKE2B 12263be3d543b2e3c69edbcab38af14dd6217c0c4ede6902ce69339bf98e63020f0a2e1e617ed48183b5d2aae5ab8f8960d83864ee55cdd3b6a494d9e198cc21 SHA512 541d311ff54b41832d005fa4b1317fda10ac24a0709b84daafa4e0c962378bef9828c34ea7bfb96556e6245d3655eed17c9f0f115c6a8142008c2c4016e2cfb7
+EBUILD gentoolkit-0.4.7.ebuild 2310 BLAKE2B 343f4afd25c4b7a48cc5ce3b6018ff0d50ef548c54283b1a96f07b39dc1080363bbc8a37bc4e1c8ce5eb0e418d5ff8cbc3841a66fdb5c9d8e9c5f1f5b6405333 SHA512 2fbf333a7aa03111bb41a7b38f93fcc7aef15159a22c6ba3a8415c0d5d2ba06a40c096ca186828510c74e38219857b82606193519e1b269a88fa89da36e382ba
+EBUILD gentoolkit-9999.ebuild 2079 BLAKE2B d9907f6e1a70545548ad15f74c247f7d59fb03e692dac268934d966d63a3340db301b4a1d3d58e804e948bd5d18bd5b4af1956eaf5d66f31a515fcc5b6a2dcbf SHA512 c526f20479299dc0849bc3cc55b540c4713e0220a511aba0668b6e9fdb781b52fb3ba51bf9940bde1615ee98a8042b325f0158c412bc002825b44ee3a7e34009
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
index 624a90da4a65..46a21780e945 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
index 4ecbc9343c9e..e4162f133220 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index f79109cd9a4e..1bb4f4cc13d5 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git"
diff --git a/app-portage/getdelta/Manifest b/app-portage/getdelta/Manifest
index 66368bd1fedd..6bf6882bdc22 100644
--- a/app-portage/getdelta/Manifest
+++ b/app-portage/getdelta/Manifest
@@ -1,4 +1,4 @@
 AUX getdelta-0.7.9.patch 9393 BLAKE2B 1b105cccd24dc039ea5c14f119b67fb9ea570172d1e0808af905951ef23275ea1843a60cda1156cfa653904ec42ae5c869faaf4133a5c614162956dc064691c8 SHA512 c9c363c8e36245a8cd409d3a43c0d9110c409311f6972893d993f16f2911496c33c50c98e8dd9138b52bb7d7dc5ffb56b0611c28e9682ea5ac189cb27c5755dc
 DIST getdelta-0.7.8.tar.bz2 10335 BLAKE2B ab2093a805649904405d23d7ec7afb2f338e87864c91f8aeb13efa2547f5493080cc1249a28a73da8e17d6b5aaff6fc00f217fe5b8df51db4fbea2420a88a523 SHA512 66374ce1a0ec5492d11478ddcaeb67b497a44357605f3cd1b9176796ca9f69d8c6865f9db188a6d7722c4ab372a5a317dfa6fafe97d9f08f76f332469f1ee2b2
-EBUILD getdelta-0.7.9-r2.ebuild 1384 BLAKE2B 56f4a5b03640207b59b63c45c18beab0b01bb0f74c96bb469fe7bac94ea27cecd24a25b35f6e0da215b60f784e0efb83dfef99e0de7985ab8506e1727f1ebd11 SHA512 e2825f4eb44243d67b9962ce4a6aeafc17b1dc71c2ccdde3505642f7fffe24abda3d53defe1c197999cb56ead5c459f4ab5e66fda1cfe68e44e07af1d58bd419
+EBUILD getdelta-0.7.9-r2.ebuild 1380 BLAKE2B 6c4e52dae2f7880e30ca041f958a60793f504d8c8c89c0b64f64639c1a4d0eb2067ed4387ab9de4320e578ffad8dff887cdf1a3d44e20bf94e33375092dd16a1 SHA512 f1847acf0da44d2365d8a0424e432b135a6d2e64a59b86b9ee433fbf454ec9435b3323e3c9452546ef8b3d1978a23ae34032d5700811fc55a1b5956c249ac235
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/app-portage/getdelta/getdelta-0.7.9-r2.ebuild b/app-portage/getdelta/getdelta-0.7.9-r2.ebuild
index cff0c6a6fe5e..55f536597134 100644
--- a/app-portage/getdelta/getdelta-0.7.9-r2.ebuild
+++ b/app-portage/getdelta/getdelta-0.7.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,7 +22,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}.patch
 }
 
-src_install () {
+src_install() {
 	# portage has moved make.globals, so we just hotfix it
 	sed -i -e "s:/etc/make.globals:/usr/share/portage/config/make.globals:g" "${WORKDIR}"/getdelta.sh || die "Couldn't fix make.globals path"
 
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 2adda29ff077..c40126ba0aad 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,5 +1,5 @@
 DIST layman-2.4.2.tar.gz 137893 BLAKE2B ad925b974e280c0c933cb7c7d5131946fbb40d15410a671be3d93fa895e2d92a4f3218bce99abc8f2c1e007e72bd51662a18665579bf2ded7f349eb9ed5c652c SHA512 9d32269f51f896c554e6cbf8a674c50009bce48dd83dfe773b08b75bafd567eb75c26c227ab3a60bc83c1ed511862a3979b8d851befe8ad16fd0847eb91337cf
-EBUILD layman-2.4.2-r1.ebuild 2180 BLAKE2B 7a754addb5f54c497deab6c2352134f58fdf5ded9b82e6a71668d7a77f88e4df6f7a050cc307a4ad4c66229bb5e856b1d14aa329d362924d178b5a8312572234 SHA512 e505e8af6a4f670e25a5db45b8feb8c4e7591a37cbc053c90e821c39c9c5c578b360c805a4dd020a7851b9a6dc4db9206fcf50640a68d3f536874c404d0a01b2
-EBUILD layman-2.4.2-r2.ebuild 2321 BLAKE2B f40318c2f25f9e704ae7c4a34e22f6ac50c444e88c419cc266d9eddbfcee1736dfeeb213c411b026e976b7c8d31ab961bd22c12bb6b1772c724ef305bddfa25b SHA512 9084e88b667b6b17b225c8ffb42cebf70b32d53e5058d6af6624c7b59d31815150f2d27ae8cfdb662fab6c814cf09334922ab3047043aa99999ec4666e2bd248
-EBUILD layman-9999.ebuild 2321 BLAKE2B f40318c2f25f9e704ae7c4a34e22f6ac50c444e88c419cc266d9eddbfcee1736dfeeb213c411b026e976b7c8d31ab961bd22c12bb6b1772c724ef305bddfa25b SHA512 9084e88b667b6b17b225c8ffb42cebf70b32d53e5058d6af6624c7b59d31815150f2d27ae8cfdb662fab6c814cf09334922ab3047043aa99999ec4666e2bd248
+EBUILD layman-2.4.2-r1.ebuild 2173 BLAKE2B d7642b6f87045257e4fcd0bbe0732699801ea618f9a45561a1fc6ed7f1e104bf04a0f8c6a6268025968806d9163e0ceebb122d3d31a45ce780fe4f682285674b SHA512 2e5aa1718a6cd1c9b630b85b4a5b5fabde279402ce68eeba9d2cb22f7804a48b5172136edfdfee77b54324803909a3c970d93c5d91276624f7ccf6263d532c32
+EBUILD layman-2.4.2-r2.ebuild 2316 BLAKE2B ebc560bee1bf5dd7427a1207433481e2f8447c930df718a48be79df9255e81ea1e47743840133ce5aa90f4299d7f98a367398d56253bc6eeadebe01ba0de8aa4 SHA512 6dc4b86805d883fd4258598914e9ad778f2224b9dd2dacf6724312b0cf19d096a4bf1caecf44d33cb65fb8151e3c02ae9cd03d5267417e68e3d20f6db1091308
+EBUILD layman-9999.ebuild 2316 BLAKE2B ebc560bee1bf5dd7427a1207433481e2f8447c930df718a48be79df9255e81ea1e47743840133ce5aa90f4299d7f98a367398d56253bc6eeadebe01ba0de8aa4 SHA512 6dc4b86805d883fd4258598914e9ad778f2224b9dd2dacf6724312b0cf19d096a4bf1caecf44d33cb65fb8151e3c02ae9cd03d5267417e68e3d20f6db1091308
 MISC metadata.xml 1177 BLAKE2B 0024befce684e122216fecaecb3ccf2f2da44fa82a3f2c8811155861041009a0cded912e93a2d6e66884814afc8b1ccbe6f006b40b6e44cafa13fa0f53c90a4d SHA512 d41244afefdb11e5f68be2200a759e4209b2b59f5b9de083e79a522d5a10f12359f9fd6f30fd24f73d4e9b190a2f974f8e519cd22614dd2b023594952dba957e
diff --git a/app-portage/layman/layman-2.4.2-r1.ebuild b/app-portage/layman/layman-2.4.2-r1.ebuild
index 316be315fb4c..8540842c8cf7 100644
--- a/app-portage/layman/layman-2.4.2-r1.ebuild
+++ b/app-portage/layman/layman-2.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="xml(+),sqlite?"
 
 inherit eutils distutils-r1 linux-info prefix
@@ -55,7 +55,7 @@ pkg_setup() {
 	layman_check_kernel_config
 }
 
-python_prepare_all()  {
+python_prepare_all() {
 	python_setup
 	esetup.py setup_plugins
 	distutils-r1_python_prepare_all
diff --git a/app-portage/layman/layman-2.4.2-r2.ebuild b/app-portage/layman/layman-2.4.2-r2.ebuild
index c681b67f3fea..a82ec4d06a4c 100644
--- a/app-portage/layman/layman-2.4.2-r2.ebuild
+++ b/app-portage/layman/layman-2.4.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="xml(+),sqlite?"
 
 inherit eutils distutils-r1 linux-info prefix
@@ -61,7 +61,7 @@ pkg_setup() {
 	layman_check_kernel_config
 }
 
-python_prepare_all()  {
+python_prepare_all() {
 	python_setup
 	esetup.py setup_plugins
 	distutils-r1_python_prepare_all
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index c681b67f3fea..a82ec4d06a4c 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="xml(+),sqlite?"
 
 inherit eutils distutils-r1 linux-info prefix
@@ -61,7 +61,7 @@ pkg_setup() {
 	layman_check_kernel_config
 }
 
-python_prepare_all()  {
+python_prepare_all() {
 	python_setup
 	esetup.py setup_plugins
 	distutils-r1_python_prepare_all
diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index e12ba6a923fd..51b3ebda5f58 100644
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -14,6 +14,6 @@ EBUILD metagen-0.6.5.ebuild 825 BLAKE2B 11b103026c9fec8053f87f7f460d0d91ed1623c7
 EBUILD metagen-0.6.6-r1.ebuild 818 BLAKE2B cc65686fab9403da53a80196cac102d6bff698c740d00830babc7b13d0f9f9b442f9062ffedf75ecec251bb576ef8a3d98b1a444ebd548aa4ebfa854f6b58565 SHA512 96a7ce22921e7729b18f5b80213cdd09b015b0ad3aa69484f2d49a062bd247b686559f8ae629f1a5fe2c4e1f229f06980286a74f387370aa283dcc8f04f13396
 EBUILD metagen-0.7.0.ebuild 759 BLAKE2B 8b5bd111e2853060aa740f37c26f025c41741f53e3b16d0ac12f8ee012f8c117bf0e2f91152a5036996b1e4f38237f6ff7f12f628d161127a0d05a5849e9ab63 SHA512 89a29aab9f4c403c7ffcabd7a5842df93baea90195d6bc1d35d72dc9c5c1ccee80e3e2549e2b75523733ccf50f4bb47359f29a3ba75b5dd89cd20c675486309f
 EBUILD metagen-0.7.1.ebuild 740 BLAKE2B 36488209622d0b0b463451b66f68ff9ff3653bf4bc5ebefc478687c11fa1ada94ea72d54f25a2ee01d91af457090222bff17ad48e8dff330fbbb8831c985f3d1 SHA512 5e15cc0e71aa7bd57adf3ba9d397d602cbfe27ef7936bf079d692657d98904dc89f5b7511abd168a5aca32f1db8c5d88ff997777ced8ae1f21a7724770657d21
-EBUILD metagen-0.7.2.ebuild 740 BLAKE2B 36488209622d0b0b463451b66f68ff9ff3653bf4bc5ebefc478687c11fa1ada94ea72d54f25a2ee01d91af457090222bff17ad48e8dff330fbbb8831c985f3d1 SHA512 5e15cc0e71aa7bd57adf3ba9d397d602cbfe27ef7936bf079d692657d98904dc89f5b7511abd168a5aca32f1db8c5d88ff997777ced8ae1f21a7724770657d21
+EBUILD metagen-0.7.2.ebuild 738 BLAKE2B def89921299a2b6aa8c5735466c22f61a5c3334c00c2fca84a1d83d386d0ecff9562f9275deb628ac11e4443309fe84ab5522b593fe35ddbbcef692bb14800b3 SHA512 f5f2431b6eee31b08600af03b167f3caadea61cb90f2655afb96300f43521f4209c68996db315d8dea7de25b318fe306c9679ba1e814628c474c6c724491f8bf
 EBUILD metagen-9999.ebuild 875 BLAKE2B 9a188abcd348c848793c87acb0ec7fe1386a60de9fd8e11feabb8827d28ac880c221881a208388f4b8c304bd34c3b2911f9bc58c829a534171eaae7d4ea23f61 SHA512 c89c02b942df1df8058c4bdbe170d47fbc73e7887892fd1266a59947ff38e867f538e677bf61160ab62eae1c671f7c8929cd1bca0bff46b1277f84faad36ff02
 MISC metadata.xml 249 BLAKE2B a4931a30c3947b238913053d611639235b076475e864914e684020d86ee1b4aa6da94e4cef59c53a0e5ccd3b3d15d3a4ae293800b17bbb89e0af9cff79314a70 SHA512 b1cb770984baef468e3d17e343acff395e1993b14f90def7f8582b5e5d1a512bd3c7727e03f1deca47f7359a8f8cc9a8360130923388a5c06fabbfb9b05d5138
diff --git a/app-portage/metagen/metagen-0.7.2.ebuild b/app-portage/metagen/metagen-0.7.2.ebuild
index dff9c50a5517..4b92f833bb10 100644
--- a/app-portage/metagen/metagen-0.7.2.ebuild
+++ b/app-portage/metagen/metagen-0.7.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index cbc579f78add..ccb75da423df 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -2,8 +2,8 @@ DIST mirrorselect-2.2.3.tar.gz 15230 BLAKE2B 7234ab8a681713c63b201e1ae362ea9a28d
 DIST mirrorselect-2.2.4.tar.gz 16085 BLAKE2B 67d3de3e25a993a4bfc546ae7d188b2a7e61da1cfbc85ac50119c88a81c4966959e31f88101880ba86ef27f0b0674a3d279b11135d2475d0b2fed1ea899021f5 SHA512 8749a916911088d128f9064d5aa78c3bf8b529d583db86eb6f7190959008257e231f7b0bae9a2f2fd6edc45f6d0ffb07364c16a3f190f8c97b88472c2d082037
 DIST mirrorselect-2.2.6.tar.gz 16727 BLAKE2B 8875bf61e26ac474338d81a602297fa4fdf3fab3dbd478b02129dbe71f2d09445efa9b82792e3e654725c5e87a4ca00d37a3d924f8bd6f2decdf74148d1069c8 SHA512 ff2b88bf568f79182275e2c85cafbeee7cbeb0226225a7c3289f0a1d7a8b5eae9d41c69b099bb7e0cc9b0300b23afea43c3ac1baa13f37c696159bb1b3ac05f8
 DIST mirrorselect-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27
-EBUILD mirrorselect-2.2.3.ebuild 969 BLAKE2B f2c2c66b18f27038b5bc5e29863273f8df6f607cbe22dcf603990e40e34e14850559d60fb33724012818c711d6ef3f1de9fe9ce773b92794182c857a4d48b4f3 SHA512 3261ec6404d2bcc3a8d9399053d0c1fc2bcfc83ab28c0163327f2ab7d198d4b0652fdac090913e228dc0be17a9a19be79e098fb371a19e5adbbdb872e09ff7af
-EBUILD mirrorselect-2.2.4-r1.ebuild 958 BLAKE2B 60f4cf85ffadff8fb706b0b0c33e97ea17811ca454f69a6f249b4f096bcb65c6b4a1c619202aa3d332e2d10337fa5a21b20404f768221a4fa9960056196700ab SHA512 81b6c15725c92e21efa5e5f3384724b5ff3304d83028ea32d57b3dad45ad0936c4c19e0013555b7656e5aad5407629b045876d05b9a24dfafeb9f9f4e58aeed9
-EBUILD mirrorselect-2.2.6-r1.ebuild 1488 BLAKE2B 835bbb26b369d7fc25fd443c803922a409149731affd4b75b53cdeb87b34fe3f3968a834cb85c9a0a29d50a322d389050f49a443141cd78b4d4bb8b90f829698 SHA512 dc2e3598a2f9b5fcca0e1ffaae3bf70f9039880e51abcba2d9a5abd8ecb8f1e31c813ab17a8a478cb7c3ae9706c8c5da02262c95ee1209a49b2caa5c60536c66
-EBUILD mirrorselect-9999.ebuild 1125 BLAKE2B 1367e29df22a03d6d1c60da88dd6f5c7a267756a9480e916bdf989512d514ea2880aa1c407a0c837ab00b6d050ec16cac04b64a90d7237a7870a569a6fd52a60 SHA512 77ac529d5c967559bef59f21829253152deef3d72a3be7ba5ddf2c4c9bffece5aadd0611a90e2e788fda787b119c2ef08a56b3f53cb5917f0db6ddb1c961caec
+EBUILD mirrorselect-2.2.3.ebuild 968 BLAKE2B 8d1496d99821bfcbbc16d1563e8e4a8fdf2a24fcf4fd2ec5bab24ce2f93db17a56575103321d4beb08f961d84807b8722b633d6f14dcf8d73583f08356373afe SHA512 21d7dcfb4e8caa301c832e8e3c8a8b684036cb6302e23030a33c4bd5eee4c709a9f0940ff13a49ac143b5cf05b69d7294734bfecae26098296550a4685efec97
+EBUILD mirrorselect-2.2.4-r1.ebuild 957 BLAKE2B 9a3f83cbd50ce0a859ca410739915584bffca4ec68561fea8870211259387dec9dc05f62bea615e817a3ffb87f44a412de9706107e82d91ebe64a8a52c11e4dd SHA512 502491164b5ea2cf4d35d9f2154af43fc95960737d53f8769d1966fdf083f04538dd33df2f83442fb0d93f30ea1146c3e2a12c74dc74b2afd0911a3e3e5ee486
+EBUILD mirrorselect-2.2.6-r1.ebuild 1487 BLAKE2B 1ef84c57d6c369c4d22627441d91ca8e81672edadc733da55077eb6473421d6490510f9bbb47c7e66477488bdaeafc56ea5e55750759fa850033fb2d7491b991 SHA512 0139e14a10599a3915b62083a9abba8d6d5df8f1a91cabd04278741db94793d7c09210642e9493859d2342584267c4a0ed4698c9559d664547214d7ed7ef31c5
+EBUILD mirrorselect-9999.ebuild 1124 BLAKE2B b5bc70646394397d5460aeb2cb3f43bcb2ec7134640c69ee22f189434470ca10091b82c82b544a1a96c2f5af9f22fe66b4c74928510cb399be46d55fb100d736 SHA512 d07b7665c53147c268eb77f276e8ad63c876e938b58781e440efc9cd3c336bd0cd291db6cf6bb5bba5f6bf3db988b0ef917014ab29f5789a4d6df86b5c990ac3
 MISC metadata.xml 470 BLAKE2B 5b799aaffb1a8166846fbc1f4bc2f28c3e664bc2a17c8dc9d743c9294a682787c404c9f099faae26667d1b38c977910acbf5e4e0cff21467bad45fc0f0e142d7 SHA512 31405437e73acec409d4d9c14d33fb10b03aed300ac88d5f793666cc7324abd46ff8703d794009316716d1a63b2b80721dc5e0841f0e1d0fbebc1f9b83f13acc
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
index c2817fcb4edc..9558fdd285e7 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
 	"
 
-python_prepare_all()  {
+python_prepare_all() {
 	python_setup
 	eprefixify setup.py mirrorselect/main.py
 	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
index 701069cfcc2d..bfbde93a0843 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
 	"
 
-python_prepare_all()  {
+python_prepare_all() {
 	python_setup
 	eprefixify setup.py mirrorselect/main.py
 	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
index 53b5eee7bccc..38b3bb9d9f51 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
 	"
 
-python_prepare_all()  {
+python_prepare_all() {
 	python_setup
 	eprefixify setup.py mirrorselect/main.py
 	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
index 5b8f8d1c2029..14f0555e4126 100644
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	=dev-python/ssl-fetch-9999[${PYTHON_USEDEP}]
 	"
 
-python_prepare_all()  {
+python_prepare_all() {
 	python_setup
 	eprefixify setup.py mirrorselect/main.py
 	echo Now setting version... VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
diff --git a/app-portage/porthole/Manifest b/app-portage/porthole/Manifest
index 124d0639af65..e623d77a3125 100644
--- a/app-portage/porthole/Manifest
+++ b/app-portage/porthole/Manifest
@@ -2,5 +2,5 @@ AUX porthole-0.6.1-masking_status.patch 485 BLAKE2B 92188c56635ab69207dcee949303
 AUX porthole-0.6.1-missing-attribute.patch 665 BLAKE2B ac282d0f7ef0f94d125520d25c3171b3f05bf42338f399b6bd7b82f09e9f6d0740e6df06c256b7179d9889b4c361b0ffa2954fd14f9a835d024feaf71499105a SHA512 e450d7d188b7762cebdfd33e6bc586c38e63fec80fe51fd500559587a85e6f5632ad3279d8e8a4bc37781e77f3f6f3df9af8b013f1725dbb47877642177d27d2
 AUX porthole-0.6.1-missing_import.patch 858 BLAKE2B 6b338ff4425d533e6f5a7033f2372032b7184ef3119a95cd5251ff92430223cbef3e95922850ee62416f9d7f2e0dde6df015a5cad1146e227c120c2e4a902630 SHA512 aa61359f9b0d53ffeb3a68bdcacf0010de2a789ea70b1bc0a1035d649ff3986e7fb44292fced65f5652475956d7a10d15907a4e6fa139854f7cdb4a7db1eaebd
 DIST porthole-0.6.1.tar.bz2 958696 BLAKE2B e4eb7493a66278cd7d16ac68304fe74ad8623054a95bb3dca84b0b8236f76cb9b0a92f446d1ffd95f907c29d703d93bdd48e8e5064485b69282e8680f5fcb658 SHA512 9bc1d79c587ad8228b9bb4eee6cb32559a5d7b6a9f4f6ece752fce9030f71fdbfd6158d7a2a055641b63df1f0a1c31995747e15b618de79cd8a7a56e4d8f634c
-EBUILD porthole-0.6.1-r5.ebuild 1995 BLAKE2B 165f1dc771d95ef772d1ea7e9ce281675a9814601b4785864c4e38a3ca5027f2bcab4b2ce57a0792cf28f27f388168daf06ea9aa73fd6f6fb23d23e495e9cf41 SHA512 3a14b99a9d968fa5459dfa9f5c8e1ac14753ee43855bfa31f616d5267041572d7520e6661b9d4372778d893be7003db554ddbf962e9b137fca4c892f3ab17d35
+EBUILD porthole-0.6.1-r5.ebuild 1993 BLAKE2B c9b9d8983e21a7e5f9cf5081426143b1fad88ceb1b6c4cdb130d9e12cf80e3b4418859cd904fd29081e8f6536110c0cdf1feb32dd2171e6e60257dd64d0477db SHA512 87c1671e2aad7bf62bb8c603d4dbf7080d16359a3d181c6d99f8dccf066a7d6642e7c119dabfb2cfa667b8e2df3269807c28fd59e5a7ef1d8fa791b64778d320
 MISC metadata.xml 344 BLAKE2B 5a339a4ff73fed112ccb83ade8e56658473c29b3a0e168af830ad8e230f6703c2970da919196a42e438ab619c6a65432b1404b5657153fdb32a4215906aee00b SHA512 0d2dfde092b1691cdf45572b7257183625dd2fb11b0990840235b365483d87780caa3be5df6807b5b64e9502dde452bf589a3551967e97eec32cc0de77577811
diff --git a/app-portage/porthole/porthole-0.6.1-r5.ebuild b/app-portage/porthole/porthole-0.6.1-r5.ebuild
index 242cd072f7d3..8dbd7c1237fe 100644
--- a/app-portage/porthole/porthole-0.6.1-r5.ebuild
+++ b/app-portage/porthole/porthole-0.6.1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -33,7 +33,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-missing-attribute.patch" #bug 323179
 )
 
-src_compile(){
+src_compile() {
 	# Compile localizations if necessary
 	if use nls ; then
 		cd scripts