2021-04-30 17:05:20 UTC

38 files changed, 55 insertions, 373 deletions

diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.16.2 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.16.2
index d0195d9da454..e07c4444b509 100644
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.16.2
+++ b/metadata/md5-cache/net-p2p/cpuminer-opt-3.16.2
@@ -1,16 +1,16 @@
 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 virtual/pkgconfig
 DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
 DESCRIPTION=Optimized multi algo CPU miner
 EAPI=7
 HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
 INHERIT=autotools flag-o-matic systemd
-IUSE=cpu_flags_x86_sse2 curl libressl
+IUSE=cpu_flags_x86_sse2 curl
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
 REQUIRED_USE=cpu_flags_x86_sse2
 SLOT=0
 SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.16.2.tar.gz -> cpuminer-opt-3.16.2.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=b8c2ee6ad9221945a58f801c284961be
+_md5_=f06866ec9db98bb526d9567c8750d4c4
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-9999 b/metadata/md5-cache/net-p2p/cpuminer-opt-9999
index d304c45d590f..f5b7a0173435 100644
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-9999
+++ b/metadata/md5-cache/net-p2p/cpuminer-opt-9999
@@ -1,15 +1,15 @@
 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 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare test unpack
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
 DESCRIPTION=Optimized multi algo CPU miner
 EAPI=7
 HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
 INHERIT=autotools flag-o-matic systemd git-r3
-IUSE=cpu_flags_x86_sse2 curl libressl
+IUSE=cpu_flags_x86_sse2 curl
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
 REQUIRED_USE=cpu_flags_x86_sse2
 SLOT=0
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=b65c0ff0a984c6b1b79c3e97a8c8688f
+_md5_=f06866ec9db98bb526d9567c8750d4c4
diff --git a/metadata/md5-cache/net-p2p/ctorrent-3.3.2-r4 b/metadata/md5-cache/net-p2p/ctorrent-3.3.2-r4
index 58e4c43b24e9..cd6653f1ac9a 100644
--- a/metadata/md5-cache/net-p2p/ctorrent-3.3.2-r4
+++ b/metadata/md5-cache/net-p2p/ctorrent-3.3.2-r4
@@ -1,12 +1,11 @@
 DEFINED_PHASES=-
-DEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= )
+DEPEND=dev-libs/openssl:0=
 DESCRIPTION=Enhanced CTorrent is a BitTorrent console client written in C and C++
 EAPI=7
 HOMEPAGE=http://www.rahul.net/dholmes/ctorrent/
-IUSE=libressl
 KEYWORDS=amd64 arm ppc ~s390 ~sparc x86
 LICENSE=GPL-2
-RDEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= )
+RDEPEND=dev-libs/openssl:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/dtorrent/ctorrent-dnh3.3.2.tar.gz
-_md5_=26b189494acbdcf4fdbb1859eff7e320
+_md5_=336bdd50b609c96ebdd6e19f13dbe464
diff --git a/metadata/md5-cache/net-p2p/mktorrent-1.1_p20180912 b/metadata/md5-cache/net-p2p/mktorrent-1.1_p20180912
index ef7bce96f006..90b3927b5914 100644
--- a/metadata/md5-cache/net-p2p/mktorrent-1.1_p20180912
+++ b/metadata/md5-cache/net-p2p/mktorrent-1.1_p20180912
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile install
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+DEPEND=ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=Simple command line utility to create BitTorrent metainfo files
 EAPI=7
 HOMEPAGE=https://github.com/Rudde/mktorrent
-IUSE=threads +ssl libressl debug
+INHERIT=toolchain-funcs
+IUSE=threads +ssl debug
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+RDEPEND=ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/Rudde/mktorrent/archive/4c221a05d949a3767a2671de139c6014909daf6b.tar.gz -> mktorrent-4c221a05d949a3767a2671de139c6014909daf6b.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a6ed7d2dd54d6818be8f3c068c5e128d
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=3d84e8a7ed13b4079a5aaf7f89b609c6
diff --git a/metadata/md5-cache/net-p2p/transmission-3.00-r1 b/metadata/md5-cache/net-p2p/transmission-3.00-r1
index 1fc2fec704ec..45d227744ad1 100644
--- a/metadata/md5-cache/net-p2p/transmission-3.00-r1
+++ b/metadata/md5-cache/net-p2p/transmission-3.00-r1
@@ -1,16 +1,16 @@
 BDEPEND=acct-group/transmission acct-user/transmission virtual/pkgconfig nls? ( gtk? ( dev-util/intltool sys-devel/gettext ) qt5? ( dev-qt/linguist-tools:5 ) ) dev-util/ninja dev-util/cmake virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/libevent-2.0.10:= !mbedtls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 appindicator? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) nls? ( virtual/libintl gtk? ( dev-util/intltool sys-devel/gettext ) qt5? ( dev-qt/linguist-tools:5 ) )
+DEPEND=>=dev-libs/libevent-2.0.10:= !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 appindicator? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) nls? ( virtual/libintl gtk? ( dev-util/intltool sys-devel/gettext ) qt5? ( dev-qt/linguist-tools:5 ) )
 DESCRIPTION=A fast, easy, and free BitTorrent client
 EAPI=7
 HOMEPAGE=https://transmissionbt.com/
 INHERIT=cmake systemd xdg-utils
-IUSE=appindicator gtk libressl lightweight nls mbedtls qt5 systemd test
+IUSE=appindicator gtk lightweight nls mbedtls qt5 systemd test
 KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ppc64 x86 ~amd64-linux
 LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
-RDEPEND=>=dev-libs/libevent-2.0.10:= !mbedtls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 appindicator? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission
+RDEPEND=>=dev-libs/libevent-2.0.10:= !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 appindicator? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/transmission-3.00.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=0895185630228a4a9067c480ec321e4e
+_md5_=2d51a91e4b95e1229be3f560216df0c3
diff --git a/metadata/md5-cache/net-p2p/transmission-9999 b/metadata/md5-cache/net-p2p/transmission-9999
index 2cbae6e0ed3d..2a897cf43c2f 100644
--- a/metadata/md5-cache/net-p2p/transmission-9999
+++ b/metadata/md5-cache/net-p2p/transmission-9999
@@ -1,15 +1,15 @@
 BDEPEND=acct-group/transmission acct-user/transmission virtual/pkgconfig nls? ( gtk? ( dev-util/intltool sys-devel/gettext ) qt5? ( dev-qt/linguist-tools:5 ) ) dev-util/ninja dev-util/cmake virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-libs/libevent-2.0.10:= !mbedtls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 appindicator? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) nls? ( virtual/libintl gtk? ( dev-util/intltool sys-devel/gettext ) qt5? ( dev-qt/linguist-tools:5 ) )
+DEPEND=>=dev-libs/libevent-2.0.10:= !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 appindicator? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) nls? ( virtual/libintl gtk? ( dev-util/intltool sys-devel/gettext ) qt5? ( dev-qt/linguist-tools:5 ) )
 DESCRIPTION=A fast, easy, and free BitTorrent client
 EAPI=7
 HOMEPAGE=https://transmissionbt.com/
 INHERIT=cmake systemd xdg-utils git-r3
-IUSE=appindicator gtk libressl lightweight nls mbedtls qt5 systemd test
+IUSE=appindicator gtk lightweight nls mbedtls qt5 systemd test
 LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
 PROPERTIES=live
-RDEPEND=>=dev-libs/libevent-2.0.10:= !mbedtls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 appindicator? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission
+RDEPEND=>=dev-libs/libevent-2.0.10:= !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 appindicator? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=1c2b77949c849564388114c9fad56743
+_md5_=caf98be0bf9642cddcec7b0c6ea0bc20
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.16 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.16
deleted file mode 100644
index 68b144682b69..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.16
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-DESCRIPTION=Kubernetes API server
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module systemd
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.16.tar.gz -> kubernetes-1.18.16.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	92660621959e7fab813173772987588b	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=15f346faed426145480f49fbbd3dc3e0
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.17 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.17
deleted file mode 100644
index 9b1e54983fa7..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.17
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-DESCRIPTION=Kubernetes API server
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module systemd
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.17.tar.gz -> kubernetes-1.18.17.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	92660621959e7fab813173772987588b	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=15f346faed426145480f49fbbd3dc3e0
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.8 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.8
deleted file mode 100644
index ffee5e6727c3..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-DESCRIPTION=Kubernetes API server
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module systemd
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.8.tar.gz -> kubernetes-1.19.8.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	92660621959e7fab813173772987588b	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=d20e7c72886afc0fbc34d3261d0981eb
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.20.6 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.20.6
index dc039fe75bc3..2fc08e037ae4 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.20.6
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.20.6
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module systemd
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.6.tar.gz -> kubernetes-1.20.6.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	92660621959e7fab813173772987588b	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=e16a9a5ddf1116c30f809d05134d7148
+_md5_=d20e7c72886afc0fbc34d3261d0981eb
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.16 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.16
deleted file mode 100644
index df87e7f83d7d..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.16
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.16.tar.gz -> kubernetes-1.18.16.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=51758dc16e8c05844f5abd104cd67570
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.17 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.17
deleted file mode 100644
index 3109066a8bd1..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.17
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.17.tar.gz -> kubernetes-1.18.17.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=51758dc16e8c05844f5abd104cd67570
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.8 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.8
deleted file mode 100644
index 06fa47951a95..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.8.tar.gz -> kubernetes-1.19.8.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=8b6c0d4d904f5f14c3d433f98c7cd7d6
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.20.6 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.20.6
index ddb0da3f31d1..cec38ad8797b 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.20.6
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.20.6
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.6.tar.gz -> kubernetes-1.20.6.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=e139ccc1e65e258bd411b84b4f9dc75f
+_md5_=8b6c0d4d904f5f14c3d433f98c7cd7d6
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.18.16 b/metadata/md5-cache/sys-cluster/kube-proxy-1.18.16
deleted file mode 100644
index ef613f6311c5..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.18.16
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=Kubernetes Proxy service
-EAPI=7
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.16.tar.gz -> kubernetes-1.18.16.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=1bca40e401c9bef0205ad3732e993a17
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.18.17 b/metadata/md5-cache/sys-cluster/kube-proxy-1.18.17
deleted file mode 100644
index 8135fdd7bcfa..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.18.17
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=Kubernetes Proxy service
-EAPI=7
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.17.tar.gz -> kubernetes-1.18.17.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=1bca40e401c9bef0205ad3732e993a17
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.19.8 b/metadata/md5-cache/sys-cluster/kube-proxy-1.19.8
deleted file mode 100644
index 4a4ba3d44671..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.19.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=Kubernetes Proxy service
-EAPI=7
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.8.tar.gz -> kubernetes-1.19.8.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=1295262c21a756305484af75a8f0c840
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.20.6 b/metadata/md5-cache/sys-cluster/kube-proxy-1.20.6
index cef04e4981fe..2186de5a424a 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.20.6
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.20.6
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.6.tar.gz -> kubernetes-1.20.6.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=0fe281a765d94ad243504314573ecafe
+_md5_=1295262c21a756305484af75a8f0c840
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.16 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.16
deleted file mode 100644
index 0284b28662b5..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.16
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-DESCRIPTION=Kubernetes Scheduler
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.16.tar.gz -> kubernetes-1.18.16.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=727ff481a4696acff0328f6db49f63ca
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.17 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.17
deleted file mode 100644
index bc872812c6fa..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.17
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-DESCRIPTION=Kubernetes Scheduler
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.17.tar.gz -> kubernetes-1.18.17.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=727ff481a4696acff0328f6db49f63ca
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.8 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.8
deleted file mode 100644
index 37cab332bba8..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-DESCRIPTION=Kubernetes Scheduler
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.8.tar.gz -> kubernetes-1.19.8.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=1a2ec21fc573554b1facd2a40a9826be
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.20.6 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.20.6
index 057d53c1c96b..f61740cd65c2 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.20.6
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.20.6
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.6.tar.gz -> kubernetes-1.20.6.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=7a24b85a26f70a47d21e46c2836b12c7
+_md5_=1a2ec21fc573554b1facd2a40a9826be
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.18.16 b/metadata/md5-cache/sys-cluster/kubeadm-1.18.16
deleted file mode 100644
index c5156722d53d..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.18.16
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=!sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.16.tar.gz -> kubernetes-1.18.16.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	92660621959e7fab813173772987588b
-_md5_=335a19a564072401804740ad9cea6aad
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.18.17 b/metadata/md5-cache/sys-cluster/kubeadm-1.18.17
deleted file mode 100644
index ff2abbad2511..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.18.17
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=!sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.17.tar.gz -> kubernetes-1.18.17.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	92660621959e7fab813173772987588b
-_md5_=335a19a564072401804740ad9cea6aad
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.19.8 b/metadata/md5-cache/sys-cluster/kubeadm-1.19.8
deleted file mode 100644
index f4bae528d666..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.19.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=!sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.8.tar.gz -> kubernetes-1.19.8.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	92660621959e7fab813173772987588b
-_md5_=ad2e7fd861a99cdf6069afee5aa882df
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.20.6 b/metadata/md5-cache/sys-cluster/kubeadm-1.20.6
index 8b22d1815969..ef9a929a54a7 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.20.6
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.20.6
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.6.tar.gz -> kubernetes-1.20.6.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	92660621959e7fab813173772987588b
-_md5_=afb44926372eb98e7d0694239613278d
+_md5_=ad2e7fd861a99cdf6069afee5aa882df
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.18.16 b/metadata/md5-cache/sys-cluster/kubectl-1.18.16
deleted file mode 100644
index 2f420fd2ee3e..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.18.16
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=!sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.16.tar.gz -> kubernetes-1.18.16.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	92660621959e7fab813173772987588b
-_md5_=9b5bcb08283a8294d9b7c8d2480b32ab
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.18.17 b/metadata/md5-cache/sys-cluster/kubectl-1.18.17
deleted file mode 100644
index fb02a896117b..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.18.17
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=!sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.17.tar.gz -> kubernetes-1.18.17.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	92660621959e7fab813173772987588b
-_md5_=9b5bcb08283a8294d9b7c8d2480b32ab
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.19.8 b/metadata/md5-cache/sys-cluster/kubectl-1.19.8
deleted file mode 100644
index 238bf47020ea..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.19.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=!sys-cluster/kubernetes
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.8.tar.gz -> kubernetes-1.19.8.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	92660621959e7fab813173772987588b
-_md5_=8d88b13f3403939ad60382363793ff22
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.20.6 b/metadata/md5-cache/sys-cluster/kubectl-1.20.6
index a7223bd941e8..72cd0aa7a0fa 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.20.6
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.20.6
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.6.tar.gz -> kubernetes-1.20.6.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	92660621959e7fab813173772987588b
-_md5_=1d975c88b26246d225ac030a58cb6c2d
+_md5_=8d88b13f3403939ad60382363793ff22
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.18.16 b/metadata/md5-cache/sys-cluster/kubelet-1.18.16
deleted file mode 100644
index c624e12ff685..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.18.16
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=Kubernetes Node Agent
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module systemd
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=!sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.16.tar.gz -> kubernetes-1.18.16.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=e7554604a6dd9bb3f7bd7f74206c9b38
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.18.17 b/metadata/md5-cache/sys-cluster/kubelet-1.18.17
deleted file mode 100644
index d8a410fe82c6..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.18.17
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=Kubernetes Node Agent
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module systemd
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=!sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.17.tar.gz -> kubernetes-1.18.17.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=e7554604a6dd9bb3f7bd7f74206c9b38
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.19.8 b/metadata/md5-cache/sys-cluster/kubelet-1.19.8
deleted file mode 100644
index 52cf114729b4..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.19.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=Kubernetes Node Agent
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module systemd
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=!sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.8.tar.gz -> kubernetes-1.19.8.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=f759e8214a664601ddbcf321044bfe23
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.20.6 b/metadata/md5-cache/sys-cluster/kubelet-1.20.6
index fbf5f302daef..02525f6f4495 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.20.6
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.20.6
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module systemd
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.6.tar.gz -> kubernetes-1.20.6.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=155188854e512cd660297f5916e7ee83
+_md5_=f759e8214a664601ddbcf321044bfe23
diff --git a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r4 b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r4
index 3a789ba4e0d5..6982be29fd4f 100644
--- a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r4
+++ b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r4
@@ -1,15 +1,15 @@
 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=configure install prepare
-DEPEND=>=net-libs/libvncserver-0.9.8[ssl=] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) x11-base/xorg-proto x11-libs/libXt
+DEPEND=>=net-libs/libvncserver-0.9.8[ssl=] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 ssl? ( dev-libs/openssl:0= ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) x11-base/xorg-proto x11-libs/libXt
 DESCRIPTION=VNC server for real X displays
 EAPI=7
 HOMEPAGE=https://libvnc.github.io/
 INHERIT=autotools
-IUSE=crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf
+IUSE=crypt fbcon ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=>=net-libs/libvncserver-0.9.8[ssl=] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) dev-lang/tk:0
+RDEPEND=>=net-libs/libvncserver-0.9.8[ssl=] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 ssl? ( dev-libs/openssl:0= ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) dev-lang/tk:0
 SLOT=0
 SRC_URI=https://github.com/LibVNC/x11vnc/archive/0.9.16.tar.gz -> x11vnc-0.9.16.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=cfac0c9ce660fd88d9d7af4b1b97c91a
+_md5_=dfe0fbba18f23b334925207d318381ea
diff --git a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r5 b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r5
index 1f122767c29b..27c18b54a7e9 100644
--- a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r5
+++ b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r5
@@ -1,15 +1,15 @@
 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=configure install prepare
-DEPEND=>=net-libs/libvncserver-0.9.8[ssl=] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) x11-base/xorg-proto x11-libs/libXt
+DEPEND=>=net-libs/libvncserver-0.9.8[ssl=] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 ssl? ( dev-libs/openssl:0= ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) x11-base/xorg-proto x11-libs/libXt
 DESCRIPTION=VNC server for real X displays
 EAPI=7
 HOMEPAGE=https://libvnc.github.io/
 INHERIT=autotools
-IUSE=crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf
+IUSE=crypt fbcon ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=>=net-libs/libvncserver-0.9.8[ssl=] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) dev-lang/tk:0
+RDEPEND=>=net-libs/libvncserver-0.9.8[ssl=] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 ssl? ( dev-libs/openssl:0= ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) dev-lang/tk:0
 SLOT=0
 SRC_URI=https://github.com/LibVNC/x11vnc/archive/0.9.16.tar.gz -> x11vnc-0.9.16.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=26dee19f0f6806af0acedf1004e20375
+_md5_=38f05629cd44c1de2a880d179e7b74e6
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 32b567f42c25..217b1c296a60 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -17497,14 +17497,14 @@ sys-cluster/k9scli 0.20.5 0.21.2 0.22.1: terminal based UI to manage kubernetes
 sys-cluster/keepalived 2.0.20 2.1.5: A strong & robust keepalive facility to the Linux Virtual Server project
 sys-cluster/knem 1.1.3-r2 9999: High-Performance Intra-Node MPI Communication
 sys-cluster/kronosnet 1.19: Network abstraction layer designed for High Availability use cases
-sys-cluster/kube-apiserver 1.18.16 1.18.17 1.18.18 1.19.8 1.19.9 1.19.10 1.20.4 1.20.5 1.20.6: Kubernetes API server
-sys-cluster/kube-controller-manager 1.18.16 1.18.17 1.18.18 1.19.8 1.19.9 1.19.10 1.20.4 1.20.5 1.20.6: Kubernetes Controller Manager
-sys-cluster/kube-proxy 1.18.16 1.18.17 1.18.18 1.19.8 1.19.9 1.19.10 1.20.4 1.20.5 1.20.6: Kubernetes Proxy service
+sys-cluster/kube-apiserver 1.18.18 1.19.9 1.19.10 1.20.4 1.20.5 1.20.6: Kubernetes API server
+sys-cluster/kube-controller-manager 1.18.18 1.19.9 1.19.10 1.20.4 1.20.5 1.20.6: Kubernetes Controller Manager
+sys-cluster/kube-proxy 1.18.18 1.19.9 1.19.10 1.20.4 1.20.5 1.20.6: Kubernetes Proxy service
 sys-cluster/kube-router 1.1.1: A turnkey solution for Kubernetes networking
-sys-cluster/kube-scheduler 1.18.16 1.18.17 1.18.18 1.19.8 1.19.9 1.19.10 1.20.4 1.20.5 1.20.6: Kubernetes Scheduler
-sys-cluster/kubeadm 1.18.16 1.18.17 1.18.18 1.19.8 1.19.9 1.19.10 1.20.4 1.20.5 1.20.6: CLI to Easily bootstrap a secure Kubernetes cluster
-sys-cluster/kubectl 1.18.16 1.18.17 1.18.18 1.19.8 1.19.9 1.19.10 1.20.4 1.20.5 1.20.6: CLI to run commands against Kubernetes clusters
-sys-cluster/kubelet 1.18.16 1.18.17 1.18.18 1.19.8 1.19.9 1.19.10 1.20.4 1.20.5 1.20.6: Kubernetes Node Agent
+sys-cluster/kube-scheduler 1.18.18 1.19.9 1.19.10 1.20.4 1.20.5 1.20.6: Kubernetes Scheduler
+sys-cluster/kubeadm 1.18.18 1.19.9 1.19.10 1.20.4 1.20.5 1.20.6: CLI to Easily bootstrap a secure Kubernetes cluster
+sys-cluster/kubectl 1.18.18 1.19.9 1.19.10 1.20.4 1.20.5 1.20.6: CLI to run commands against Kubernetes clusters
+sys-cluster/kubelet 1.18.18 1.19.9 1.19.10 1.20.4 1.20.5 1.20.6: Kubernetes Node Agent
 sys-cluster/kubeletctl 1.5 1.6: A client for kubelet
 sys-cluster/legion 16.08.0-r1 16.10.0 17.02.0 17.05.0 17.08.0 17.10.0 18.02.0 18.05.0 18.12.0 19.06.0 9999: A data-centric parallel programming system
 sys-cluster/libcircle 0.3.0: API for distributing embarrassingly parallel workloads using self-stabilization
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8514025af259..a598b2c27dd6 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 30 Apr 2021 16:50:12 +0000
+Fri, 30 Apr 2021 17:05:20 +0000