gentoo resync : 20.12.2017

3 files changed, 3 insertions, 49 deletions

diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 6f6dfdc2ce6e..426ec9a57bc1 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -1,10 +1,8 @@
 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
 DIST kubernetes-1.8.5.tar.gz 23235782 BLAKE2B 923c4e5a0a3dc19d57665bf184bdd33fcbd9ffacf4aaf6a89553568631cdbc136f4bc0f6de0619bbabdc9f9bab05c495626bdccd1879bffb231fa31792707d08 SHA512 c4d6b2bafb4bc148ffe2273433241ff0564c6a452469180c2289f3f90fde72f0817881332502d08bcba3095809d71865255e8702d1e210dda81dff3310c24124
-EBUILD kubelet-1.8.3.ebuild 1206 BLAKE2B 970c67a20cd300b93f80ea7e330261802ccb898c7a4033b0b425743dbcb39d7b1591df3da43b62072dc8a1c715eda18f3e0c552710dd110e145fd6e0ba6d8cdc SHA512 232f3600c53b381f4cfc41c9808ca68a6582958bc7aa31a04b2d95466c2ff0770350906d208091150fa50a137ea59d04f30b820e03a9d3221ec60e7f5e94fb43
-EBUILD kubelet-1.8.4.ebuild 1298 BLAKE2B 419836dfde6e4f2d39718ed6ac04765948e6576116e30199c759206be0be524d22a0be48bd3f2fe3a77f0fbb1fd26be3b23c022f99712309fe78ad49f8a31166 SHA512 35df955c8c56be6fe3666115d5f8ef93530a391516498b887581c88c7dd9daad83f22d5fd6470084244767bab9c794619e8a9651abe00aa2ae8c8268d1bc0f82
+DIST kubernetes-1.9.0.tar.gz 23346652 BLAKE2B 0ed7a0b77798feb75adb1261720d23d5bf0ec0b754ea5b1fa369140a324cdfe291c271dca4e0cec50e7484aa6cfdff9aa7f0d0ee0fd469622695c6742ff05e38 SHA512 dc418c46521e15e499bda2444b1fa096004cfbff7a18cf0079df8f939e716b0234246c5b77240b24fe862cb081a0bd91d8a309318ab0fd3494fb0cd8e7b59c12
 EBUILD kubelet-1.8.5.ebuild 1298 BLAKE2B 419836dfde6e4f2d39718ed6ac04765948e6576116e30199c759206be0be524d22a0be48bd3f2fe3a77f0fbb1fd26be3b23c022f99712309fe78ad49f8a31166 SHA512 35df955c8c56be6fe3666115d5f8ef93530a391516498b887581c88c7dd9daad83f22d5fd6470084244767bab9c794619e8a9651abe00aa2ae8c8268d1bc0f82
+EBUILD kubelet-1.9.0.ebuild 1217 BLAKE2B 4d10deeffd29e0b71034e56c262ec592398cea24605ea62bb80548604b2d98daa299a023dec64d1d4828c1f4bffb6bdd20cc726989f2412cfc2479562c5d6ec1 SHA512 e73ce9c5d33371b37daa34501b7340a12ed3ace526f3ad4b18dd5e27b3713f38f8dcbd82d03d6cccf6737c28362e91bc350208e920f2abb38e473f975c6b35e3
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kubelet/kubelet-1.8.4.ebuild b/sys-cluster/kubelet/kubelet-1.8.4.ebuild
deleted file mode 100644
index f50b649733f0..000000000000
--- a/sys-cluster/kubelet/kubelet-1.8.4.ebuild
+++ /dev/null
@@ -1,44 +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 "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} GOFLAGS=-v
-}
-
-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.3.ebuild b/sys-cluster/kubelet/kubelet-1.9.0.ebuild
index 8348f6d70ace..26ac4661f469 100644
--- a/sys-cluster/kubelet/kubelet-1.8.3.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.9.0.ebuild
@@ -28,7 +28,7 @@ src_prepare() {
 
 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() {