gentoo resync : 26.11.2017

3 files changed, 10 insertions, 54 deletions

diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 93cf2d5ce22b..845be02bf576 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -1,10 +1,8 @@
-AUX kubelet.confd 58 SHA256 c1476a6d4af6a40296c990ad46bd5793d9b52c8b12c0c7764ee177962022938e SHA512 2ae3bbc8a66da644b59d7f753294ad43d5675edbe2e4769b91d7c988d0eeffd5b4209a10650ad937f9698b1b6050279d448c75274815a6b348ad2023f2fef08e WHIRLPOOL 95d2f220e8afbe315e146ee76cab3df06d63662894c59d4b03fed887ed99c17e71baf7bdf3493d4e904cbcfa10cf7848c6761184112714fc423d611a8e5d81b2
-AUX kubelet.initd 520 SHA256 76dda0fed830ea6a0dac72d91252a9c82575281984b8049e4760e2f27dd4f4af SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0 WHIRLPOOL ff5c283443b303485b58647666577dc627f81eb11b4ed1f03a44bc8381be78777f24a4ae4f4fac33f32e476bea7c5fea7f70f044cdb1f277ff64656878c260e8
-AUX kubelet.logrotated 84 SHA256 43b1e0acf404fb18ea0b225c2a2acd712d86f53eea4416b65ec253c19e7ea577 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5 WHIRLPOOL 472c61cefc673fe47f52c979b8a6985767bb146380587e921cca8580447c1dfd80cc6020ddecb968efedb4d4da3f7691d41aa570c43c36b76ab575fe2564300e
-DIST kubernetes-1.8.1.tar.gz 23400352 SHA256 a262050d532275a1b340ca1a453a986eb977a094d7a8f4a7600358677f114a18 SHA512 b09e72990cd148c604a92d866e4dd07da113a9dd1e68faebea8dd9bf256bfd908070d4e38eed7ce04c8f416d20203cf29c9c7f8906e1b50b678cb18e2ef8f5b3 WHIRLPOOL 87142b40c7d19b8be8563ec5ccaefc3970b7ce79a081bd9c1ff8c3d5227843c267fe5ab8d56b7a42874b7f29d8517f0d69beb2842ab2b58f8fb1efa5e6a61291
-DIST kubernetes-1.8.2.tar.gz 23123452 SHA256 3052c0ce35bd1f8a1500588580947c7f17f09f1ddea3a54466036fd62b46c736 SHA512 a813681f07fc674f493701833a30bc6b156572e4c8d28558b0e22dd36c16257c6c0922df773e4a5799a2eec05674cd1180f2b15ab69b0bdce52d1a861723214b WHIRLPOOL d8beb599ca2e194af5e5e1eb6d521c7846ad2ffad72da965119c51c92b16db41a17222886e57de5aad83359f20c8b264eb2e7411048218c95790d1f95f0b75fe
-DIST kubernetes-1.8.3.tar.gz 23203777 SHA256 8ab7e41126dfc3bc1a23ff76efc20e5131320530dc1277e5c2ed8c9618041b95 SHA512 6538b60daf91ad0b89e07d1c7d3a5127ac65f642aa317aefc030656488decf0f288ec7d71390755e90e1452f0719916c38ac45ec71d67969d0f4cf7b402682c8 WHIRLPOOL 94bc84421b648b42b1a0e0ffd8ed8f4e3fe4c5c25bc7ada6026be2e7a22278199b5539b99c2bcc571882ba8a1df3f5b7993c238c163bb1efdef746ec641a6e61
-EBUILD kubelet-1.8.1.ebuild 1206 SHA256 192d3c71383989c1c7a0d54e5a5d68f19f60f80759d10f7d8c4fa1fdea8294ea SHA512 232f3600c53b381f4cfc41c9808ca68a6582958bc7aa31a04b2d95466c2ff0770350906d208091150fa50a137ea59d04f30b820e03a9d3221ec60e7f5e94fb43 WHIRLPOOL 2a0127c6af63a85b3e6dbc6c6c48d1dfd739af224efbc6cc78e7513fb28fc486e72246d8004633572d31db4d5500346252a7fbbef79d0d71a4d4fba416c495ec
-EBUILD kubelet-1.8.2.ebuild 1206 SHA256 192d3c71383989c1c7a0d54e5a5d68f19f60f80759d10f7d8c4fa1fdea8294ea SHA512 232f3600c53b381f4cfc41c9808ca68a6582958bc7aa31a04b2d95466c2ff0770350906d208091150fa50a137ea59d04f30b820e03a9d3221ec60e7f5e94fb43 WHIRLPOOL 2a0127c6af63a85b3e6dbc6c6c48d1dfd739af224efbc6cc78e7513fb28fc486e72246d8004633572d31db4d5500346252a7fbbef79d0d71a4d4fba416c495ec
-EBUILD kubelet-1.8.3.ebuild 1206 SHA256 192d3c71383989c1c7a0d54e5a5d68f19f60f80759d10f7d8c4fa1fdea8294ea SHA512 232f3600c53b381f4cfc41c9808ca68a6582958bc7aa31a04b2d95466c2ff0770350906d208091150fa50a137ea59d04f30b820e03a9d3221ec60e7f5e94fb43 WHIRLPOOL 2a0127c6af63a85b3e6dbc6c6c48d1dfd739af224efbc6cc78e7513fb28fc486e72246d8004633572d31db4d5500346252a7fbbef79d0d71a4d4fba416c495ec
-MISC metadata.xml 331 SHA256 d36b415b6920b0f46ff81985c0ad7d18c35a945358cf2846d0a968cdf9dc5f1c SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68 WHIRLPOOL 3fb6d9e005c6ea6d7d82e288c0a0c9c6b643599b5c16f3f66113b99d5082036642502541d54bc2f84f764f5fd1cd84eaf1d50e3e11ce7f9bff46763304794925
+AUX kubelet.confd 58 BLAKE2B 5c01a2146beacf3a024f312d1bd3422055887ba48d5d869a32a2be99585f260f9d9b9946e57290345e0d57870f7d4509892c53fe4c7a63b0111b1fa8f464daf0 SHA512 2ae3bbc8a66da644b59d7f753294ad43d5675edbe2e4769b91d7c988d0eeffd5b4209a10650ad937f9698b1b6050279d448c75274815a6b348ad2023f2fef08e
+AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a00585489864c262d90ad8347763753f99eccec6fe6670c6fa016674dee4dea0fa838991abb503db97bd983a SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0
+AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
+DIST kubernetes-1.8.3.tar.gz 23203777 BLAKE2B ce8cd5fab6f309bfa5611a66be5c244bec1bfbd5f8dc2db045755f870a5a1bdc2791842a967a0537874b805a3fa49c9a2bec4aac218db35790bf14ed9e88b38a SHA512 6538b60daf91ad0b89e07d1c7d3a5127ac65f642aa317aefc030656488decf0f288ec7d71390755e90e1452f0719916c38ac45ec71d67969d0f4cf7b402682c8
+DIST kubernetes-1.8.4.tar.gz 23213010 BLAKE2B 0c8f4ad04c1ee709344d17ffa37a1d532f437d0b7e04fdc84b6d940346f2b5746c91376b0d2e55a76bb5414b4b7c285da039e7267e7879151b848c9a4112b90e SHA512 4b487256e49cb5d93c22b1992a84f079147bddb243d3b3ca5e984939dca334d62501de426bf3ba1e8e511642bbf4b999091c97b0b1885b87c5bcc9936d29e8c3
+EBUILD kubelet-1.8.3.ebuild 1206 BLAKE2B 970c67a20cd300b93f80ea7e330261802ccb898c7a4033b0b425743dbcb39d7b1591df3da43b62072dc8a1c715eda18f3e0c552710dd110e145fd6e0ba6d8cdc SHA512 232f3600c53b381f4cfc41c9808ca68a6582958bc7aa31a04b2d95466c2ff0770350906d208091150fa50a137ea59d04f30b820e03a9d3221ec60e7f5e94fb43
+EBUILD kubelet-1.8.4.ebuild 1298 BLAKE2B 419836dfde6e4f2d39718ed6ac04765948e6576116e30199c759206be0be524d22a0be48bd3f2fe3a77f0fbb1fd26be3b23c022f99712309fe78ad49f8a31166 SHA512 35df955c8c56be6fe3666115d5f8ef93530a391516498b887581c88c7dd9daad83f22d5fd6470084244767bab9c794619e8a9651abe00aa2ae8c8268d1bc0f82
+MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kubelet/kubelet-1.8.2.ebuild b/sys-cluster/kubelet/kubelet-1.8.2.ebuild
deleted file mode 100644
index 8348f6d70ace..000000000000
--- a/sys-cluster/kubelet/kubelet-1.8.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 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"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" 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}
-}
-
-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}
-}
diff --git a/sys-cluster/kubelet/kubelet-1.8.1.ebuild b/sys-cluster/kubelet/kubelet-1.8.4.ebuild
index 8348f6d70ace..f50b649733f0 100644
--- a/sys-cluster/kubelet/kubelet-1.8.1.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.8.4.ebuild
@@ -22,13 +22,14 @@ RESTRICT="test"
 
 src_prepare() {
 	default
+	sed -i -e "s/git archive/git-archive/" src/${EGO_PN}/hack/lib/version.sh || die
 	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" 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}
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
 }
 
 src_install() {