gentoo resync : 05.04.2019

6 files changed, 12 insertions, 136 deletions

diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 862d6934e1af..0231203e5248 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,24 +1,18 @@
 AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8810268f894e3466cea4d82c7882e56d6a0bf425311adbf6a55e3e3fe351b9a1a7ce1d9e1e087018b SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
-DIST kubernetes-1.10.11.tar.gz 25085442 BLAKE2B 1cd758c8f042f9ccd797e67690f31038595a1162e8d50aed849e35dcc522aff3af2ce074f3c27f8dfce536ffb290af5d6bf0f684089eb76567f1bfb33f2764c6 SHA512 db7feafe398436123e66c90a271f714a645da5f170241d01371bfe613e87e2c177610f32325f85e02b63df9e847b19fd6000bff0b35d2635e8f03b31a40b9d11
 DIST kubernetes-1.10.12.tar.gz 25091359 BLAKE2B 8bc053ba737bdbe0cf65a2061f6ed9c959b85af19bf64b7c8c08738ac443b84486ebf229d6eec245b2414dc459987c855ae0d295d35e02c62ec83f8f789966d9 SHA512 74f476617d64e1ae0b520a2a8424c27e76dc5a7829b3565e132da9df6d7b0d6ad20592c4330d8cb5be714d4e40098dfb4d267a278a46df3baee762fd5d797e41
-DIST kubernetes-1.11.5.tar.gz 24813001 BLAKE2B 71c631b53246b9364ca29f5c2aebbf4303e7dbe103dc1d779c5e4f0aa26ee6caf5aab8023a8beb9a9fb513567283fcef4e584218c8cf30d1083f42344139cbfd SHA512 60a28bb32a469517974d1ba6d950d7f1550fea47d951a993edea0036d1b5baf35719edc73c2022291b70532c22241518f8324d70a86083c65fe38863ed04ac1c
 DIST kubernetes-1.11.6.tar.gz 24827575 BLAKE2B 095adccef1b5618f7e5d3a46cbf835f10513a667f663a673e2dedad5820ce59a4fde2208550447677a6693c11d4820db3f12c2e265153a1e33aaca71eadf6798 SHA512 cffe96ae56a6a9e3549090afd84e9e43955ce00f8089a71771c5171ce33b23ef164a67d3f3506326f95c1a602b53ec9d631b7160f6b8a51658c41b6eb048c670
-DIST kubernetes-1.12.3.tar.gz 28042821 BLAKE2B 79c2020608e4e94532b2d525c2c68dfbf9e7660f9047a215675e24f08eb00d145155ea09d9b05f92732c964d47c65138ea9170f6e8fd13ff9d63208a78b60f7d SHA512 6c4ef50240626f97246ed71229463e3649f42674d64bca3a8171728f67807cd0509da9156f53d0e7a8d4967e081cff0f03e0e1469ce5c81313eff67201d49b72
-DIST kubernetes-1.12.4.tar.gz 28064009 BLAKE2B 96cb269796628cde2665cb17bd6918d51a8d2cdebdaf75c65e352beebf7da4bee5da311ddf93931250471e46dd30dbd238727716542c688f364b1f14578d9146 SHA512 f7135a2dd7dac19512db13c0e72264b32c07f4a2f9fbc3573e31fa346415c99738446bd48463c3dd9bee3a716e040dd0c9e681c970603507649eefceca5926d7
 DIST kubernetes-1.12.5.tar.gz 28128559 BLAKE2B add647a579e75e877552fbde0800064d9170022619e236e9d280dc17f245adc8218458e12d0c7643a2a105c988ae7a4fa0176e19cc56989c54eb7edebd8d9dfc SHA512 bb391858b040fd75b03f5dcaf7e7f1b776d288443a833412c34c2fea8bbf23a8b76c4dd89da0b6fbd6ebfc1172407620aef8d8c5873b6f103dd118817dc17ad6
-DIST kubernetes-1.13.1.tar.gz 28715812 BLAKE2B f51d456264348cc89aa00b6bbda2c90acfc881ff9d9ff80af77a405c3cf302626e8be96c3bec1f7f3f4df3250e48d02778c1918320484acb7827e8f411ab4bda SHA512 95a5558c9ae2b1e8207d76157f4f52d17236c6aa315ca4c7cac0f18fbe59b061156c05a5d886321b589a6cb675c142754e48f9e0ca7e966116749a32120e92c7
 DIST kubernetes-1.13.3.tar.gz 28781320 BLAKE2B 7ae1a6ddeff5b8d19bacc868ad5970cc8ea81239f1ce709207e321ab97c0f155c6c363b3b0f9af25f6e6ce68d99678cf2b10c841a45f082f486bd9dee7be5e3a SHA512 45c2639a88e04d16511c92ca48ca6326b12422f0765df92fb883a1afe7fda9adefcf111d76855532f69b48c6e681774ee0c7e08f74594de808b50e11f8ec52c5
+DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4cc0f5556f6245b8e87aee5244e96ed6beede646f8b95b118d79ac715e988111f7fd2ddfb4c478af7a9bfe19c4dd227be SHA512 aced7b8dae452c62f4751785ad106c3747054ccb075b3d04dd82bd816d74f4002844e3cfa7aee138c9661e5c30a9aa9743f10a0dd807bbd590fffb60ce72f617
+DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
-EBUILD kube-proxy-1.10.11.ebuild 1117 BLAKE2B 399c883d474fb02f41f1784b4d4370c913f09ffc44438336eced438bdecb2579a8985e584299f6a435c9ed23e3ac8932056125439036fccb34b4a7a6a39d60a5 SHA512 cfb9378b244419075ab4d1a614a0c8b9bc838f032733b5acf80dcc036d76200a3c2894c9e24bb1070101389a7812d1af896e30b51d348eef57b5a25bb3318387
 EBUILD kube-proxy-1.10.12.ebuild 1117 BLAKE2B d52df182032ff67ae4c2e52180a3ec368a0b957076133f7d5225cab3286c4535a608dc03bb926cc892e8acac461a2c2b5abf66dbaab4dfb3124a1a807117aada SHA512 6665f98db3f1879ef801f087656fa5fb3ab8129fa4df7743ee0c23e433db8bbfd702ceedf17433f91ff9755d52fa109bb022ebd18f5a5ba300ae4eb37a6cb277
-EBUILD kube-proxy-1.11.5.ebuild 1117 BLAKE2B 399c883d474fb02f41f1784b4d4370c913f09ffc44438336eced438bdecb2579a8985e584299f6a435c9ed23e3ac8932056125439036fccb34b4a7a6a39d60a5 SHA512 cfb9378b244419075ab4d1a614a0c8b9bc838f032733b5acf80dcc036d76200a3c2894c9e24bb1070101389a7812d1af896e30b51d348eef57b5a25bb3318387
 EBUILD kube-proxy-1.11.6.ebuild 1117 BLAKE2B d52df182032ff67ae4c2e52180a3ec368a0b957076133f7d5225cab3286c4535a608dc03bb926cc892e8acac461a2c2b5abf66dbaab4dfb3124a1a807117aada SHA512 6665f98db3f1879ef801f087656fa5fb3ab8129fa4df7743ee0c23e433db8bbfd702ceedf17433f91ff9755d52fa109bb022ebd18f5a5ba300ae4eb37a6cb277
-EBUILD kube-proxy-1.12.3.ebuild 1117 BLAKE2B 399c883d474fb02f41f1784b4d4370c913f09ffc44438336eced438bdecb2579a8985e584299f6a435c9ed23e3ac8932056125439036fccb34b4a7a6a39d60a5 SHA512 cfb9378b244419075ab4d1a614a0c8b9bc838f032733b5acf80dcc036d76200a3c2894c9e24bb1070101389a7812d1af896e30b51d348eef57b5a25bb3318387
-EBUILD kube-proxy-1.12.4.ebuild 1117 BLAKE2B d52df182032ff67ae4c2e52180a3ec368a0b957076133f7d5225cab3286c4535a608dc03bb926cc892e8acac461a2c2b5abf66dbaab4dfb3124a1a807117aada SHA512 6665f98db3f1879ef801f087656fa5fb3ab8129fa4df7743ee0c23e433db8bbfd702ceedf17433f91ff9755d52fa109bb022ebd18f5a5ba300ae4eb37a6cb277
 EBUILD kube-proxy-1.12.5.ebuild 1117 BLAKE2B d52df182032ff67ae4c2e52180a3ec368a0b957076133f7d5225cab3286c4535a608dc03bb926cc892e8acac461a2c2b5abf66dbaab4dfb3124a1a807117aada SHA512 6665f98db3f1879ef801f087656fa5fb3ab8129fa4df7743ee0c23e433db8bbfd702ceedf17433f91ff9755d52fa109bb022ebd18f5a5ba300ae4eb37a6cb277
-EBUILD kube-proxy-1.13.1.ebuild 1137 BLAKE2B 52d86c985e37cd01c32721f21b892ed79e08971436372eddf7ab16e2498ef55bd4caec7f85e1969210fd2fdc1131c365958e3ccdf6671a679c1756bd13d3d8c9 SHA512 afd924929ad466945cad79764bd8d593fa719c850d77b9429f363709c858e932e8db7b8320deb47406ff7110bf96f0a899761c07305beeaf7abc372986df1f83
 EBUILD kube-proxy-1.13.3.ebuild 1137 BLAKE2B 52d86c985e37cd01c32721f21b892ed79e08971436372eddf7ab16e2498ef55bd4caec7f85e1969210fd2fdc1131c365958e3ccdf6671a679c1756bd13d3d8c9 SHA512 afd924929ad466945cad79764bd8d593fa719c850d77b9429f363709c858e932e8db7b8320deb47406ff7110bf96f0a899761c07305beeaf7abc372986df1f83
+EBUILD kube-proxy-1.13.5.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
+EBUILD kube-proxy-1.14.0.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 EBUILD kube-proxy-1.9.11.ebuild 1117 BLAKE2B 399c883d474fb02f41f1784b4d4370c913f09ffc44438336eced438bdecb2579a8985e584299f6a435c9ed23e3ac8932056125439036fccb34b4a7a6a39d60a5 SHA512 cfb9378b244419075ab4d1a614a0c8b9bc838f032733b5acf80dcc036d76200a3c2894c9e24bb1070101389a7812d1af896e30b51d348eef57b5a25bb3318387
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.10.11.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.10.11.ebuild
deleted file mode 100644
index ecd6ebd729ef..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.10.11.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 Proxy service"
-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"
-
-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} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${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-proxy/kube-proxy-1.11.5.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.11.5.ebuild
deleted file mode 100644
index ecd6ebd729ef..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.11.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 Proxy service"
-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"
-
-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} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${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-proxy/kube-proxy-1.12.3.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.12.3.ebuild
deleted file mode 100644
index ecd6ebd729ef..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.12.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 Proxy service"
-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"
-
-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} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${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-proxy/kube-proxy-1.13.1.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.13.5.ebuild
index 25f9544b2a65..f519690e8b2f 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.13.1.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.13.5.ebuild
@@ -18,11 +18,13 @@ SLOT="0"
 DEPEND="dev-go/go-bindata
 	>=dev-lang/go-1.11"
 
+RDEPEND="net-firewall/conntrack-tools"
+
 RESTRICT="test"
 
 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 "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
 	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
 }
 
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.12.4.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.14.0.ebuild
index 9c91e87318db..f519690e8b2f 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.12.4.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.14.0.ebuild
@@ -15,13 +15,16 @@ SRC_URI="${ARCHIVE_URI}"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-DEPEND="dev-go/go-bindata"
+DEPEND="dev-go/go-bindata
+	>=dev-lang/go-1.11"
+
+RDEPEND="net-firewall/conntrack-tools"
 
 RESTRICT="test"
 
 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 "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
 	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
 }