gentoo resync : 20.12.2017

3 files changed, 3 insertions, 53 deletions

diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index caaaf919231a..66cc1f9fe9ad 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,10 +1,8 @@
 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
 DIST kubernetes-1.8.5.tar.gz 23235782 BLAKE2B 923c4e5a0a3dc19d57665bf184bdd33fcbd9ffacf4aaf6a89553568631cdbc136f4bc0f6de0619bbabdc9f9bab05c495626bdccd1879bffb231fa31792707d08 SHA512 c4d6b2bafb4bc148ffe2273433241ff0564c6a452469180c2289f3f90fde72f0817881332502d08bcba3095809d71865255e8702d1e210dda81dff3310c24124
-EBUILD kube-apiserver-1.8.3.ebuild 1197 BLAKE2B a3e7d7d760735ae7be06ca13023c0303d82202b59b53711cfa1e2e4501d418f604a31068f4df5c402f8afd43df736dd914d6c031a46beb6e3aad68d683446c38 SHA512 fb9ea8d90470560651ee6a05144f78b55c97edc0b1fac0afb6378b355da5c1810ca1dace31f2499411327fbea31ce247c9aa47d3e01362936fc0f332eae1643d
-EBUILD kube-apiserver-1.8.4.ebuild 1289 BLAKE2B 7ae937843a1e671ab69bb54bc7f7a941e62428964c4f5a48ed4d54678b01c5a49c72aadfb7017476c0c638c561332969fdbbd52e39e38d1773a585f16a4b4975 SHA512 d9a3cda779df4a70bf733f30737c400c01f295bde3ef7ab86ed55197c3bdad9f180d3ba9590b59ac694c0d02d337e6f19d32c1a2d2f1484a071bfa413685c274
+DIST kubernetes-1.9.0.tar.gz 23346652 BLAKE2B 0ed7a0b77798feb75adb1261720d23d5bf0ec0b754ea5b1fa369140a324cdfe291c271dca4e0cec50e7484aa6cfdff9aa7f0d0ee0fd469622695c6742ff05e38 SHA512 dc418c46521e15e499bda2444b1fa096004cfbff7a18cf0079df8f939e716b0234246c5b77240b24fe862cb081a0bd91d8a309318ab0fd3494fb0cd8e7b59c12
 EBUILD kube-apiserver-1.8.5.ebuild 1289 BLAKE2B 7ae937843a1e671ab69bb54bc7f7a941e62428964c4f5a48ed4d54678b01c5a49c72aadfb7017476c0c638c561332969fdbbd52e39e38d1773a585f16a4b4975 SHA512 d9a3cda779df4a70bf733f30737c400c01f295bde3ef7ab86ed55197c3bdad9f180d3ba9590b59ac694c0d02d337e6f19d32c1a2d2f1484a071bfa413685c274
+EBUILD kube-apiserver-1.9.0.ebuild 1208 BLAKE2B 098cebf85204ce4e7789ebb89f59a948e59f03cb6c5c3fdc036ca1927616b24699ed3418fff297bb997ecdbb6270a48b2b782ad21b37bd2026d1dd43eca87bf4 SHA512 6d595a9ff51d84d6add3027de98a746320ba3c1786aa195f8153a649e3bed7686ee5026d66b5108ee1502f801222dbdacc1188757417210693d9a4962e2edc60
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.8.4.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.8.4.ebuild
deleted file mode 100644
index 920080a62a38..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.8.4.ebuild
+++ /dev/null
@@ -1,48 +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 "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} GOFLAGS=-v
-}
-
-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.3.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.9.0.ebuild
index 56d8ee795dcd..9cfeaaab10b1 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.8.3.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.9.0.ebuild
@@ -31,7 +31,7 @@ src_prepare() {
 }
 
 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() {