gentoo resync : 23.03.2018

3 files changed, 4 insertions, 5 deletions

diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 129cd78255fd..04d2ddb0034a 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,10 +1,10 @@
 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.7.tar.gz 23246803 BLAKE2B b7fb8919462359f0fa211cf0cad834a7f09c893dd7da2ea9ca4564cc9f65e374ae6e036f12c182a42cd0f3b52f80b366d1e662bdf7967a066cacc9e6b8018ad4 SHA512 ea1be8a1cdc78d818a393da7ef7629405b08cf9a6fd2426d891912082b2230a148be49465b415cef9494476694715779a90429660ad1bb815bf258f3978c9707
-DIST kubernetes-1.9.2.tar.gz 23390279 BLAKE2B de9782209236d04fddefe83e074f1c41b37bc052ac45472cd75b30b0d5ba6a358ccf3db67fdb621627b483a59fa78b4fefdc78693287a138b18154f0e8f782fc SHA512 8dd20ad6b2e77f1adc5ef37bdb319be472c5afa47c83c64e4496bb7ee3517bcca0aba398c16283dfda981915878dbd3685a61af65912d4d3fd14a77346edbe13
 DIST kubernetes-1.9.3.tar.gz 23396346 BLAKE2B e65a68e27f479dfedbfa17dd770dbeee9d56cd439abe3537a928bed15e054a12f7f8445c35e89957665b74a831135240d0e12af10ef14bd4e5938bca1781e0e5 SHA512 73a20c0f28cc04728bdaac36d08a2b78c7f203bc61a80c4716a1cb8447547f56e7ae76cbe77b3b03c704b6224392c4d0aa88ede3ce116c8aa2c15cb8a9bd4840
-EBUILD kube-controller-manager-1.8.7.ebuild 1297 BLAKE2B 114a3171dc88b283b7adb97751502b18c1f414379b6dfc649dd1bbe74ae3bf4cd67daa2944e22271d72d81c043e28d82b294cbc3202191d8b957531f40932fc0 SHA512 299acc2a8f6821200dbddcdabcbec512e44a758fa3f14d0ec3c897782af5e30f6441ba0b28af8089f0d31433aa8931217c0e261b7d282fd7ef774e21a8a9d3ef
-EBUILD kube-controller-manager-1.9.2.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
+DIST kubernetes-1.9.5.tar.gz 23533411 BLAKE2B 1dc2699a903b10945a9b4b1b0d957a7ef0ee3309e3eb54d53155818bc943c780a381962703ed3b5f510998a3fdb20f7a2b0f0b9a2a09d4b811f2a8270a5efc6d SHA512 631ad278566ba4f51cd260ac5941df1776b6e9a01a67933fe348273f1ac5140a66a51be0120c090789e3baaa57d9913bf8fdfd71137d7d7c4af5d795097f4fb7
+DIST kubernetes-1.9.6.tar.gz 23538810 BLAKE2B ff832b3c8b0c06d47d62c6bbb981a60c94d31822921eb4a2e1fcb9b04c44cb9ffbb2f3bca050ba7188a49ec5292e5bad9a0560c6c39bce8ff706d1034df90e45 SHA512 1182f189fe5090297c373359f8c3782acc05213cc05c35b7cd48aaed845a2c8cbe32e155699e549690d8438cea220a129bde8256e834ae8939badf2ad953fa1e
 EBUILD kube-controller-manager-1.9.3.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
+EBUILD kube-controller-manager-1.9.5.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
+EBUILD kube-controller-manager-1.9.6.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.2.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.5.ebuild
index 3a0b835d0991..3a0b835d0991 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.2.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.5.ebuild
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.7.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.6.ebuild
index c1076001c2cd..3a0b835d0991 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.7.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.6.ebuild
@@ -26,7 +26,6 @@ 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
 }