gentoo resync : 26.11.2017

3 files changed, 10 insertions, 58 deletions

diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index e2a4b41a69bb..f947f67eddad 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,10 +1,8 @@
-AUX kube-apiserver.confd 116 SHA256 41c807a6b97b5cb309fb83a9c201956849d9e26da160825cc14e64aaa258e327 SHA512 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee WHIRLPOOL 97e3233336c3afc89a579d20ea26a67ecacfae776f1be05ff9e1a355d0955c74dbc404ca6947d5e0d3f52902c7db816c30413bb774751c30b987fd20399bf803
-AUX kube-apiserver.initd 541 SHA256 c20920c79c9b17d28e9a9bb2375a7a226e05a96e7a0ec8079999ae300a54c06c SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110 WHIRLPOOL 54b8496a4e67e381ffcbf8fbc5d030d6e2cafffaf2a21dea2c46cd03198559c6370b0388fe31a37df54c5f2fa8e3397b344e09e5560269430ba3f0833e1b42d3
-AUX kube-apiserver.logrotated 88 SHA256 27232cac89ee8436333872e1e89e82a3708fe25dd91c110e828387c700e9cf29 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e WHIRLPOOL 367818a50912337d297019ac535b3266ef20e1e674632736e12d6824a9f3758f2f79eb6aebca267b4dff73bfbfb3c8c93297353807027db2ac936f79d739fd70
-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-apiserver-1.8.1.ebuild 1197 SHA256 bd2f234b0c230833e147daba384e39fc4bb65a862e82126d6ad4563023c241be SHA512 fb9ea8d90470560651ee6a05144f78b55c97edc0b1fac0afb6378b355da5c1810ca1dace31f2499411327fbea31ce247c9aa47d3e01362936fc0f332eae1643d WHIRLPOOL f4b9f72baad98189da9c354be284e3fd167f20b4e472c13d5bd248c23380d847cc94a149d68e13edfd41da70dc68af040e76637d1086dfc89fc495534d933f13
-EBUILD kube-apiserver-1.8.2.ebuild 1197 SHA256 bd2f234b0c230833e147daba384e39fc4bb65a862e82126d6ad4563023c241be SHA512 fb9ea8d90470560651ee6a05144f78b55c97edc0b1fac0afb6378b355da5c1810ca1dace31f2499411327fbea31ce247c9aa47d3e01362936fc0f332eae1643d WHIRLPOOL f4b9f72baad98189da9c354be284e3fd167f20b4e472c13d5bd248c23380d847cc94a149d68e13edfd41da70dc68af040e76637d1086dfc89fc495534d933f13
-EBUILD kube-apiserver-1.8.3.ebuild 1197 SHA256 bd2f234b0c230833e147daba384e39fc4bb65a862e82126d6ad4563023c241be SHA512 fb9ea8d90470560651ee6a05144f78b55c97edc0b1fac0afb6378b355da5c1810ca1dace31f2499411327fbea31ce247c9aa47d3e01362936fc0f332eae1643d WHIRLPOOL f4b9f72baad98189da9c354be284e3fd167f20b4e472c13d5bd248c23380d847cc94a149d68e13edfd41da70dc68af040e76637d1086dfc89fc495534d933f13
-MISC metadata.xml 331 SHA256 d36b415b6920b0f46ff81985c0ad7d18c35a945358cf2846d0a968cdf9dc5f1c SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68 WHIRLPOOL 3fb6d9e005c6ea6d7d82e288c0a0c9c6b643599b5c16f3f66113b99d5082036642502541d54bc2f84f764f5fd1cd84eaf1d50e3e11ce7f9bff46763304794925
+AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7334eedcb2593855e7481d5969ed458d322ac29de0e9a9c7f9f041911ee7aeca750ff77ce04fd60bf3a3d3 SHA512 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee
+AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
+AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
+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-apiserver-1.8.3.ebuild 1197 BLAKE2B a3e7d7d760735ae7be06ca13023c0303d82202b59b53711cfa1e2e4501d418f604a31068f4df5c402f8afd43df736dd914d6c031a46beb6e3aad68d683446c38 SHA512 fb9ea8d90470560651ee6a05144f78b55c97edc0b1fac0afb6378b355da5c1810ca1dace31f2499411327fbea31ce247c9aa47d3e01362936fc0f332eae1643d
+EBUILD kube-apiserver-1.8.4.ebuild 1289 BLAKE2B 7ae937843a1e671ab69bb54bc7f7a941e62428964c4f5a48ed4d54678b01c5a49c72aadfb7017476c0c638c561332969fdbbd52e39e38d1773a585f16a4b4975 SHA512 d9a3cda779df4a70bf733f30737c400c01f295bde3ef7ab86ed55197c3bdad9f180d3ba9590b59ac694c0d02d337e6f19d32c1a2d2f1484a071bfa413685c274
+MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.8.2.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.8.2.ebuild
deleted file mode 100644
index 56d8ee795dcd..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.8.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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"
-
-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" 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}
-	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.8.1.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.8.4.ebuild
index 56d8ee795dcd..920080a62a38 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.8.1.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.8.4.ebuild
@@ -26,12 +26,13 @@ pkg_setup() {
 
 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() {