gentoo resync : 25.09.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-09-25 19:33:39 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-09-28 08:31:11 +0100
commit: ad6182343997a405079870a2fe91c4e0c6b94595 (patch)
tree: 4aa7483cd0ad7de54338afc8e7971417abe1dd81 /sys-cluster
parent: e8f81810baa21f490d6910e8e2d424546b72a333 (diff)
38 files changed, 137 insertions, 730 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 63869e544f6b..42295265df67 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index c3924bd95b5f..3755787e282f 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -30,6 +30,7 @@ AUX ceph-14.2.0-no-virtualenvs.patch 2349 BLAKE2B a012ab044f92c2a22c8f04661d2210
 AUX ceph-14.2.3-boost-1.6-python-sonames.patch 987 BLAKE2B c70ee9689cbe2f7b3ad437285d9ab58a029ef35ea1a9f4a34891a32f3ac21068d28e0bbedcdefeee7f1748566e2133ce8c2c79eaf2a74b416a53c9cee4f3a7b9 SHA512 f8596e0c22270e771ae24498ea959e4d0079433198950fba05e172bdb6caa6ece75515f2fefc8aebc93cfd1b0a8ac087bf917bd99f6dd486fe855ba81a448c53
 AUX ceph-14.2.3-boost-1.70.patch 3591 BLAKE2B 12a947de968155cc9b73299757acb04f1588e988658f40b5bb6ef781d273a280543fd78a37cd5565599fe1bc7c187f7beaaa63a103d4b9ba1e7f3981e1027c87 SHA512 1bff4165c44a26950de22b01221e791b6cffe32653eceab0e9f03d3ae893b0b1fdab5659d5742335aa1fb519e34d2d841984ed8c844e8b8f1db8bc78bbed2472
 AUX ceph-14.2.3-boost-sonames.patch 13701 BLAKE2B 7d8fa01f56922770190d7cada4cd5404e1584cf8afc2a84aae9d0031e66d778af6e9b2072e405982ca652229b86169f5cdefcd7fe321a1626f9bec5ca014c54e SHA512 c6e7497a427c0ca10b4aa006020467e9ae6c2fb167f500d72d92adc953490a1f7062bbc2dcdeee61a6ab251fa3a27ddd6c64b190bb88e7993df1fd4084d39882
+AUX ceph-14.2.3-dpdk-compile-fix-1.patch 4729 BLAKE2B 96e709b592a7ea9324f54acf75ac3f78334a0d2b155f6d4b5360df8b13e2c9c8e5f6d6b19da5ddb7760c56d9307e056db9aeecec1926dddec88b6b685eb55374 SHA512 d0849fa120b3d7c26106e75bd830874854ee4214ac867b577f4486e4a033b2f555fa6745910f90d26f7fa5280bff01f5880eda9a2bc6edc856400a5756a8346b
 AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d
 AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8
 AUX ceph-osd_at.service 362 BLAKE2B 7ccbf3428d687d1dfc3a8e10d56083802bba621d7cc9b965b55677e7ae8ce19bd178d31be687e47ed4ae21eef017c8913339cb465822ceadecd2e90cf84d692d SHA512 99c932fa99679a26b288ad57ca725a50847199915368a07ae1bb589ca777cd6e6a68e84f4d506a1097a06ace06eede176ea573e694bcbe43b434381116d63300
@@ -50,11 +51,11 @@ DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7
 DIST ceph-12.2.8.tar.gz 77243685 BLAKE2B 37c34396a0c276b8d79735e14934ac70da024822c2a060061531c234e03e5d41aad6c41dc64b05c2ce47f03287d0cae9ef9bed67e4a0861b6380c8ce1de4ea69 SHA512 91c5c11aaeef701b3e31c9f8a1192b6b79fd34f3b96c61595c65173c98bfce0009c5b7c9b29764f5e4d4b1f5ac2ca7109fed5ae598c176aba717a34a132fabac
 DIST ceph-13.2.5.tar.gz 91006057 BLAKE2B 68551e2f54d78aff7b0e9ec3c62e6a3394dd7c23e80924a5b400cd9666a05a42e5f22445deee4040f1b78201c6a6660b283109878d4c92d845821bff831c8a5e SHA512 6daea524523f829e725609328ea71f416b2c3a9530fa8956720a7bc69dc08e55a169654f500704579dc9ba693f04eedd7e04614c0850e9ab1169cd45f19039f8
 DIST ceph-13.2.6.tar.gz 90808224 BLAKE2B cd7b4f4838eafc9dd580102cbb5247b86a153f90127f81355b556f32dbbacd2d7fb0144d15f99869a318a7148d2f50a9f995eb05aee056d7a5843830ede5702c SHA512 1e9c08d16b14447bf6b8bb72144e053aa9d5cf390bb4a6e878869e38895d3698073502fe9c4f8b775a3da872b920444bd01260105d3a839e53cf90cd27c6ab9c
-DIST ceph-14.2.3.tar.gz 118349530 BLAKE2B db73d6adeca84426eee1b47a8ee68c4f94ee7a61e60ef1127153d19e02472a658877ebb7adfad5b4725d2c8c38855636bad1c44e79a3d3c397b56f74bf4b53fa SHA512 3d02e766a1d53d39355ee88738dd0233dc02f8a3cb44935194cb538b888507de8f8acdd99bf7890895f68795a310f53e2a8652305d5f2be5212efbd9046bd3a9
+DIST ceph-14.2.4.tar.gz 116371380 BLAKE2B 2d2c78ec32a0749df16e9c527d2fd087a75daeb2ef26ac5f6aa641989eab62fa276eb320b873740e9eee3fd4f369da152c53c2389b1def1b6a45906ccc1bd1f1 SHA512 dc60321ed4dcaccacca711ab70c35011b5dfc6b8369016fb413a9976199ed4ba22c7dc87ba1ebaf1118513dee1a0c263c99ab137f27fc03c55e8a0625a3bdcc0
 EBUILD ceph-12.2.11.ebuild 8025 BLAKE2B 0b7a0acd31afef011b05907332ecafd8ca72fe6d90244bcdfd879eb1b554a6293349b16638ad151052048019863ede89da0aa5024a6561c9016fab15f24f1778 SHA512 b6d0203fb1aec6ba62a2d7db6ee62794efab5389f4ac9a86cb4ad796f6f81985f8d8e107d55abfdc669a6beb55ecaeaa2e71d4283f3d93ee135803bc2d17293f
 EBUILD ceph-12.2.12-r2.ebuild 8390 BLAKE2B dbbf53017559230bfc03f4cf267e325e5c2c112657ced392c9ce93653fe796d2793b198150f24e8217c5b8c8a1fde750cb1ffa16cde2d5c990cd77e69001bfd8 SHA512 48e7f521c584aba6373f5e63c5769671cd016f0726fb30233b57c8a1598b01570fcee9765c3a58a6bdbdd92fe5c3bd8bf4e16aca340a47986c546624fb5c20d5
 EBUILD ceph-12.2.8-r1.ebuild 7886 BLAKE2B e99590739ce73d96895c282108d3b945bb0e13bdb73e34b06d2da5c9e7d74dc4fdceddfb6330a106b775c612c7cca6b67325b83389f1c6d5af712e59a6f1fd55 SHA512 ab8d2a1ee7c4a7d7179f81e18dc601a18da365663351d88cf6dfee32e2aaaf40412bc2fde98d7c07012f79f8b6c19bac773ef97b872a32b663748ce41a5954c1
 EBUILD ceph-13.2.5-r4.ebuild 9007 BLAKE2B fc84d7fee8572582743979cd3da76cdd337667843410f8efb167ec80442d006b6d4c1c947ffeeb9c6265c47116a6cf15a012f4277c619cb55ad942b0e95f6cdb SHA512 eec2780a80d98b3a535a33c86efaae4112605b8c6e220b61beb9956ece895a8807024fe71f86b626c89b3ca8af3b94a4c0e990c47e9951cc31490a90c1841ff3
 EBUILD ceph-13.2.6.ebuild 9133 BLAKE2B d5990d637edaa460b90eadc0b97c8952b2e7688c4916f0978bb15e9c2b99c206f3be5c2f57ded889393e5ba32fa63bf08a89138ea96a7045b6a47a3cd59d0381 SHA512 7a510c208b8b15fe124aafba24d25c0f181bc2ff61710d274e59c383f5d0a27ef83fbbd6b19e1020953887a0a4221769d88e8f75e720d0af3fa93ba5d9c50792
-EBUILD ceph-14.2.3.ebuild 9770 BLAKE2B 8827e1e4d8c734942599b393ec9625c378c81a4532e640860419067feb7b687f04ec8a7d5852e30bfac90c4baa26a37245aaf19a576f956cd70201195751edd3 SHA512 84e76634c608fad0488ca3992c91915eb8108f93b7f7211e1eb8cd6dbfbc99c486dec4ef88015a2b6cb51ac19760aa8695e12adc2e3603c3a9555b8dc60b1494
+EBUILD ceph-14.2.4.ebuild 9817 BLAKE2B 43d45c7c519878a324b601d380f15be54b82fdde061011b60f7279270b69eb7e174dc16e443f9e71af859e190b65bb7cce1a5fc36dd83d592e7c8e7f4d00243f SHA512 506a2ac4ebbba662c82f6f542c5234ab904694c7ed5cbbc8b3667d3dc5dedee29d84ad541aba4ba1f56302a3bdb2b633cac2d098d48ba77e53b516276571d716
 MISC metadata.xml 1588 BLAKE2B c3a1f7afa0e61fc589e60ec00bc1702a6f953bbbbc1ab6a8582fe08bad9f6af9217350641399bc7de4dfb69a79ee0e41b46d971eef53348f3b568c6dcd439273 SHA512 ac2196349f897b7dfafaa924cda3f4eb094233bd04e7949b9f8fafd135775202c3c1bdc11cc4a931e752fb40b9d1c86524cdd849a23d364e4f2aa240bbdf1250
diff --git a/sys-cluster/ceph/ceph-14.2.3.ebuild b/sys-cluster/ceph/ceph-14.2.4.ebuild
index f440a49160c9..82af9e6a844e 100644
--- a/sys-cluster/ceph/ceph-14.2.3.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.4.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
 DESCRIPTION="Ceph distributed filesystem"
@@ -153,6 +153,7 @@ PATCHES=(
 	"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
 	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
 	"${FILESDIR}/ceph-14.2.3-boost-1.70.patch"
+	"${FILESDIR}/ceph-14.2.3-dpdk-compile-fix-1.patch"
 )
 
 # dpdk and ninja don't get along
diff --git a/sys-cluster/ceph/files/ceph-14.2.3-dpdk-compile-fix-1.patch b/sys-cluster/ceph/files/ceph-14.2.3-dpdk-compile-fix-1.patch
new file mode 100644
index 000000000000..ef06758326e9
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.3-dpdk-compile-fix-1.patch
@@ -0,0 +1,111 @@
+diff --git a/src/msg/async/dpdk/DPDKStack.cc b/src/msg/async/dpdk/DPDKStack.cc
+index 3101ae57ac..1db97c289a 100644
+--- a/src/msg/async/dpdk/DPDKStack.cc
++++ b/src/msg/async/dpdk/DPDKStack.cc
+@@ -203,7 +203,9 @@ DPDKWorker::Impl::~Impl()
+   _dev->unset_local_queue(id);
+ }
+
+-int DPDKWorker::listen(entity_addr_t &sa, const SocketOptions &opt,
++int DPDKWorker::listen(entity_addr_t &sa,
++		       unsigned addr_slot,
++		       const SocketOptions &opt,
+                        ServerSocket *sock)
+ {
+   ceph_assert(sa.get_family() == AF_INET);
+diff --git a/src/msg/async/dpdk/DPDKStack.h b/src/msg/async/dpdk/DPDKStack.h
+index a44ae38367..622ff8a3c6 100644
+--- a/src/msg/async/dpdk/DPDKStack.h
++++ b/src/msg/async/dpdk/DPDKStack.h
+@@ -37,7 +37,7 @@ class DPDKServerSocketImpl : public ServerSocketImpl {
+   typename Protocol::listener _listener;
+  public:
+   DPDKServerSocketImpl(Protocol& proto, uint16_t port, const SocketOptions &opt,
+-		       int type);
++		       int type, unsigned addr_slot);
+   int listen() {
+     return _listener.listen();
+   }
+@@ -184,8 +184,9 @@ class NativeConnectedSocketImpl : public ConnectedSocketImpl {
+
+ template <typename Protocol>
+ DPDKServerSocketImpl<Protocol>::DPDKServerSocketImpl(
+-  Protocol& proto, uint16_t port, const SocketOptions &opt, int type)
+-  : ServerSocketImpl(type), _listener(proto.listen(port)) {}
++  Protocol& proto, uint16_t port, const SocketOptions &opt,
++  int type, unsigned addr_slot)
++  : ServerSocketImpl(type, addr_slot), _listener(proto.listen(port)) {}
+
+ template <typename Protocol>
+ int DPDKServerSocketImpl<Protocol>::accept(ConnectedSocket *s, const SocketOptions &options, entity_addr_t *out, Worker *w) {
+@@ -229,7 +230,8 @@ class DPDKWorker : public Worker {
+
+  public:
+   explicit DPDKWorker(CephContext *c, unsigned i): Worker(c, i) {}
+-  virtual int listen(entity_addr_t &addr, const SocketOptions &opts, ServerSocket *) override;
++  virtual int listen(entity_addr_t &addr, unsigned addr_slot,
++		     const SocketOptions &opts, ServerSocket *) override;
+   virtual int connect(const entity_addr_t &addr, const SocketOptions &opts, ConnectedSocket *socket) override;
+   void arp_learn(ethernet_address l2, ipv4_address l3) {
+     _impl->_inet.learn(l2, l3);
+diff --git a/src/msg/async/dpdk/TCP.cc b/src/msg/async/dpdk/TCP.cc
+index c6397709b1..26f29e10f7 100644
+--- a/src/msg/async/dpdk/TCP.cc
++++ b/src/msg/async/dpdk/TCP.cc
+@@ -153,9 +153,10 @@ bool ipv4_tcp::forward(forward_hash& out_hash_data, Packet& p, size_t off)
+ }
+
+ int tcpv4_listen(tcp<ipv4_traits>& tcpv4, uint16_t port, const SocketOptions &opts,
+-                 int type, ServerSocket *sock)
++                 int type, unsigned addr_slot, ServerSocket *sock)
+ {
+-  auto p = new DPDKServerSocketImpl<tcp<ipv4_traits>>(tcpv4, port, opts, type);
++  auto p = new DPDKServerSocketImpl<tcp<ipv4_traits>>(tcpv4, port, opts,
++						      type, addr_slot);
+   int r = p->listen();
+   if (r < 0) {
+     delete p;
+diff --git a/src/msg/async/dpdk/DPDK.h b/src/msg/async/dpdk/DPDK.h
+index fa12af6b27..6bb52973e0 100644
+--- a/src/msg/async/dpdk/DPDK.h
++++ b/src/msg/async/dpdk/DPDK.h
+@@ -833,7 +833,7 @@ class DPDKDevice {
+   subscription<Packet> receive(unsigned cpuid, std::function<int (Packet)> next_packet) {
+     auto sub = _queues[cpuid]->_rx_stream.listen(std::move(next_packet));
+     _queues[cpuid]->rx_start();
+-    return std::move(sub);
++    return sub;
+   }
+   ethernet_address hw_address() {
+     struct ether_addr mac;
+@@ -849,7 +849,7 @@ class DPDKDevice {
+   std::unique_ptr<DPDKQueuePair> init_local_queue(CephContext *c, EventCenter *center, string hugepages, uint16_t qid) {
+     std::unique_ptr<DPDKQueuePair> qp;
+     qp = std::unique_ptr<DPDKQueuePair>(new DPDKQueuePair(c, center, this, qid));
+-    return std::move(qp);
++    return qp;
+   }
+   unsigned hash2qid(uint32_t hash) {
+     // return hash % hw_queues_count();
+diff --git a/src/msg/async/dpdk/Packet.h b/src/msg/async/dpdk/Packet.h
+index db9cd2a764..f929da3178 100644
+--- a/src/msg/async/dpdk/Packet.h
++++ b/src/msg/async/dpdk/Packet.h
+@@ -125,7 +125,7 @@ class Packet {
+       n->rss_hash.construct(old->rss_hash);
+       std::copy(old->frags, old->frags + old->_nr_frags, n->frags);
+       old->copy_internal_fragment_to(n.get());
+-      return std::move(n);
++      return n;
+     }
+
+     static std::unique_ptr<impl> copy(impl* old) {
+@@ -134,7 +134,7 @@ class Packet {
+
+     static std::unique_ptr<impl> allocate_if_needed(std::unique_ptr<impl> old, size_t extra_frags) {
+       if (old->_allocated_frags >= old->_nr_frags + extra_frags) {
+-        return std::move(old);
++        return old;
+       }
+       return copy(old.get(), std::max<size_t>(old->_nr_frags + extra_frags, 2 * old->_nr_frags));
+     }
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index cd440570fe52..ef5a172b6191 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -2,15 +2,13 @@ AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
 DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
-DIST kubernetes-1.13.9.tar.gz 28870425 BLAKE2B d09a8654fe0704562f383dc1d475db064c79c01f7213aba2374d56b834051827e04ed62d8d74bb5a3d70eec9981ccfec5991f264c9882177528782ce95a733e2 SHA512 94086ac8b12e874b8045cc32ceaf8ceeea9718eee9f7eeed4f44f515ee738ba486bb8e124c1dcaa4e7b3f49f99fc70481571c6f972115da11348a9c9722e434c
-DIST kubernetes-1.14.5.tar.gz 28071522 BLAKE2B 1d949f53ebae03c5ce02d32253e85e96c7c0fef85d16dac8442ca379b980ba553d1602a5ae5e984eb6ae5abe5998155f62521292a3683612a251e7b81c940b05 SHA512 3c15c3663fd81dbbfbfa15219cbf94306af1cb846f9e3a6739db8c188d90b8ae25c601e0c746e93c13cbc4734fe612f9b5ca42fad97055903ccc473e5f3e15c3
 DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
-DIST kubernetes-1.15.2.tar.gz 26628888 BLAKE2B 49c72f9355e1bb00f743571f4253261b46d58fe6252b1f9284d0982a201502ef13ccc77da588087e407a7d6ed250d1ab224b9fcf99d2542225d6736a8dffb4d9 SHA512 0de798631a3bf82766b797f05084f40df4422808c8ec8651480c5c27ecd4adb51148d15c7260b06482eba11c9bbb68966abc03a2d472b98d12cb0fe2ccf38473
+DIST kubernetes-1.14.7.tar.gz 28086210 BLAKE2B 5731ce2796f4d5178ec3ee01c340c48af88fdfc7330b53bf04933ff26c00be0092f55f7e8717e60415423f74369db465ab260ac7ff60a9787b76e085c0e07301 SHA512 cc5eb12c4337a72c234fcc1bc660fa8e6f95957b53c774e2dafa2974a2eb5f0b05532766bac8dfc2f45d1f683ed6de425978c71a633a5782843aebed192f0337
 DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
+DIST kubernetes-1.15.4.tar.gz 26643115 BLAKE2B 7fa68a2deae73d92526a65a0c70f697ec831e158417a607ab1884ade53c652123370e0fdfb13bc6804fc3fece03d2a29d3bd91fd27f767585f3ea05eec759b47 SHA512 046305e572b743c4eb59fd9ee05af197961d1a5b47cf88d30cbcbb9be4cc7dddc497738cd3700a4ff047deb8c0057d809b2c7b98fcf160657b94ae7b71ea3299
 EBUILD kube-apiserver-1.13.10.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
-EBUILD kube-apiserver-1.13.9.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
-EBUILD kube-apiserver-1.14.5.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
 EBUILD kube-apiserver-1.14.6.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
-EBUILD kube-apiserver-1.15.2.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
+EBUILD kube-apiserver-1.14.7.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
 EBUILD kube-apiserver-1.15.3.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
+EBUILD kube-apiserver-1.15.4.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.13.9.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.14.7.ebuild
index a1931590ff31..a1931590ff31 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.13.9.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.14.7.ebuild
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.15.2.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.15.2.ebuild
deleted file mode 100644
index a1931590ff31..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.15.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-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
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.14.5.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.15.4.ebuild
index a1931590ff31..a1931590ff31 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.14.5.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.15.4.ebuild
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index f74c52d578b3..aff4192762a7 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -2,15 +2,13 @@ AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2c
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
 DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
-DIST kubernetes-1.13.9.tar.gz 28870425 BLAKE2B d09a8654fe0704562f383dc1d475db064c79c01f7213aba2374d56b834051827e04ed62d8d74bb5a3d70eec9981ccfec5991f264c9882177528782ce95a733e2 SHA512 94086ac8b12e874b8045cc32ceaf8ceeea9718eee9f7eeed4f44f515ee738ba486bb8e124c1dcaa4e7b3f49f99fc70481571c6f972115da11348a9c9722e434c
-DIST kubernetes-1.14.5.tar.gz 28071522 BLAKE2B 1d949f53ebae03c5ce02d32253e85e96c7c0fef85d16dac8442ca379b980ba553d1602a5ae5e984eb6ae5abe5998155f62521292a3683612a251e7b81c940b05 SHA512 3c15c3663fd81dbbfbfa15219cbf94306af1cb846f9e3a6739db8c188d90b8ae25c601e0c746e93c13cbc4734fe612f9b5ca42fad97055903ccc473e5f3e15c3
 DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
-DIST kubernetes-1.15.2.tar.gz 26628888 BLAKE2B 49c72f9355e1bb00f743571f4253261b46d58fe6252b1f9284d0982a201502ef13ccc77da588087e407a7d6ed250d1ab224b9fcf99d2542225d6736a8dffb4d9 SHA512 0de798631a3bf82766b797f05084f40df4422808c8ec8651480c5c27ecd4adb51148d15c7260b06482eba11c9bbb68966abc03a2d472b98d12cb0fe2ccf38473
+DIST kubernetes-1.14.7.tar.gz 28086210 BLAKE2B 5731ce2796f4d5178ec3ee01c340c48af88fdfc7330b53bf04933ff26c00be0092f55f7e8717e60415423f74369db465ab260ac7ff60a9787b76e085c0e07301 SHA512 cc5eb12c4337a72c234fcc1bc660fa8e6f95957b53c774e2dafa2974a2eb5f0b05532766bac8dfc2f45d1f683ed6de425978c71a633a5782843aebed192f0337
 DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
+DIST kubernetes-1.15.4.tar.gz 26643115 BLAKE2B 7fa68a2deae73d92526a65a0c70f697ec831e158417a607ab1884ade53c652123370e0fdfb13bc6804fc3fece03d2a29d3bd91fd27f767585f3ea05eec759b47 SHA512 046305e572b743c4eb59fd9ee05af197961d1a5b47cf88d30cbcbb9be4cc7dddc497738cd3700a4ff047deb8c0057d809b2c7b98fcf160657b94ae7b71ea3299
 EBUILD kube-controller-manager-1.13.10.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
-EBUILD kube-controller-manager-1.13.9.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
-EBUILD kube-controller-manager-1.14.5.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
 EBUILD kube-controller-manager-1.14.6.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
-EBUILD kube-controller-manager-1.15.2.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
+EBUILD kube-controller-manager-1.14.7.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
 EBUILD kube-controller-manager-1.15.3.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
+EBUILD kube-controller-manager-1.15.4.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.13.9.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.7.ebuild
index 6aa71f51b8b1..6aa71f51b8b1 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.13.9.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.7.ebuild
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.2.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.2.ebuild
deleted file mode 100644
index 6aa71f51b8b1..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-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
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.5.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.4.ebuild
index 6aa71f51b8b1..6aa71f51b8b1 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.5.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.4.ebuild
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 1fc82d152f03..eea1bc03e4f2 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -2,15 +2,9 @@ AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
 DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
-DIST kubernetes-1.13.9.tar.gz 28870425 BLAKE2B d09a8654fe0704562f383dc1d475db064c79c01f7213aba2374d56b834051827e04ed62d8d74bb5a3d70eec9981ccfec5991f264c9882177528782ce95a733e2 SHA512 94086ac8b12e874b8045cc32ceaf8ceeea9718eee9f7eeed4f44f515ee738ba486bb8e124c1dcaa4e7b3f49f99fc70481571c6f972115da11348a9c9722e434c
-DIST kubernetes-1.14.5.tar.gz 28071522 BLAKE2B 1d949f53ebae03c5ce02d32253e85e96c7c0fef85d16dac8442ca379b980ba553d1602a5ae5e984eb6ae5abe5998155f62521292a3683612a251e7b81c940b05 SHA512 3c15c3663fd81dbbfbfa15219cbf94306af1cb846f9e3a6739db8c188d90b8ae25c601e0c746e93c13cbc4734fe612f9b5ca42fad97055903ccc473e5f3e15c3
 DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
-DIST kubernetes-1.15.2.tar.gz 26628888 BLAKE2B 49c72f9355e1bb00f743571f4253261b46d58fe6252b1f9284d0982a201502ef13ccc77da588087e407a7d6ed250d1ab224b9fcf99d2542225d6736a8dffb4d9 SHA512 0de798631a3bf82766b797f05084f40df4422808c8ec8651480c5c27ecd4adb51148d15c7260b06482eba11c9bbb68966abc03a2d472b98d12cb0fe2ccf38473
 DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
 EBUILD kube-proxy-1.13.10.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
-EBUILD kube-proxy-1.13.9.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
-EBUILD kube-proxy-1.14.5.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 EBUILD kube-proxy-1.14.6.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
-EBUILD kube-proxy-1.15.2.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 EBUILD kube-proxy-1.15.3.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.13.9.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.13.9.ebuild
deleted file mode 100644
index f519690e8b2f..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.13.9.ebuild
+++ /dev/null
@@ -1,44 +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
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RDEPEND="net-firewall/conntrack-tools"
-
-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
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.14.5.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.14.5.ebuild
deleted file mode 100644
index f519690e8b2f..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.14.5.ebuild
+++ /dev/null
@@ -1,44 +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
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RDEPEND="net-firewall/conntrack-tools"
-
-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
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.15.2.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.15.2.ebuild
deleted file mode 100644
index f519690e8b2f..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.15.2.ebuild
+++ /dev/null
@@ -1,44 +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
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RDEPEND="net-firewall/conntrack-tools"
-
-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
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 11306cb2f140..da4372ed32d3 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -2,15 +2,13 @@ AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c26912
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
 DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
-DIST kubernetes-1.13.9.tar.gz 28870425 BLAKE2B d09a8654fe0704562f383dc1d475db064c79c01f7213aba2374d56b834051827e04ed62d8d74bb5a3d70eec9981ccfec5991f264c9882177528782ce95a733e2 SHA512 94086ac8b12e874b8045cc32ceaf8ceeea9718eee9f7eeed4f44f515ee738ba486bb8e124c1dcaa4e7b3f49f99fc70481571c6f972115da11348a9c9722e434c
-DIST kubernetes-1.14.5.tar.gz 28071522 BLAKE2B 1d949f53ebae03c5ce02d32253e85e96c7c0fef85d16dac8442ca379b980ba553d1602a5ae5e984eb6ae5abe5998155f62521292a3683612a251e7b81c940b05 SHA512 3c15c3663fd81dbbfbfa15219cbf94306af1cb846f9e3a6739db8c188d90b8ae25c601e0c746e93c13cbc4734fe612f9b5ca42fad97055903ccc473e5f3e15c3
 DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
-DIST kubernetes-1.15.2.tar.gz 26628888 BLAKE2B 49c72f9355e1bb00f743571f4253261b46d58fe6252b1f9284d0982a201502ef13ccc77da588087e407a7d6ed250d1ab224b9fcf99d2542225d6736a8dffb4d9 SHA512 0de798631a3bf82766b797f05084f40df4422808c8ec8651480c5c27ecd4adb51148d15c7260b06482eba11c9bbb68966abc03a2d472b98d12cb0fe2ccf38473
+DIST kubernetes-1.14.7.tar.gz 28086210 BLAKE2B 5731ce2796f4d5178ec3ee01c340c48af88fdfc7330b53bf04933ff26c00be0092f55f7e8717e60415423f74369db465ab260ac7ff60a9787b76e085c0e07301 SHA512 cc5eb12c4337a72c234fcc1bc660fa8e6f95957b53c774e2dafa2974a2eb5f0b05532766bac8dfc2f45d1f683ed6de425978c71a633a5782843aebed192f0337
 DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
+DIST kubernetes-1.15.4.tar.gz 26643115 BLAKE2B 7fa68a2deae73d92526a65a0c70f697ec831e158417a607ab1884ade53c652123370e0fdfb13bc6804fc3fece03d2a29d3bd91fd27f767585f3ea05eec759b47 SHA512 046305e572b743c4eb59fd9ee05af197961d1a5b47cf88d30cbcbb9be4cc7dddc497738cd3700a4ff047deb8c0057d809b2c7b98fcf160657b94ae7b71ea3299
 EBUILD kube-scheduler-1.13.10.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
-EBUILD kube-scheduler-1.13.9.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
-EBUILD kube-scheduler-1.14.5.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
 EBUILD kube-scheduler-1.14.6.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
-EBUILD kube-scheduler-1.15.2.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
+EBUILD kube-scheduler-1.14.7.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
 EBUILD kube-scheduler-1.15.3.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
+EBUILD kube-scheduler-1.15.4.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.13.9.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.14.7.ebuild
index 2830ac40ff36..2830ac40ff36 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.13.9.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.14.7.ebuild
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.15.2.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.15.2.ebuild
deleted file mode 100644
index 2830ac40ff36..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.15.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-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
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.14.5.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.15.4.ebuild
index 2830ac40ff36..2830ac40ff36 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.14.5.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.15.4.ebuild
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 98d55ec2e4a8..2c0524a8a84b 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,14 +1,8 @@
 AUX kubeadm-1.14-openrc.patch 3523 BLAKE2B bbcc45a82984afe2a8ab567ce1319b6c14c84eade26aba21393ba6fe44de35b654000468e15fd44e49da329c85cd4d3dac3fe643d8c83183ab126edaf4a5f4c9 SHA512 8aec0a1cda24fcd7001e34ff6163aee7eaf679dea953068b58df3578c016f70e1406903e032a51519bc16ac0dbe583159d1cf4d504adbb2930d811cc2f762cfe
 DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
-DIST kubernetes-1.13.9.tar.gz 28870425 BLAKE2B d09a8654fe0704562f383dc1d475db064c79c01f7213aba2374d56b834051827e04ed62d8d74bb5a3d70eec9981ccfec5991f264c9882177528782ce95a733e2 SHA512 94086ac8b12e874b8045cc32ceaf8ceeea9718eee9f7eeed4f44f515ee738ba486bb8e124c1dcaa4e7b3f49f99fc70481571c6f972115da11348a9c9722e434c
-DIST kubernetes-1.14.5.tar.gz 28071522 BLAKE2B 1d949f53ebae03c5ce02d32253e85e96c7c0fef85d16dac8442ca379b980ba553d1602a5ae5e984eb6ae5abe5998155f62521292a3683612a251e7b81c940b05 SHA512 3c15c3663fd81dbbfbfa15219cbf94306af1cb846f9e3a6739db8c188d90b8ae25c601e0c746e93c13cbc4734fe612f9b5ca42fad97055903ccc473e5f3e15c3
 DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
-DIST kubernetes-1.15.2.tar.gz 26628888 BLAKE2B 49c72f9355e1bb00f743571f4253261b46d58fe6252b1f9284d0982a201502ef13ccc77da588087e407a7d6ed250d1ab224b9fcf99d2542225d6736a8dffb4d9 SHA512 0de798631a3bf82766b797f05084f40df4422808c8ec8651480c5c27ecd4adb51148d15c7260b06482eba11c9bbb68966abc03a2d472b98d12cb0fe2ccf38473
 DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
 EBUILD kubeadm-1.13.10.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
-EBUILD kubeadm-1.13.9.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
-EBUILD kubeadm-1.14.5.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
 EBUILD kubeadm-1.14.6.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
-EBUILD kubeadm-1.15.2.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e
 EBUILD kubeadm-1.15.3.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e
 MISC metadata.xml 1128 BLAKE2B b5ad31ef126f2d95646a37c256b82d2ad5e008968f928fb56b05c39514d4a9e0a252ebcefbeac8679f5349acac170886859af44f095aafea97fc8bf00a34bc44 SHA512 b9246624712068cf304fc5329ae851c26d52204b684b5f547892b23e68948b04b4ed4654a49d7bb5fe7eea658b58fbdbbe51a7a9ba1f4a94c5d0499a033b7f5a
diff --git a/sys-cluster/kubeadm/kubeadm-1.13.9.ebuild b/sys-cluster/kubeadm/kubeadm-1.13.9.ebuild
deleted file mode 100644
index 6c4b699b7594..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.13.9.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.11
-	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.14.5.ebuild b/sys-cluster/kubeadm/kubeadm-1.14.5.ebuild
deleted file mode 100644
index 763c3838067b..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.14.5.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/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 650938741f72..cb7366615a08 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,11 +1,13 @@
 DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
-DIST kubernetes-1.14.5.tar.gz 28071522 BLAKE2B 1d949f53ebae03c5ce02d32253e85e96c7c0fef85d16dac8442ca379b980ba553d1602a5ae5e984eb6ae5abe5998155f62521292a3683612a251e7b81c940b05 SHA512 3c15c3663fd81dbbfbfa15219cbf94306af1cb846f9e3a6739db8c188d90b8ae25c601e0c746e93c13cbc4734fe612f9b5ca42fad97055903ccc473e5f3e15c3
 DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
-DIST kubernetes-1.15.2.tar.gz 26628888 BLAKE2B 49c72f9355e1bb00f743571f4253261b46d58fe6252b1f9284d0982a201502ef13ccc77da588087e407a7d6ed250d1ab224b9fcf99d2542225d6736a8dffb4d9 SHA512 0de798631a3bf82766b797f05084f40df4422808c8ec8651480c5c27ecd4adb51148d15c7260b06482eba11c9bbb68966abc03a2d472b98d12cb0fe2ccf38473
+DIST kubernetes-1.14.7.tar.gz 28086210 BLAKE2B 5731ce2796f4d5178ec3ee01c340c48af88fdfc7330b53bf04933ff26c00be0092f55f7e8717e60415423f74369db465ab260ac7ff60a9787b76e085c0e07301 SHA512 cc5eb12c4337a72c234fcc1bc660fa8e6f95957b53c774e2dafa2974a2eb5f0b05532766bac8dfc2f45d1f683ed6de425978c71a633a5782843aebed192f0337
 DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
+DIST kubernetes-1.15.4.tar.gz 26643115 BLAKE2B 7fa68a2deae73d92526a65a0c70f697ec831e158417a607ab1884ade53c652123370e0fdfb13bc6804fc3fece03d2a29d3bd91fd27f767585f3ea05eec759b47 SHA512 046305e572b743c4eb59fd9ee05af197961d1a5b47cf88d30cbcbb9be4cc7dddc497738cd3700a4ff047deb8c0057d809b2c7b98fcf160657b94ae7b71ea3299
+DIST kubernetes-1.16.0.tar.gz 31159351 BLAKE2B e140a8bcbd753e29dfe4367c5a81578327239e72e51d1dd9402094c7482ba159a27ba5fb9df9825e5c7f3e428a6855c598670932f53d63845cf18fcdec6a0a54 SHA512 2019c15ea952b9dea7cb2a1ce6df0402f8addc9e5786413cc9a734923c0fa0256881e59b9a36f859cac9072c91754baf2ba235793296ec870e1aee5a64c4a097
 EBUILD kubectl-1.13.10.ebuild 1254 BLAKE2B 2743900120a1056c1a533a63144ffb2c2f76efdc4bc9efed8689126396ce83a80f55b9c65cfeb20e859471c3cb6f8a60d6c0c7e61a0bbcfb059858b72caa45a1 SHA512 b5d88e62e375cf74e1ffac496f5a931fe2df7fd119618cb0e0f6e062940a1f566cff14dcd74d27f0455b303b309de2f184a960a66d2e5e8b0f72572a6b699ce1
-EBUILD kubectl-1.14.5.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
 EBUILD kubectl-1.14.6.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
-EBUILD kubectl-1.15.2.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
+EBUILD kubectl-1.14.7.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
 EBUILD kubectl-1.15.3.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
+EBUILD kubectl-1.15.4.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
+EBUILD kubectl-1.16.0.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
 MISC metadata.xml 331 BLAKE2B 5af758a2aff067b1d7e94cb6d87a27fb96825c56490b5a4c7d9554cbb5057cf10b0dfb7d069f3edf8f7bcdce88b0f6b4286c4622c3cdcf5e5b283c75760f6a1d SHA512 d44cef89f9f902c706b0f9c0c4106bfd6ca094d64c273d0a13da53aec7ba2b238cd6ff489f13765e895ee4a6f2bb4638436839c7c60cce2ece3013fdc27232a4
diff --git a/sys-cluster/kubectl/kubectl-1.14.5.ebuild b/sys-cluster/kubectl/kubectl-1.14.7.ebuild
index 7a61b25dce90..7a61b25dce90 100644
--- a/sys-cluster/kubectl/kubectl-1.14.5.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.14.7.ebuild
diff --git a/sys-cluster/kubectl/kubectl-1.15.2.ebuild b/sys-cluster/kubectl/kubectl-1.15.4.ebuild
index 7a61b25dce90..7a61b25dce90 100644
--- a/sys-cluster/kubectl/kubectl-1.15.2.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.15.4.ebuild
diff --git a/sys-cluster/kubeadm/kubeadm-1.15.2.ebuild b/sys-cluster/kubectl/kubectl-1.16.0.ebuild
index ffd3646b62e1..7a61b25dce90 100644
--- a/sys-cluster/kubeadm/kubeadm-1.15.2.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.16.0.ebuild
@@ -8,7 +8,7 @@ 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"
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
 HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
 SRC_URI="${ARCHIVE_URI}"
 
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 96a23f3ed47a..059f32d1cc3e 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -4,13 +4,9 @@ AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a005854898
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
 DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
-DIST kubernetes-1.14.5.tar.gz 28071522 BLAKE2B 1d949f53ebae03c5ce02d32253e85e96c7c0fef85d16dac8442ca379b980ba553d1602a5ae5e984eb6ae5abe5998155f62521292a3683612a251e7b81c940b05 SHA512 3c15c3663fd81dbbfbfa15219cbf94306af1cb846f9e3a6739db8c188d90b8ae25c601e0c746e93c13cbc4734fe612f9b5ca42fad97055903ccc473e5f3e15c3
 DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
-DIST kubernetes-1.15.2.tar.gz 26628888 BLAKE2B 49c72f9355e1bb00f743571f4253261b46d58fe6252b1f9284d0982a201502ef13ccc77da588087e407a7d6ed250d1ab224b9fcf99d2542225d6736a8dffb4d9 SHA512 0de798631a3bf82766b797f05084f40df4422808c8ec8651480c5c27ecd4adb51148d15c7260b06482eba11c9bbb68966abc03a2d472b98d12cb0fe2ccf38473
 DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
 EBUILD kubelet-1.13.10.ebuild 1370 BLAKE2B 266582d9525e760a83c267cee55e51402121c8b70f5392cfb428eb47da7a5087a3d8c419f22ee8d1f17ff8471e610b0cb29605079118f64470b0b3ebc4198731 SHA512 8efbd5783cf009f22ee4687d20fb09ad495cd8cb65be297c168f47871ed1d7a945066ad49b114511987d97c6196dc30c58e774a9ddbee3d5b292807ec9abae3a
-EBUILD kubelet-1.14.5.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
 EBUILD kubelet-1.14.6.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
-EBUILD kubelet-1.15.2.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
 EBUILD kubelet-1.15.3.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kubelet/kubelet-1.14.5.ebuild b/sys-cluster/kubelet/kubelet-1.14.5.ebuild
deleted file mode 100644
index f38ce59e625d..000000000000
--- a/sys-cluster/kubelet/kubelet-1.14.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 systemd
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-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() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.15.2.ebuild b/sys-cluster/kubelet/kubelet-1.15.2.ebuild
deleted file mode 100644
index f38ce59e625d..000000000000
--- a/sys-cluster/kubelet/kubelet-1.15.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 systemd
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-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() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/open-mx/Manifest b/sys-cluster/open-mx/Manifest
deleted file mode 100644
index e31766b3889a..000000000000
--- a/sys-cluster/open-mx/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX omxoed.initd 912 BLAKE2B abf30abf82c72647cc94223ed34cf51127c8299f40e477fe07bc0bda6b7cb28265edd69bdc4792c9c510332c009092101309ecc46dc65ea8e81a3390cc64125d SHA512 ecfc0419317ca767d099f8089e92d08396359c5fd223123281bdada1f165619ef73498b1b0732a5f9f280551e7e4fb5efccea69450b68e6c1360405ff84f48dd
-AUX open-mx-1.4.0-driver.patch 284 BLAKE2B 681849e8efc021c0e4a0fd281b49e110ec19319e1bc290e0d3ff96124cc3b89f65a68cfa6ab30782d6f0d4353c1b8871cd4375aaecba036a4953ae8fc35eadf9 SHA512 8807f515f6bc29c8500b282b69d5cb7030e25804e0597b44e6015988ea639487882ad3ca3d650aec21ff06815662e11753d8524dcc8b713bcbb9fd318fa78488
-DIST open-mx-1.5.4.tar.gz 1094452 BLAKE2B 324db9b2cfeaba3ee057fd3f7c163b0085a57c022be1d170e37bee21c952a49a48bc53cd301e186eb2a0fa837be702fe3a187ce2fbebaf8aa22173bd25f907b1 SHA512 df41132de0c6f7a20a1cdb9aff3c654d5e306771369c12086affda785686e1a3ed23ba82e617618ebbd72ffa3b32d1f3c76e4450d6ab772d9e5a3080f6a3e977
-EBUILD open-mx-1.5.4.ebuild 1913 BLAKE2B 7d2cf0ea69cbd8e1351a5a36cf70957c87e74b1720214fe6efe80f47f82c95adad21121e5631e3f03764b8f55505a0111095e213ec2a455efb0afab9b5f098f5 SHA512 134a61592d9bc9ed16edff25b05548543d5b616dab241cc99e9d7a0e015c306b0f46351ec4ff83b6d2c629bfbd2d839fcf1cefb1f5b6042f85032e68c039ba7f
-MISC metadata.xml 365 BLAKE2B ceba315f0fbd74cfc6ec310a70126108f304deef94ba49cc1a9f8291b9827fdea3e3224cd7a52265d98ec55e240496d943874301e7a51f29eef2d5f03a26842d SHA512 debd6bb734810af46390ed76b73151e5729999aff31956951cf9482e06ae6d08e4d642f9fc27ff99f0947b0b63214dc9ca6514e760d0d93a79bcd9ea79b60743
diff --git a/sys-cluster/open-mx/files/omxoed.initd b/sys-cluster/open-mx/files/omxoed.initd
deleted file mode 100644
index 765842ed7f68..000000000000
--- a/sys-cluster/open-mx/files/omxoed.initd
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-checksystem() {
-	if [ -c /dev/open-mx ]; then
-		einfo "Open-MX module already loaded"
-		return 0
-	else
-		einfo "Checking if Open-MX module present"
-		if [ "x$(modprobe -l  open-mx | grep open-mx)" == "x" ]; then
-			eerror "open-mx not found!"
-			return 1
-		fi
-	fi
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	checksystem || return 1
-	if [ ! -c /dev/open-mx ]; then
-		ebegin "Loading open-mx module"
-		modprobe -q open-mx
-	fi
-	start-stop-daemon --start --exec /usr/bin/omxoed \
-	 	--background --make-pidfile \
-	 	--pidfile /var/run/omeoed.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/bin/omxoed \
-		--pidfile /var/run/omeoed.pid
-	eend $?
-}
-
-status() {
-	ebegin "Showing current active Open-MX peers"
-	omx_info -q
-}
diff --git a/sys-cluster/open-mx/files/open-mx-1.4.0-driver.patch b/sys-cluster/open-mx/files/open-mx-1.4.0-driver.patch
deleted file mode 100644
index e082865c235a..000000000000
--- a/sys-cluster/open-mx/files/open-mx-1.4.0-driver.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.am	2011-07-15 02:42:53.000000000 +0400
-+++ Makefile.am	2011-07-15 02:43:02.000000000 +0400
-@@ -20,11 +20,6 @@
- 
- SUBDIRS =
- 
--# Driver
--if OMX_BUILD_DRIVER
--  SUBDIRS += driver/linux
--endif
--
- # Library
- if OMX_BUILD_LIBRARY
-   SUBDIRS += libopen-mx tools tests tests/mx
diff --git a/sys-cluster/open-mx/metadata.xml b/sys-cluster/open-mx/metadata.xml
deleted file mode 100644
index fc70a30f312d..000000000000
--- a/sys-cluster/open-mx/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
-<maintainer type="project">
-		<email>cluster@gentoo.org</email>
-		<name>Gentoo Cluster Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sys-cluster/open-mx/open-mx-1.5.4.ebuild b/sys-cluster/open-mx/open-mx-1.5.4.ebuild
deleted file mode 100644
index ac461bfced30..000000000000
--- a/sys-cluster/open-mx/open-mx-1.5.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils linux-mod multilib toolchain-funcs udev
-
-DESCRIPTION="Open-MX - Myrinet Express over Generic Ethernet Hardware"
-HOMEPAGE="http://open-mx.gforge.inria.fr/"
-SRC_URI="http://gforge.inria.fr/frs/download.php/34371/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug modules static-libs"
-
-DEPEND="
-		sys-apps/hwloc
-		virtual/linux-sources
-		virtual/pkgconfig"
-RDEPEND="
-		sys-apps/hwloc
-		virtual/modutils"
-
-MODULE_NAMES="open-mx(misc:${S}/driver/linux)"
-BUILD_TARGETS="all"
-BUILD_PARAMS="KDIR=${KERNEL_DIR}"
-
-pkg_setup() {
-	einfo "You can set desired mtu by setting OPEN_MX_MTU in make.conf"
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	# We still want to configure driver but dont want to build it at all
-	epatch "${FILESDIR}/open-mx-1.4.0-driver.patch"
-	# We dont want tests
-	sed -e 's:tests/mx::g' \
-		-e 's:tests::g' \
-		-i Makefile.am || die "sed failed"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-mtu=${OPEN_MX_MTU:-9000} \
-		--with-linux="${KERNEL_DIR}" \
-		--with-linux-release=${KV_FULL} \
-		$(use_enable static-libs static) \
-		$(use_enable debug)
-}
-
-src_compile() {
-	default
-	if use modules; then
-		cd "${S}/driver/linux"
-		linux-mod_src_compile || die "failed to build driver"
-	fi
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.*a' -exec rm {} +
-	# Drop init scripts
-	rm -rf "${ED}/usr/sbin" || die
-	rm "${ED}/usr/bin/omx_check"
-	# install udev rules
-	udev_dorules "${ED}/etc/open-mx/10-open-mx.rules"
-	dodoc "${ED}/usr/share/open-mx/FAQ.html"
-	# Drop misc stuff
-	rm "${ED}/etc/open-mx/10-open-mx.rules" || die
-	rm -rf "${ED}/usr/share/open-mx" || die
-	newinitd "${FILESDIR}/omxoed.initd" omxoed
-	if use modules; then
-		cd "${S}/driver/linux"
-		linux-mod_src_install || die "failed to install driver"
-	fi
-}
diff --git a/sys-cluster/zookeepercli/Manifest b/sys-cluster/zookeepercli/Manifest
index d6cc08237ccb..722a757d5e34 100644
--- a/sys-cluster/zookeepercli/Manifest
+++ b/sys-cluster/zookeepercli/Manifest
@@ -1,9 +1,5 @@
 DIST github.com-outbrain-golib-ab954725f502c2be1491afadbbc66da2f99a45ae.tar.gz 5892 BLAKE2B 8ac98704758e0ddf121ae088b15873234f14eba14ab86379f3212638787345e618f104608364f21e9d00106242e4942293e4706dbc1bb7e5ddbf19b2f71bd511 SHA512 dfb5758f5c26320ca5cdf502c1e3847ed35adb85d09db7df2a0784a3ec0662dc316bab6d88e6aa9e085585fe0157aa9f83a53e30d0ac38b5cc96704e12fa8194
 DIST github.com-samuel-go-zookeeper-c4fab1ac1bec58281ad0667dc3f0907a9476ac47.tar.gz 37110 BLAKE2B 4c32afe54c27ed1532a50d386217bec3b477ceba3744bb415f906c5b0301db172289455a6631659e98b4600175ad391d09f7c60532bdc5754761a177482be37f SHA512 3dab581a699336979b7be6b9792a877eee9e9fe39157b0774e38831735e1148b522617d246c7c1d146cb8c6dd3faba20cb72b94e9bd85e532f11d20f97e755d9
-DIST go-zookeeper-218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f.tar.gz 29301 BLAKE2B db6f18d03187ae502a9755709de0100e01521fb9077d4240c72a7c99e2cf16a1fe96fcd582723d503fbaa53158c9a5feb43c787a98fec1f61f84f50fb69410c8 SHA512 0fda62feaa668b43bdc7866270780b30069d7dace5c25c69d27d5df17bc3331885c9a7d3575b822c4da712e8a4af0465c6370cd3e89f6c39e73d70aed346d599
-DIST golib-2418949ac30d9933e7412ccce41f1aa2ae8d5ae8.tar.gz 5892 BLAKE2B 5fa26796cd008d79f5df32aeb0398d627c958bd07d27b5a10b1d1f8ae1cd77688b0e114b8022099e98ae06884d3b5e830d9a554fe780f58b4f64866cb2ee0f45 SHA512 924b9e296f5d0051f321115b542603653d8868d3bc8cb933b16eaa511c34bb9869fc763ea2f2261a71e8dbe06c5e1963ff202986f496d7d889a55ae7694704ec
-DIST zookeepercli-1.0.10.tar.gz 11942 BLAKE2B d9683dc441642641e9f72b244a75a76194e4fe9cc80e8f85be007dfd88d4e92703da8b66d264b732a08ab3b66ab3d2ff83e7654c3b97a74f827f85bd9cc9ee8f SHA512 793de5eb2b62265a97c6e82f14c7ba1f9d32dacb86a02375a18ca6cbf472d5b7649e94107e3c497e81d4b81f7131b85032ba100c2d8f14a47fd8fc972c6be47d
 DIST zookeepercli-1.0.12.tar.gz 51077 BLAKE2B 5b5c07305407882845fe339bbc75fd7a521020f588db30303855733c6263409a6c3ad08d5c0bb287cd2c4c03aeb7ff7ee3b544c0b3480fab17952f67d6cca339 SHA512 fb18d1a725fe21e98039cdd19f158a344cae008eff319abeabf349921ef9f4b92b0e251ec5e6414102fe66394d287d1aa3c675bd7454665c1a47d0e9cb4fb352
-EBUILD zookeepercli-1.0.10.ebuild 1614 BLAKE2B e7de60ebf86f9e3bda2928236b0932d3bd22d0a0328e66c263eb42717b9e2ddc14317231559ac7e879e399b567d6e59118660f781c37580c4bf712c3ff6ad659 SHA512 e845d780873f2435c008a36583232c2f77beed717462d645a7a875a5282da1c86d1727a185b42d4ed853408011d8f3ce4316b87110bf64537d027377c54076d8
-EBUILD zookeepercli-1.0.12.ebuild 936 BLAKE2B 41cec2364059c39febfb10e29deda90b4cd62cf2a690b79eacfd9a5456b7390825b2dd23396775702cdf37907814173f9f31f73e2a381596153901547b31bd53 SHA512 c62e9e4cea56180c61bd4f45fd7f141805d179c4aacf75a0cb593e35d0fb25072f0e02ef8a5760da9436bd39156c57aea1d6dbdb11ca96f6ad2080f6c5cac292
+EBUILD zookeepercli-1.0.12.ebuild 940 BLAKE2B 62bee25dd46f31334d8713e995d73da642f93cde2b17156fb786ba26cb80f447cb9b90bd9ca26705659e8562d0e3bd0bdfed3570c906079276c38770a69861b8 SHA512 96004efcb4f141df718d1033b05797ec4aadaa2e6bdcbe351953d7ea0d1f2818619f677e32c216f2ad8360c1c30bb19f4a9cf1fa320748c4f6b2657d33b911b7
 MISC metadata.xml 330 BLAKE2B 39902629c95b8860082ab3a9f1f844f54fff912225f007cbdf6c4c2aa0c4c433643ec3911d7e4233ce0cb2f7594d6d86916d025b16e7677cdf3c46dfaf13a260 SHA512 4330eb8e97dbe6441726384149b6090b77c6276ce02547731756968bf255f8d632fdf5f1ebf77f66c977fdd5d75672b2dbc31e1ac0f29678e0f07b27484f37b6
diff --git a/sys-cluster/zookeepercli/zookeepercli-1.0.10.ebuild b/sys-cluster/zookeepercli/zookeepercli-1.0.10.ebuild
deleted file mode 100644
index fe03fb04c045..000000000000
--- a/sys-cluster/zookeepercli/zookeepercli-1.0.10.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/outbrain/zookeepercli/..."
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-https://github.com/outbrain/golib/archive/2418949ac30d9933e7412ccce41f1aa2ae8d5ae8.tar.gz -> golib-2418949ac30d9933e7412ccce41f1aa2ae8d5ae8.tar.gz
-https://github.com/samuel/go-zookeeper/archive/218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f.tar.gz -> go-zookeeper-218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f.tar.gz"
-DESCRIPTION="Simple, lightweight, dependable CLI for ZooKeeper"
-HOMEPAGE="https://github.com/outbrain/zookeepercli"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-DEPEND=">=dev-lang/go-1.4.2:="
-
-get_archive_go_package() {
-	local archive=${1} uri x
-	for x in ${SRC_URI}; do
-		if [[ ${x} == http* ]]; then
-			uri=${x}
-		elif [[ ${x} == ${archive} ]]; then
-			break
-		fi
-	done
-	uri=${uri#https://}
-	echo ${uri%/archive/*}
-}
-
-unpack_go_packages() {
-	local go_package x
-	# Unpack packages to appropriate locations for GOPATH
-	for x in ${A}; do
-		unpack ${x}
-		if [[ ${x} == *.tar.gz ]]; then
-			go_package=$(get_archive_go_package ${x})
-			mkdir -p "${S}/src/${go_package%/*}"
-			for x in ${go_package##*/}-*; do
-				[[ ${x} -ef ${S} ]] && continue
-				mv "${x}" "${S}/src/${go_package}" || die
-			done
-		fi
-	done
-}
-
-src_unpack() {
-	unpack_go_packages
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #678960
-	GOPATH="${S}" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/sys-cluster/zookeepercli/zookeepercli-1.0.12.ebuild b/sys-cluster/zookeepercli/zookeepercli-1.0.12.ebuild
index 13a626b00c26..8591b84d3523 100644
--- a/sys-cluster/zookeepercli/zookeepercli-1.0.12.ebuild
+++ b/sys-cluster/zookeepercli/zookeepercli-1.0.12.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 S="${WORKDIR}/${P}/src/${EGO_PN}"
 DESCRIPTION="Simple, lightweight, dependable CLI for ZooKeeper"
 HOMEPAGE="https://github.com/outbrain/zookeepercli"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD"
 SLOT="0"
 IUSE=""
 DEPEND=">=dev-lang/go-1.9:="
author	V3n3RiX <venerix@redcorelinux.org>	2019-09-25 19:33:39 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-09-28 08:31:11 +0100
commit	ad6182343997a405079870a2fe91c4e0c6b94595 (patch)
tree	4aa7483cd0ad7de54338afc8e7971417abe1dd81 /sys-cluster
parent	e8f81810baa21f490d6910e8e2d424546b72a333 (diff)