gentoo Easter resync : 12.04.2020

11 files changed, 7 insertions, 418 deletions

diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 397ce42ac669..523f0e36c2d6 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,26 +1,13 @@
-AUX kubeadm-1.14-openrc.patch 3523 BLAKE2B bbcc45a82984afe2a8ab567ce1319b6c14c84eade26aba21393ba6fe44de35b654000468e15fd44e49da329c85cd4d3dac3fe643d8c83183ab126edaf4a5f4c9 SHA512 8aec0a1cda24fcd7001e34ff6163aee7eaf679dea953068b58df3578c016f70e1406903e032a51519bc16ac0dbe583159d1cf4d504adbb2930d811cc2f762cfe
-DIST kubernetes-1.14.8.tar.gz 28096873 BLAKE2B a75fc2443475c9edc67328dc8a2c1b258ca02e675f665e4ea570889e4be76d6f55bfe8ca376b305c482dd12c7a7e9f9f8a452b69277d055b277ab37d24f8abdd SHA512 c751d04f59336186a9556f066bbd4c410cfd9748c2fdffaf14936d734a52de5cc044414d3f4d1e005914564858ceaac0451fd2360f1b9d97847d6f8515c50378
-DIST kubernetes-1.14.9.tar.gz 28099090 BLAKE2B 418e00594eb5d06c9e508054c95ac12e00bc431344c8eef7a8e016729a75f811d430dd00de1f6434ac79d6f5c784758edd062135066cd02c9ab55ba04be416b5 SHA512 61ffb34d0d3ed7543539b9c7339db1a04aa86a396f35a2fe214d64d772488146db8e1ee36a51efc629d6f1378745ec60c2f94051026b30a9b72604080f01b6f6
 DIST kubernetes-1.15.10.tar.gz 26689433 BLAKE2B 5648bf9e6b4738393c735a00baec25e144e278c219c0c906a6a9b209896ce5dcb1411d58bbc8e9dd04f4f9312f7052b5f28eb4f2047406547de69a083fc4db19 SHA512 48c069d88a0111072ac02aed0760bc34ae44fbb5140489a837f089a6c944b5fa18f95f4bcc4286ca1fdfd6cd25e7bd0ff99c3b21373a1d70d3a0f70d352d4ed8
-DIST kubernetes-1.15.5.tar.gz 26658547 BLAKE2B a1b97329c7e8b7b54b682cb9cf5c35181a83fe7434dd02b4fc8731cd0a7abe67154a1f04ddf9f2e2bfa28a4e1b3940ebac167dc066b88565a9f12d7011966978 SHA512 2fe035e9cbef19582b1b5e732bf8afff2113281e1d4802a531233c8f6f04cd1538a9b59bc7f4407c0c483d06a5339b02f234337e453533b3e5c016a65f53d6b0
-DIST kubernetes-1.15.6.tar.gz 26665166 BLAKE2B 9e40db549d524a4e248479d5836aaa6063e44c0e01f1bbdfcf3bdc37e8f317badc0446148b8cc737c16790d93dd2827f48ab896d0ec36e1b265b598a67ecbae5 SHA512 f7b374bc0797a9c48535ffea28da1629de8734aa8884cf63ff4850ae5f63e64d55b89ceb6e2a29082bf7317ab742f8deed6333b2c21089e9e99e931d72e8f6b0
-DIST kubernetes-1.15.9.tar.gz 26683313 BLAKE2B e8faaf32bda63dd0ac25670cd96a4a04ac7d1e5151855c9b41bca8d85ae3afadd55f85079b122282f9726386f42898878571072af9326e062062b68c8dfc4e10 SHA512 f60b2e78cd5afee4c5235af37738bed954fd792dfae8788972104bcc79bd2461a8a706f93b3c48f5353610650b6600ebd7197df03aa480ca0fd68fb4ac26278f
-DIST kubernetes-1.16.2.tar.gz 31202049 BLAKE2B e7bb9330c233959702545207ce3061559ecae6283332eae9eb57d38654a0b7a447d85ca016a674cf72b253c816662bffe2e04cf298ce43d3e5dd26d722783ac1 SHA512 44c600f3e9af64f66d2403340137cd162bfcc1ed30d5d6ad440b77be403656f624a1390489680134a7742626d3eb0affa92ff3e17c02ba2df91f7a75655046a9
-DIST kubernetes-1.16.3.tar.gz 31211177 BLAKE2B 816b7a4c3489b328d14ae149bdc71bcdc9a6c981ddff8d812b602d1976d12785355615f6ad43246cc201c6d7f3d5a19381d3e6cefba9358a754df81cf35bedca SHA512 3381249ab9b76849720252ddcc89565dd4f79c003c6e6f97b9cb39f7490acfd12110d21beeee4d5b7239769ace998d1949f8b25d70e42643c244b819d7b5c042
-DIST kubernetes-1.16.6.tar.gz 31714463 BLAKE2B 050897d4308a31d5164a907766af4f952d6551fba7e503bf7def78db37d017a3f5bd7a1c54125e42f9adeb850e6e38ef4ac9a98af978faf2efc4a474323b9f43 SHA512 2e1ca5781842ccd32f6e9791d069e9838a6221be3c4018abc06517cf97517bb500a6fafd7ae346088430f60c3e1dcbb983842572b9ed3241b70467dc1941e4a1
+DIST kubernetes-1.15.11.tar.gz 26693249 BLAKE2B 8ffaac0416034e8113955863bffbd04a3bf7f7075374872a63b7c5bdb47d1d241d8da8635c401cab86b2cc278ee6efd8237910aa6cc321e7bc014fc50febef03 SHA512 ec86cad825d06ccc8336e6c0eb3f2e5351e4ba84df0cccd515c37cd6845e1e6d5b8414ea6d970ff92c71088576396a95daaa6deb15d18452eb85d80e09246e1e
 DIST kubernetes-1.16.7.tar.gz 31722167 BLAKE2B 4792fec43d5921086dc78fc46d9d38554bc710bfb1a29928fd962fc0940946d4a4c1cba1ca86e999ebf2e1064bbeb011c9c6e464fada90c8a3e52a0cc2984977 SHA512 dc7d9180dd120418964e2fcc57105c9c3ba9b79abfdf357ca3ecd3c41468100b89e63b82ab6658b423c730ac2f229bf5eacca0321896b0739963fbc18343d765
-DIST kubernetes-1.17.2.tar.gz 31753827 BLAKE2B de92f1e0f087115691b5ce057a07f4b46a4410714ad9164801c0390190bd8e29f8aa6e79d0d8b816669770feaf229932df04c48792ce11e77e8c682db54f28bd SHA512 64c45967e6a85943fd3f62f82e0d51001bbeb04ed8ccbe376ad63989f4a888f838bc17d1d0942e8c857118781703a6cbd3336bff1f3ae5269f808b5d9b4d11bd
+DIST kubernetes-1.16.8.tar.gz 31731459 BLAKE2B 1d53c16586b5a7a41fc42d0fb3444b694531d3f04fb9e168a70d4b98f966f322bc82d39234612e38c71da052002c5bcc452c747d9f948dacbdd91ea40a9f5417 SHA512 04c8e9a9227ac9a98074cd52cbe90758134fedb10164fa69accbc19716a2f18dc133a4f880d0e35a3728c377faea431363f00ae9fe2ff5ca9e509444da9106c5
 DIST kubernetes-1.17.3.tar.gz 31762013 BLAKE2B 4470fadf2ec441ed7a5f3a82581af6a0f4d768780048576863b2aae9c13cff543592da73b979c7f9191a4c7c2b5a1ad10d85e0eba04fdcd08ece86884ab1f80d SHA512 09b33377de0bdd7dc8ac2ae81196d15eeb93862cb0aba1256bcfca38d2ce1f15951ad70cf67600fc3d16c1d449e0451707e756ec21ad812c6628ae1f0fdda427
-EBUILD kubeadm-1.14.8.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
-EBUILD kubeadm-1.14.9.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
+DIST kubernetes-1.17.4.tar.gz 31777775 BLAKE2B cd04e429d3f524f5dce7948db9b22230df8abdeb7570001ab985ffdb5b85709a8d1698490b9df13455d8f3968741db9571ee1ab3bc2a6fdd06a8c0fe274476e2 SHA512 fd1944d26c840bc1d2f585fccbabf48091fe8820ea089b3ea5c18652fd1edb3c8157a70ea19111b8b62aef16e0284a1607b583c3c1af79dd0dd266b99e20c549
 EBUILD kubeadm-1.15.10.ebuild 1259 BLAKE2B 19a9929ca93f885b8f33b51162649ad9b218a2c90572e28e43da4dc3064d18d1c975bc41266e65f41c68d308eaa4d01f13d637f8640b3a4bf86f79cecd67c1d3 SHA512 7e0b06c3086bf4c09fd724c3f50e07bcfbe3e8cfcdee09161bfee0ecabdbb4d8a89fbef6176f3c5aec1f22ec86395ca5f38e85a281f7f23ba47e8102b9105c01
-EBUILD kubeadm-1.15.5.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e
-EBUILD kubeadm-1.15.6.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e
-EBUILD kubeadm-1.15.9.ebuild 1259 BLAKE2B 39e44efefd2cafe28c6488c8269d01c86ea5903dc331c69ab04e3c5857e1b2b2b44da5078815dd7dbb3870dd291b0f41a6497eb7272980674bd853f044969df3 SHA512 79c9698208663bfd5d0b19b82294d13440a762ac37d9caec8c662b05d6a39921a189c4e0df89301d25ee4d7aa2c5de8d739b53b980b24a1eb4b9ede86f060504
-EBUILD kubeadm-1.16.2.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e
-EBUILD kubeadm-1.16.3.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e
-EBUILD kubeadm-1.16.6.ebuild 1259 BLAKE2B c493558a7faeaad6f21e3d223deab0596b95e282fa3636e5fb362c3ee4154977724498a992758f8bc7631c7c659dbb652b5836a5b69c2f1b083150aa7e1786d2 SHA512 9b9b93e65116ce6023452fdf2bc4c5fe20957cbcafed0a0407e762efa319345e89e43bfe995fc7aa635d46bf6d36d3393f2495f47f7b9cb78a3142451fd71c66
+EBUILD kubeadm-1.15.11.ebuild 1259 BLAKE2B 19a9929ca93f885b8f33b51162649ad9b218a2c90572e28e43da4dc3064d18d1c975bc41266e65f41c68d308eaa4d01f13d637f8640b3a4bf86f79cecd67c1d3 SHA512 7e0b06c3086bf4c09fd724c3f50e07bcfbe3e8cfcdee09161bfee0ecabdbb4d8a89fbef6176f3c5aec1f22ec86395ca5f38e85a281f7f23ba47e8102b9105c01
 EBUILD kubeadm-1.16.7.ebuild 1259 BLAKE2B c493558a7faeaad6f21e3d223deab0596b95e282fa3636e5fb362c3ee4154977724498a992758f8bc7631c7c659dbb652b5836a5b69c2f1b083150aa7e1786d2 SHA512 9b9b93e65116ce6023452fdf2bc4c5fe20957cbcafed0a0407e762efa319345e89e43bfe995fc7aa635d46bf6d36d3393f2495f47f7b9cb78a3142451fd71c66
-EBUILD kubeadm-1.17.2.ebuild 1049 BLAKE2B 76523b23b08c88c6e56bdc8927096b299008f8f6edec3fc27327b63860c20ac9772ff5bc03cf6be625109cb42d7059b6bcc12de8b8dc06d3c09ada9935c71fe7 SHA512 c2412c7e68a3efa031c2e27a5173b0a540de3cefac94245e48d4b4f810f7134219e29c68d7b3314d7697e267d1add10e341399a771537e1021958021ce050755
+EBUILD kubeadm-1.16.8.ebuild 1259 BLAKE2B c493558a7faeaad6f21e3d223deab0596b95e282fa3636e5fb362c3ee4154977724498a992758f8bc7631c7c659dbb652b5836a5b69c2f1b083150aa7e1786d2 SHA512 9b9b93e65116ce6023452fdf2bc4c5fe20957cbcafed0a0407e762efa319345e89e43bfe995fc7aa635d46bf6d36d3393f2495f47f7b9cb78a3142451fd71c66
 EBUILD kubeadm-1.17.3.ebuild 1049 BLAKE2B 76523b23b08c88c6e56bdc8927096b299008f8f6edec3fc27327b63860c20ac9772ff5bc03cf6be625109cb42d7059b6bcc12de8b8dc06d3c09ada9935c71fe7 SHA512 c2412c7e68a3efa031c2e27a5173b0a540de3cefac94245e48d4b4f810f7134219e29c68d7b3314d7697e267d1add10e341399a771537e1021958021ce050755
+EBUILD kubeadm-1.17.4.ebuild 1049 BLAKE2B 76523b23b08c88c6e56bdc8927096b299008f8f6edec3fc27327b63860c20ac9772ff5bc03cf6be625109cb42d7059b6bcc12de8b8dc06d3c09ada9935c71fe7 SHA512 c2412c7e68a3efa031c2e27a5173b0a540de3cefac94245e48d4b4f810f7134219e29c68d7b3314d7697e267d1add10e341399a771537e1021958021ce050755
 MISC metadata.xml 917 BLAKE2B ece7788c2a425d9663a25793715a9a2b1227c76f4ca0606340adf98bf524325524cbfde458125fc20cdfe4278950f4109d6a8a4d31c066f7884c33d856b5cd31 SHA512 587a9b0e0de0e18ccd2b8de9929f588c270172e795cede9093fa2380aa422f67e6e35ea0f534d8507ec278448bb1a7a2832bff561a92f8663e15824130be450a
diff --git a/sys-cluster/kubeadm/files/kubeadm-1.14-openrc.patch b/sys-cluster/kubeadm/files/kubeadm-1.14-openrc.patch
deleted file mode 100644
index f4da52f0823c..000000000000
--- a/sys-cluster/kubeadm/files/kubeadm-1.14-openrc.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-Needed for OpenRC support until https://github.com/kubernetes/kubernetes/pull/73101 is merged.
-
-Brought to attention by https://bugs.alpinelinux.org/issues/10179
-
----------------------------------
---- a/pkg/util/initsystem/initsystem.go
-+++ b/pkg/util/initsystem/initsystem.go
-@@ -1,5 +1,5 @@
- /*
--Copyright 2016 The Kubernetes Authors.
-+Copyright 2019 The Kubernetes Authors.
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
-@@ -23,6 +23,9 @@
- )
- 
- type InitSystem interface {
-+	// return a string describing how to enable a service
-+	EnableCommand(service string) string
-+
- 	// ServiceStart tries to start a specific service
- 	ServiceStart(service string) error
- 
-@@ -42,8 +45,63 @@
- 	ServiceIsActive(service string) bool
- }
- 
-+type OpenRCInitSystem struct{}
-+
-+func (openrc OpenRCInitSystem) ServiceStart(service string) error {
-+	args := []string{service, "start"}
-+	return exec.Command("rc-service", args...).Run()
-+}
-+
-+func (openrc OpenRCInitSystem) ServiceStop(service string) error {
-+	args := []string{service, "stop"}
-+	return exec.Command("rc-service", args...).Run()
-+}
-+
-+func (openrc OpenRCInitSystem) ServiceRestart(service string) error {
-+	args := []string{service, "restart"}
-+	return exec.Command("rc-service", args...).Run()
-+}
-+
-+// openrc writes to stderr if a service is not found or not enabled
-+// this is in contrast to systemd which only writes to stdout.
-+// Hence, we use the Combinedoutput, and ignore the error.
-+func (openrc OpenRCInitSystem) ServiceExists(service string) bool {
-+	args := []string{service, "status"}
-+	outBytes, _ := exec.Command("rc-service", args...).CombinedOutput()
-+	if strings.Contains(string(outBytes), "does not exist") {
-+		return false
-+	}
-+	return true
-+}
-+
-+func (openrc OpenRCInitSystem) ServiceIsEnabled(service string) bool {
-+	args := []string{"show", "default"}
-+	outBytes, _ := exec.Command("rc-update", args...).Output()
-+	if strings.Contains(string(outBytes), service) {
-+		return true
-+	}
-+	return false
-+}
-+
-+func (openrc OpenRCInitSystem) ServiceIsActive(service string) bool {
-+	args := []string{service, "status"}
-+	outBytes, _ := exec.Command("rc-service", args...).Output()
-+	if strings.Contains(string(outBytes), "stopped") {
-+		return false
-+	}
-+	return true
-+}
-+
-+func (openrc OpenRCInitSystem) EnableCommand(service string) string {
-+	return fmt.Sprintf("rc-update add %s default", service)
-+}
-+
- type SystemdInitSystem struct{}
- 
-+func (sysd SystemdInitSystem) EnableCommand(service string) string {
-+	return fmt.Sprintf("systemctl enable %s.service", service)
-+}
-+
- func (sysd SystemdInitSystem) reloadSystemd() error {
- 	if err := exec.Command("systemctl", "daemon-reload").Run(); err != nil {
- 		return fmt.Errorf("failed to reload systemd: %v", err)
-@@ -110,6 +168,10 @@
- // WindowsInitSystem is the windows implementation of InitSystem
- type WindowsInitSystem struct{}
- 
-+func (sysd WindowsInitSystem) EnableCommand(service string) string {
-+	return fmt.Sprintf("Set-Service '%s' -StartupType Automatic", service)
-+}
-+
- func (sysd WindowsInitSystem) ServiceStart(service string) error {
- 	args := []string{"Start-Service", service}
- 	err := exec.Command("powershell", args...).Run()
-@@ -170,6 +232,10 @@
- 	_, err := exec.LookPath("systemctl")
- 	if err == nil {
- 		return &SystemdInitSystem{}, nil
-+	}
-+	_, err = exec.LookPath("openrc")
-+	if err == nil {
-+		return &OpenRCInitSystem{}, nil
- 	}
- 	_, err = exec.LookPath("wininit.exe")
- 	if err == nil {
diff --git a/sys-cluster/kubeadm/kubeadm-1.14.8.ebuild b/sys-cluster/kubeadm/kubeadm-1.14.8.ebuild
deleted file mode 100644
index 763c3838067b..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.14.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.12
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-	pushd src/${EGO_PN} || die
-	eapply "${FILESDIR}/${PN}-1.14-openrc.patch"
-	popd || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.14.9.ebuild b/sys-cluster/kubeadm/kubeadm-1.14.9.ebuild
deleted file mode 100644
index 763c3838067b..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.14.9.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.12
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-	pushd src/${EGO_PN} || die
-	eapply "${FILESDIR}/${PN}-1.14-openrc.patch"
-	popd || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.15.9.ebuild b/sys-cluster/kubeadm/kubeadm-1.15.11.ebuild
index 4ccf5719a94c..6f09247989fc 100644
--- a/sys-cluster/kubeadm/kubeadm-1.15.9.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.15.11.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND=">=dev-lang/go-1.12
+DEPEND="=dev-lang/go-1.12*
 	dev-go/go-bindata"
 
 RESTRICT="test"
diff --git a/sys-cluster/kubeadm/kubeadm-1.15.5.ebuild b/sys-cluster/kubeadm/kubeadm-1.15.5.ebuild
deleted file mode 100644
index ffd3646b62e1..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.15.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.12
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.15.6.ebuild b/sys-cluster/kubeadm/kubeadm-1.15.6.ebuild
deleted file mode 100644
index ffd3646b62e1..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.15.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.12
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.16.2.ebuild b/sys-cluster/kubeadm/kubeadm-1.16.2.ebuild
deleted file mode 100644
index ffd3646b62e1..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.16.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.12
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.16.3.ebuild b/sys-cluster/kubeadm/kubeadm-1.16.3.ebuild
deleted file mode 100644
index ffd3646b62e1..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.16.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.12
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.16.6.ebuild b/sys-cluster/kubeadm/kubeadm-1.16.8.ebuild
index 3c0ba8c5f84f..3c0ba8c5f84f 100644
--- a/sys-cluster/kubeadm/kubeadm-1.16.6.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.16.8.ebuild
diff --git a/sys-cluster/kubeadm/kubeadm-1.17.2.ebuild b/sys-cluster/kubeadm/kubeadm-1.17.4.ebuild
index a2529fec51c7..a2529fec51c7 100644
--- a/sys-cluster/kubeadm/kubeadm-1.17.2.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.17.4.ebuild