gentoo resync : 28.04.2021

37 files changed, 68 insertions, 122 deletions

diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 0d29cb0e3aa6..4c5606c97765 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-awk-0.3 b/metadata/md5-cache/app-eselect/eselect-awk-0.3
index 66a2d95ca22b..197fa3a5f964 100644
--- a/metadata/md5-cache/app-eselect/eselect-awk-0.3
+++ b/metadata/md5-cache/app-eselect/eselect-awk-0.3
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Manages the {,/usr}/bin/awk symlink
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~junghans/distfiles/eselect-awk-0.3.tar.gz
-_md5_=74378925c3e6da4482303365abb250e5
+_md5_=d573240fb416ba58283b0daa348cd317
diff --git a/metadata/md5-cache/app-eselect/eselect-blas-0.1 b/metadata/md5-cache/app-eselect/eselect-blas-0.1
index fd7754176689..98efa01719a6 100644
--- a/metadata/md5-cache/app-eselect/eselect-blas-0.1
+++ b/metadata/md5-cache/app-eselect/eselect-blas-0.1
@@ -3,8 +3,8 @@ DEPEND=>=app-admin/eselect-1.0.5
 DESCRIPTION=BLAS module for eselect
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.5
 SLOT=0
-_md5_=6946478034e5fdffd2161c9270a567c1
+_md5_=5202a1d9cd6d0bffef84661c416d2a24
diff --git a/metadata/md5-cache/app-eselect/eselect-cblas-0.1 b/metadata/md5-cache/app-eselect/eselect-cblas-0.1
index 9533b79ff14c..32bc97ef9ac9 100644
--- a/metadata/md5-cache/app-eselect/eselect-cblas-0.1
+++ b/metadata/md5-cache/app-eselect/eselect-cblas-0.1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=C-language BLAS module for eselect
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.5
 SLOT=0
-_md5_=44bba8fa0e2c88d5d3077065e5c530b1
+_md5_=1797ab31377509417fcc95d995c7c6c0
diff --git a/metadata/md5-cache/app-eselect/eselect-cdparanoia-0.1 b/metadata/md5-cache/app-eselect/eselect-cdparanoia-0.1
deleted file mode 100644
index 0898d9cbfd18..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-cdparanoia-0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=app-eselect/eselect-lib-bin-symlink-0.1.1 !<media-sound/cdparanoia-3.10.2-r5
-DESCRIPTION=Manage /usr/bin/cdparanoia symlink
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-eselect/eselect-lib-bin-symlink-0.1.1 !<media-sound/cdparanoia-3.10.2-r5
-SLOT=0
-_md5_=1dd1d17d9a4d33f3016ca970d0b9d099
diff --git a/metadata/md5-cache/app-eselect/eselect-cdparanoia-0.1-r1 b/metadata/md5-cache/app-eselect/eselect-cdparanoia-0.1-r1
index a95b2ffa2e99..6fabf0a2fe7c 100644
--- a/metadata/md5-cache/app-eselect/eselect-cdparanoia-0.1-r1
+++ b/metadata/md5-cache/app-eselect/eselect-cdparanoia-0.1-r1
@@ -3,8 +3,8 @@ DEPEND=app-eselect/eselect-lib-bin-symlink
 DESCRIPTION=Manage /usr/bin/cdparanoia symlink
 EAPI=7
 HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-eselect/eselect-lib-bin-symlink
 SLOT=0
-_md5_=2e9ebe908734ea66d140167223a21b0d
+_md5_=e0c4394aee00e92ce27145ecd834e88a
diff --git a/metadata/md5-cache/app-eselect/eselect-ctags-1.18 b/metadata/md5-cache/app-eselect/eselect-ctags-1.18
index 7a612813a65a..55c7b60933ca 100644
--- a/metadata/md5-cache/app-eselect/eselect-ctags-1.18
+++ b/metadata/md5-cache/app-eselect/eselect-ctags-1.18
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Manages ctags implementations
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/eselect-emacs-1.18.tar.xz
-_md5_=baf6e034afbe4916aba765340f87681c
+_md5_=409491792ee1c7c6fdc30b3cd60bf1c3
diff --git a/metadata/md5-cache/app-eselect/eselect-emacs-1.18 b/metadata/md5-cache/app-eselect/eselect-emacs-1.18
index 22ef29e59dc9..7f4fd01a6e84 100644
--- a/metadata/md5-cache/app-eselect/eselect-emacs-1.18
+++ b/metadata/md5-cache/app-eselect/eselect-emacs-1.18
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=Manage multiple Emacs versions on one system
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=app-admin/eselect-1.2.6 ~app-eselect/eselect-ctags-1.18
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/eselect-emacs-1.18.tar.xz
-_md5_=238ae0107707c36d1c5061d48ef057b2
+_md5_=6d1d8448c703c56c3c892ccd84f99e68
diff --git a/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1-r1 b/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1-r1
index e17f23821a39..361880622676 100644
--- a/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1-r1
+++ b/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=An eselect module to manage /etc/fonts/conf.d symlinks
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3 >=media-libs/fontconfig-2.4
 SLOT=0
 SRC_URI=mirror://gentoo/fontconfig.eselect-1.1.bz2
-_md5_=fdc358b3f19410d36c9fd36869e1796c
+_md5_=d472be14f8c1d93e617599c031b3d7d9
diff --git a/metadata/md5-cache/app-eselect/eselect-infinality-1-r1 b/metadata/md5-cache/app-eselect/eselect-infinality-1-r1
deleted file mode 100644
index 8e9231cc8681..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-infinality-1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Eselect module to choose an infinality font configuration style
-EAPI=6
-HOMEPAGE=https://github.com/yngwin/eselect-infinality
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-admin/eselect
-SLOT=0
-SRC_URI=https://github.com/yngwin/eselect-infinality/tarball/v1 -> eselect-infinality-1.tar.gz
-_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=7c144030297a1d113a3e3465a58ed858
diff --git a/metadata/md5-cache/app-eselect/eselect-infinality-1.1 b/metadata/md5-cache/app-eselect/eselect-infinality-1.1
deleted file mode 100644
index 0318e566c0ff..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-infinality-1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Eselect module to choose an infinality font configuration style
-EAPI=6
-HOMEPAGE=https://github.com/amadio/eselect-infinality
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-admin/eselect
-SLOT=0
-SRC_URI=https://github.com/amadio/eselect-infinality/archive/v1.1.tar.gz -> eselect-infinality-1.1.tar.gz
-_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=3fc5ec66477f4e03a9ae8afeb5b5948c
diff --git a/metadata/md5-cache/app-eselect/eselect-iptables-20200508 b/metadata/md5-cache/app-eselect/eselect-iptables-20200508
index 16b6c8bc7351..e42c9ef6a0fa 100644
--- a/metadata/md5-cache/app-eselect/eselect-iptables-20200508
+++ b/metadata/md5-cache/app-eselect/eselect-iptables-20200508
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Manages the {,/usr}/sbin/iptables symlink
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~chutzpah/dist/iptables/eselect-iptables-20200508.tar.xz
-_md5_=f2d25713db69589a73a232b62f77a92a
+_md5_=eaaddc9b88eaa84e9ce91a8a705ff7fe
diff --git a/metadata/md5-cache/app-eselect/eselect-java-0.4.0 b/metadata/md5-cache/app-eselect/eselect-java-0.4.0
index 27662f34c6de..6ff08c35e2d3 100644
--- a/metadata/md5-cache/app-eselect/eselect-java-0.4.0
+++ b/metadata/md5-cache/app-eselect/eselect-java-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=postinst prepare
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A set of eselect modules for Java
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!app-eselect/eselect-ecj !app-eselect/eselect-maven !<dev-java/java-config-2.2 app-admin/eselect
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/eselect-java.git/snapshot/eselect-java-0.4.0.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2e2749de86ddd3fd10a9f3f099e4702d
diff --git a/metadata/md5-cache/app-eselect/eselect-java-0.4.2 b/metadata/md5-cache/app-eselect/eselect-java-0.4.2
index 27ecb4ff8722..04f1737aba11 100644
--- a/metadata/md5-cache/app-eselect/eselect-java-0.4.2
+++ b/metadata/md5-cache/app-eselect/eselect-java-0.4.2
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=postinst prepare
 DESCRIPTION=A set of eselect modules for Java
 EAPI=7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!app-eselect/eselect-ecj !app-eselect/eselect-maven !<dev-java/java-config-2.2 app-admin/eselect
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/eselect-java.git/snapshot/eselect-java-0.4.2.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a8bd65b4cf712470c7b6cd2d9ff58a16
diff --git a/metadata/md5-cache/app-eselect/eselect-lapack-0.2 b/metadata/md5-cache/app-eselect/eselect-lapack-0.2
index fa1a8b3a36a7..2e6553a9e9db 100644
--- a/metadata/md5-cache/app-eselect/eselect-lapack-0.2
+++ b/metadata/md5-cache/app-eselect/eselect-lapack-0.2
@@ -3,8 +3,8 @@ DEPEND=>=app-admin/eselect-1.0.5
 DESCRIPTION=LAPACK module for eselect
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.5
 SLOT=0
-_md5_=d75fa3b0bdba7f5b9a233b7840856905
+_md5_=f192b435dc096543b384e03acd7e34ce
diff --git a/metadata/md5-cache/app-eselect/eselect-lcdfilter-2 b/metadata/md5-cache/app-eselect/eselect-lcdfilter-2
deleted file mode 100644
index f7c84ac70917..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-lcdfilter-2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Eselect module to choose Freetype infinality-enhanced LCD filtering settings
-EAPI=7
-HOMEPAGE=https://github.com/yngwin/eselect-lcdfilter
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=media-libs/freetype[infinality]
-RDEPEND=app-admin/eselect
-SLOT=0
-SRC_URI=https://github.com/yngwin/eselect-lcdfilter/archive/v2.tar.gz -> eselect-lcdfilter-2.tar.gz
-_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=b4cbedcdcc44f90664ee3e46b4ff0517
diff --git a/metadata/md5-cache/app-eselect/eselect-lib-bin-symlink-0.1.1-r1 b/metadata/md5-cache/app-eselect/eselect-lib-bin-symlink-0.1.1-r1
index 49ec477e63fc..2c559dc413b1 100644
--- a/metadata/md5-cache/app-eselect/eselect-lib-bin-symlink-0.1.1-r1
+++ b/metadata/md5-cache/app-eselect/eselect-lib-bin-symlink-0.1.1-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=An eselect library to manage executable symlinks
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/eselect-lib-bin-symlink/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://github.com/mgorny/eselect-lib-bin-symlink/releases/download/eselect-lib-bin-symlink-0.1.1/eselect-lib-bin-symlink-0.1.1.tar.bz2
-_md5_=0172e68899215aedb4bf4b363ed2c828
+_md5_=44201fe710e7b19531f4e5996053066d
diff --git a/metadata/md5-cache/app-eselect/eselect-lib-bin-symlink-9999 b/metadata/md5-cache/app-eselect/eselect-lib-bin-symlink-9999
index f41547a90a52..28d26ca1d5c1 100644
--- a/metadata/md5-cache/app-eselect/eselect-lib-bin-symlink-9999
+++ b/metadata/md5-cache/app-eselect/eselect-lib-bin-symlink-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=prepare unpack
 DESCRIPTION=An eselect library to manage executable symlinks
 EAPI=7
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=app-admin/eselect
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=115ae87c2ea96801b60ed1069e006d4e
diff --git a/metadata/md5-cache/app-eselect/eselect-mpg123-0.1 b/metadata/md5-cache/app-eselect/eselect-mpg123-0.1
deleted file mode 100644
index 12bd55568bf9..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-mpg123-0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=app-eselect/eselect-lib-bin-symlink-0.1.1 !<media-sound/mpg123-1.14.4-r1
-DESCRIPTION=Manage /usr/bin/mpg123 symlink
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=app-eselect/eselect-lib-bin-symlink-0.1.1 !<media-sound/mpg123-1.14.4-r1
-SLOT=0
-_md5_=11ceac270dfed4220683a41b0e17c9c1
diff --git a/metadata/md5-cache/app-eselect/eselect-mpg123-0.1-r1 b/metadata/md5-cache/app-eselect/eselect-mpg123-0.1-r1
index 0bb3967c19e1..6ecab15d5703 100644
--- a/metadata/md5-cache/app-eselect/eselect-mpg123-0.1-r1
+++ b/metadata/md5-cache/app-eselect/eselect-mpg123-0.1-r1
@@ -3,8 +3,8 @@ DEPEND=app-eselect/eselect-lib-bin-symlink
 DESCRIPTION=Manage /usr/bin/mpg123 symlink
 EAPI=7
 HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=app-eselect/eselect-lib-bin-symlink
 SLOT=0
-_md5_=4d0ce8ee455eddbc7c22ab8470d8810e
+_md5_=7a46d5d7d8bf5ff5cc3706fcbf47470e
diff --git a/metadata/md5-cache/app-eselect/eselect-package-manager-20110108-r1 b/metadata/md5-cache/app-eselect/eselect-package-manager-20110108-r1
index f4a1608e35b0..3187b6c4da18 100644
--- a/metadata/md5-cache/app-eselect/eselect-package-manager-20110108-r1
+++ b/metadata/md5-cache/app-eselect/eselect-package-manager-20110108-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Manages PACKAGE_MANAGER environment variable
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-admin/eselect-1.1.1
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-package-manager-20110108.tar.bz2
-_md5_=b94f6c94dc980677bb19bee867909fee
+_md5_=2a611d06c9d5553399933e3f7e96384b
diff --git a/metadata/md5-cache/app-eselect/eselect-php-0.9.6 b/metadata/md5-cache/app-eselect/eselect-php-0.9.6
index a2cdba3d5661..84c3958ee643 100644
--- a/metadata/md5-cache/app-eselect/eselect-php-0.9.6
+++ b/metadata/md5-cache/app-eselect/eselect-php-0.9.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect apache2? ( www-servers/apache[apache2_modules_dir] )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mjo/distfiles/eselect-php-0.9.6.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e94baf5df912377dbe66a90b33e4466f
diff --git a/metadata/md5-cache/app-eselect/eselect-php-0.9.7 b/metadata/md5-cache/app-eselect/eselect-php-0.9.7
index e771be08c984..9a2467646608 100644
--- a/metadata/md5-cache/app-eselect/eselect-php-0.9.7
+++ b/metadata/md5-cache/app-eselect/eselect-php-0.9.7
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare
 DESCRIPTION=PHP eselect module
 EAPI=7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect apache2? ( www-servers/apache[apache2_modules_dir] )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/eselect-php.git/snapshot/eselect-php-0.9.7.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=08e2ad515f3a7c29993dfc184c87d087
diff --git a/metadata/md5-cache/app-eselect/eselect-php-9999 b/metadata/md5-cache/app-eselect/eselect-php-9999
index b3bd417dea4c..9905c5dfd34c 100644
--- a/metadata/md5-cache/app-eselect/eselect-php-9999
+++ b/metadata/md5-cache/app-eselect/eselect-php-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare unpack
 DESCRIPTION=PHP eselect module
 EAPI=7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=app-admin/eselect apache2? ( www-servers/apache[apache2_modules_dir] )
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=6b0136861dbeb19be754975ad4940f7f
diff --git a/metadata/md5-cache/app-eselect/eselect-pinentry-0.7.1 b/metadata/md5-cache/app-eselect/eselect-pinentry-0.7.1
index 9523b280526b..eca1c75c96f4 100644
--- a/metadata/md5-cache/app-eselect/eselect-pinentry-0.7.1
+++ b/metadata/md5-cache/app-eselect/eselect-pinentry-0.7.1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Manage /usr/bin/pinentry symlink
 EAPI=7
 HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-eselect/eselect-lib-bin-symlink-0.1.1
 SLOT=0
-_md5_=a703cbe1e3a4ac4607f548d2e2d86dac
+_md5_=4d3c2b871c37301759762bb65e14cab9
diff --git a/metadata/md5-cache/app-eselect/eselect-postgresql-2.4 b/metadata/md5-cache/app-eselect/eselect-postgresql-2.4
index 2983903c3eb9..0b064c29768d 100644
--- a/metadata/md5-cache/app-eselect/eselect-postgresql-2.4
+++ b/metadata/md5-cache/app-eselect/eselect-postgresql-2.4
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Utility to select the default PostgreSQL slot
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=!<dev-db/postgresql-9.6.2-r1:9.6 !<dev-db/postgresql-9.5.6-r1:9.5 !<dev-db/postgresql-9.4.11-r1:9.4 !<dev-db/postgresql-9.3.16-r1:9.3 !<dev-db/postgresql-9.2.20-r1
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~titanofold/eselect-postgresql-2.4.tbz2
-_md5_=d584ab495f68f61c428211b7e907c022
+_md5_=b461de4299fd985372ee1a868dd9b825
diff --git a/metadata/md5-cache/app-eselect/eselect-python-20190417 b/metadata/md5-cache/app-eselect/eselect-python-20190417
index d753b39f5614..7e7ff664bc67 100644
--- a/metadata/md5-cache/app-eselect/eselect-python-20190417
+++ b/metadata/md5-cache/app-eselect/eselect-python-20190417
@@ -2,9 +2,9 @@ DEFINED_PHASES=postinst prepare
 DESCRIPTION=Eselect module for management of multiple Python versions
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Python
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3 >=dev-lang/python-exec-2.4.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/eselect-python-20190417.tar.bz2
-_md5_=f5724f75be387388bae3758f3426a0da
+_md5_=b9daf19bd97939ba5f56440b5b88ff76
diff --git a/metadata/md5-cache/app-eselect/eselect-python-20200719 b/metadata/md5-cache/app-eselect/eselect-python-20200719
index f5405db09b74..1c5838b158a9 100644
--- a/metadata/md5-cache/app-eselect/eselect-python-20200719
+++ b/metadata/md5-cache/app-eselect/eselect-python-20200719
@@ -2,9 +2,9 @@ DEFINED_PHASES=postinst prepare
 DESCRIPTION=Eselect module for management of multiple Python versions
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Python
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3 >=dev-lang/python-exec-2.4.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~chutzpah/dist/misc/eselect-python-20200719.tar.bz2
-_md5_=f0c3444d50cf9adcd05dadbb22f2ab5f
+_md5_=2328bebc1562c28fb1d45a7b35445a9e
diff --git a/metadata/md5-cache/app-eselect/eselect-python-99999999 b/metadata/md5-cache/app-eselect/eselect-python-99999999
index 16983ce2fa5c..1d4e555901fd 100644
--- a/metadata/md5-cache/app-eselect/eselect-python-99999999
+++ b/metadata/md5-cache/app-eselect/eselect-python-99999999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=postinst prepare unpack
 DESCRIPTION=Eselect module for management of multiple Python versions
 EAPI=7
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=app-admin/eselect-1.2.3 >=dev-lang/python-exec-2.4.2
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=1a357fd220772e48afbc64fd54deea12
diff --git a/metadata/md5-cache/app-eselect/eselect-repository-8 b/metadata/md5-cache/app-eselect/eselect-repository-10
index 0e41f53c8493..7a72466de0d4 100644
--- a/metadata/md5-cache/app-eselect/eselect-repository-8
+++ b/metadata/md5-cache/app-eselect/eselect-repository-10
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install setup
 DESCRIPTION=Manage repos.conf via eselect
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/mgorny/eselect-repository
 IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-admin/eselect python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) net-misc/wget
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
-SRC_URI=https://github.com/mgorny/eselect-repository/archive/v8.tar.gz -> eselect-repository-8.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=656d558e9cddb2cfaf15e3630056531e
+SRC_URI=https://github.com/mgorny/eselect-repository/archive/v10.tar.gz -> eselect-repository-10.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=baa98f9ee950319c239cfdacd459e23c
diff --git a/metadata/md5-cache/app-eselect/eselect-repository-9 b/metadata/md5-cache/app-eselect/eselect-repository-9
index de59fdb55b34..3d2796ed2e7a 100644
--- a/metadata/md5-cache/app-eselect/eselect-repository-9
+++ b/metadata/md5-cache/app-eselect/eselect-repository-9
@@ -3,11 +3,11 @@ DESCRIPTION=Manage repos.conf via eselect
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/eselect-repository
 IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-admin/eselect python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) net-misc/wget
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/eselect-repository/archive/v9.tar.gz -> eselect-repository-9.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8bcde906f44e7a4f8abcec5c34ed9e5a
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=697ee66d0238958436f24cca4fe54a07
diff --git a/metadata/md5-cache/app-eselect/eselect-ruby-20170723 b/metadata/md5-cache/app-eselect/eselect-ruby-20170723
index 17d79948280b..21d14e598102 100644
--- a/metadata/md5-cache/app-eselect/eselect-ruby-20170723
+++ b/metadata/md5-cache/app-eselect/eselect-ruby-20170723
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Manages multiple Ruby versions
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-20170723.xz
-_md5_=7e55deae7958fc2e0cf5c410510c9b6a
+_md5_=f61bbe9152b9b08b797de48d281aa805
diff --git a/metadata/md5-cache/app-eselect/eselect-ruby-20190121 b/metadata/md5-cache/app-eselect/eselect-ruby-20190121
index a20e27f6af5f..d6ff048f7b59 100644
--- a/metadata/md5-cache/app-eselect/eselect-ruby-20190121
+++ b/metadata/md5-cache/app-eselect/eselect-ruby-20190121
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Manages multiple Ruby versions
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-20190121.xz
-_md5_=38c37652e77e0e4770338ade2409801f
+_md5_=43c54f2b74e2184c90375e3dae28784d
diff --git a/metadata/md5-cache/app-eselect/eselect-rust-20200419 b/metadata/md5-cache/app-eselect/eselect-rust-20200419
index 71fae2142721..123dee2cdf22 100644
--- a/metadata/md5-cache/app-eselect/eselect-rust-20200419
+++ b/metadata/md5-cache/app-eselect/eselect-rust-20200419
@@ -2,9 +2,9 @@ DEFINED_PHASES=postinst prepare
 DESCRIPTION=Eselect module for management of multiple Rust versions
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Rust
-KEYWORDS=amd64 arm arm64 ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~whissi/dist/eselect-rust/eselect-rust-20200419.tar.bz2
-_md5_=d3dc2219c32498b7b355245784ee20d3
+_md5_=96fe1ef233524a169c3e19641ce8058b
diff --git a/metadata/md5-cache/app-eselect/eselect-sh-0.4.1 b/metadata/md5-cache/app-eselect/eselect-sh-0.4.1
index 8f0511856a77..ca1e4adc2469 100644
--- a/metadata/md5-cache/app-eselect/eselect-sh-0.4.1
+++ b/metadata/md5-cache/app-eselect/eselect-sh-0.4.1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Manages the /bin/sh (POSIX shell) symlink
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-eselect/eselect-lib-bin-symlink
 SLOT=0
-_md5_=8cd14ab02b3498e4d19f516f341c2fb0
+_md5_=761fada0a03c61e6ff6368a7ade90260
diff --git a/metadata/md5-cache/app-eselect/eselect-vi-1.2 b/metadata/md5-cache/app-eselect/eselect-vi-1.2
index 33a337f9bba2..2522f6d34c1d 100644
--- a/metadata/md5-cache/app-eselect/eselect-vi-1.2
+++ b/metadata/md5-cache/app-eselect/eselect-vi-1.2
@@ -1,12 +1,12 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare
 DESCRIPTION=Manages the /usr/bin/vi symlink
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Vim
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/eselect-vi.git/snapshot/eselect-vi-1.2.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8395d16fd83fa4528199c84c6e546a11
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2f76573bf12166f4334ff1d197c1e3e9
diff --git a/metadata/md5-cache/app-eselect/eselect-xvmc-0.4 b/metadata/md5-cache/app-eselect/eselect-xvmc-0.4
index 46a3f23448ed..43afbf95d322 100644
--- a/metadata/md5-cache/app-eselect/eselect-xvmc-0.4
+++ b/metadata/md5-cache/app-eselect/eselect-xvmc-0.4
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Manages XvMC implementations
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
-_md5_=3099a48fc02adf22a7b5a8449e1adf48
+_md5_=14e6929c75fd710a1eafc257bd8dd6af