gentoo resync : 26.11.2017

3 files changed, 10 insertions, 58 deletions

diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 50dbe706c683..9d495cc73799 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,10 +1,8 @@
-AUX kube-controller-manager.confd 142 SHA256 378af056f60aefc4e4619b7d805e489d2129a4e2407b198cd7421d4294455ca9 SHA512 b0227a7431018a6742b3931fda0f14b4a040107ecd6821c84593180919ba8a5af9b99b7a507645a5488792f14accd686acc4cc6f70a5084bbdfcdd494021aafc WHIRLPOOL e2e88071f8bbb487fcf5594134220398a223c364867600cd78d02553ffa5bb864336da9adb6da973e429186cb7164d18e12032fbef9579c5868255bd9806c45b
-AUX kube-controller-manager.initd 566 SHA256 1271f550840ad78ce45135f6a64c2a95d639fb2f5dbbdf81cf336a4f705fe022 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1 WHIRLPOOL b642c8ca42215e6e8d132ef02cbaba187554be715c780ebe18e88168a5045ac73c5b8d59bf2a8bb36450b2a3892d040059f2bd48c4b50c0858886d44c46c9e06
-AUX kube-controller-manager.logrotated 97 SHA256 d6a51d4753956b17c6b308a9e831bbe9553c3ea33cf9cdb47e01d1f1942e487d SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c WHIRLPOOL d683da579cdcbd69686e35e52a8d1e83783b818f5de35032916a9d04f4e8742b7599ed9ddb86a30bf2cd7932a307b03867607e9722b04a389699bf952d10e559
-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-controller-manager-1.8.1.ebuild 1205 SHA256 10cbae6a937d6f84e48ee5f6991bcbe27d62a3763747b2c6028b6398073b4941 SHA512 7e3d27d052066d98fd014d4188f090eeea7a87d34b152be35c4fab01175ce2a375fb566dc718a2531464cbe528cb374e2d548cbbcb867660770798b72f2b103c WHIRLPOOL 787009973d32c39053c68d5e0ad74d07dc2ff3d3169e8ad8304621ec393878c3f1533c6b803facabc7d08cf067522b7151346d1761a4719a0b646927b97603c3
-EBUILD kube-controller-manager-1.8.2.ebuild 1205 SHA256 10cbae6a937d6f84e48ee5f6991bcbe27d62a3763747b2c6028b6398073b4941 SHA512 7e3d27d052066d98fd014d4188f090eeea7a87d34b152be35c4fab01175ce2a375fb566dc718a2531464cbe528cb374e2d548cbbcb867660770798b72f2b103c WHIRLPOOL 787009973d32c39053c68d5e0ad74d07dc2ff3d3169e8ad8304621ec393878c3f1533c6b803facabc7d08cf067522b7151346d1761a4719a0b646927b97603c3
-EBUILD kube-controller-manager-1.8.3.ebuild 1205 SHA256 10cbae6a937d6f84e48ee5f6991bcbe27d62a3763747b2c6028b6398073b4941 SHA512 7e3d27d052066d98fd014d4188f090eeea7a87d34b152be35c4fab01175ce2a375fb566dc718a2531464cbe528cb374e2d548cbbcb867660770798b72f2b103c WHIRLPOOL 787009973d32c39053c68d5e0ad74d07dc2ff3d3169e8ad8304621ec393878c3f1533c6b803facabc7d08cf067522b7151346d1761a4719a0b646927b97603c3
-MISC metadata.xml 331 SHA256 d36b415b6920b0f46ff81985c0ad7d18c35a945358cf2846d0a968cdf9dc5f1c SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68 WHIRLPOOL 3fb6d9e005c6ea6d7d82e288c0a0c9c6b643599b5c16f3f66113b99d5082036642502541d54bc2f84f764f5fd1cd84eaf1d50e3e11ce7f9bff46763304794925
+AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2cf815b25ac4e91354e3fce756a1955e71ec762fab1091074ef4233fff22667aba50417c0d6a896055f8f52b6630bb4e SHA512 b0227a7431018a6742b3931fda0f14b4a040107ecd6821c84593180919ba8a5af9b99b7a507645a5488792f14accd686acc4cc6f70a5084bbdfcdd494021aafc
+AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
+AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
+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-controller-manager-1.8.3.ebuild 1205 BLAKE2B e6ee1622a25e26b841a06f3a244487ecc965c26a29a210abddce67149352713756ea4edff64a92f7c4d7f02208feddcebe4d81c49b629a661a75472ba8508bd5 SHA512 7e3d27d052066d98fd014d4188f090eeea7a87d34b152be35c4fab01175ce2a375fb566dc718a2531464cbe528cb374e2d548cbbcb867660770798b72f2b103c
+EBUILD kube-controller-manager-1.8.4.ebuild 1297 BLAKE2B 4ccde72bf842070735214df423c38f7b096e23998889890ddf8f422b03bdc94541fc06f7763879023dc7a09662b73f1d68e65b87b1844346645d01ae96cb91ce SHA512 bd4208d50ba6705430ef824d2464ea2e52c1d09ea80c9d21723f8ada91cb027f3c107c26b8713fde4c290fd1cea490bf7171aa84ef142f5a7f3e199992ddaf88
+MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.2.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.2.ebuild
deleted file mode 100644
index e5ab12f16012..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-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 Controller Manager"
-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-controller-manager/kube-controller-manager-1.8.1.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.4.ebuild
index e5ab12f16012..678bdaaf6a29 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.1.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-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() {