gentoo resync : 25.11.2020

7 files changed, 43 insertions, 64 deletions

diff --git a/metadata/news/2020-04-03-kubernetes-moving-to-single-package/2020-04-03-kubernetes-moving-to-single-package.en.txt b/metadata/news/2020-04-03-kubernetes-moving-to-single-package/2020-04-03-kubernetes-moving-to-single-package.en.txt
deleted file mode 100644
index 499b30a1feb6..000000000000
--- a/metadata/news/2020-04-03-kubernetes-moving-to-single-package/2020-04-03-kubernetes-moving-to-single-package.en.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Title: K8s Moving to a Single Package
-Author: William Hubbs <williamh@gentoo.org>
-Posted: 2020-04-03
-Revision: 1
-News-Item-Format: 2.0
-Display-If-Installed: sys-cluster/kubeadm
-Display-If-Installed: sys-cluster/kube-apiserver
-Display-If-Installed: sys-cluster/kube-controller-manager
-Display-If-Installed: sys-cluster/kubectl
-Display-If-Installed: sys-cluster/kubelet
-Display-If-Installed: sys-cluster/kube-proxy
-Display-If-Installed: sys-cluster/kube-scheduler
-
-Formerly, we packaged kubernetes as seven separate packages:
-
-sys-cluster/kubeadm, sys-cluster/kube-apiserver,
-sys-cluster/kube-controller-manager, sys-cluster/kubectl,
-sys-cluster/kubelet, sys-cluster/kube-proxy and
-sys-cluster/kube-scheduler.
-
-Starting with kubernetes 1.18.0, 1.17.5 and 1.16.9, these will be merged
-into one package, sys-cluster/kubernetes. The components of this package
-which are build and installed will be selectable by use flags.
-
-If you are using 1.16.x or 1.17.x and would like to migrate to the
-single package without upgrading, I have also made 1.16.8 and 1.17.4
-available in this new package.
-
-Currently, everything is built and installed by default; however, I am
-open to changing this if there is a better way to configure the default
-build.
diff --git a/metadata/news/2020-04-03-kubernetes-moving-to-single-package/2020-04-03-kubernetes-moving-to-single-package.en.txt.asc b/metadata/news/2020-04-03-kubernetes-moving-to-single-package/2020-04-03-kubernetes-moving-to-single-package.en.txt.asc
deleted file mode 100644
index e9f1aefe605f..000000000000
--- a/metadata/news/2020-04-03-kubernetes-moving-to-single-package/2020-04-03-kubernetes-moving-to-single-package.en.txt.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEnB9e/J8YI6T0NBsJm0Co7cr65zMFAl6HwJ0ACgkQm0Co7cr6
-5zNd5xAAsSSs++Ga+KQUVziwYdWBxC/AizJssBsVfPD4leyVz80bX+JYAqblqsCo
-pVyNpA64dcOo9nEY7JAGEoSnvuND2IUutt8sKs4Wjgc/B9kt7IIqaSYlmLfbEBo1
-3ozdUQ8RIAalsQwjJMuShq/RgK1D/NKqqEVuDR9zhuW1X81fNUaKVf2QDFpm6rJV
-Ho50Uwaac5Wkn9fruIeinl0YYn338FEpabgFfuVcABhNYJr/f9CJ5yjdV06CBFJH
-cjlTlwlnQQl599zEO44fq9ZvYRn7aUAzzyA8ykRi7gCsqEOdc6v1HunDRNDOBR1w
-ftMm8Du7rEr0nyqEJw7/CqS+UgNn4uJ6tB8LF151ZApE3DDoulfrEtQODAe9Xxv+
-4WFm+T2oX+9Ii1vueDrDjG6uoiUPBIiRV8Rbd7fstOdsbmGvdqFLAgs5oQiPfp0U
-l8VPHoezg42kr0Zjy30Poubzl6dDoLlRYcIHjQIIYlXPMoql6U0T3IIYb7uaQWtl
-piJ3Zs/B7Co8FhJAXHmP0fZ0vbggF+q/ax+QJCOq+fpO1PUqG9d8qb11NgnNiQeN
-RhncuwGL8hbobrDswTyawfxo9hHv3ORryAE/qNS9xpVFj2cG2rDdail6Vw/l64UR
-Agg18g4xzeyKbri0LzkURQCsLJVg22U2GFRAz20v8/BSnmCnXdE=
-=x3lR
------END PGP SIGNATURE-----
diff --git a/metadata/news/2020-10-06-k8s-split-packages/2020-10-06-k8s-split-packages.en.txt b/metadata/news/2020-10-06-k8s-split-packages/2020-10-06-k8s-split-packages.en.txt
new file mode 100644
index 000000000000..9ef5a9a1c519
--- /dev/null
+++ b/metadata/news/2020-10-06-k8s-split-packages/2020-10-06-k8s-split-packages.en.txt
@@ -0,0 +1,26 @@
+Title: kubernetes Split Packages Returning
+Author: William Hubbs <williamh@gentoo.org>
+Posted: 2020-10-06
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Installed: sys-cluster/kubernetes
+
+In order to fix the ability to upgrade kubernetes components separately,
+the kubernetes split packages are returning [1].
+
+Starting with kubernetes 1.17.12, 1.18.9 and 1.19.2, you will need to
+install the following packages in the appropriate configuration for
+your cluster.
+
+sys-cluster/kubeadm
+sys-cluster/kube-apiserver
+sys-cluster/kube-controller-manager
+sys-cluster/kubectl
+sys-cluster/kubelet
+sys-cluster/kube-proxy
+sys-cluster/kube-scheduler
+
+Once the split packages are stabilized, sys-cluster/kubernetes will be
+masked and removed.
+
+[1] https://bugs.gentoo.org/741572
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index bf9c3675f4a2..fc10cba53558 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 12242 BLAKE2B 63708e1e51b16a34a3f2a50a323f3af5b5b915560c0d248ae23b0b8063bdc4daa42999e12540ecf402753557b8be008f183bd9a3362df2a8f759d0570eb42801 SHA512 ae0f4bf6ad260e68b33f0fea3cb44d30aa724f573ded1559f1d30ca00b5a8f42e24129f34d4bfdd6c445dcfbfce001adc85474be53ed6ee989e703f11ff64aba
-TIMESTAMP 2020-10-01T21:38:34Z
+MANIFEST Manifest.files.gz 12077 BLAKE2B 2f3ed2165704c3f21cd4304fe3c7b1c7220549685a7eaa2b3e7c032afad54f4636d2f0b3a9ec4d5d71d15b7b035403e2ef7a90326cff0da0eaf8ffd7e4fac1aa SHA512 f30fcba11723fbc57f0bea029403880a3ba6f50c0d547ae57a3947cb791df5cb0e16dcf31a4810562ece91b1fc646aa82b76a7ef6f7a60e3a0bdd95f0bc0a165
+TIMESTAMP 2020-11-25T22:08:37Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl92TFpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl++1eVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDQCg//UrQnaG+avBhhXsgoc8ezyw0VIF8nOmHJtq5inh6WNIB87S0qNNnOB1LX
-4ptw9uL0MUb5Y8xhaD9yNStq/haINVgCA+zI6LUm2nya7YUVrk+C6w+jIL2rFGV4
-CMZSSy74QlZW5KCzU1g5n1PNDJg70ZVkvXop6HF9PSseF9p+3rnUL2hPiVBfigMu
-W12Aj1D7irQjolcqhFWCw1qj/fiINz+oR4kek1yUm+rCAjQZfHS+katq5P5vwBtF
-NPBjkVcuutOQcP+9HuinXqkGcUcyeDDafHXJUtwCn3zb2DXLsbxBN5xV9kPXyojr
-bG+oaEYLxoZeQvNWFFSMB1iji4hARe6XHY8TjANCAl/NzUVkgy/Ne+f+87E/DRZp
-FPEbxfDwsl1Z1V49A+Qc+7WsS56rNVQ6o/05l4ZVOSjagw/NmochPmYa9ycqpsEh
-Yidoej0hKrFWRfgAwkqvHLJ+aC6dTZdXh1F1hkDFF/bPjOEigCnw9GI73g6Js0nF
-sFx29IgRqosrr73z5TDWUWGehCibjgcWxdjYHBGZC3UQwaktA0hdf24R9aKDFdnz
-+hxZzORctDaQDveHjjqFEDH3uJMU33FuzHXQDc7+69P/lPlB1flrPhEZdUuMqQIA
-tYoIRZt/umt/vb2Bj/UjoLE6IvvctexHwSYEEPp6YfDFCJ9jbfs=
-=+T2u
+klCxZg//dLulDaf+IqZLLo/WU4Y2GoOGkT9Fmv8BMkQtO6nSJpn0SNFLlDowelmq
+p0iJF9CoiPMsDRgq52zs4yEXwBCsmLvvs0vSamYm+R5baYB10AInJElohQ5+RVa5
+WGXKz4+tQyZaL9ajPYpT9Ii7EHT+257Umof5kGP9Mpu7pt0VME7EIE69+6AIj1he
+3QfFm6YWN4HzyKq55dLrfP9gsXI01nPFCBT0f5hqnCvohuUFcsANlyb52kNX3OLg
++Onllymc+QO1vG3kEUuxHWcqhTZxSeRXvlP1faOUU8nlB6FXmNUL9ZSRtOrQtaOM
+jrokERw85kmF5r8B/aQsHdaiT18EORDny1Of49Q4v3ZDMDOXCilwNU2W+IpOl70F
+4YQPB05fnqOWnCmWURKvxb0BOcX6R7L4xeYm4j+Qxqy/VdQV74ttIsyXshjTpWTT
+V+gpdxYx7o1hClsaqf/mUZ7Sq81TbPXotnuNfsutHlKh0afQkKxf94vkQIx1kt4z
+nNcDvR0zxoSjqj765UK78iDXEmqEwmtcMl0LBbYF5AHaA0giJyaEd8s7oBM1TuMI
+qsdwCF5FfjIzJFFyIR04WFQocTIuvVP4nA5uJZvRrSEqlNOEBiMi1WR3PWRRuD3c
+5CSJoN123PXhQQbqyirsvqTXhpafUtHMj77ZN6TWwlHVTfcZKJQ=
+=GqPX
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index fbbe9a9a6eb3..b9ac2e92eaa6 100644
--- a/metadata/news/Manifest.files.gz
+++ b/metadata/news/Manifest.files.gz
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 251b1b6a1d70..43b544e08290 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 01 Oct 2020 21:38:30 +0000
+Wed, 25 Nov 2020 22:08:33 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index be0a717ea9c3..9ef05a3a4fd5 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-33358d385bbf206509e018b9208f126d647a1702 1601308260 2020-09-28T15:51:00+00:00
+3055337f5458471b69abf209530d9ce13c7ede6c 1601998698 2020-10-06T15:38:18+00:00