gentoo resync : 26.11.2017

3 files changed, 10 insertions, 52 deletions

diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index f42dcee693d9..8727010439f3 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,10 +1,8 @@
-AUX kube-proxy.confd 53 SHA256 a64f7683e165325c7ea27d75f1072a9aab33f3bb6dbd3cde10c62e0e39cc4876 SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018 WHIRLPOOL 06b0c1feb540972544331c2b34325b78dc70fa25ae89a131581fa796eecb3f5a84c3825f875558f34aabeff161e1936701b922c5e3f74e104f590117c8a1a809
-AUX kube-proxy.initd 507 SHA256 b8da03e55d7ab6265a202c664b8a128f173caa146335179d5ee25cb1f58a9898 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364 WHIRLPOOL 915c7538815aadcd24e71fb664e51c00243d021c3d7769d147d5ae0c026ff8e957109219cdf7ab1f6eb5606da8ab4e0773405fe20962bbffd3dfbb6f02f6fff1
-AUX kube-proxy.logrotated 84 SHA256 d5cede3f593d9f748b162647b89aac25123dd92cb003f4249c5c7abdf139de6d SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d WHIRLPOOL 78cc481814917f289ba91b84369e3af377133ee1da7700aca679683d94327f5cd4da1f0d85f7d46ab75409694a4b98a14d83ba96695d75562fad0f2464d287ae
-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 kube-proxy-1.8.1.ebuild 1109 SHA256 c954932ce483576da1b3f4295617d74b465f8da1bed5370f404d76637e4178e3 SHA512 6dd581cfd97d999d1634181700984a8fd3b4d87f7a91011638a100b7076e23b5addfa364425b1bfb3619aae4919ef1d77f9e11a38daf782b3ebe3ae9b4e867bf WHIRLPOOL e4854293acc347634aea7538ec6770298719b30c684e09d14fac7f5bb7221a88578f465ead9ee5702e0bad61ed7b23dbba63c8c2a49a153b09619fb29e46fc39
-EBUILD kube-proxy-1.8.2.ebuild 1109 SHA256 c954932ce483576da1b3f4295617d74b465f8da1bed5370f404d76637e4178e3 SHA512 6dd581cfd97d999d1634181700984a8fd3b4d87f7a91011638a100b7076e23b5addfa364425b1bfb3619aae4919ef1d77f9e11a38daf782b3ebe3ae9b4e867bf WHIRLPOOL e4854293acc347634aea7538ec6770298719b30c684e09d14fac7f5bb7221a88578f465ead9ee5702e0bad61ed7b23dbba63c8c2a49a153b09619fb29e46fc39
-EBUILD kube-proxy-1.8.3.ebuild 1109 SHA256 c954932ce483576da1b3f4295617d74b465f8da1bed5370f404d76637e4178e3 SHA512 6dd581cfd97d999d1634181700984a8fd3b4d87f7a91011638a100b7076e23b5addfa364425b1bfb3619aae4919ef1d77f9e11a38daf782b3ebe3ae9b4e867bf WHIRLPOOL e4854293acc347634aea7538ec6770298719b30c684e09d14fac7f5bb7221a88578f465ead9ee5702e0bad61ed7b23dbba63c8c2a49a153b09619fb29e46fc39
-MISC metadata.xml 331 SHA256 d36b415b6920b0f46ff81985c0ad7d18c35a945358cf2846d0a968cdf9dc5f1c SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68 WHIRLPOOL 3fb6d9e005c6ea6d7d82e288c0a0c9c6b643599b5c16f3f66113b99d5082036642502541d54bc2f84f764f5fd1cd84eaf1d50e3e11ce7f9bff46763304794925
+AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8810268f894e3466cea4d82c7882e56d6a0bf425311adbf6a55e3e3fe351b9a1a7ce1d9e1e087018b SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018
+AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
+AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
+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 kube-proxy-1.8.3.ebuild 1109 BLAKE2B 5f6e46c1e47368f37747a3f32900dbd745c0a88d6ec5433c5c9ee6674b730386f9dfffae26904ed7517a4b55e2cf908cae0aeedb7d2fed3fbfb6a6c75669234c SHA512 6dd581cfd97d999d1634181700984a8fd3b4d87f7a91011638a100b7076e23b5addfa364425b1bfb3619aae4919ef1d77f9e11a38daf782b3ebe3ae9b4e867bf
+EBUILD kube-proxy-1.8.4.ebuild 1201 BLAKE2B 80e0e31d4003f5b8f96a56c2da008a3cb06fd9297be932a3f73c0af3385406f3b679b3eb054a74362afb4f27be8f52c1edff984b6a43149127988c7582786a0d SHA512 bee756c013fe7bc4c4de17949e65053030f508f3060ab2fef490001306cf870f7671ce573e1daf44ee61e90a4bca2761a709ca26d4e9eb6d6592f6ec4a1e646e
+MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.8.2.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.8.2.ebuild
deleted file mode 100644
index 4824d28abca5..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.8.2.ebuild
+++ /dev/null
@@ -1,41 +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 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"
-
-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() {
-	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 /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.8.1.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.8.4.ebuild
index 4824d28abca5..162ba7e725f9 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.8.1.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.8.4.ebuild
@@ -21,12 +21,13 @@ 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() {
-	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() {