gentoo resync : 22.01.2021

5 files changed, 49 insertions, 8 deletions

diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 05daba39a5d0..6885b3198672 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,14 +1,16 @@
 AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2cf815b25ac4e91354e3fce756a1955e71ec762fab1091074ef4233fff22667aba50417c0d6a896055f8f52b6630bb4e SHA512 b0227a7431018a6742b3931fda0f14b4a040107ecd6821c84593180919ba8a5af9b99b7a507645a5488792f14accd686acc4cc6f70a5084bbdfcdd494021aafc
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
-DIST kubernetes-1.17.14.tar.gz 31844013 BLAKE2B 725081706a7647127018d34d55d1eae1ac750d1378a7b8762aff39a638f88931e2f37d8609329b32bce360bb52e654f230f1c121d122fd90ab94de6b8a035f0f SHA512 6d5a22c47bd89a5622e38746a6e9c6d3146f065d7f1e63c161f6fc667e1c7d973a4ce0a77a63b53ed46708f490477c182119a0809d08b8ee3041f232a60ad19e
 DIST kubernetes-1.18.14.tar.gz 32666861 BLAKE2B 6a005804280d72de84d1bab68a51e72c41de0b3a50a1c40befab1290e9fcfecba133fa441f50bf250f458ca4ad44f4fab495da4782626efff70dcfe0f3029d49 SHA512 e19b834db4920db6b466662a8c001ecaad7a7bee6c4faef871bbc3f528e10b0b4c9fc6f3ac065953ce625db0ede98d76536cf3158b4fb241725115febb141946
+DIST kubernetes-1.18.15.tar.gz 32665949 BLAKE2B 7a99a5fdbc51bb89fe5c61eb35b7d89eca0fa7e1e797787e793b1a2a29a399dc3f6a74be866d3699ec150a0257d8b0a55e9a2e73a67a552ea963129ca85c149b SHA512 bbe18742323ce66a4e8c40ae906e0ac18ff1fdc89f64ee43777e4dbe762f06d4f27b9152e06d985a58574b3c7e518cd103390f5dc7f2f593a046d0e887671a30
 DIST kubernetes-1.19.6.tar.gz 33470206 BLAKE2B ea7614da380ce7c834884d96b37753802eb4919b4fb274dabf0d38f0438039c90ab1fccc86e0d8f665c15ae61f1d3f6ce4d400782ed580033cfd58390cd50617 SHA512 d7c6db2fa399b04a3acae792546fa0384e6b3a3e5eaa2c1ba6c49d656da0197f5be3d009756313436816f3839825c66ce23a06a1ec35c37f1c3fcfba79f9ac32
-DIST kubernetes-1.20.0.tar.gz 35797322 BLAKE2B 8bcb34cd3e62f241caa21706f95f010cb5962b697799fcbfba62c67bfb786c3cdcac61b444676fa90952d4ac0d997364202c3797f963c8fcf60d69deca235ba5 SHA512 d04967ca858c05eb52ea46fbd5415cadb86e2ceb88481f523de2779c68dfc5eacdab033ccd873ba2c4b23e843d97b9f01400d058b421ddc618ea2b2ef751e24b
+DIST kubernetes-1.19.7.tar.gz 33481861 BLAKE2B de83b13ebc10f96cdcc6bbf4015db35740c4c3e821cc263669f5ac63ff69bc674106cacd95e0bfde165c4fa2b6d7b6dfcbb94654e1551ab3bd43c8aff00ae3ce SHA512 1fc0d6820a9486a81242e25e7cd034537110fe10fa1aadc89be115a16441d50913ea1add1c1364a5f8e4d9255ef3e619a75c45e43b853d1c6038d6af66473ad1
 DIST kubernetes-1.20.1.tar.gz 34424663 BLAKE2B 156482f88f051eeea0c428c357a79d876ff0ce5f8ed6eb1ffa72be83bff45b72970280fa1bc7629804c178b9fa45ad84a9961a4f0e7eca1b58351fc7d7f4cfc0 SHA512 40598999cc5c96c54591338eb985bc056892ef2f98cfb521ff26937fa29f63a20e97f52a8454433ff98614d579509b7a5e927edcd96f4725505a334a999c0326
-EBUILD kube-controller-manager-1.17.14.ebuild 995 BLAKE2B 415d764fd1b869881b77028994696658f3df64861e30afe2f428886355f839f8ad9e6935f7097578942d81e77510c567116eba6eac69fa338c568bbec90ca7b4 SHA512 6b217ae240ab158951ab2b57a81c7d76175a4ab24c886a57f8cce35852123d34b8c4321fc6ca35c3a97f25631089e873d328c7f78b032ad27489ee9ece87f0e9
+DIST kubernetes-1.20.2.tar.gz 34428927 BLAKE2B d49ddbe95f377320261aeca655bea2fb375f134bac32f594ad5d2ee8c349d946f267257888375a3d5184140d5a7d2eddc759e25f633b771e2803595838fcd60f SHA512 7459825ead1435135dbd8f226cba7fc9698771809447067f14742a444073bd6933bb936d053eb70c7745edf8360c1e5e6f835cf3956abc78d3ac26447279a36c
 EBUILD kube-controller-manager-1.18.14.ebuild 995 BLAKE2B 0e02e87535309211f9b0616b55d68b4f39b961de404c2241c5f98c7ac33c11a7688c02a291cb1fbd6a47476b448c7d8937a69b1d4ceae1669ffd11ecac6f84e7 SHA512 5f7c3ad0e5f76d130752015beca896d42a249981a19fc96f30fd79a3ea721aa17b6d6a070797f695e32c63ff3e2a913bc55cbbd9816768153dc434cb5837c649
+EBUILD kube-controller-manager-1.18.15.ebuild 996 BLAKE2B 1b71359d516c24758c4c22ef0724aad19fd7cffabc0a1e22eba9809e635099d1934336309ba7330801eacdb2ec17136e080ac3de2868d56670d15216d3781042 SHA512 dc4c0d820fcdc1602952e42f4868f9e7a2a7f10a3b49633b11807e4a6bd22be44e19f4306aaf88b1a3b1f0442173fde980c0c7534c078e535f1251aa66548d00
 EBUILD kube-controller-manager-1.19.6.ebuild 1013 BLAKE2B ece69494aaf4069df77f5b59f69194bc9026ff0ff9c99c26d01871c79d79cdb9690b6ef0e23548aa9d949fc2a3d498d90ae3343d718d75f8c5fc064f15fc82f4 SHA512 b4cd7597206d1a0689ae8fc8592ecf2b438e386d8a65057b60aafc8fb2614d1ce0a16ef92d3e807c4dc93177786f93f9a10f00d0dfe091abd3a6c01ec34c5142
-EBUILD kube-controller-manager-1.20.0.ebuild 1014 BLAKE2B 17fcd0560a912cb174f5efe605c2400f13644a1229cc2d2009c8f01e73cf1f8c277e9111f07f020ef6fdd65667fdff1cf89578fb76849f01c06000449a2def66 SHA512 557136c63f805b8ffa64d3a6c63411594d77c1d98587cb0ac42a9ecc00eb9c6b91330866da16b82bafe8e97eec6a1b3d899b790bf98f112a566eda9bae0b53c9
-EBUILD kube-controller-manager-1.20.1.ebuild 1014 BLAKE2B 17fcd0560a912cb174f5efe605c2400f13644a1229cc2d2009c8f01e73cf1f8c277e9111f07f020ef6fdd65667fdff1cf89578fb76849f01c06000449a2def66 SHA512 557136c63f805b8ffa64d3a6c63411594d77c1d98587cb0ac42a9ecc00eb9c6b91330866da16b82bafe8e97eec6a1b3d899b790bf98f112a566eda9bae0b53c9
+EBUILD kube-controller-manager-1.19.7.ebuild 1014 BLAKE2B 17fcd0560a912cb174f5efe605c2400f13644a1229cc2d2009c8f01e73cf1f8c277e9111f07f020ef6fdd65667fdff1cf89578fb76849f01c06000449a2def66 SHA512 557136c63f805b8ffa64d3a6c63411594d77c1d98587cb0ac42a9ecc00eb9c6b91330866da16b82bafe8e97eec6a1b3d899b790bf98f112a566eda9bae0b53c9
+EBUILD kube-controller-manager-1.20.1.ebuild 1013 BLAKE2B ece69494aaf4069df77f5b59f69194bc9026ff0ff9c99c26d01871c79d79cdb9690b6ef0e23548aa9d949fc2a3d498d90ae3343d718d75f8c5fc064f15fc82f4 SHA512 b4cd7597206d1a0689ae8fc8592ecf2b438e386d8a65057b60aafc8fb2614d1ce0a16ef92d3e807c4dc93177786f93f9a10f00d0dfe091abd3a6c01ec34c5142
+EBUILD kube-controller-manager-1.20.2.ebuild 1014 BLAKE2B 17fcd0560a912cb174f5efe605c2400f13644a1229cc2d2009c8f01e73cf1f8c277e9111f07f020ef6fdd65667fdff1cf89578fb76849f01c06000449a2def66 SHA512 557136c63f805b8ffa64d3a6c63411594d77c1d98587cb0ac42a9ecc00eb9c6b91330866da16b82bafe8e97eec6a1b3d899b790bf98f112a566eda9bae0b53c9
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.17.14.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.15.ebuild
index c96771b74a1f..25099739497e 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.17.14.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.15.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
@@ -25,7 +25,7 @@ S="${WORKDIR}/kubernetes-${PV}"
 
 src_compile() {
 	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" WHAT=cmd/${PN}
+		emake -j1 GOFLAGS="" GOLDFLAGS="" WHAT=cmd/${PN}
 }
 
 src_install() {
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.0.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.7.ebuild
index 7ebd21720e51..7ebd21720e51 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.0.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.7.ebuild
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.1.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.1.ebuild
index 7ebd21720e51..1ebd04eb6335 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.1.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.2.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.2.ebuild
new file mode 100644
index 000000000000..7ebd21720e51
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}