gentoo resync : 29.10.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-29 11:22:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-29 11:22:34 +0000
commit: bd7908c6630f38067350d396ac5d18c3cc2434a0 (patch)
tree: 3559b3e11424f5529527f2474d8a977a91ee3389 /sys-cluster
parent: 8b2628ad8526c806375e7b157889e4274b70248b (diff)
48 files changed, 805 insertions, 822 deletions
diff --git a/sys-cluster/csync2/Manifest b/sys-cluster/csync2/Manifest
index 6e533d0a20c3..b5869b16f95d 100644
--- a/sys-cluster/csync2/Manifest
+++ b/sys-cluster/csync2/Manifest
@@ -1,7 +1,7 @@
 AUX csync2.initd 492 SHA256 a5be7bd48f86cf3301e3a321ad925f55ed61c2eaa08e19d3911fc2e541a41311 SHA512 a189bdc921efb51734e66f8df808289850c6ce5c60c797c85abb7b3063a45630261a32edced1efd23fe367e8e91e4fe69c3d5e44a10d5b95112ae990e26fa916 WHIRLPOOL 8b2d233db8d5d2c30da1d2c293ab2d168776a4e217d58518a0b603c1408905cb3e6dde670cad59f3d1853f2f803bd7345d078602ad443d92d19f72f5dba55cf2
 AUX csync2.xinetd 388 SHA256 c281d7e494088abd84ef09b5487482cfa886f12aa0ab717f4cb579b729cc7ee9 SHA512 538bb8fc5b6b667a8afd708fbb35c9b1e98967cf0c1e5b139cdd15a19305000fd7fb7eab564131eb7cf3f562ba9189b08a06061aa31ef64e8e85ca13d6f3d583 WHIRLPOOL 35896b35309fd8f99e938d592db2a4f9c3d348bd065e0e9428d9d0f1c3073b5992e77cc04c7655cefbde80cc079b049230dd483ef862b411239a71e5b18c99e8
 DIST csync2-2.0.tar.gz 411013 SHA256 11cb37380fb185bce0c22b804fec9b01c385d9d83cc528cfd48d748453834fa2 SHA512 f91fd222f67affe9634471d341b43ff67854a6ed25b620301a454e98a79a9fb80b2a66eb8713546758fd08300d52751e5ca7472c696daa20ee11779b87a830f8 WHIRLPOOL 6cbe49b5dd36d455d2c2b15089cc8e766aa3f9ebc2d5ebbd0528379123ae280850972b07279075a38dc328391633bd63f1a5dc8a2403b1d4faac295e27d1d920
-EBUILD csync2-2.0.ebuild 2723 SHA256 3033eac729c2ffd7ac8b6b96ccc99d6060b4746726e751ca24b957f85df699b3 SHA512 e52af2fa658cb623999970fbe2e68e28895226e1406045a76c732162075516f930a9a12c86d0cc7e5b08901ebcf7051c0b3c1cc343862c32553be46026bfc3d3 WHIRLPOOL f758b18ccf495183507399f8dbc75542de99f93eb39e1a988192120d77051b8f09c1315e7798cf2184bf473ebf86cf2872d7dcbe102769993eb80f525eefee54
+EBUILD csync2-2.0.ebuild 2728 SHA256 b8759dbde39fd2d3b111d2429a303f71ffdbc1d2a1d66853f73d1714cca0fc52 SHA512 1539633ead9768601d2609c4a735c063222ba7c96da7694c023adf92828dbb0af6894c23d42df12c1f9f45311136c82a615b9722129de41cb8781d9f1b756a59 WHIRLPOOL 8509a80cdf9c5354eb426abeef28bf68e988ef18e2fa5e5c616ea20ef60b2902a6a25ac53a88d5c67b84edfa523bfbbddcaef8dd67d276c760ec7f364414911e
 MISC ChangeLog 3451 SHA256 fa973c8f70b09c1e824687d2736ccc860653ac90b045cfc520675ca4ecfdce7a SHA512 8eb74fd49db3260d6db89b5ad4c51112981d94189595ef2f25462a060c830a9bc3b19228c46dc395aa4a11c6682bcb7259713034ad9ab19a8d346b9f4c21d234 WHIRLPOOL 5ce67d2316e4c711027ea68149f2bb013dcd6cf2538a07cbf1c29f673a6c965d4ae5a999972dca44a8af4259e069a145206ab3b096d8ce8439332af43b45bdfd
 MISC ChangeLog-2015 6036 SHA256 03c45115b34a893f4407f21d8e88cc36c102ee4a8b87a8f94b42588eac70f5da SHA512 4c74232df11aac1b2ff5611bdf662a681644cc148de0cdc56854d352460a8fbebbf239c09e4a8b109591d9d724b64bfe15e13839512d2b842f6f3b8ea40d6b2b WHIRLPOOL 49898ba121e89e1315a3e62972a6364e2ca4ea21077494f4a4186e6cf5ea405bcac457069e5f66e62c4c66f0e2fc48854716ec993a4ebda5c91de1e98372909e
 MISC metadata.xml 257 SHA256 eba5a727fcb9e27d2a6e5dac0c92b252de676d434ef19bb09d44534257bed08c SHA512 d01f4b592393076365e924fcc717c807172488f03a7b64542238616207fd00dacd096c383e68b9558142f7dab357578f91904f73acd41ce3a6ba7b7ef72b4980 WHIRLPOOL 8621cedc31dcd2b89dffd18c102b491aea21946189d752b9dfc3b686aea7adfff6782a3c7796d777e18677b7dd99f1cd8584022642eaf009cab3b733918a501b
diff --git a/sys-cluster/csync2/csync2-2.0.ebuild b/sys-cluster/csync2/csync2-2.0.ebuild
index 93288e0b154a..727751fad472 100644
--- a/sys-cluster/csync2/csync2-2.0.ebuild
+++ b/sys-cluster/csync2/csync2-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ HOMEPAGE="http://oss.linbit.com/csync2/"
 SRC_URI="http://oss.linbit.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 
 IUSE="mysql postgres sqlite ssl xinetd"
 
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 5c6f69086103..1ef687d506a9 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,5 +1,8 @@
 AUX 50glusterfs-mode-gentoo.el 169 SHA256 2467d044665d16dd95f78f7a7a104099ce00849cd0a2a86b110fe4c91b316a9d SHA512 f90b3f49f53c08db5596a6795df64a834b390602a79fb79b56f6cfb6191c7ca8ce2bedd2885d049575e26cc3b321f80e2786e99055c02682f4fbf454d5ed5804 WHIRLPOOL fb4abfc0c07ddc8805430446bd901b95a9951f53711da647e87ea8c26bece8ed9c7bb17b33cfa9b114ba2a64a055f275202d520cf37ee0c178d005d07ff80173
 AUX glusterd-r2.initd 749 SHA256 d060ffbc9c2233d786a0b0dc224518ef3de15a8c69b2b3bf8c7449a18eb366e3 SHA512 90b2ab62bd69f0a6f4ef9596ea4b287524650821251ff9cf6fe43f7f362e359c43615fd5ba68d4b5589af1a3e712a91cab69bb95b363b4e20efdf9e02a5e1e6a WHIRLPOOL ec91d20794d04ec04288742329315e7d16b3fd775f20002fb321e29d8c6d05c50f37664752b4b8a016b2f29587bc2ecdf2b326370849784d2c479278621b3fe9
+AUX glusterd-r3.initd 755 SHA256 b8efb5a7517c95791d943b34722a10155163edab062ba2ec32398088f81a210c SHA512 d6f46374f48cf78c4114c786fbba4412764527cec020f43ab2a46000fcada98bdb6dfb67ba9db2be3e39a851cba1db97a7154e4cab6df7ce541c0157c781706c WHIRLPOOL 8997aa6eee420afe3f69cc7dea447eed9ead28141b3e3ad574dc87fafd029e256d8350b3cca4d341c085f7853561e7c5297368c86fa80556d3cdacc4184d6a9e
+AUX glusterfs-3.12.2-poisoned-sysmacros.patch 431 SHA256 c010d7239bda13b730df7464e2c079e3765b918bda8f64297a9b5b2499c9d00b SHA512 fb9f56254a90325bfc92d60af41075b51460d179eac7149cf1d0dc218d7cc7c9102eaf0591c2763df2fa68d2595f87dd3427d810bc182b61103bd5f9588c77db WHIRLPOOL eb273a106701efe651ae6415b3c2a244df022268071800b804357e85114f648cc1ee1580a06455655c1ab9be0bf90881a5ffda003c0efafdcab8b25829a700be
+AUX glusterfs-3.12.2-silent_rules.patch 632 SHA256 25ab2bbfeff23f0de89353b8db04230d008d1d6d2ecae454f044c8260d21f548 SHA512 81ec26ad0385b3c9e94c918a720ecea606cf5adf9f28aa57bfcd8de179e24b4feb344573820528716d6530079553bd3df7ac1cea39e3893b35573990fe3ffd1c WHIRLPOOL 4ca0731fe5507123031156cc5ba4ad3a07e091bebcefa56cb8698b8bf466c0ee2c4206ef994ae45ec4494b4cb1245e117c7e7b0375c1b0d56c0f13f8c44a26a3
 AUX glusterfs-3.4.0-silent_rules.patch 553 SHA256 08a55b2f54050ad47dae1a953fc1f1410842556bf2464ab15e7df9019ab24de5 SHA512 67fe230a667084f30960d4ed79f58c7da93edde086ca8614cb3f7160901cb87da471cce932cfae470033c5dfc92b00ed69fd0e32238bc0e9af770e1946f511ce WHIRLPOOL e596ee4c6fae6cb7f843501b55e832791d612547f81d5e6adf4e96ea8cc4fc20fd71d5164f7fe42a74ed0b8e7036643cd5b684317f98bfd610b91dbe4c4c3684
 AUX glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch 2145 SHA256 10b0ad92f61996f7ca0e0bf12b383813c4cd2013d95d8b6e1ab53a18853a9e05 SHA512 22d4ead173579698a23b7d66e566e61410e5bc0178b1dc0b7346b18d7e8cf33a44873b83a09e6dab32b06e7df8285da4bb7eb730626c61c1b3d28e9e8ce86f00 WHIRLPOOL e8e5572a5861478c718cd0b89c74159e3b13f6ef204eb3e3b2d8af8ddd296bc71469648ae957f0dd4e18de187e6fcd3e1910ea9ec5a707b78f61af8c88c9bb9b
 AUX glusterfs-3.6.5-build-shared-only.patch 27261 SHA256 b2d73ffb27f07bf762e8f67bdbbbdd3a7eef62049ec346a2ab84a9171e55c053 SHA512 cbaa02845022cb32aab1e419d13f8291b59aa6de78ccdd944af52d05defcd4ae9bb891c0f303f7d4870056e0777d70507b137aa9e38a4a13a267925a3cbc0277 WHIRLPOOL ab0b75e36a0f3011618e87dc9490471c9a759cd65985074a3046be5bb3609830018ca50d82de4db8b783424c46768d4b2fe0c906271cb5e2a01fec264b0f26e1
@@ -8,11 +11,13 @@ AUX glusterfs.confd 129 SHA256 a9023ba1112ceb4597c654228f0beb0053ed695aeb32c65e0
 AUX glusterfs.logrotate 611 SHA256 ec29f5830f6108fca793d6ac90bb49e644a991a073a736ccb76fd05f9a9f60a2 SHA512 568728fe77acecb686286b0be6c086fe3448d054d26da15c3846726a8f845ae963e6756c517b413a9eb4d6b646c61972887a35e89846d2d90d364b755e471791 WHIRLPOOL 10ced84d8035e3e7e5aaa013cd7c0c9761999e8ddca41ff2df3ed2be7a78add579d5c2b17a27b86d9a6fafdb607b9d175725208af72585d9fdc66b3bdb5fed3d
 AUX glusterfs.vim 139 SHA256 f214c1c8a01c9184b535fa7ae307200a8a1dc83fd42e92bdd57a7b1cae1dc099 SHA512 6ea3b56b71d7e206a57611dd68160b6b9242a19b5c927560f60881dc28d250f7958c50f788a7b9a41fb46010fdac2d67a8289b909ed1f05b793c900f37ccbfb7 WHIRLPOOL 3006d9fea924fe274ac00dc5d711cfe642f347808889c3d5dbde764f0f0cd2ab27509fa75d37b95ccd98c33bc1db8d082e5d16a26e0f888b7189f9738b6ff963
 DIST glusterfs-3.10.1.tar.gz 8926368 SHA256 d3c23df3299964efe6b688c94ddde258506ecf173b58e8c07fa18d470bb21517 SHA512 35acf10d37db7ca9cf7d88e4eabcac4febdccfe15cbe68df86c44042987547f3a56447a1ced5ed238d171efdbcb97dd1fc6917283641bdcd7d476deb37ad0871 WHIRLPOOL 7ce3b5cbe136b1d09b4c0c062decf0d9c5bba03f9b7249648e886ceff758061e73863c9f6d82ed2de3fc41546950ee08c022683174283dc03201c12d61d295aa
+DIST glusterfs-3.12.2.tar.gz 9404275 SHA256 6f9fbf8183df9e012a2c95f3ac3fad303443218beef4fd060f4af57c0bdbc069 SHA512 2bcb3e9356964ea8557ea4291cf6b641122c58a3beb59c00de0acb6772b05b22c0610db4f2bde2e506e15233cfa610db415c6622933e04600ddee3cc55b01166 WHIRLPOOL e788f65be5a3b9965ae485a1d273c2890d89fcff705490c040192fc549580e051e3208e0d2ccdc8dc9350c1e57b188a39a1690751dee1201ef032ca71d514871
 DIST glusterfs-3.6.5.tar.gz 6091408 SHA256 20d912ef35fb8350c50c39c15134a3558ee90d012203f049799c8eb67a61fd2a SHA512 7ca41855239818fc4c84cdb86e1f1d39502e781d5117a5ee50ea134f03f0823a8640ee9bda28f05463e8504aba9ddb12ac72e118f0ce7c3755c083033f5677ca WHIRLPOOL 9fc0592052d976d65fcc769c69d910fa6d909695162bccf80c1e799a2c54c531ab03a4afd3788951c231a214a22e5f8bb3613a83277858627425b86fd532ab5e
 DIST glusterfs-3.7.4.tar.gz 7552110 SHA256 f98f448117d1de7666ae425eddd8d7d87b02c57f6627234ce96ba60566f47173 SHA512 f9a281f3a37835f9f54679740ddb19b307babe576a8f14c9ef24d256f483789c227d7e7c5b0ed4ef5c13a257bcf00d0c17b6108fa60c5e45d0175df6e236b3a5 WHIRLPOOL 7b0320936de078234228cb691f3e381da3cc89c638d6246aba63695aa36cb114afca6e53d12d23de441b8da0b3a594ac1702b450d5d14720254af73e689c4ab8
 DIST glusterfs-3.8.11.tar.gz 8544971 SHA256 2285c02f9449168eabeaa7b72706e80f3de659eb685293dd899c71c33798702e SHA512 61cadc567a73403c78eac5e472aadd1457053be936042ea1218c172760376b026152e84b4ca15a0c249524347d434cc7d35c3a73f4d0b01e89c6aec5edcbbb49 WHIRLPOOL 21d4c2da1d281cb03181c21385a62d74c71f24936d2c33da22085accb5fa563b7095757b7df3eb30bf865c37fe683c420756c542d6933c99c0d3f9025c07a217
 DIST glusterfs-3.8.6.tar.gz 8456856 SHA256 5c62c0b66cde74427eacc49cdbda7c84cc8289b38bcda80107adedd24b355715 SHA512 115d65183682587b4e8dd0c3d52f4a43eabbd6968441b7f09db006748890155f6748ceddf7ce80a7481207df7cb2dca6339b77cc7b8bccfc7fe00084ac00b223 WHIRLPOOL 7321468daf15a4ebad158d32328dfe64590cbf0ddcdda4d855a7b8a9849b29fed1c1af58475f8c1ef140f244fc15db57c00170eb477c27854408598bc0a7f6b8
 EBUILD glusterfs-3.10.1.ebuild 6400 SHA256 95dbe210c2c0ca19efab0b50a629a51046136d8c76d14ba4de677c2f7220e7a7 SHA512 da1b1913fb38f583e24f38a09b8c78189a529b75f9a52eaec73c7a8e40f95e50b75b238da84afe0875518968c5d3015bd786026de5485206af79aef6499d5862 WHIRLPOOL a8335aff33c6747232d7af164e6e21f9855007669106a9f08af1b643fa1373d6889b3d336c2eaf6952402cf97432c868cdff84af4befcf3a89e28d879eb272db
+EBUILD glusterfs-3.12.2.ebuild 6390 SHA256 526355321e5b80a109a80a7fcd6b41d12437f66d664291fe532c1ee9ade72e3a SHA512 74ce06ea86cde697823ee6e8179ec34e9607e8f9e969421e0d13240d3b7074458b8c508a4f0fc1f15acbdadfff25cc5a6129c7615bb3d31fa73cd17fcfb95294 WHIRLPOOL edab174361da337fe7a0f7b16e1d85ded21fe022e60290597ad9f4536fde9fe2b9736e3b7562260907ac554e128317941d6d66fd74b1ca2f1b0be7e3af0f72da
 EBUILD glusterfs-3.6.5.ebuild 5609 SHA256 bfd7872898f9e82244a0d8e0138c790a860efb5d42591ca9619760d9e752d81c SHA512 89629b74afb06c7409375a8c342873840436f6eaccbc4a29800b264090dd31f1dcfa391d77d655a6ecc73ce906a6d7b253e6a9065697ab920ac5e75ea64a1b45 WHIRLPOOL 6a416115a63db0dd41d3b7b442cacf91bdbc8cebd467c49236afb4467aeb42c49bcdd3acdac17804816b88f80c7c4a4b7e2d3c90dd7daa0ebfe63ddb04d01e4e
 EBUILD glusterfs-3.7.4.ebuild 6268 SHA256 2071435b4071e7ce43e814a1d97beedbec5508ec4afabfd1c4f29d92b549859c SHA512 3dbcb7f16578ef39bc4e98dd7a29288017710ffc292885c46e5fa79193084f990965234f325f250e4577d1188ca2aaf24cdb92607a2ff0bb2fab768958452ec3 WHIRLPOOL 9b419c65f5a8cf7a632e95910fa31deaa5dcd4ffebc473e9053b8d04c55be30f6e7466889eeee15a3229acd73b1f3f9e571856e1cbf5143f2b2adca80d3a60d1
 EBUILD glusterfs-3.8.11.ebuild 6364 SHA256 7bdcfc483a1c112ea8a14c28704a29aafff20e5a5f854d738c60587c35c1ac2d SHA512 ddc4360288b35815688e87c4efc4e818cde0dede9bee87f7b816ed3e9ec2db524d86224488ece231e7fc2055cb75baf6b78c538648460c575c3cab27a84241f6 WHIRLPOOL ce429a4a2c269a138a5e6836bdad5b436a627b122667166b4ec0b647f81b7ef9bea3ff290a079196415a0ae41f99108a00d147b9c422f71effb5ee3b5dbf3e60
diff --git a/sys-cluster/glusterfs/files/glusterd-r3.initd b/sys-cluster/glusterfs/files/glusterd-r3.initd
new file mode 100644
index 000000000000..27682d06216d
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterd-r3.initd
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Gluster elastic volume management daemon"
+command="/usr/sbin/glusterd"
+pidfile="/var/run/${SVCNAME}.pid"
+command_args="-N"
+
+command_background="yes"
+
+depend() {
+	need net
+	before netmount
+}
+
+start_pre() {
+	# Ensure that the GlusterFS auxiliary mount parent directory exists
+	checkpath --directory --owner gluster:gluster --mode 0775 /var/run/gluster
+}
+
+start_post() {
+	local c=0
+	ebegin "Waiting for glusterd to start up"
+	while ! /usr/sbin/gluster volume list &>/dev/null && [ "${c}" -lt "${glusterd_max_wait_start-60}" ]; do
+		(( ++c ))
+	done
+	[ "${c}" -lt "${glusterd_max_wait_start-60}" ]
+	eend $?
+
+	return 0
+}
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.12.2-poisoned-sysmacros.patch b/sys-cluster/glusterfs/files/glusterfs-3.12.2-poisoned-sysmacros.patch
new file mode 100644
index 000000000000..341535163747
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-3.12.2-poisoned-sysmacros.patch
@@ -0,0 +1,11 @@
+diff --git a/libglusterfs/src/compat.h b/libglusterfs/src/compat.h
+index 1d0ac27e8..b1a7c0a93 100644
+--- a/libglusterfs/src/compat.h
++++ b/libglusterfs/src/compat.h
+@@ -510,6 +510,7 @@ int gf_mkostemp (char *tmpl, int suffixlen, int flags);
+ /* Use run API, see run.h */
+ #include <stdlib.h> /* system(), mkostemp() */
+ #include <stdio.h> /* popen() */
++#include <sys/sysmacros.h>
+ #pragma GCC poison system mkostemp popen
+ #endif
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.12.2-silent_rules.patch b/sys-cluster/glusterfs/files/glusterfs-3.12.2-silent_rules.patch
new file mode 100644
index 000000000000..d5e2727aa8df
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-3.12.2-silent_rules.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac	2017-08-30 13:46:34.075359703 +0100
++++ b/configure.ac	2017-09-07 21:28:48.110879291 +0100
+@@ -19,19 +19,6 @@
+ #but libglusterfs fails to build with contrib (Then are not set up that way?)
+ #AM_INIT_AUTOMAKE([subdir-objects])
+ 
+-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
+-
+-if make --help 2>&1 | grep -q no-print-directory; then
+-   AM_MAKEFLAGS="$AM_MAKEFLAGS --no-print-directory";
+-fi
+-
+-if make --help 2>&1 | grep -q quiet; then
+-   AM_MAKEFLAGS="$AM_MAKEFLAGS --quiet"
+-fi
+-
+-if libtool --help 2>&1 | grep -q quiet; then
+-   AM_LIBTOOLFLAGS="--quiet";
+-fi
+ 
+ AC_CONFIG_HEADERS([config.h site.h])
+ 
diff --git a/sys-cluster/glusterfs/glusterfs-3.12.2.ebuild b/sys-cluster/glusterfs/glusterfs-3.12.2.ebuild
new file mode 100644
index 000000000000..f5220e9f1813
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-3.12.2.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools elisp-common python-single-r1 systemd user versionator
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="https://www.gluster.org/"
+SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml"
+
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
+	glupy? ( ${PYTHON_REQUIRED_USE} )"
+
+# the tests must be run as root
+RESTRICT="test"
+
+# sys-apps/util-linux is required for libuuid
+RDEPEND="bd-xlator? ( sys-fs/lvm2 )
+	emacs? ( virtual/emacs )
+	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
+	qemu-block? ( dev-libs/glib:2 )
+	systemtap? ( dev-util/systemtap )
+	tiering? ( dev-db/sqlite:3 )
+	xml? ( dev-libs/libxml2 )
+	sys-libs/readline:=
+	dev-libs/libaio
+	dev-libs/openssl:=[-bindist]
+	dev-libs/userspace-rcu:=
+	|| ( sys-libs/glibc sys-libs/argp-standalone )
+	sys-apps/util-linux"
+DEPEND="${RDEPEND}
+	virtual/acl
+	virtual/pkgconfig
+	sys-devel/bison
+	sys-devel/flex
+	test? ( >=dev-util/cmocka-1.0.1
+		app-benchmarks/dbench
+		dev-vcs/git
+		net-fs/nfs-utils
+		virtual/perl-Test-Harness
+		dev-libs/yajl
+		sys-fs/xfsprogs
+		sys-apps/attr )"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.12.2-poisoned-sysmacros.patch"
+	"${FILESDIR}/${PN}-3.12.2-silent_rules.patch"
+)
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+# Maintainer notes:
+# * The build system will always configure & build argp-standalone but it'll never use it
+#   if the argp.h header is found in the system. Which should be the case with
+#   glibc or if argp-standalone is installed.
+
+pkg_setup() {
+	python_setup "python2*"
+	python-single-r1_pkg_setup
+
+	# Needed for statedumps
+	# https://github.com/gluster/glusterfs/commit/0e50c4b3ea734456c14e2d7a578463999bd332c3
+	enewgroup gluster
+	enewuser gluster -1 -1 "${EPREFIX}"/var/run/gluster gluster
+}
+
+src_prepare() {
+	default
+
+	# build rpc-transport and xlators only once as shared libs
+	find rpc/rpc-transport xlators -name Makefile.am |
+		xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
+
+	# fix execution permissions
+	chmod +x libglusterfs/src/gen-defaults.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-silent-rules \
+		--disable-fusermount \
+		$(use_enable debug) \
+		$(use_enable bd-xlator) \
+		$(use_enable crypt-xlator) \
+		$(use_enable fuse fuse-client) \
+		$(use_enable georeplication) \
+		$(use_enable glupy) \
+		$(use_enable infiniband ibverbs) \
+		$(use_enable qemu-block) \
+		$(use_enable static-libs static) \
+		$(use_enable syslog) \
+		$(use_enable systemtap) \
+		$(use_enable test cmocka) \
+		$(use_enable tiering) \
+		$(use_enable xml xml-output) \
+		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+src_install() {
+	default
+
+	rm \
+		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
+		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
+		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
+
+	if use rsyslog ; then
+		insinto /etc/rsyslog.d
+		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} extras/glusterfs-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+	fi
+
+	# insert some other tools which might be useful
+	insinto /usr/share/glusterfs/scripts
+	doins \
+		extras/backend-{cleanup,xattr-sanitize}.sh \
+		extras/clear_xattrs.sh \
+		extras/migrate-unify-to-distribute.sh
+
+	# correct permissions on installed scripts
+	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
+	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
+
+	if use georeplication ; then
+		# move the gsync-sync-gfid tool to a binary path
+		# and set a symlink to be compliant with all other distros
+		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
+		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
+	fi
+
+	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd
+
+	# QA
+	rm -r "${ED}/var/run/" || die
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.la' -delete || die
+	fi
+
+	# fix all shebang for python2 #560750
+	python_fix_shebang "${ED}"
+}
+
+src_test() {
+	./run-tests.sh || die
+}
+
+pkg_postinst() {
+	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
+	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
+	elog "  /etc/init.d/glusterd start"
+	echo
+	elog "For static configurations, the glusterfsd startup script can be multiplexed."
+	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
+	elog "separate service.  To create additional instances of the glusterfsd service"
+	elog "simply create a symlink to the glusterfsd startup script."
+	echo
+	elog "Example:"
+	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
+	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
+	elog "You can now treat glusterfsd2 like any other service"
+	echo
+	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
+	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
+	ewarn "run GlusterFS."
+	echo
+	elog "If you are upgrading from a previous version of ${PN}, please read:"
+	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(get_version_component_range '1-2')/"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index 2b72f81437fb..4a3fe1f42ccc 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1,14 +1,17 @@
 AUX heat.initd 1349 SHA256 6351d06084b740daebd7b4b225d0f953e576f32be269acd1e8793c6433473411 SHA512 a2a2f45bb4268260ca88d7cb5c2df1e9d27041bf36fa59aadc7e39d85b79aad6992c70a3e8f9d580a493801c75299ab99191df23624ad70139f30758d8027492 WHIRLPOOL 851a5ab7febd2d8901446db2a5682cdb1c12582a0a8320ec4650abdefed2229eedf4404d4faa68f050fd96362ba4bb21e00da61493994d380a4927257a5365ad
 AUX heat.initd-2 463 SHA256 2c7f4e524c7b8022aa5a68406655bdb3a47b9d6bd6a44329d9710c760ce14c82 SHA512 8f92853d6bb21e6efae3a59bc2856bd496498297e43a5aa0350a3202e8a709cfd0791f77017b77d8b7845c3cf0d2b266273026c9cac869e3dbc749e36bf83c7c WHIRLPOOL b3379ec3c880e423c121c2b9e25039005d587c8765ade235173816e1434a79c94cd3f7da09cc18ee6d30dcc8c2e45fb10c5722a5596ce08b93353c59c2efb16a
 DIST heat-8.0.4.tar.gz 2304762 SHA256 7997dac0f35ad7fb236536959a46e843dab56dbce5694849585cb97affbbb198 SHA512 9846114813b743ba9abfb4ce6e9d3cdcddfb81a242fda83a9d22a9fc30017fec2464f3b75364d9be38d50218e79485f3405e429fac1830d163c50737b07c2865 WHIRLPOOL 8420bffb6e2b86528d9104abb981368fa2fe36b33057b0e02f1fcf9e9106a4cd58bdb833e459e38a64bd47b2f4955e15f589673b57442184e3bcd60894feab4b
+DIST heat-8.0.5.tar.gz 2309642 SHA256 8f17e09740ca1aafed4af3302b49fa425ad5a83c5ffa51de1b0aaa1b695578b6 SHA512 5ddb9a18ea0ce727b1900015d5690028bc92fe98e42dff3d609b504e5147608e3eefa54e7058ec0e8f6eefbcd3c92bb61eee29e604ce327a5b51250c6f68a1ad WHIRLPOOL 078b53006b75564230315729aa0a7d5f1ca0a790d30fd2e2ec3182f0f7357e6a45d239c7737b4c8370b1056e1f87d10c66367877917d563cb0f62aa9ca47cd89
 DIST heat-9.0.0.tar.gz 2359104 SHA256 36dbb46b72bf7b495ba8812804da7d4e9bb59481743e6e0499e904efdf4ee7be SHA512 d60cfd69807af5a51da6d236e5ccf482a5fd65f8bb2e5e8287eca587f27d0af570979b554a311037904a7c01cd8dcba43a5ef577261fb7f12a557ba6ff2ec58e WHIRLPOOL 43f9afaa57e84e7e29bba4754d3b7499afece40961891dafd6bf75da3032f79806dee6d4de91e0afd24ad53b97cf615e91df46646ed39b2df05fa53d36a31527
 DIST heat.conf.sample-2017.1.9999 88798 SHA256 688a6fd65df3b9f004345c8cf739c5a553b6806213c399ac25846d1ad248e963 SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560 WHIRLPOOL 9a91069136dcbf15d47a4b5df6521ca2740eb1a88feab57b28f2f921e517ae7557125b5ea877d4c9ed5314321c8de551270722809d270c1b8ae0245d2a75b515
 DIST heat.conf.sample-2017.2.9999 88901 SHA256 cb46fbbfa0e8ccccdc84c4637312f0d21b0c95037d2b3404623653c1b5eb0a92 SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932 WHIRLPOOL 284ad592883c8e42518872d603d097672056ba25a194569f31ee9244d1095f640f02097fda0a6539b47247ba580929d79ec173f1847bfc5e19bf45fb8cbe4720
 DIST heat.conf.sample-8.0.4 88798 SHA256 688a6fd65df3b9f004345c8cf739c5a553b6806213c399ac25846d1ad248e963 SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560 WHIRLPOOL 9a91069136dcbf15d47a4b5df6521ca2740eb1a88feab57b28f2f921e517ae7557125b5ea877d4c9ed5314321c8de551270722809d270c1b8ae0245d2a75b515
+DIST heat.conf.sample-8.0.5 88798 SHA256 688a6fd65df3b9f004345c8cf739c5a553b6806213c399ac25846d1ad248e963 SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560 WHIRLPOOL 9a91069136dcbf15d47a4b5df6521ca2740eb1a88feab57b28f2f921e517ae7557125b5ea877d4c9ed5314321c8de551270722809d270c1b8ae0245d2a75b515
 DIST heat.conf.sample-9.0.0 88901 SHA256 cb46fbbfa0e8ccccdc84c4637312f0d21b0c95037d2b3404623653c1b5eb0a92 SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932 WHIRLPOOL 284ad592883c8e42518872d603d097672056ba25a194569f31ee9244d1095f640f02097fda0a6539b47247ba580929d79ec173f1847bfc5e19bf45fb8cbe4720
 EBUILD heat-2017.1.9999.ebuild 5666 SHA256 6a00fb00d27ca007fde4f73f112019af92cb6a5d79d578ff19a1cb05f7d1f368 SHA512 3b99e7e4b8fa48d17e72b2e404c818da31ba668f63d76f4404ff42a6862f0918e4b9ac91fdc95977dda98c931ebd893cadba35553dcb437f563b75905b6ce058 WHIRLPOOL 86a5eaf23be27bd19123ea137b1d3f78fe7b055c1855527677d619d45dd48ae9189d8a740927250f0eed193653c7cc3448b8a06da3c91d4935383506b21c53b9
 EBUILD heat-2017.2.9999.ebuild 6456 SHA256 2fe1669fee37a96e85605a9a968d9f3dbd1a8b2575af46b6c6d57584e4efd4aa SHA512 5f57c8610494a03382c9f2e60716eb221b26e39f56354637960bfc2166437e0d217297911460c8d34a60b5f2dc00e2aa00d10f8b17d0d025c7d5341510e53a7f WHIRLPOOL de4d89ebd301252ca63cb967abee76d6cb6d4ddacfc21e9ff8e81cbf1d5044f1ed4dd11ad8c6416959f285be8c7d7f5cc5fc1f0a2906401b814b9b5f4fddbd44
 EBUILD heat-8.0.4.ebuild 5644 SHA256 7f86f98db8c106c035b62da96aa43ee9ab19af49bb36d4f002999d8a16eb90f6 SHA512 7cf53cd26567282869ce2aaf1b045cd30c16af63fe484fd238cae512ce8c8a04018d76d5fd7cb828a690d9d24526cdc5b259e7b3b0a4e786b090c41b290269cb WHIRLPOOL 9b9fc8adda07a3d08b84600ba51afd7599110463564584d2e0fef574113ba1db50c10c0acf638c90773242441ec1e244defc0cb98abbf33fc0a8b8eceb66da5c
+EBUILD heat-8.0.5.ebuild 5646 SHA256 652794a279ca5b8e60fd736cbec75be4c12e18943d1f87b1489854ee5de51064 SHA512 de3bdebe67dc127a7684cdf688b3625652d9c67ea0eaca1a301ebe67a43cda16c9289faa717b8aa8d737bb7580122efbf17d124b5496903b9caeac8f6f623bd5 WHIRLPOOL da9e18015d8e8ed7dcfd230840807e9405e973f90618138006ab113f4c529ae62c017673e5e2fcf9f265b39a1f146aa37532be7ca87bd05d2f7fa743af78a698
 EBUILD heat-9.0.0.ebuild 6435 SHA256 6af699b66af71f9cd386b2784ff5d2f53326dbefa0769680cad695837900b4de SHA512 2d4de5bd02b861ef4e6b306314629bd06c2c883b56e5493e8efda75cf7a62fc5a600002c401115ac34c019325fb858ddc059ae307cf2e7751dfdbd0b4c9d22eb WHIRLPOOL 28f9bce391a7f3d7cfb8ea3ffb86fcace088f8bae779b660a2c1d117514d0e65dfd2081b9377f42500c55809a55ad4638e5edcded737e80aacb8064e690dbdf5
 MISC ChangeLog 1787 SHA256 3deab106bdcbb6a3b66d3c6a12797c9d36e1e77d24534669bf06759f5119981e SHA512 7d7b6abdfafe22c664c324317e6e9caa39f25d9ab8f49325534e414ec776ec7611538df92ac7b1dff370cc31c27f7b04a0c9346edc257bb46a48de9f858acc0a WHIRLPOOL a05b856678fccde635231f43c3275dee8b1f92aad8ff12988b2a03a087d61ac598f70d94e22efa9dc3630c99cd446ae5d84579db48f15043bbe00437d0ab8eef
 MISC metadata.xml 631 SHA256 d276373e28e559d61fd96704214c329d6e264841cde3147f0600e52ef877c5e6 SHA512 44e741975cc462454bfd08fce461b019c5ef141997f272796052f7f3aa7297646304cdc7d75a2ed01319bcba753475ba5861306c3ac74f3d97218bce60d42429 WHIRLPOOL cb83fb56d6316389e63043623c025abfc09352d6ade6a0aee9d442f8bf4603f09167b99aba5593ae4fa55be369b3c7ae442dc7ac5ed680c2d4a666a8c92baaef
diff --git a/sys-cluster/heat/heat-8.0.5.ebuild b/sys-cluster/heat/heat-8.0.5.ebuild
new file mode 100644
index 000000000000..ea586ee6ec43
--- /dev/null
+++ b/sys-cluster/heat/heat-8.0.5.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchistration engine."
+HOMEPAGE="https://launchpad.net/heat"
+SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ocata -> heat.conf.sample-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+mysql +memcached postgres sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	>=dev-python/aodhclient-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-ceilometerclient-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-heatclient-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-magnumclient-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-manilaclient-1.12.0[${PYTHON_USEDEP}]
+	>=dev-python/python-mistralclient-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-monascaclient-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-saharaclient-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-senlinclient-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-zaqarclient-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+
+	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/yaql-1.1.0[${PYTHON_USEDEP}]"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewgroup heat
+	enewuser heat -1 -1 /var/lib/heat heat
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	diropts -m0750 -o heat -g heat
+	keepdir /etc/heat
+	dodir /etc/heat/environment.d
+	dodir /etc/heat/templates
+
+	for svc in api api-cfn engine; do
+		newinitd "${FILESDIR}/heat.initd" heat-${svc}
+	done
+
+	insinto /etc/heat
+	insopts -m0640 -o heat -g heat
+	newins "${DISTDIR}/heat.conf.sample-${PV}" "heat.conf.sample"
+	doins "etc/heat/api-paste.ini"
+	doins "etc/heat/policy.json"
+	insinto /etc/heat/templates
+	doins "etc/heat/templates/"*
+	insinto /etc/heat/environment.d
+	doins "etc/heat/environment.d/default.yaml"
+
+	dodir /var/log/heat
+	fowners heat:heat /var/log/heat
+}
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index ea782d0dded9..e8a2fd7758a3 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,12 +1,8 @@
 AUX kube-apiserver.confd 116 SHA256 41c807a6b97b5cb309fb83a9c201956849d9e26da160825cc14e64aaa258e327 SHA512 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee WHIRLPOOL 97e3233336c3afc89a579d20ea26a67ecacfae776f1be05ff9e1a355d0955c74dbc404ca6947d5e0d3f52902c7db816c30413bb774751c30b987fd20399bf803
 AUX kube-apiserver.initd 541 SHA256 c20920c79c9b17d28e9a9bb2375a7a226e05a96e7a0ec8079999ae300a54c06c SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110 WHIRLPOOL 54b8496a4e67e381ffcbf8fbc5d030d6e2cafffaf2a21dea2c46cd03198559c6370b0388fe31a37df54c5f2fa8e3397b344e09e5560269430ba3f0833e1b42d3
-AUX kube-apiserver.logrotated 84 SHA256 0e47872a37f8b06bc56ea17e35640af70f490588b16928d936f354415e559500 SHA512 91c1115cfebb17355f655b54b6574499c3e85876b186e217e80c87974a42171b32f9b1a359f5a361df0e33d1d6ecbb79dce1506728f4948bb5973680128b5ff2 WHIRLPOOL 6f4bf99d3f33a47633fbb657c335c6c6b75ff1da31363d694e3d3a16f0d8b90076aebe7c9898c3f0462025e5eb47d665dd1868e0f0e4a0bfb5aa754de75206fa
-DIST kubernetes-1.7.5.tar.gz 22027539 SHA256 5fe434de8b17ef951d156f7cee24b24a0c5a071a85a612bba4890603541e1ff1 SHA512 a9fcc8f2d50ab431dc9aa5580c79acb8f1738102980f15cf99d01c64be5c6764dd670d436b2e42bf53d1e068a1e8924117384ebc4a3ac571267875862a86d4e3 WHIRLPOOL c2bcf741d9bd8a2fe840ceb9e8b67221c96218a0a0c4caa198d3971cd6044fe922da58c2be20e4230aab6b3ae7057ac37a82c457d0049b126954ece40f66d3de
-DIST kubernetes-1.7.6.tar.gz 22032012 SHA256 434ef607ba5cb77046066e5ebe2859fb7a1a07657f2b56762f7f16501dc12359 SHA512 b4db0951236f2a7aa8bea70ab0c3e5f1f1efe302ab378277db3752a44a41a360c4def9d71b3398e41f3f3ede503a5fccb5ed7b65e4c1152f0a0854659c4966c9 WHIRLPOOL b9b11e07bed8cb14b15ec346be388ec3c481bd97d744c73743653a17d1dedff21a77fd4729380141d589b50cf772e7018cb3fa697fa1fb9a3c4372885f9c48ce
-DIST kubernetes-1.8.0.tar.gz 23388112 SHA256 235c3eccf3490d5ffb7a32d7b3a02f0b849efe0a0ff831094f614ff6907d36aa SHA512 679e58bb29cd398198343f008da27fa4a0461d25c922a54b17cf26a7f6329ed7443717d1e564df646d17f60a014e1e4e0b1285d0ae4f63ab846843b309ce2872 WHIRLPOOL c9e06b6a699903382c0efef8a2fb850efcc4a8c855beaa5cd9bb94e6dc4dfe2fc139ae4814f29bbb3c46a19ca65ec68b7bb5a5f454eeb0fb6bfef55c3d0caee9
+AUX kube-apiserver.logrotated 88 SHA256 27232cac89ee8436333872e1e89e82a3708fe25dd91c110e828387c700e9cf29 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e WHIRLPOOL 367818a50912337d297019ac535b3266ef20e1e674632736e12d6824a9f3758f2f79eb6aebca267b4dff73bfbfb3c8c93297353807027db2ac936f79d739fd70
 DIST kubernetes-1.8.1.tar.gz 23400352 SHA256 a262050d532275a1b340ca1a453a986eb977a094d7a8f4a7600358677f114a18 SHA512 b09e72990cd148c604a92d866e4dd07da113a9dd1e68faebea8dd9bf256bfd908070d4e38eed7ce04c8f416d20203cf29c9c7f8906e1b50b678cb18e2ef8f5b3 WHIRLPOOL 87142b40c7d19b8be8563ec5ccaefc3970b7ce79a081bd9c1ff8c3d5227843c267fe5ab8d56b7a42874b7f29d8517f0d69beb2842ab2b58f8fb1efa5e6a61291
-EBUILD kube-apiserver-1.7.5.ebuild 1197 SHA256 bd2f234b0c230833e147daba384e39fc4bb65a862e82126d6ad4563023c241be SHA512 fb9ea8d90470560651ee6a05144f78b55c97edc0b1fac0afb6378b355da5c1810ca1dace31f2499411327fbea31ce247c9aa47d3e01362936fc0f332eae1643d WHIRLPOOL f4b9f72baad98189da9c354be284e3fd167f20b4e472c13d5bd248c23380d847cc94a149d68e13edfd41da70dc68af040e76637d1086dfc89fc495534d933f13
-EBUILD kube-apiserver-1.7.6.ebuild 1197 SHA256 bd2f234b0c230833e147daba384e39fc4bb65a862e82126d6ad4563023c241be SHA512 fb9ea8d90470560651ee6a05144f78b55c97edc0b1fac0afb6378b355da5c1810ca1dace31f2499411327fbea31ce247c9aa47d3e01362936fc0f332eae1643d WHIRLPOOL f4b9f72baad98189da9c354be284e3fd167f20b4e472c13d5bd248c23380d847cc94a149d68e13edfd41da70dc68af040e76637d1086dfc89fc495534d933f13
-EBUILD kube-apiserver-1.8.0.ebuild 1197 SHA256 bd2f234b0c230833e147daba384e39fc4bb65a862e82126d6ad4563023c241be SHA512 fb9ea8d90470560651ee6a05144f78b55c97edc0b1fac0afb6378b355da5c1810ca1dace31f2499411327fbea31ce247c9aa47d3e01362936fc0f332eae1643d WHIRLPOOL f4b9f72baad98189da9c354be284e3fd167f20b4e472c13d5bd248c23380d847cc94a149d68e13edfd41da70dc68af040e76637d1086dfc89fc495534d933f13
+DIST kubernetes-1.8.2.tar.gz 23123452 SHA256 3052c0ce35bd1f8a1500588580947c7f17f09f1ddea3a54466036fd62b46c736 SHA512 a813681f07fc674f493701833a30bc6b156572e4c8d28558b0e22dd36c16257c6c0922df773e4a5799a2eec05674cd1180f2b15ab69b0bdce52d1a861723214b WHIRLPOOL d8beb599ca2e194af5e5e1eb6d521c7846ad2ffad72da965119c51c92b16db41a17222886e57de5aad83359f20c8b264eb2e7411048218c95790d1f95f0b75fe
 EBUILD kube-apiserver-1.8.1.ebuild 1197 SHA256 bd2f234b0c230833e147daba384e39fc4bb65a862e82126d6ad4563023c241be SHA512 fb9ea8d90470560651ee6a05144f78b55c97edc0b1fac0afb6378b355da5c1810ca1dace31f2499411327fbea31ce247c9aa47d3e01362936fc0f332eae1643d WHIRLPOOL f4b9f72baad98189da9c354be284e3fd167f20b4e472c13d5bd248c23380d847cc94a149d68e13edfd41da70dc68af040e76637d1086dfc89fc495534d933f13
+EBUILD kube-apiserver-1.8.2.ebuild 1197 SHA256 bd2f234b0c230833e147daba384e39fc4bb65a862e82126d6ad4563023c241be SHA512 fb9ea8d90470560651ee6a05144f78b55c97edc0b1fac0afb6378b355da5c1810ca1dace31f2499411327fbea31ce247c9aa47d3e01362936fc0f332eae1643d WHIRLPOOL f4b9f72baad98189da9c354be284e3fd167f20b4e472c13d5bd248c23380d847cc94a149d68e13edfd41da70dc68af040e76637d1086dfc89fc495534d933f13
 MISC metadata.xml 331 SHA256 d36b415b6920b0f46ff81985c0ad7d18c35a945358cf2846d0a968cdf9dc5f1c SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68 WHIRLPOOL 3fb6d9e005c6ea6d7d82e288c0a0c9c6b643599b5c16f3f66113b99d5082036642502541d54bc2f84f764f5fd1cd84eaf1d50e3e11ce7f9bff46763304794925
diff --git a/sys-cluster/kube-apiserver/files/kube-apiserver.logrotated b/sys-cluster/kube-apiserver/files/kube-apiserver.logrotated
index 8bbeb0abde24..4ed84506231f 100644
--- a/sys-cluster/kube-apiserver/files/kube-apiserver.logrotated
+++ b/sys-cluster/kube-apiserver/files/kube-apiserver.logrotated
@@ -1,4 +1,4 @@
-/var/log/kube-apiserver/* {
+/var/log/kube-apiserver/*.log {
 	missingok
 	size 5M
 	rotate 3
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.7.6.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.7.6.ebuild
deleted file mode 100644
index 56d8ee795dcd..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.7.6.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 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 "/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-apiserver/kube-apiserver-1.8.0.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.8.0.ebuild
deleted file mode 100644
index 56d8ee795dcd..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.8.0.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 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 "/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-apiserver/kube-apiserver-1.7.5.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.8.2.ebuild
index 56d8ee795dcd..56d8ee795dcd 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.7.5.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.8.2.ebuild
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 131a07b11d98..e5fbe5a26bb8 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,12 +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 93 SHA256 f56bb3ae56cd34c554524f1dd663b0b7652f09401fe1c0eaf0c6190192679155 SHA512 9c9d33696dc4fb915848efff258d2150b31d1a793e6b58715a6bc97bf7843ff8b67497f9fb02e025b19a109975913a6d93b7aacd9f485562d535591d849199f2 WHIRLPOOL 53c4279418049dc805d514401776ee4687957f2fbe030228ca2a2ce1c427e73fe711f4b009aece6b657aa1947b3c4759008d946759f1469a2faaba8a6d34064b
-DIST kubernetes-1.7.5.tar.gz 22027539 SHA256 5fe434de8b17ef951d156f7cee24b24a0c5a071a85a612bba4890603541e1ff1 SHA512 a9fcc8f2d50ab431dc9aa5580c79acb8f1738102980f15cf99d01c64be5c6764dd670d436b2e42bf53d1e068a1e8924117384ebc4a3ac571267875862a86d4e3 WHIRLPOOL c2bcf741d9bd8a2fe840ceb9e8b67221c96218a0a0c4caa198d3971cd6044fe922da58c2be20e4230aab6b3ae7057ac37a82c457d0049b126954ece40f66d3de
-DIST kubernetes-1.7.6.tar.gz 22032012 SHA256 434ef607ba5cb77046066e5ebe2859fb7a1a07657f2b56762f7f16501dc12359 SHA512 b4db0951236f2a7aa8bea70ab0c3e5f1f1efe302ab378277db3752a44a41a360c4def9d71b3398e41f3f3ede503a5fccb5ed7b65e4c1152f0a0854659c4966c9 WHIRLPOOL b9b11e07bed8cb14b15ec346be388ec3c481bd97d744c73743653a17d1dedff21a77fd4729380141d589b50cf772e7018cb3fa697fa1fb9a3c4372885f9c48ce
-DIST kubernetes-1.8.0.tar.gz 23388112 SHA256 235c3eccf3490d5ffb7a32d7b3a02f0b849efe0a0ff831094f614ff6907d36aa SHA512 679e58bb29cd398198343f008da27fa4a0461d25c922a54b17cf26a7f6329ed7443717d1e564df646d17f60a014e1e4e0b1285d0ae4f63ab846843b309ce2872 WHIRLPOOL c9e06b6a699903382c0efef8a2fb850efcc4a8c855beaa5cd9bb94e6dc4dfe2fc139ae4814f29bbb3c46a19ca65ec68b7bb5a5f454eeb0fb6bfef55c3d0caee9
+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
-EBUILD kube-controller-manager-1.7.5.ebuild 1205 SHA256 10cbae6a937d6f84e48ee5f6991bcbe27d62a3763747b2c6028b6398073b4941 SHA512 7e3d27d052066d98fd014d4188f090eeea7a87d34b152be35c4fab01175ce2a375fb566dc718a2531464cbe528cb374e2d548cbbcb867660770798b72f2b103c WHIRLPOOL 787009973d32c39053c68d5e0ad74d07dc2ff3d3169e8ad8304621ec393878c3f1533c6b803facabc7d08cf067522b7151346d1761a4719a0b646927b97603c3
-EBUILD kube-controller-manager-1.7.6.ebuild 1205 SHA256 10cbae6a937d6f84e48ee5f6991bcbe27d62a3763747b2c6028b6398073b4941 SHA512 7e3d27d052066d98fd014d4188f090eeea7a87d34b152be35c4fab01175ce2a375fb566dc718a2531464cbe528cb374e2d548cbbcb867660770798b72f2b103c WHIRLPOOL 787009973d32c39053c68d5e0ad74d07dc2ff3d3169e8ad8304621ec393878c3f1533c6b803facabc7d08cf067522b7151346d1761a4719a0b646927b97603c3
-EBUILD kube-controller-manager-1.8.0.ebuild 1205 SHA256 10cbae6a937d6f84e48ee5f6991bcbe27d62a3763747b2c6028b6398073b4941 SHA512 7e3d27d052066d98fd014d4188f090eeea7a87d34b152be35c4fab01175ce2a375fb566dc718a2531464cbe528cb374e2d548cbbcb867660770798b72f2b103c WHIRLPOOL 787009973d32c39053c68d5e0ad74d07dc2ff3d3169e8ad8304621ec393878c3f1533c6b803facabc7d08cf067522b7151346d1761a4719a0b646927b97603c3
+DIST kubernetes-1.8.2.tar.gz 23123452 SHA256 3052c0ce35bd1f8a1500588580947c7f17f09f1ddea3a54466036fd62b46c736 SHA512 a813681f07fc674f493701833a30bc6b156572e4c8d28558b0e22dd36c16257c6c0922df773e4a5799a2eec05674cd1180f2b15ab69b0bdce52d1a861723214b WHIRLPOOL d8beb599ca2e194af5e5e1eb6d521c7846ad2ffad72da965119c51c92b16db41a17222886e57de5aad83359f20c8b264eb2e7411048218c95790d1f95f0b75fe
 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
 MISC metadata.xml 331 SHA256 d36b415b6920b0f46ff81985c0ad7d18c35a945358cf2846d0a968cdf9dc5f1c SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68 WHIRLPOOL 3fb6d9e005c6ea6d7d82e288c0a0c9c6b643599b5c16f3f66113b99d5082036642502541d54bc2f84f764f5fd1cd84eaf1d50e3e11ce7f9bff46763304794925
diff --git a/sys-cluster/kube-controller-manager/files/kube-controller-manager.logrotated b/sys-cluster/kube-controller-manager/files/kube-controller-manager.logrotated
index a74eca94abf1..06efce234069 100644
--- a/sys-cluster/kube-controller-manager/files/kube-controller-manager.logrotated
+++ b/sys-cluster/kube-controller-manager/files/kube-controller-manager.logrotated
@@ -1,4 +1,4 @@
-/var/log/kube-controller-manager/* {
+/var/log/kube-controller-manager/*.log {
 	missingok
 	size 5M
 	rotate 3
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.7.6.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.7.6.ebuild
deleted file mode 100644
index e5ab12f16012..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.7.6.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.0.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.0.ebuild
deleted file mode 100644
index e5ab12f16012..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.0.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.7.5.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.2.ebuild
index e5ab12f16012..e5ab12f16012 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.7.5.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.2.ebuild
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 2537bf77cc28..a16fe88b5dfd 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,12 +1,8 @@
 AUX kube-proxy.confd 53 SHA256 a64f7683e165325c7ea27d75f1072a9aab33f3bb6dbd3cde10c62e0e39cc4876 SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018 WHIRLPOOL 06b0c1feb540972544331c2b34325b78dc70fa25ae89a131581fa796eecb3f5a84c3825f875558f34aabeff161e1936701b922c5e3f74e104f590117c8a1a809
 AUX kube-proxy.initd 507 SHA256 b8da03e55d7ab6265a202c664b8a128f173caa146335179d5ee25cb1f58a9898 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364 WHIRLPOOL 915c7538815aadcd24e71fb664e51c00243d021c3d7769d147d5ae0c026ff8e957109219cdf7ab1f6eb5606da8ab4e0773405fe20962bbffd3dfbb6f02f6fff1
-AUX kube-proxy.logrotated 80 SHA256 c9a2cd891aaa1a4193d8244ffd857400e2bc258d6b43fb4796c0787f3a06fcba SHA512 866e25b63e955ca4855ed6bff2d98225b82e313155a6f24ba39c3063bf0d66a2ed87be4f940a0a562d5bdb73cd90daf11b9b4748a880e64db4ec5092689fcbe4 WHIRLPOOL 13e918604291bb3378105e59d6e27108e6b3bc9df0ec314be5ff9f117e81267585257c0a8b80d8bcf1b840d9ac3827f015c4ff6698f5d49b70452c3588d09355
-DIST kubernetes-1.7.5.tar.gz 22027539 SHA256 5fe434de8b17ef951d156f7cee24b24a0c5a071a85a612bba4890603541e1ff1 SHA512 a9fcc8f2d50ab431dc9aa5580c79acb8f1738102980f15cf99d01c64be5c6764dd670d436b2e42bf53d1e068a1e8924117384ebc4a3ac571267875862a86d4e3 WHIRLPOOL c2bcf741d9bd8a2fe840ceb9e8b67221c96218a0a0c4caa198d3971cd6044fe922da58c2be20e4230aab6b3ae7057ac37a82c457d0049b126954ece40f66d3de
-DIST kubernetes-1.7.6.tar.gz 22032012 SHA256 434ef607ba5cb77046066e5ebe2859fb7a1a07657f2b56762f7f16501dc12359 SHA512 b4db0951236f2a7aa8bea70ab0c3e5f1f1efe302ab378277db3752a44a41a360c4def9d71b3398e41f3f3ede503a5fccb5ed7b65e4c1152f0a0854659c4966c9 WHIRLPOOL b9b11e07bed8cb14b15ec346be388ec3c481bd97d744c73743653a17d1dedff21a77fd4729380141d589b50cf772e7018cb3fa697fa1fb9a3c4372885f9c48ce
-DIST kubernetes-1.8.0.tar.gz 23388112 SHA256 235c3eccf3490d5ffb7a32d7b3a02f0b849efe0a0ff831094f614ff6907d36aa SHA512 679e58bb29cd398198343f008da27fa4a0461d25c922a54b17cf26a7f6329ed7443717d1e564df646d17f60a014e1e4e0b1285d0ae4f63ab846843b309ce2872 WHIRLPOOL c9e06b6a699903382c0efef8a2fb850efcc4a8c855beaa5cd9bb94e6dc4dfe2fc139ae4814f29bbb3c46a19ca65ec68b7bb5a5f454eeb0fb6bfef55c3d0caee9
+AUX kube-proxy.logrotated 84 SHA256 d5cede3f593d9f748b162647b89aac25123dd92cb003f4249c5c7abdf139de6d SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d WHIRLPOOL 78cc481814917f289ba91b84369e3af377133ee1da7700aca679683d94327f5cd4da1f0d85f7d46ab75409694a4b98a14d83ba96695d75562fad0f2464d287ae
 DIST kubernetes-1.8.1.tar.gz 23400352 SHA256 a262050d532275a1b340ca1a453a986eb977a094d7a8f4a7600358677f114a18 SHA512 b09e72990cd148c604a92d866e4dd07da113a9dd1e68faebea8dd9bf256bfd908070d4e38eed7ce04c8f416d20203cf29c9c7f8906e1b50b678cb18e2ef8f5b3 WHIRLPOOL 87142b40c7d19b8be8563ec5ccaefc3970b7ce79a081bd9c1ff8c3d5227843c267fe5ab8d56b7a42874b7f29d8517f0d69beb2842ab2b58f8fb1efa5e6a61291
-EBUILD kube-proxy-1.7.5.ebuild 1109 SHA256 c954932ce483576da1b3f4295617d74b465f8da1bed5370f404d76637e4178e3 SHA512 6dd581cfd97d999d1634181700984a8fd3b4d87f7a91011638a100b7076e23b5addfa364425b1bfb3619aae4919ef1d77f9e11a38daf782b3ebe3ae9b4e867bf WHIRLPOOL e4854293acc347634aea7538ec6770298719b30c684e09d14fac7f5bb7221a88578f465ead9ee5702e0bad61ed7b23dbba63c8c2a49a153b09619fb29e46fc39
-EBUILD kube-proxy-1.7.6.ebuild 1109 SHA256 c954932ce483576da1b3f4295617d74b465f8da1bed5370f404d76637e4178e3 SHA512 6dd581cfd97d999d1634181700984a8fd3b4d87f7a91011638a100b7076e23b5addfa364425b1bfb3619aae4919ef1d77f9e11a38daf782b3ebe3ae9b4e867bf WHIRLPOOL e4854293acc347634aea7538ec6770298719b30c684e09d14fac7f5bb7221a88578f465ead9ee5702e0bad61ed7b23dbba63c8c2a49a153b09619fb29e46fc39
-EBUILD kube-proxy-1.8.0.ebuild 1109 SHA256 c954932ce483576da1b3f4295617d74b465f8da1bed5370f404d76637e4178e3 SHA512 6dd581cfd97d999d1634181700984a8fd3b4d87f7a91011638a100b7076e23b5addfa364425b1bfb3619aae4919ef1d77f9e11a38daf782b3ebe3ae9b4e867bf WHIRLPOOL e4854293acc347634aea7538ec6770298719b30c684e09d14fac7f5bb7221a88578f465ead9ee5702e0bad61ed7b23dbba63c8c2a49a153b09619fb29e46fc39
+DIST kubernetes-1.8.2.tar.gz 23123452 SHA256 3052c0ce35bd1f8a1500588580947c7f17f09f1ddea3a54466036fd62b46c736 SHA512 a813681f07fc674f493701833a30bc6b156572e4c8d28558b0e22dd36c16257c6c0922df773e4a5799a2eec05674cd1180f2b15ab69b0bdce52d1a861723214b WHIRLPOOL d8beb599ca2e194af5e5e1eb6d521c7846ad2ffad72da965119c51c92b16db41a17222886e57de5aad83359f20c8b264eb2e7411048218c95790d1f95f0b75fe
 EBUILD kube-proxy-1.8.1.ebuild 1109 SHA256 c954932ce483576da1b3f4295617d74b465f8da1bed5370f404d76637e4178e3 SHA512 6dd581cfd97d999d1634181700984a8fd3b4d87f7a91011638a100b7076e23b5addfa364425b1bfb3619aae4919ef1d77f9e11a38daf782b3ebe3ae9b4e867bf WHIRLPOOL e4854293acc347634aea7538ec6770298719b30c684e09d14fac7f5bb7221a88578f465ead9ee5702e0bad61ed7b23dbba63c8c2a49a153b09619fb29e46fc39
+EBUILD kube-proxy-1.8.2.ebuild 1109 SHA256 c954932ce483576da1b3f4295617d74b465f8da1bed5370f404d76637e4178e3 SHA512 6dd581cfd97d999d1634181700984a8fd3b4d87f7a91011638a100b7076e23b5addfa364425b1bfb3619aae4919ef1d77f9e11a38daf782b3ebe3ae9b4e867bf WHIRLPOOL e4854293acc347634aea7538ec6770298719b30c684e09d14fac7f5bb7221a88578f465ead9ee5702e0bad61ed7b23dbba63c8c2a49a153b09619fb29e46fc39
 MISC metadata.xml 331 SHA256 d36b415b6920b0f46ff81985c0ad7d18c35a945358cf2846d0a968cdf9dc5f1c SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68 WHIRLPOOL 3fb6d9e005c6ea6d7d82e288c0a0c9c6b643599b5c16f3f66113b99d5082036642502541d54bc2f84f764f5fd1cd84eaf1d50e3e11ce7f9bff46763304794925
diff --git a/sys-cluster/kube-proxy/files/kube-proxy.logrotated b/sys-cluster/kube-proxy/files/kube-proxy.logrotated
index 892c730e83a1..b8d1032c1f76 100644
--- a/sys-cluster/kube-proxy/files/kube-proxy.logrotated
+++ b/sys-cluster/kube-proxy/files/kube-proxy.logrotated
@@ -1,4 +1,4 @@
-/var/log/kube-proxy/* {
+/var/log/kube-proxy/*.log {
 	missingok
 	size 5M
 	rotate 3
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.7.6.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.7.6.ebuild
deleted file mode 100644
index 4824d28abca5..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.7.6.ebuild
+++ /dev/null
@@ -1,41 +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 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}
-}
-
-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.8.0.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.8.0.ebuild
deleted file mode 100644
index 4824d28abca5..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.8.0.ebuild
+++ /dev/null
@@ -1,41 +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 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}
-}
-
-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.7.5.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.8.2.ebuild
index 4824d28abca5..4824d28abca5 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.7.5.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.8.2.ebuild
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 98c41860b625..982c4ab5346f 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,12 +1,8 @@
 AUX kube-scheduler.confd 133 SHA256 70edc8af1b41224c51951df215533029e708f544fbc9c8852862fa3e7034b4ab SHA512 d7326f34b26aaebf4b5c25a03abcff3bc3d397382ad4fed0f4718ee425e71399febf6fec6dc817813490671692d3f1b454fd5d14d9c47c3d41b0d3405a01a6c2 WHIRLPOOL 18149eaa544a683e49e23975faddeb547032528107a34f3bd0920724e073a73c742e928a97960e304b33018a7306d099cb359a04f239ad902e76fd09c99788fa
 AUX kube-scheduler.initd 548 SHA256 5da776b988c9f11ef4801fe80c30c8d1af7d451a31b094daa3cd34e85309831e SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3 WHIRLPOOL 621ccbc1e20e0f9eecef2654f6e3d0f633070f2e58ecc54620cb32e5240593dae5b91cc6af65230479f012882bdf7513b5681b5524ae92324d9a5f82aa741f5c
-AUX kube-scheduler.logrotated 84 SHA256 1930db199708801e324d3fd0131f2a8f0eecd32d108a92df521f976333d4d5ef SHA512 34d1cf5b5e84b2466b2f40a998bd81e197df7f284636e79ed6e55442d04c7a565af57487ee2f95566c7a9bc95cc903fa2772cc434eaf49c1aa3a6df4f0be5fd2 WHIRLPOOL cebd1e659f51be2c6c9db184bf39df4dbcc247ff4249daddc7ef693cba48c0ce6ee05b870297c336d5f2a2ab9589a1396bbd66a83748ac699658fd0b23ead5a0
-DIST kubernetes-1.7.5.tar.gz 22027539 SHA256 5fe434de8b17ef951d156f7cee24b24a0c5a071a85a612bba4890603541e1ff1 SHA512 a9fcc8f2d50ab431dc9aa5580c79acb8f1738102980f15cf99d01c64be5c6764dd670d436b2e42bf53d1e068a1e8924117384ebc4a3ac571267875862a86d4e3 WHIRLPOOL c2bcf741d9bd8a2fe840ceb9e8b67221c96218a0a0c4caa198d3971cd6044fe922da58c2be20e4230aab6b3ae7057ac37a82c457d0049b126954ece40f66d3de
-DIST kubernetes-1.7.6.tar.gz 22032012 SHA256 434ef607ba5cb77046066e5ebe2859fb7a1a07657f2b56762f7f16501dc12359 SHA512 b4db0951236f2a7aa8bea70ab0c3e5f1f1efe302ab378277db3752a44a41a360c4def9d71b3398e41f3f3ede503a5fccb5ed7b65e4c1152f0a0854659c4966c9 WHIRLPOOL b9b11e07bed8cb14b15ec346be388ec3c481bd97d744c73743653a17d1dedff21a77fd4729380141d589b50cf772e7018cb3fa697fa1fb9a3c4372885f9c48ce
-DIST kubernetes-1.8.0.tar.gz 23388112 SHA256 235c3eccf3490d5ffb7a32d7b3a02f0b849efe0a0ff831094f614ff6907d36aa SHA512 679e58bb29cd398198343f008da27fa4a0461d25c922a54b17cf26a7f6329ed7443717d1e564df646d17f60a014e1e4e0b1285d0ae4f63ab846843b309ce2872 WHIRLPOOL c9e06b6a699903382c0efef8a2fb850efcc4a8c855beaa5cd9bb94e6dc4dfe2fc139ae4814f29bbb3c46a19ca65ec68b7bb5a5f454eeb0fb6bfef55c3d0caee9
+AUX kube-scheduler.logrotated 88 SHA256 03458ca43bf70c5991caa6a47ed8b796592a958a06eb2db6d734f196920dfd79 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6 WHIRLPOOL 22e896b20485794a714f86b462aa1dfa213a01c0d82c91b074f23d52d52fb9fa111362aa4e7c1f5af0caa667b2764c2c4f46022ce8c1557335657dfb9a7f0f16
 DIST kubernetes-1.8.1.tar.gz 23400352 SHA256 a262050d532275a1b340ca1a453a986eb977a094d7a8f4a7600358677f114a18 SHA512 b09e72990cd148c604a92d866e4dd07da113a9dd1e68faebea8dd9bf256bfd908070d4e38eed7ce04c8f416d20203cf29c9c7f8906e1b50b678cb18e2ef8f5b3 WHIRLPOOL 87142b40c7d19b8be8563ec5ccaefc3970b7ce79a081bd9c1ff8c3d5227843c267fe5ab8d56b7a42874b7f29d8517f0d69beb2842ab2b58f8fb1efa5e6a61291
-EBUILD kube-scheduler-1.7.5.ebuild 1212 SHA256 61aa6e4d0aa1aaeac5fe4df77d787b02944e9902d04c8b2548915c0c4a4a2c54 SHA512 03ad58f55630501b97575183c6d56aa59a4290a3bd8b08818c5f616f0966f539558588ebce58283dedc1543519e229c228f83f8886f82e5f36a636c5b4d655c9 WHIRLPOOL 7648f122210c39a05ceeacaff31e1149ca4929ce3b6072358ca856b2f51abe93d1b7cf37c8633770b88d3c6fd65d049d1bc94c306263de19bfedc749a75ab303
-EBUILD kube-scheduler-1.7.6.ebuild 1212 SHA256 61aa6e4d0aa1aaeac5fe4df77d787b02944e9902d04c8b2548915c0c4a4a2c54 SHA512 03ad58f55630501b97575183c6d56aa59a4290a3bd8b08818c5f616f0966f539558588ebce58283dedc1543519e229c228f83f8886f82e5f36a636c5b4d655c9 WHIRLPOOL 7648f122210c39a05ceeacaff31e1149ca4929ce3b6072358ca856b2f51abe93d1b7cf37c8633770b88d3c6fd65d049d1bc94c306263de19bfedc749a75ab303
-EBUILD kube-scheduler-1.8.0.ebuild 1212 SHA256 61aa6e4d0aa1aaeac5fe4df77d787b02944e9902d04c8b2548915c0c4a4a2c54 SHA512 03ad58f55630501b97575183c6d56aa59a4290a3bd8b08818c5f616f0966f539558588ebce58283dedc1543519e229c228f83f8886f82e5f36a636c5b4d655c9 WHIRLPOOL 7648f122210c39a05ceeacaff31e1149ca4929ce3b6072358ca856b2f51abe93d1b7cf37c8633770b88d3c6fd65d049d1bc94c306263de19bfedc749a75ab303
+DIST kubernetes-1.8.2.tar.gz 23123452 SHA256 3052c0ce35bd1f8a1500588580947c7f17f09f1ddea3a54466036fd62b46c736 SHA512 a813681f07fc674f493701833a30bc6b156572e4c8d28558b0e22dd36c16257c6c0922df773e4a5799a2eec05674cd1180f2b15ab69b0bdce52d1a861723214b WHIRLPOOL d8beb599ca2e194af5e5e1eb6d521c7846ad2ffad72da965119c51c92b16db41a17222886e57de5aad83359f20c8b264eb2e7411048218c95790d1f95f0b75fe
 EBUILD kube-scheduler-1.8.1.ebuild 1212 SHA256 61aa6e4d0aa1aaeac5fe4df77d787b02944e9902d04c8b2548915c0c4a4a2c54 SHA512 03ad58f55630501b97575183c6d56aa59a4290a3bd8b08818c5f616f0966f539558588ebce58283dedc1543519e229c228f83f8886f82e5f36a636c5b4d655c9 WHIRLPOOL 7648f122210c39a05ceeacaff31e1149ca4929ce3b6072358ca856b2f51abe93d1b7cf37c8633770b88d3c6fd65d049d1bc94c306263de19bfedc749a75ab303
+EBUILD kube-scheduler-1.8.2.ebuild 1212 SHA256 61aa6e4d0aa1aaeac5fe4df77d787b02944e9902d04c8b2548915c0c4a4a2c54 SHA512 03ad58f55630501b97575183c6d56aa59a4290a3bd8b08818c5f616f0966f539558588ebce58283dedc1543519e229c228f83f8886f82e5f36a636c5b4d655c9 WHIRLPOOL 7648f122210c39a05ceeacaff31e1149ca4929ce3b6072358ca856b2f51abe93d1b7cf37c8633770b88d3c6fd65d049d1bc94c306263de19bfedc749a75ab303
 MISC metadata.xml 331 SHA256 d36b415b6920b0f46ff81985c0ad7d18c35a945358cf2846d0a968cdf9dc5f1c SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68 WHIRLPOOL 3fb6d9e005c6ea6d7d82e288c0a0c9c6b643599b5c16f3f66113b99d5082036642502541d54bc2f84f764f5fd1cd84eaf1d50e3e11ce7f9bff46763304794925
diff --git a/sys-cluster/kube-scheduler/files/kube-scheduler.logrotated b/sys-cluster/kube-scheduler/files/kube-scheduler.logrotated
index 8bd67e8db69e..6cce6c6f5be7 100644
--- a/sys-cluster/kube-scheduler/files/kube-scheduler.logrotated
+++ b/sys-cluster/kube-scheduler/files/kube-scheduler.logrotated
@@ -1,4 +1,4 @@
-/var/log/kube-scheduler/* {
+/var/log/kube-scheduler/*.log {
 	missingok
 	size 5M
 	rotate 3
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.7.6.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.7.6.ebuild
deleted file mode 100644
index aa15c73ecc3a..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.7.6.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=plugin/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-scheduler/kube-scheduler-1.8.0.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.8.0.ebuild
deleted file mode 100644
index aa15c73ecc3a..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.8.0.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=plugin/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-scheduler/kube-scheduler-1.7.5.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.8.2.ebuild
index aa15c73ecc3a..aa15c73ecc3a 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.7.5.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.8.2.ebuild
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index f647cd0fbd2d..f42f645fe825 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,7 +1,5 @@
-DIST kubernetes-1.7.6.tar.gz 22032012 SHA256 434ef607ba5cb77046066e5ebe2859fb7a1a07657f2b56762f7f16501dc12359 SHA512 b4db0951236f2a7aa8bea70ab0c3e5f1f1efe302ab378277db3752a44a41a360c4def9d71b3398e41f3f3ede503a5fccb5ed7b65e4c1152f0a0854659c4966c9 WHIRLPOOL b9b11e07bed8cb14b15ec346be388ec3c481bd97d744c73743653a17d1dedff21a77fd4729380141d589b50cf772e7018cb3fa697fa1fb9a3c4372885f9c48ce
-DIST kubernetes-1.8.0.tar.gz 23388112 SHA256 235c3eccf3490d5ffb7a32d7b3a02f0b849efe0a0ff831094f614ff6907d36aa SHA512 679e58bb29cd398198343f008da27fa4a0461d25c922a54b17cf26a7f6329ed7443717d1e564df646d17f60a014e1e4e0b1285d0ae4f63ab846843b309ce2872 WHIRLPOOL c9e06b6a699903382c0efef8a2fb850efcc4a8c855beaa5cd9bb94e6dc4dfe2fc139ae4814f29bbb3c46a19ca65ec68b7bb5a5f454eeb0fb6bfef55c3d0caee9
 DIST kubernetes-1.8.1.tar.gz 23400352 SHA256 a262050d532275a1b340ca1a453a986eb977a094d7a8f4a7600358677f114a18 SHA512 b09e72990cd148c604a92d866e4dd07da113a9dd1e68faebea8dd9bf256bfd908070d4e38eed7ce04c8f416d20203cf29c9c7f8906e1b50b678cb18e2ef8f5b3 WHIRLPOOL 87142b40c7d19b8be8563ec5ccaefc3970b7ce79a081bd9c1ff8c3d5227843c267fe5ab8d56b7a42874b7f29d8517f0d69beb2842ab2b58f8fb1efa5e6a61291
-EBUILD kubectl-1.7.6.ebuild 1195 SHA256 52c65b73376bfe55d2e4422c840ca0ea3b76c3dd67d91d066d024b747fc25b45 SHA512 7f11ea2a0820fdd11ee3e15ff86f1af6999e538e6b96703921babba7df6a0756e1f209b795816bc8b983d6066dc5424a868be4fc6200b69d43007e4e40eb8544 WHIRLPOOL 5f80d841ed707970cc4f37ac11e7914bfcfa5f3b2496babfe68d08b07b3b3ed128c22ad7e62621fb21d15459afb14abf9dc3c3fe5b078aada5e8c10b88e15814
-EBUILD kubectl-1.8.0.ebuild 1195 SHA256 52c65b73376bfe55d2e4422c840ca0ea3b76c3dd67d91d066d024b747fc25b45 SHA512 7f11ea2a0820fdd11ee3e15ff86f1af6999e538e6b96703921babba7df6a0756e1f209b795816bc8b983d6066dc5424a868be4fc6200b69d43007e4e40eb8544 WHIRLPOOL 5f80d841ed707970cc4f37ac11e7914bfcfa5f3b2496babfe68d08b07b3b3ed128c22ad7e62621fb21d15459afb14abf9dc3c3fe5b078aada5e8c10b88e15814
+DIST kubernetes-1.8.2.tar.gz 23123452 SHA256 3052c0ce35bd1f8a1500588580947c7f17f09f1ddea3a54466036fd62b46c736 SHA512 a813681f07fc674f493701833a30bc6b156572e4c8d28558b0e22dd36c16257c6c0922df773e4a5799a2eec05674cd1180f2b15ab69b0bdce52d1a861723214b WHIRLPOOL d8beb599ca2e194af5e5e1eb6d521c7846ad2ffad72da965119c51c92b16db41a17222886e57de5aad83359f20c8b264eb2e7411048218c95790d1f95f0b75fe
 EBUILD kubectl-1.8.1.ebuild 1196 SHA256 97374f8f5b45b01ce8b1ff8990fe4030a83acd5bfbf64887839a5e911d28198f SHA512 a815fa1ad8084d48ccc36f5fcc234394e53460c0e3133b2389f694cbe30b4e91c25bd16ed49486d2022e57647a12ea1f364fc61a960cc1c99066abd1e835362a WHIRLPOOL df72c0de492aee9acacf85a4711354f0b33add7e226b427c24fa7448e016974a879f8beac23033d6f2cae37e8c8da02b76ed247927ba5a9f9a3c027f8d41dce9
+EBUILD kubectl-1.8.2.ebuild 1210 SHA256 bc2d8c9e3a03a6f9d502d1c8b3063be1d989aed4145825107be17806874eec26 SHA512 d4a5d6860476b6b86bb794f0f9e90852a9cafe3e5cda4da8ef8662d1e798e065f05ae33dde58f5066efc290fbe974a678989658eea3b05867007f98ab3d2bdb1 WHIRLPOOL 659bc4a6e7c07bb216aa73e565ee6640a7a57c5fb1144d1fb520e411c2cf10953e9283310673cf29e014377f326dd093d1a9597aa9c421cff0c2f3a7e52f4e2d
 MISC metadata.xml 331 SHA256 757e4c9e564d7c023ce2068c998fa06b2266edf7608d717268c294a3f6e10a41 SHA512 d44cef89f9f902c706b0f9c0c4106bfd6ca094d64c273d0a13da53aec7ba2b238cd6ff489f13765e895ee4a6f2bb4638436839c7c60cce2ece3013fdc27232a4 WHIRLPOOL 51540c0c28cc89e47e72825981e9f823b4abf942d35e755daa69e18c5160335f13001fbc93da85d3556562473ba8d983596c069b8ff17ce55d6ac0466bc7fb0f
diff --git a/sys-cluster/kubectl/kubectl-1.8.0.ebuild b/sys-cluster/kubectl/kubectl-1.8.0.ebuild
deleted file mode 100644
index 89ea95537ed0..000000000000
--- a/sys-cluster/kubectl/kubectl-1.8.0.ebuild
+++ /dev/null
@@ -1,46 +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 bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-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}
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash
-	_output/bin/${PN} completion zsh > ${PN}.zsh
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh ${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubectl/kubectl-1.7.6.ebuild b/sys-cluster/kubectl/kubectl-1.8.2.ebuild
index 89ea95537ed0..c1b8998e6518 100644
--- a/sys-cluster/kubectl/kubectl-1.7.6.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.8.2.ebuild
@@ -29,8 +29,8 @@ src_prepare() {
 src_compile() {
 	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN}
 	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash
-	_output/bin/${PN} completion zsh > ${PN}.zsh
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
 	popd || die
 }
 
@@ -40,7 +40,7 @@ src_install() {
 
 	newbashcomp ${PN}.bash ${PN}
 	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh ${PN}
+	newins ${PN}.zsh _${PN}
 
 	popd || die
 }
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 2bed27609ea9..026eeb92c56a 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -1,12 +1,8 @@
 AUX kubelet.confd 58 SHA256 c1476a6d4af6a40296c990ad46bd5793d9b52c8b12c0c7764ee177962022938e SHA512 2ae3bbc8a66da644b59d7f753294ad43d5675edbe2e4769b91d7c988d0eeffd5b4209a10650ad937f9698b1b6050279d448c75274815a6b348ad2023f2fef08e WHIRLPOOL 95d2f220e8afbe315e146ee76cab3df06d63662894c59d4b03fed887ed99c17e71baf7bdf3493d4e904cbcfa10cf7848c6761184112714fc423d611a8e5d81b2
 AUX kubelet.initd 520 SHA256 76dda0fed830ea6a0dac72d91252a9c82575281984b8049e4760e2f27dd4f4af SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0 WHIRLPOOL ff5c283443b303485b58647666577dc627f81eb11b4ed1f03a44bc8381be78777f24a4ae4f4fac33f32e476bea7c5fea7f70f044cdb1f277ff64656878c260e8
-AUX kubelet.logrotated 80 SHA256 80eb18515e5c7f12d2bcbe907ef6fc218f3c83274c18f22535bf59feaa8003a8 SHA512 c51f65a691fdd280798610cb04f9a48766045952687917828dd9c554f626a2303220ecd717a5d6be8f838422720a69a7c5e11576245a2e7dd75311a975a8d72e WHIRLPOOL 01e7acf5a8f5b3fde6ccd5633ca0eb0c612a2918cf98cc9cf191d87df908dd0d4b966c363cb9aba7f49891aee14ec5b6a616a06b07d81a55745293aeb1665312
-DIST kubernetes-1.7.5.tar.gz 22027539 SHA256 5fe434de8b17ef951d156f7cee24b24a0c5a071a85a612bba4890603541e1ff1 SHA512 a9fcc8f2d50ab431dc9aa5580c79acb8f1738102980f15cf99d01c64be5c6764dd670d436b2e42bf53d1e068a1e8924117384ebc4a3ac571267875862a86d4e3 WHIRLPOOL c2bcf741d9bd8a2fe840ceb9e8b67221c96218a0a0c4caa198d3971cd6044fe922da58c2be20e4230aab6b3ae7057ac37a82c457d0049b126954ece40f66d3de
-DIST kubernetes-1.7.6.tar.gz 22032012 SHA256 434ef607ba5cb77046066e5ebe2859fb7a1a07657f2b56762f7f16501dc12359 SHA512 b4db0951236f2a7aa8bea70ab0c3e5f1f1efe302ab378277db3752a44a41a360c4def9d71b3398e41f3f3ede503a5fccb5ed7b65e4c1152f0a0854659c4966c9 WHIRLPOOL b9b11e07bed8cb14b15ec346be388ec3c481bd97d744c73743653a17d1dedff21a77fd4729380141d589b50cf772e7018cb3fa697fa1fb9a3c4372885f9c48ce
-DIST kubernetes-1.8.0.tar.gz 23388112 SHA256 235c3eccf3490d5ffb7a32d7b3a02f0b849efe0a0ff831094f614ff6907d36aa SHA512 679e58bb29cd398198343f008da27fa4a0461d25c922a54b17cf26a7f6329ed7443717d1e564df646d17f60a014e1e4e0b1285d0ae4f63ab846843b309ce2872 WHIRLPOOL c9e06b6a699903382c0efef8a2fb850efcc4a8c855beaa5cd9bb94e6dc4dfe2fc139ae4814f29bbb3c46a19ca65ec68b7bb5a5f454eeb0fb6bfef55c3d0caee9
+AUX kubelet.logrotated 84 SHA256 43b1e0acf404fb18ea0b225c2a2acd712d86f53eea4416b65ec253c19e7ea577 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5 WHIRLPOOL 472c61cefc673fe47f52c979b8a6985767bb146380587e921cca8580447c1dfd80cc6020ddecb968efedb4d4da3f7691d41aa570c43c36b76ab575fe2564300e
 DIST kubernetes-1.8.1.tar.gz 23400352 SHA256 a262050d532275a1b340ca1a453a986eb977a094d7a8f4a7600358677f114a18 SHA512 b09e72990cd148c604a92d866e4dd07da113a9dd1e68faebea8dd9bf256bfd908070d4e38eed7ce04c8f416d20203cf29c9c7f8906e1b50b678cb18e2ef8f5b3 WHIRLPOOL 87142b40c7d19b8be8563ec5ccaefc3970b7ce79a081bd9c1ff8c3d5227843c267fe5ab8d56b7a42874b7f29d8517f0d69beb2842ab2b58f8fb1efa5e6a61291
-EBUILD kubelet-1.7.5.ebuild 1206 SHA256 192d3c71383989c1c7a0d54e5a5d68f19f60f80759d10f7d8c4fa1fdea8294ea SHA512 232f3600c53b381f4cfc41c9808ca68a6582958bc7aa31a04b2d95466c2ff0770350906d208091150fa50a137ea59d04f30b820e03a9d3221ec60e7f5e94fb43 WHIRLPOOL 2a0127c6af63a85b3e6dbc6c6c48d1dfd739af224efbc6cc78e7513fb28fc486e72246d8004633572d31db4d5500346252a7fbbef79d0d71a4d4fba416c495ec
-EBUILD kubelet-1.7.6.ebuild 1206 SHA256 192d3c71383989c1c7a0d54e5a5d68f19f60f80759d10f7d8c4fa1fdea8294ea SHA512 232f3600c53b381f4cfc41c9808ca68a6582958bc7aa31a04b2d95466c2ff0770350906d208091150fa50a137ea59d04f30b820e03a9d3221ec60e7f5e94fb43 WHIRLPOOL 2a0127c6af63a85b3e6dbc6c6c48d1dfd739af224efbc6cc78e7513fb28fc486e72246d8004633572d31db4d5500346252a7fbbef79d0d71a4d4fba416c495ec
-EBUILD kubelet-1.8.0.ebuild 1206 SHA256 192d3c71383989c1c7a0d54e5a5d68f19f60f80759d10f7d8c4fa1fdea8294ea SHA512 232f3600c53b381f4cfc41c9808ca68a6582958bc7aa31a04b2d95466c2ff0770350906d208091150fa50a137ea59d04f30b820e03a9d3221ec60e7f5e94fb43 WHIRLPOOL 2a0127c6af63a85b3e6dbc6c6c48d1dfd739af224efbc6cc78e7513fb28fc486e72246d8004633572d31db4d5500346252a7fbbef79d0d71a4d4fba416c495ec
+DIST kubernetes-1.8.2.tar.gz 23123452 SHA256 3052c0ce35bd1f8a1500588580947c7f17f09f1ddea3a54466036fd62b46c736 SHA512 a813681f07fc674f493701833a30bc6b156572e4c8d28558b0e22dd36c16257c6c0922df773e4a5799a2eec05674cd1180f2b15ab69b0bdce52d1a861723214b WHIRLPOOL d8beb599ca2e194af5e5e1eb6d521c7846ad2ffad72da965119c51c92b16db41a17222886e57de5aad83359f20c8b264eb2e7411048218c95790d1f95f0b75fe
 EBUILD kubelet-1.8.1.ebuild 1206 SHA256 192d3c71383989c1c7a0d54e5a5d68f19f60f80759d10f7d8c4fa1fdea8294ea SHA512 232f3600c53b381f4cfc41c9808ca68a6582958bc7aa31a04b2d95466c2ff0770350906d208091150fa50a137ea59d04f30b820e03a9d3221ec60e7f5e94fb43 WHIRLPOOL 2a0127c6af63a85b3e6dbc6c6c48d1dfd739af224efbc6cc78e7513fb28fc486e72246d8004633572d31db4d5500346252a7fbbef79d0d71a4d4fba416c495ec
+EBUILD kubelet-1.8.2.ebuild 1206 SHA256 192d3c71383989c1c7a0d54e5a5d68f19f60f80759d10f7d8c4fa1fdea8294ea SHA512 232f3600c53b381f4cfc41c9808ca68a6582958bc7aa31a04b2d95466c2ff0770350906d208091150fa50a137ea59d04f30b820e03a9d3221ec60e7f5e94fb43 WHIRLPOOL 2a0127c6af63a85b3e6dbc6c6c48d1dfd739af224efbc6cc78e7513fb28fc486e72246d8004633572d31db4d5500346252a7fbbef79d0d71a4d4fba416c495ec
 MISC metadata.xml 331 SHA256 d36b415b6920b0f46ff81985c0ad7d18c35a945358cf2846d0a968cdf9dc5f1c SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68 WHIRLPOOL 3fb6d9e005c6ea6d7d82e288c0a0c9c6b643599b5c16f3f66113b99d5082036642502541d54bc2f84f764f5fd1cd84eaf1d50e3e11ce7f9bff46763304794925
diff --git a/sys-cluster/kubelet/files/kubelet.logrotated b/sys-cluster/kubelet/files/kubelet.logrotated
index 3d096428655b..ddf8c1dd80f6 100644
--- a/sys-cluster/kubelet/files/kubelet.logrotated
+++ b/sys-cluster/kubelet/files/kubelet.logrotated
@@ -1,4 +1,4 @@
-/var/log/kubernetes/* {
+/var/log/kubernetes/*.log {
 	missingok
 	size 5M
 	rotate 3
diff --git a/sys-cluster/kubelet/kubelet-1.7.6.ebuild b/sys-cluster/kubelet/kubelet-1.7.6.ebuild
deleted file mode 100644
index 8348f6d70ace..000000000000
--- a/sys-cluster/kubelet/kubelet-1.7.6.ebuild
+++ /dev/null
@@ -1,43 +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 "/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}
-}
-
-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.0.ebuild b/sys-cluster/kubelet/kubelet-1.8.0.ebuild
deleted file mode 100644
index 8348f6d70ace..000000000000
--- a/sys-cluster/kubelet/kubelet-1.8.0.ebuild
+++ /dev/null
@@ -1,43 +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 "/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}
-}
-
-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.7.5.ebuild b/sys-cluster/kubelet/kubelet-1.8.2.ebuild
index 8348f6d70ace..8348f6d70ace 100644
--- a/sys-cluster/kubelet/kubelet-1.7.5.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.8.2.ebuild
diff --git a/sys-cluster/legion/Manifest b/sys-cluster/legion/Manifest
index faef48085d58..d5dc7feba310 100644
--- a/sys-cluster/legion/Manifest
+++ b/sys-cluster/legion/Manifest
@@ -5,11 +5,13 @@ DIST legion-16.10.0.tar.gz 2474656 SHA256 92190ae5ff0a1f6356890446e026479ed71523
 DIST legion-17.02.0.tar.gz 2690415 SHA256 c5413fe8990c33a087c9a567671756c8267e050f5285f75ee33b84911b00c355 SHA512 0c6ee53953ec2e5072d39b1c1260a1783393feaf7064f381bb1733cf9cdb1be8fd521a35e0a452ebc9e9509d117fdc6f3e472cdb6c633ba00c987c880a33bc2d WHIRLPOOL 97bb2da8d362414d6e3c65ba2b50bf4e57041e337f6492efb27f5796c3afe0225c6324532e7413e5f9987c8395b05751d6fc0ca7b7983c21b96ef7679fdc57dc
 DIST legion-17.05.0.tar.gz 2783482 SHA256 b5f54454b28d3b61dde03711dadc2b969cf5c6412b9c1887893c5af521eba79a SHA512 51532f043eea1467a2b8ff17004f224c763f411eb5940d0a4dc5d8eb6503d758964aba26eb4977c68264c7344fcf269682a428e86a2c1a756f91cc9c50d04677 WHIRLPOOL c178ad310ef79997f4716dc7380892c814a11eadb39cbb88f1dab46df73b7fc6396262ea3a7db330847bd25b217b5f50dc5ea3c9b3e86932e3e3693e5a9eb5cb
 DIST legion-17.08.0.tar.gz 2839522 SHA256 5edfc9ee05b7bd0eb45f698e3cfd66c062d21fe36c3da89d233d93b2d47d9d1e SHA512 5d97157f97e12149e5fdf3a75d2e6e8a41ebf97e09c35501e2c93437bd0a47643d261f68c6b4a83b47e64d706f35914acd3a852eb0c08a11696b05ba9ef7af87 WHIRLPOOL 0602b0876190a1209fd215d9a85d3713ae2dcbae8f4df7b9eb34f40da5c13d2ee446137d22bc89f250bc90e134d84f484ec15106ea3cab1d32740941186a38a8
+DIST legion-17.10.0.tar.gz 2975023 SHA256 dd93a21834c2b686a73e5ff3d9c1e90bc26fd52f019d9399756b9096a1416137 SHA512 c4be9b32b47b3c4ae38374606125867f963a109dd542a52ee20b2964e5849121207d78947f0ab6ea4ed5e8a027b26da7b1a3a61124f175c1b9f7323e56b8d9b2 WHIRLPOOL e31ef90bd733e66127703a10a88bfd13166e946d416b56f2ce00e37b468fc7ba7456c9c5d471f1614f93e7ae4bfa96cc6a10ea987e52121af0e8f4399e96b932
 EBUILD legion-16.08.0-r1.ebuild 842 SHA256 e80b953435f1132477a2101dfa2957a59bb3699bf902891df9e2bee455500551 SHA512 d3d0f07e5028c88a288ec07b40cd06c336319405421ece8abc66a8606cfc8ae48e16636462c377dba2fc09afe29a013f6782cf2e3894c24dcfac5847cbd26166 WHIRLPOOL a3c664438deb63dcfbb960ef5c55a380eb2d664ff5689e9c66063f0a30d9c0706017a07cb7881a55ccd9b0fb6a3b927c23ca4d68a44e80b6f81cb08ea6911fab
 EBUILD legion-16.10.0.ebuild 669 SHA256 1907079216e421227fc0c894d8301c765104b19607f0fc637b11a1bab4aafbb8 SHA512 599658544d58e5df36506abd5fb05fef69bccac29668714c203d48fd5902127fa6a73cb3284b798569e9402cb921d5db5f766bc2a69edb6558837f55262385df WHIRLPOOL b502a08bdcecb8a3c418fdd6f722d9490c34c384c7a73f15c54593fed487e2e6fbf914ce10a0341b25e281e07abbd14822e00cb7f73054632c6d7e0c693219d5
 EBUILD legion-17.02.0.ebuild 724 SHA256 501d4895858173b4fcf3f5d22de0a8cc286cdb4c07925686793b44ca7b1c55d4 SHA512 ecb3a77330e40a0abee5af0bbc5a7ecf0fc7baad53f077eea9975f22b165c68ad999111f3c01bdc9e8df92c57ce3ac658817b7be4b96429c2fe67c8782671c98 WHIRLPOOL 87d65fb5e0b24b1f66388f3649c9a31f412306136f72b46dd37da2dfc079eb682e3fe45cd18ba19995bf81e645398d967579af1c6f0e5d6926648f6d158e9423
 EBUILD legion-17.05.0.ebuild 881 SHA256 36b33f834bbdc15edc9f675b70bfab407e95773420485ac01ea97baf1a4846f9 SHA512 8976cb8040a1ad4a205900ee6d040029c54c1cf802a70d83fc52b63190bd8405d1f0107f4a0a9e5a3cb9ba37a9e2446a4f7a2b84587ba33b83d60d2dfea9c01f WHIRLPOOL 4defbb7fad9a327bad2bf79ac80600c7f7bbd7bc4a7e18214ef48ee04837b3808cff286f0c0dd0c3b5f727ff520550b456dcf0a704524dc7ec8fc988e3b5fd9d
 EBUILD legion-17.08.0.ebuild 925 SHA256 0bde161e407b52d5594a6e6cd8da962a4e6051ad2f7a247fea7c33948c606cc4 SHA512 fd399c48fe6e4209c1d5a1cb8ea8a2d9af507268784c009143aa67fefe3f8a9f5fce81b3231e0b2390bf049f410372928c59e211def52cb0303fa49647964538 WHIRLPOOL b7a5f8606322bcdc35f0ea65d52b757d7907b131d65904fef4245fdf70041379d87f5d275a8d699cca4d4947a1c892b52de5feeef051a1d9fc39ba8461633e57
+EBUILD legion-17.10.0.ebuild 925 SHA256 0bde161e407b52d5594a6e6cd8da962a4e6051ad2f7a247fea7c33948c606cc4 SHA512 fd399c48fe6e4209c1d5a1cb8ea8a2d9af507268784c009143aa67fefe3f8a9f5fce81b3231e0b2390bf049f410372928c59e211def52cb0303fa49647964538 WHIRLPOOL b7a5f8606322bcdc35f0ea65d52b757d7907b131d65904fef4245fdf70041379d87f5d275a8d699cca4d4947a1c892b52de5feeef051a1d9fc39ba8461633e57
 EBUILD legion-9999.ebuild 881 SHA256 36b33f834bbdc15edc9f675b70bfab407e95773420485ac01ea97baf1a4846f9 SHA512 8976cb8040a1ad4a205900ee6d040029c54c1cf802a70d83fc52b63190bd8405d1f0107f4a0a9e5a3cb9ba37a9e2446a4f7a2b84587ba33b83d60d2dfea9c01f WHIRLPOOL 4defbb7fad9a327bad2bf79ac80600c7f7bbd7bc4a7e18214ef48ee04837b3808cff286f0c0dd0c3b5f727ff520550b456dcf0a704524dc7ec8fc988e3b5fd9d
 MISC ChangeLog 871 SHA256 4b5f0f0f160797c9a0abae5d7c114c513dabf3c96718cfa978ba1a60afeb2e78 SHA512 9730f27c06a5f2652ba26dc791a29c8aebe88b3a729d5409727bd00854fddb398fa159257aaa88a4b8ee49bb3fa1a143984bf75ead04b2286efa55ee120183ac WHIRLPOOL 61560ebde65e47f5607eb10b12468a84c9b4f52759aab3091b0b914c5035874865a55cd7e2340c29b2a44b17e453d3a5a3aa19b37b556286087f8fb8d33f2a82
 MISC metadata.xml 602 SHA256 fb472821c80dc596cc022cf5f60ed06e77e7f38175451bef57088854527bb186 SHA512 ec6acaf029c0909ea54e7548c50fbcf5b1796081c9e774dcdaf6cd9ebfb9f67110be68b88208dcb1dd59cc9b4c7efc16ab5cf740a81ba2c61cc3b568b4648ac1 WHIRLPOOL d7eae2d05617cb3a4647e7263d5ddbdaae86dd9bd34ddb42d1ae6220590894a9dd681562db499f9805376364fc7a2fe683d2e3a14de6ecc3edce03c0d42dcd65
diff --git a/sys-cluster/legion/legion-17.10.0.ebuild b/sys-cluster/legion/legion-17.10.0.ebuild
new file mode 100644
index 000000000000..4d6ccbc9cb31
--- /dev/null
+++ b/sys-cluster/legion/legion-17.10.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A data-centric parallel programming system"
+HOMEPAGE="http://legion.stanford.edu/"
+if [[ $PV = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-${P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="gasnet +hwloc test"
+
+DEPEND="
+	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
+	hwloc? ( sys-apps/hwloc )
+	"
+
+src_configure() {
+	mycmakeargs=(
+		-DLegion_USE_HWLOC=$(usex hwloc)
+		-DLegion_USE_GASNet=$(usex gasnet)
+		-DLegion_ENABLE_TESTING=$(usex test)
+		-DBUILD_SHARED_LIBS=ON
+		-DLegion_BUILD_EXAMPLES=ON
+		-DLegion_BUILD_TESTS=ON
+		-DLegion_BUILD_TUTORIAL=ON
+	)
+	cmake-utils_src_configure
+}
diff --git a/sys-cluster/minikube/Manifest b/sys-cluster/minikube/Manifest
index 82604fe8349c..ca25f2d42d9d 100644
--- a/sys-cluster/minikube/Manifest
+++ b/sys-cluster/minikube/Manifest
@@ -1,3 +1,5 @@
 DIST minikube-0.22.3.tar.gz 18675181 SHA256 c27b870da46048b8d0eb775f86b8351e21583cf234f7c722ac92e18edf098dac SHA512 2ef1f64a5011bb57034e1d873730c55284ce008ab480775c64a66a148118bf0f66608177244a29527ac984aa34d9d39400d4d42006b930bdb35da6551e936833 WHIRLPOOL 92636e47bb9604211979cfcdc8b936fe4b5b1ce9938ceb8121a3c6fc25895fa383626226c7c8107838235fa16e8152162a602b37d8ca1c83962fd65b92d258a5
+DIST minikube-0.23.0.tar.gz 19015892 SHA256 a8f8d220a9082ae16d20f664051ab108092e51efeb10d00dc796fdaa8f69b9b8 SHA512 c89c633b6edf5dcabdc60e6c361b16934c47ee141b49d48192b7f5167e5612a7a7d44d79cf595161ac44826f8053051ace5300cdf64c710bd2c3b4247c159522 WHIRLPOOL 536a34cf88907dc8d89f4195d61ac239c4d3a3477f23cd3cfacc0b99910a33a019e21f8e6372e2dca28d4bec3b22e1275fdac25b285c5b0cb76f83485bf13bce
 EBUILD minikube-0.22.3.ebuild 1250 SHA256 abe8d564bae9bfb5c48464bb1ffb1de5e1b445dea8a0e72b5f42ead98e281597 SHA512 38875170f6d33d604a48d51384fbf3a82641779513ce44167ad9f9165758040c85fabbbbb70a83ad07d4de262213585df6f9b38d3600a7b20ed6bcaa0e7bcde6 WHIRLPOOL 842c2e2f6080b4b12d892c9ef545d0ef0a26589243c748d4e2a57b3a516ec191386d5da39f8d6eec07b5828bd3a220ba2f168941ac58cc33f2f82caef16b0a87
+EBUILD minikube-0.23.0.ebuild 1236 SHA256 5c3506cfb4a7095daf7d794cc1a8577a068e4308185c09728b204749dd4d16f4 SHA512 5feaae850de8df546c9439d56d08117419b0d920e260957a1daf47ae66f6ef61585be8023a6a501d307651fccc089ec8dde0d2c70d57efb1c63c7e4e792e9599 WHIRLPOOL ab286d1aebe30002dce5f89711ee998e5e4d54458440e85221547b7f60b0dc641f65c4133f69a9a81c93907a2f3c2381c03f779b95422cf5f2414dec19f29e0d
 MISC metadata.xml 329 SHA256 b3600da8b14aec576f9da32558438704a4a31afe04a4b5e91a12ee4ebeb31209 SHA512 4b280d1e0c76f5f571d1b31cda9cad9c564e03d99891ff7ae83f6e61e078636608aed240d088bc2d4b309f9315645abdba751cdba11bfd8268b89adc8c339857 WHIRLPOOL b5e347c694f5fa801e203f738ecdaab2d90025a7090f4f001a6467a4958f9796d8e42e7d46fd2c9e58f151888889985566c3202132eb2d5f7bfdca02588ae826
diff --git a/sys-cluster/minikube/minikube-0.23.0.ebuild b/sys-cluster/minikube/minikube-0.23.0.ebuild
new file mode 100644
index 000000000000..a345c984a945
--- /dev/null
+++ b/sys-cluster/minikube/minikube-0.23.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit python-any-r1 golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/minikube"
+ARCHIVE_URI="https://github.com/kubernetes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Single Node Kubernetes Cluster"
+HOMEPAGE="https://github.com/kubernetes/minikube https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+
+DEPEND="dev-go/go-bindata
+	${PYTHON_DEPS}"
+RDEPEND=">=sys-cluster/kubectl-1.8.0"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e 's/ -s -w/ -w/' -e 's#$(GOPATH)/bin/go-bindata#go-bindata#' -e 's#GOBIN=$(GOPATH)/bin go get github.com/jteeuwen/go-bindata/...##' src/${EGO_PN}/Makefile || die
+	sed -i -e "s/get_rev(), get_version(), get_tree_state()/get_rev(), get_version(), 'gitTreeState=clean'/"  src/${EGO_PN}/hack/get_k8s_version.py || die
+}
+
+src_compile() {
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -C src/${EGO_PN}
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin out/minikube
+	dodoc -r docs CHANGELOG.md README.md
+	popd || die
+}
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 7f346c58036b..88daa9dbc5c0 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -7,21 +7,17 @@ AUX neutron-server.confd 70 SHA256 40d09a699fc3bced40c5a9dc7394a76c40c245b579fc2
 AUX neutron.initd 679 SHA256 9dde94306c7681110eab64122dae7f63ce370d09c724557e9e9e1c7d40371774 SHA512 7c233d3ca96a90201a97772b67e98d50e7dcacc079bee9d7eb62e3900b54d515eb4615bea098148ec5bd02ecab0818dad80f2dcbd9867760b31cb74325218493 WHIRLPOOL 7c0f36b05a6ab346da2941695b1a7fcf8aedd351f3bc380c88b71c5f498582250b55c243dad0e486f6ef88b185c169e2a141172ecb39e5e7b1554c198080aedb
 AUX neutron.initd-2 530 SHA256 ae78b7651dd97277c928d478ab809434d0e34402ed3aa90a65d296fd8e7fa5b1 SHA512 56331cbac87b14180e738cb2d3881682344a59f698b8fa67428e058693430363418e31707484786b4eb8053904c061d278d06a56c03cc77d8f6a0372c892d5a7 WHIRLPOOL 192bddf28a05290356a38907e5b3cb3406b8937d3876090d52650bac625101a324bb10af6f81ee379783ed5ed9c6dded76362d36a90eae3aa7bd7ef77b2b8cd4
 AUX neutron.sudoersd 117 SHA256 b40ea04a95deedbb66fe504df61b55905cbd746e5ba26321c01cd25b5cc9dcbe SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366 WHIRLPOOL bb0e35d7b7471fab424f86f181601bc87d4bba98f4fbc282cc6302a05128992613097afe1fea159e9c718cd688a03c280b53d72bfe47fc91bd24967a4b4618da
-DIST neutron-10.0.3.tar.gz 3125880 SHA256 7f4c455d54647f5f32871b61acac0d66de32dd1e7a589bad04b266560d0ba7ef SHA512 615c5ece84d61c1e3878566cc538af15f32d92a3a3def0bfe627e804c44c9d64cb1160f7adf4f136596e687348036a795035c773213f7d57e79422fb149f560e WHIRLPOOL 1c249112c5f850b6244db7264f2295106ef2b8b68cc472eafe19e407f36c6afcfd8024ac160d9b2e7da85a60c86a88f70bd385763bdd8c22fc276000151ff46c
 DIST neutron-10.0.4.tar.gz 3124422 SHA256 1e7c999045c8d5c1e3dcb6aca05984f880bc58935682f6b8146239739a3a121a SHA512 f85949ac08728b6338cf58abfaf2c9e67882d49fefa16104580c73aaea3f0634602712583e88248f261fd3b0c8690172e4a72f550bd159cacf732440274cc844 WHIRLPOOL 6694f8372e8a2af3ff2bcc766523c11837515ebb85548160779d4cc4ea21ee7a68f1bc0636efb56f2f83764521625a1f238b59999df21849c36826c8186b03e4
 DIST neutron-11.0.1.tar.gz 10472277 SHA256 a6ea7a9e57c507bbcffea9373383543f976289c692c9aafc458a530e51db10f0 SHA512 ab353e6ae09e32c9b520a918624a661c5635f2de4df05f78f3e9c6102258ab12ee5c657f89732d89ef182833f80cb70454418a5556cc7738bd7f86b995762b37 WHIRLPOOL cb74b2feaa659f980e619c1f0fd95b5d40ddc1a581a0cc0b6b35fb2d74ec6ff93b2fb675c7b5be4ea59769c878e777ee920a6943c9612b32219a4fc619d5f2eb
-DIST neutron-configs-10.0.3.tar.gz 25094 SHA256 7f210828b0c3fa9d859fca8c4735fd60aefad3cd5d0cf810b762af268df59269 SHA512 40ab9f2f4ea338c061c57d9aa5611ee3f3476ab8f5199ac50577f94fec032ccd27028bd072d9d9d0cc9f12327613e542b4d62a0403540730f9d6efbc4992a00d WHIRLPOOL dbdaff979a40e33cd171390657e39fb9b2a311c972e8d018e301af5361b0224ba62972241febfc4991a06bf9f16390e5c779de86823ed94eaebbee610c8c6657
 DIST neutron-configs-10.0.4.tar.gz 25094 SHA256 7f210828b0c3fa9d859fca8c4735fd60aefad3cd5d0cf810b762af268df59269 SHA512 40ab9f2f4ea338c061c57d9aa5611ee3f3476ab8f5199ac50577f94fec032ccd27028bd072d9d9d0cc9f12327613e542b4d62a0403540730f9d6efbc4992a00d WHIRLPOOL dbdaff979a40e33cd171390657e39fb9b2a311c972e8d018e301af5361b0224ba62972241febfc4991a06bf9f16390e5c779de86823ed94eaebbee610c8c6657
 DIST neutron-configs-11.0.1.tar.gz 25030 SHA256 ad2a57865a13ccf62b852c2d31336e9f0aab0f979caaaa6227856c59a3ef86ac SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a WHIRLPOOL 30a577afb2d48ee5d5c13666dc23843bee1aadcd3369d090ffa150bf7ea60ae97bfac0ecc39aa09d29106f9117aab477632c520b146db4c9a78ec021c959851d
 DIST neutron-configs-2017.1.9999.tar.gz 25094 SHA256 7f210828b0c3fa9d859fca8c4735fd60aefad3cd5d0cf810b762af268df59269 SHA512 40ab9f2f4ea338c061c57d9aa5611ee3f3476ab8f5199ac50577f94fec032ccd27028bd072d9d9d0cc9f12327613e542b4d62a0403540730f9d6efbc4992a00d WHIRLPOOL dbdaff979a40e33cd171390657e39fb9b2a311c972e8d018e301af5361b0224ba62972241febfc4991a06bf9f16390e5c779de86823ed94eaebbee610c8c6657
 DIST neutron-configs-2017.2.9999.tar.gz 25030 SHA256 ad2a57865a13ccf62b852c2d31336e9f0aab0f979caaaa6227856c59a3ef86ac SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a WHIRLPOOL 30a577afb2d48ee5d5c13666dc23843bee1aadcd3369d090ffa150bf7ea60ae97bfac0ecc39aa09d29106f9117aab477632c520b146db4c9a78ec021c959851d
-DIST neutron-ml2-plugins-10.0.3.tar.gz 6811 SHA256 6ad759c8720563e502602fc32a72569884bdaad1443f4b8d23c8e9d240071f70 SHA512 51c01eab8f424b871f55b7dc45bbae6300d477e8bc7be4587c4945f75a4fc65f622ed69dbfe0c63db7fced2118987730204d259bce53e353a6b4d24df89dadcb WHIRLPOOL 5e4bf872895e8354fa9e6d7bb071f3d973f28c22297ea414f1bfc8f1bb3ae3102609ff61f19efda59f9d9d7a515fb8ae8216347a2935af64e4bdeeb6ec610863
 DIST neutron-ml2-plugins-10.0.4.tar.gz 6811 SHA256 6ad759c8720563e502602fc32a72569884bdaad1443f4b8d23c8e9d240071f70 SHA512 51c01eab8f424b871f55b7dc45bbae6300d477e8bc7be4587c4945f75a4fc65f622ed69dbfe0c63db7fced2118987730204d259bce53e353a6b4d24df89dadcb WHIRLPOOL 5e4bf872895e8354fa9e6d7bb071f3d973f28c22297ea414f1bfc8f1bb3ae3102609ff61f19efda59f9d9d7a515fb8ae8216347a2935af64e4bdeeb6ec610863
 DIST neutron-ml2-plugins-11.0.1.tar.gz 6885 SHA256 bcd177baaed1c4438f8852607a7a660aa5d6181c18b42dd52a489a229730b3a5 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd WHIRLPOOL a77d3c00d63f21e96d2996ea59af326555499455f63a63d517a2580435d9ec822f1e74d0cb747c3bc04edeb183d65cc918f4e3336b2d6ea5db7ecd72d6a014e4
 DIST neutron-ml2-plugins-2017.1.9999.tar.gz 6811 SHA256 6ad759c8720563e502602fc32a72569884bdaad1443f4b8d23c8e9d240071f70 SHA512 51c01eab8f424b871f55b7dc45bbae6300d477e8bc7be4587c4945f75a4fc65f622ed69dbfe0c63db7fced2118987730204d259bce53e353a6b4d24df89dadcb WHIRLPOOL 5e4bf872895e8354fa9e6d7bb071f3d973f28c22297ea414f1bfc8f1bb3ae3102609ff61f19efda59f9d9d7a515fb8ae8216347a2935af64e4bdeeb6ec610863
 DIST neutron-ml2-plugins-2017.2.9999.tar.gz 6885 SHA256 bcd177baaed1c4438f8852607a7a660aa5d6181c18b42dd52a489a229730b3a5 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd WHIRLPOOL a77d3c00d63f21e96d2996ea59af326555499455f63a63d517a2580435d9ec822f1e74d0cb747c3bc04edeb183d65cc918f4e3336b2d6ea5db7ecd72d6a014e4
-EBUILD neutron-10.0.3.ebuild 8645 SHA256 ba205bea9d609683143120d0918552df1acf1e163ce463f86e36388ebf772597 SHA512 8069f0a69824c5dfcf127d0e058dd0c0e5cff5a5ae54b3bf82e87bfc55e283379f3e38a095edce156f6533ae2547b3f7a54c1fe09fd44c10d5c28847d73ad0bc WHIRLPOOL 6142edffbe6733b9b04dcee547cf893823491fb7d858ac6c70495983129232f1378e94b656c0e10fc4c0a9516a01951d06b053957e790f7f5309ff4e76fce285
-EBUILD neutron-10.0.4.ebuild 8647 SHA256 8bef9b36cdb64e41f01d4f70ea9d51195f3a06923d4e8e695f22e39ed31e8a55 SHA512 2503c0d4bd453e0aa34abf373e3b3cec4ac68144d744a834656bbfc116ea081ab48171a5595955dd1072ff3e140905e918f2c69972a0d585d2dbe615830908ef WHIRLPOOL 90206aac2b18b50c0fd475cff66dc93587a24602ddfea6addcd125b39791020e5af28b0f1ee7b51d1c890bfc2f583157a7e53aa552bbdb5aaacbd8b475e1262b
+EBUILD neutron-10.0.4.ebuild 8645 SHA256 ba205bea9d609683143120d0918552df1acf1e163ce463f86e36388ebf772597 SHA512 8069f0a69824c5dfcf127d0e058dd0c0e5cff5a5ae54b3bf82e87bfc55e283379f3e38a095edce156f6533ae2547b3f7a54c1fe09fd44c10d5c28847d73ad0bc WHIRLPOOL 6142edffbe6733b9b04dcee547cf893823491fb7d858ac6c70495983129232f1378e94b656c0e10fc4c0a9516a01951d06b053957e790f7f5309ff4e76fce285
 EBUILD neutron-11.0.1.ebuild 9547 SHA256 b29ed2fdae67682c0a9b4771b0cf3152f22dd9a1080fed4b9fa149619538e36c SHA512 097ba6eb1aa4a3a3748978f32ccbfa496855eeb9ce34931061380d52210225687952713ceb5940e1a0d4a57213ff815209dc58b7ffba21ea986a6adc7c4c36f0 WHIRLPOOL 640d247edff40330fbf063390dbb9d59449b8e4a5fa89ef1a2f5df40c0f546b8d4d170e1e02cc40e90dce5955541b0bdc63a10d596020a6d5c5804ee1e047b0b
 EBUILD neutron-2017.1.9999.ebuild 8670 SHA256 e9d64cad0e05c54fc38d555bbf66bfa5c3390a88b13a104710ed74ebb21030de SHA512 26022752732fe8171b1e341d36f04b8eb73b3ad64b798a5002856d8d68672d88766ae0a19e66dd0af9122e3a12d0569e3b19b5646495fc45557ffa04d0ddf62f WHIRLPOOL 2ac706a5956e535c910bf563281d8b65eec0ceeff86d6c101d67b7e93fcf370b0db741efee2f190dcc0daf2dac2e015f5df3b84c7d3e44cd6b990dd93a6dc4de
 EBUILD neutron-2017.2.9999.ebuild 9571 SHA256 d7e656eac8dbb12c23b766c162c2de57bb5b9c4fc5b74c9f56cb17f4d4bc36b8 SHA512 4769f3f31fc4e9b936a556272dc59614b8f50e3a077afa564472a65ee96baba352ab2dd641537331bdb30349c0114cdc1c0984a1cf809290950eab576dc7ef58 WHIRLPOOL e22263dd546d00ebce12a921ca1bfae564d5cfcb05aa268056013ef88967d05a04310719cd68a6e549b59a73993846e2dd88d913f89b12ed60aa158c0b5e369e
diff --git a/sys-cluster/neutron/neutron-10.0.3.ebuild b/sys-cluster/neutron/neutron-10.0.3.ebuild
deleted file mode 100644
index 482826b624b0..000000000000
--- a/sys-cluster/neutron/neutron-10.0.3.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
-
-inherit distutils-r1 linux-info user
-
-DESCRIPTION="A virtual network service for Openstack"
-HOMEPAGE="https://launchpad.net/neutron"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ocata/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ocata/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="compute-only dhcp ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
-						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
-						|| ( openvswitch linuxbridge ) )"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/pecan-1.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.2[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.3[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.4[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/neutron-lib-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/ryu-4.9[${PYTHON_USEDEP}]
-	compute-only? (
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/ovs-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.4.12[${PYTHON_USEDEP}]
-	>=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
-	>=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	sys-apps/iproute2
-	net-misc/iputils[arping]
-	net-misc/bridge-utils
-	net-firewall/ipset
-	net-firewall/iptables
-	net-firewall/ebtables
-	net-firewall/conntrack-tools
-	openvswitch? ( <=net-misc/openvswitch-2.6.9999 )
-	ipv6? (
-		net-misc/radvd
-		>=net-misc/dibbler-1.0.1
-	)
-	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
-	NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewgroup neutron
-	enewuser neutron -1 -1 /var/lib/neutron neutron
-}
-
-pkg_config() {
-	fperms 0700 /var/log/neutron
-	fowners neutron:neutron /var/log neutron
-}
-
-src_prepare() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	# it's /bin/ip not /sbin/ip
-	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use server; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
-		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
-		dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
-	fi
-	if use dhcp; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
-		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
-	fi
-	if use l3; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
-		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
-	fi
-	if use metadata; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
-		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
-	fi
-	if use openvswitch; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
-		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
-	fi
-	if use linuxbridge; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
-	fi
-	diropts -m 755 -o neutron -g neutron
-	dodir /var/log/neutron /var/lib/neutron
-	keepdir /etc/neutron
-	insinto /etc/neutron
-	insopts -m 0640 -o neutron -g neutron
-
-	doins etc/*
-	# stupid renames
-	insinto /etc/neutron
-	doins -r "etc/neutron/plugins"
-	insopts -m 0640 -o root -g root
-	doins "etc/rootwrap.conf"
-	doins -r "etc/neutron/rootwrap.d"
-
-	#add sudoers definitions for user neutron
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/neutron.sudoersd" neutron
-
-	# add generated configs
-	cd "${D}/etc/neutron" || die
-	unpack "neutron-configs-${PV}.tar.gz"
-	cd "${D}/etc/neutron/plugins/ml2" || die
-	unpack "neutron-ml2-plugins-${PV}.tar.gz"
-
-	# correcting perms
-	fowners neutron:neutron -R "/etc/neutron"
-	fperms o-rwx -R "/etc/neutron/"
-
-	#remove superfluous stuff
-	rm -R "${D}/usr/etc/"
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	insopts -m 0644
-	insinto "/$(python_get_sitedir)/neutron/db/migration/alembic_migrations/"
-	doins -r "neutron/db/migration/alembic_migrations/versions"
-}
-
-pkg_postinst() {
-	elog
-	elog "neutron-server's conf.d file may need updating to include additional ini files"
-	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
-	elog "on if you will use openvswitch or linuxbridge (or something else)"
-	elog
-	elog "Other conf.d files may need updating too, but should be good for the default use case"
-	elog
-}
diff --git a/sys-cluster/neutron/neutron-10.0.4.ebuild b/sys-cluster/neutron/neutron-10.0.4.ebuild
index 3d7f813965c4..482826b624b0 100644
--- a/sys-cluster/neutron/neutron-10.0.4.ebuild
+++ b/sys-cluster/neutron/neutron-10.0.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ocata/con
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="compute-only dhcp ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres"
 REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
 						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 8a01594c4e94..3233deee7aea 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -6,12 +6,15 @@ AUX openstack-scsi-disk.rules 134 SHA256 929cfecc3eae1142ac45923f1de06876af9db7f
 AUX scsi-openscsi-link.sh 2777 SHA256 4ea97b8b7121092245ae108faf488beb2b11113407eb2b478ff8ee79a87b8290 SHA512 3e7f6fc872f27b6a4d6c991346bd8eafcbc8f2b74439f1c77e93362e57fa1010ff002813cf21bf12d0550bfc165f79c70430862cd4ed5aaa15056777baf34409 WHIRLPOOL 636fff1abe0e8934dde986e9c8f51bc4a4284d57db9efe4b0090479df7516817bbfdc3e3da2fd35d19c80b095bddbcc2f31b1cd54be8d204a62df6da973279f0
 DIST nova-15.0.7.tar.gz 5763951 SHA256 75d2f307301396d423e81e817b4c087da08c9db7ab2340fcef7618fc20379fb9 SHA512 3e4b02bebdc8d0c002a09d757a2f1e96e9b7a5c16c6bd9108f0564c9be23da8ae8f90d81924050f01be691b4800c5c0ff2f5b3400fa389964899b1faa509293c WHIRLPOOL 6c8c49509bbee938886c7d2b900cf113ca86105c606c46976f3528afdd215f9ebe34026103c8e36c065ce33efe05a96db4b618be6ab94d0f3c9dceaff0ef10ab
 DIST nova-16.0.1.tar.gz 10896414 SHA256 e657675b0ca62fbbe66808cccbb7db84bdfd007b82f9579ced98c13c215b18d6 SHA512 bdeb3254e9ad6b95e7f8c07093192fb511e2a278790afd6336093f817288cd6cddee9c1a3d81b1ea82bddd4d8caf60234183f995f35bad631edaf6b9c0fe2b79 WHIRLPOOL 59750f9b4b849f78156db15c8e692ee0cdb998b786acc7466dd49cae24d6c1d869913b5b7533bba2d7993586f41e9969e10631de57593454926b50adf89a0328
+DIST nova-16.0.2.tar.gz 10912478 SHA256 a4c529f35b557b7849a6610834430030b7ca65d5eec41a74d652e75b8ed6006a SHA512 8216087bd15a14b20d340911cacb09251fa500d71a335638b8a80f4d5ca113b3b17f0e2436c3c0297450bde6885f48d7475f778190e0d48c9e761e2b5042d0c5 WHIRLPOOL 2464f1bc6db4f796808bbad35b021c063376317d527ddb37fce592cded4ebc8c86278fdf20f9e6173445c909f6d02ff8e19424249979955b8d329d4e14572e2b
 DIST nova.conf.sample-15.0.7 344760 SHA256 09c086c981505a6e775a4e2073856b1d38998d97b92062f019095f98d7d26e1f SHA512 5c55c752c8752876acbd8d2348abb39d6a8449f637ad2a6515f5c9f4619dbad73c4ae7a6ac4cd164656a0c466ed000a4d68a291050a03a5641fe96b3dd7f732d WHIRLPOOL 22f174d402e6d9c3e1e18da0cdec883209013083c66eb2b5a2921546fb609c1a19de594832afa8f40ee26a999f2596c563eb16ba1a08035895b5d6c72a729125
 DIST nova.conf.sample-16.0.1 360926 SHA256 2fad4c60277289b28ec6de87bbe41086d3f5c88003839c90dda264b0e6e1c835 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378 WHIRLPOOL bb8d5fffb6fd5e6c820a422615abe6cc8398852ce6cbce12eba5dca17e2c71e413c113342916c25d38e7651b0c26b20357fdbaa5dee6d904e4ee9cc08f3b953c
+DIST nova.conf.sample-16.0.2 360926 SHA256 2fad4c60277289b28ec6de87bbe41086d3f5c88003839c90dda264b0e6e1c835 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378 WHIRLPOOL bb8d5fffb6fd5e6c820a422615abe6cc8398852ce6cbce12eba5dca17e2c71e413c113342916c25d38e7651b0c26b20357fdbaa5dee6d904e4ee9cc08f3b953c
 DIST nova.conf.sample-2017.1.9999 344760 SHA256 09c086c981505a6e775a4e2073856b1d38998d97b92062f019095f98d7d26e1f SHA512 5c55c752c8752876acbd8d2348abb39d6a8449f637ad2a6515f5c9f4619dbad73c4ae7a6ac4cd164656a0c466ed000a4d68a291050a03a5641fe96b3dd7f732d WHIRLPOOL 22f174d402e6d9c3e1e18da0cdec883209013083c66eb2b5a2921546fb609c1a19de594832afa8f40ee26a999f2596c563eb16ba1a08035895b5d6c72a729125
 DIST nova.conf.sample-2017.2.9999 360926 SHA256 2fad4c60277289b28ec6de87bbe41086d3f5c88003839c90dda264b0e6e1c835 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378 WHIRLPOOL bb8d5fffb6fd5e6c820a422615abe6cc8398852ce6cbce12eba5dca17e2c71e413c113342916c25d38e7651b0c26b20357fdbaa5dee6d904e4ee9cc08f3b953c
 EBUILD nova-15.0.7.ebuild 8591 SHA256 12a90783f0304604efa69aacda39728b3f37ada4aedfaa57782c392d85b1851f SHA512 89db87c533edf932796f688fea8cac0f2db5e0fd5a950dd26e6560e7b69231379949ff537d9116ae75f57cdbaec6306baaee35d7610284484d08ca33134c961f WHIRLPOOL 1c09faff69e257366d4ef57b47c5772130afe61185c0e9dad20425d2e6b9de7756356397c1e016c21fd6afa922d4883b563d02bc7f6734167bbe8f19ecb642b1
 EBUILD nova-16.0.1.ebuild 9551 SHA256 3f0655394e915f29142e75f04b784b2902cc72a27277cd83504529712113bfc3 SHA512 f4c4e83282dd32be8bf9ebeb89489e456e8ca7a647d5c1d9689556d8238d64d6f5b654be9c9839b17c6708efce9888cb28da98da2e4c179545ea4e3fbfe6d368 WHIRLPOOL 86497228a1f38fec87ff319d3abf9328256ec64993b5c2c0d2e14747179e5d3b7daff45c987850c6fa8c7172873e0ace6893dc3a245013de7e96622522b12b33
+EBUILD nova-16.0.2.ebuild 9553 SHA256 7ecdcf9236c0cec0402693725aa9c31eccecc993b929f0cf6dc067e10913136a SHA512 42bae0c28bc130012b39e6fda0b18a38264e21cdba03b9a65e3100fbd81f42cc5fdb204d8a5463db65d0f5ac910156cc74f69b000fb0c559c0b1d4842c2ec688 WHIRLPOOL 7e1b61fde66519e7d135313e67751012a54de88fc5fdfd1c60eb5666f4156b473480541894fb8ef65b54a15fd198abbb0033a79067deb5f7a8dcc1699d3ef16a
 EBUILD nova-2017.1.9999.ebuild 8563 SHA256 c941662be7134e1adda0b0517bfe049b750b4b5fb2ec0704293cca7dd607aa4f SHA512 cea6cfbaafb3c5c0977cabbbc790da256daf851459079aa73c9d4ee0a9e81153051b2bd0cf62c18eeaee4be1c268a9cf35f671b839cc6a97316a8df80679f94a WHIRLPOOL 5eae713ffe93790ba7263573c05f5e7995bfe666d9c82336979baf60fe64510f9ab52abe4bf239820b2d4cf4fa29a4893192f58bade106028b6975621a6310df
 EBUILD nova-2017.2.9999.ebuild 9572 SHA256 d0c9b13a305fea4fa388c7984929fe411e8b9f02e87a7bf90e485190e7399594 SHA512 51f966525ad1f5d7b5b611296bbccd2bf81ec58b7a2021e48cee28342f451c19a95158b21aaa4c4f1a03c5e7d7f104e997389905737d4108fb3c666e0566a86d WHIRLPOOL ad7ba84108e74a29e01744470b7a9a0b107d861424ed9152705b49330faf9ec8472b86b347e087da6e1ed2e535cfe0d90b23bf8eaf4cd904eb2b3f9441870679
 MISC ChangeLog 19879 SHA256 6d2732fdce1e774100e6fc0ea79645c59c6e563dc558b4f3a3d83a252a620408 SHA512 aed39b76013532d72711f5925b4f3ae888fddc06bad6bb87c0db553f81bf01b23d587c8287911f70a81c016f28cc826d2d9630173d0ba5a8326eb3902cbff149 WHIRLPOOL 2d89dc73f49a207a0073147be545947f571890b6e34a5f4c6b85a01f034ac12c82f391b2bb06b2d0aa81bc5a59e16b49985a27bd8fa76f6f905c5e81d99e6844
diff --git a/sys-cluster/nova/nova-16.0.2.ebuild b/sys-cluster/nova/nova-16.0.2.ebuild
new file mode 100644
index 000000000000..bc2f36d667b4
--- /dev/null
+++ b/sys-cluster/nova/nova-16.0.2.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 eutils linux-info multilib user
+
+DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
+HOMEPAGE="https://launchpad.net/nova"
+SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/pike/nova.conf.sample -> nova.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
+
+CDEPEND="
+	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-36.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	compute-only? (
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-1.15.2[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.47.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/pypowervm-1.1.6[${PYTHON_USEDEP}]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	app-emulation/libvirt[iscsi?]
+	novncproxy? ( www-apps/novnc )
+	sys-apps/iproute2
+	openvswitch? ( net-misc/openvswitch )
+	rabbitmq? ( net-misc/rabbitmq-server )
+	memcached? (
+		net-misc/memcached
+		>=dev-python/python-memcached-1.58
+	)
+	sys-fs/sysfsutils
+	sys-fs/multipath-tools
+	net-misc/bridge-utils
+	compute? (
+		app-cdr/cdrtools
+		sys-fs/dosfstools
+		app-emulation/qemu
+	)
+	iscsi? (
+		sys-fs/lsscsi
+		>=sys-block/open-iscsi-2.0.873-r1
+	)"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
+	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
+	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+	enewgroup nova
+	enewuser nova -1 -1 /var/lib/nova nova
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use !compute-only; then
+		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
+			newinitd "${FILESDIR}/nova.initd-2" "nova-${svc}"
+		done
+	fi
+	use compute && newinitd "${FILESDIR}/nova.initd-2" "nova-compute"
+	use novncproxy && newinitd "${FILESDIR}/nova.initd-2" "nova-novncproxy"
+
+	diropts -m 0750 -o nova -g qemu
+	dodir /var/log/nova /var/lib/nova/instances
+	diropts -m 0750 -o nova -g nova
+
+	insinto /etc/nova
+	insopts -m 0640 -o nova -g nova
+	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
+	doins "${FILESDIR}/nova-compute.conf"
+	doins "${S}/etc/nova/"*
+	# rootwrap filters
+	insopts -m 0644
+	insinto /etc/nova/rootwrap.d
+	doins "etc/nova/rootwrap.d/api-metadata.filters"
+	doins "etc/nova/rootwrap.d/compute.filters"
+	doins "etc/nova/rootwrap.d/network.filters"
+
+	# add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0600 -o root -g root
+	doins "${FILESDIR}/nova-sudoers"
+
+	if use iscsi ; then
+		# Install udev rules for handle iscsi disk with right links under /dev
+		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
+
+		insinto /etc/nova/
+		doins "${FILESDIR}/scsi-openscsi-link.sh"
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	# copy migration conf file (not coppied on install via setup.py script)
+	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
+	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+	# copy the CA cert dir (not coppied on install via setup.py script)
+	cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed"
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "iscsid needs to be running if you want cinder to connect"
+	fi
+}
diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index f916e7770d3b..8e3f35a19dc4 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,9 +1,7 @@
 AUX singularity-2.2.1-glibc-2.25.patch 742 SHA256 836cd7544d3ee88003ea032b2b7def8b09aae5b2515c372c22bf3f2e2caf776d SHA512 745fe14112e72fb06b5956516a3ad37fd18b96e024d80444b7e6844019e7a0c7ab1adc0887cb6591c1fba01484e659be50dc1a3cf03e6feb1065d98ecd4ac5c1 WHIRLPOOL 7e6afa455881605c75110ab392f8aebac024a2b545405d2d825a46086bffe4f8238fc906263c8c4b2d15ee25a70b7a5364f8147cae8fb211d1e2e58934f34e7e
 AUX singularity-2.3.1-slurm.patch 1597 SHA256 85e1995332f2589859de6cc590c06a04c0eeb11ef7a75911d33b951dd4f82ef8 SHA512 174dc15dcd5bff0a0b6796d4623f829fb4b7d0e8483308cafe179beb6321d31cf3ee9913decd91aebac0689a62181096cc0ac3a283f8c88927c00e113a476224 WHIRLPOOL 538a295dff1e92252696d54e054ae1578d2180bd594afbdaea808f1b9609ad7390e1b85b9d64ce8c26bbb51955a748d790a93dc7ca8237c74df002ac3b031d51
-DIST singularity-2.2.1.tar.gz 493368 SHA256 0e2a0b0cf6c8d4dc041365f715b2df157e0d8d89986e4eb111c61716df031c8a SHA512 b1195e98254957cd8d80b35b13d4f11060c5836f05ed450d242544fc30f8c298b837ba8986b1184288bc9a5ff2ebb5b1f56dc55a0686b540242b0042a152f902 WHIRLPOOL 3d3c5cb0928bd5beb683c4075c88453d076795c0e41ad30676f7169ccbd6d71a70ad64104833925913138f47b8fc318e90366af79259a05bad41bb0a42703b05
 DIST singularity-2.3.1.tar.gz 643021 SHA256 dcccae9ff67a550d142c94e932c0fb59442dd59ae69ce1deeb7ba45829ef2cd7 SHA512 36c581e8dba57d133013c2fcfea26886b54a1a9a9165b011d2cebacb2a6249fe0f8e5aa91ed90f7a18855c658300682436c431a226629408f31422cc8a036600 WHIRLPOOL d9bb8604ce2afb6bb2b5b257eb88276a93987916cd4c08ecc800d98761f5d1ae54e48ed615d77b1c992bcc8bb6202e9bf5e04637d10d1126fba6d1c2619cb98c
 DIST singularity-2.4.tar.gz 689760 SHA256 34ca94250f15354819587364b21b0fdf7eebcff05110f8443caae8ed6961d7da SHA512 b445e73d9794f344ab72ce17d8f802390d0c0c153791b837f416254eadabf19365f1abd29f0b498be5486b600f32cd7fe53e5dc131eee3465ab890c9d6b171f4 WHIRLPOOL 5434f8da66b3863a0c45d17dbe716231b4f04587907ecd608f92d5becb2e34ae599cfebce2a6768a0745fc00ca70297ba7ca9e7370e7080139c8e3eca2b5428d
-EBUILD singularity-2.2.1.ebuild 603 SHA256 284ddda57f6ab272b912705b7bfb5f4e601864b8878e75c96aed805a9807bbf3 SHA512 030a1a39ea1915d75ef5ebdaa8b6b6d4b0eb0c45222a1d4492cb3a3b41cb4e6ad50c1fa6b85d13413d34bb232b62db14f12f4db48ea9876127d0fe32fdbff5d0 WHIRLPOOL 4afd0755887fe98ccf3fdbafacb61f7a0874590a2c7256323ffca8da1e2b7f33d4657ccf006c28a2ae270569937b5a21447f4ef48f6a94d9d1ae5e1dcd68c035
 EBUILD singularity-2.3.1.ebuild 952 SHA256 b45c03e3a2ca5de21b14144967c2da9727f477709332a9c32bc357c3de9dc815 SHA512 60ed34f1ab7543ae5f728b51595640dc671ebb514028dce2fb82c72f1d192ca896c761fe38b4c786641f1df678adfd45d855eac262b68ee00c2b1048072e6d2c WHIRLPOOL 07f332ecdc9de4af06a10941cec0db76c20b04695e6ecde0f11cbd02edaeffa134ff7188e595e8dab5f44849fad32403c246bc355f23ec1c645c0e6c9ad12bc4
 EBUILD singularity-2.4.ebuild 821 SHA256 449738c88c8cbd8e08708b7b5151e6be1ff67c2ff8b375296d6c2122994ba2cb SHA512 48bab7aae5fadefb6e5b1c4521b19d93360e2a7103cd865e71109b1be71084693705ac6c34e8430e135e127f69bf2c842007cc722d6a73d9ac7f4e6a9cc1b6f7 WHIRLPOOL 892a6bfae256d9b114c6ed209aba376ea7771309fd122083fa3721718c850e9d5f6faae6b86fcd7a161e23e07073fad60b6daeb82da38fd308d0a4ffa589d4b1
 MISC ChangeLog 771 SHA256 37adb96a35be0b0dcb6bc1c64e47203bc7836c7d6cb944ca69db79007b0bd446 SHA512 1e6fb03f5d3c4329a3c22c8274610ee940406c8bfcdf0e0ec9b3c3caed4b51f2ff1e34079c76e27940eab7470c8c1447bf02fa5d3f9ff985006ec65f0be76536 WHIRLPOOL dcbfd8b7040b56025c5567b78237aeb14bda64684dc6995a9cef05c6da392d5c6fb5f56bdee89c720dec3c0f67e3b745105f0fc3ca1e0e55477725ce1df28627
diff --git a/sys-cluster/singularity/singularity-2.2.1.ebuild b/sys-cluster/singularity/singularity-2.2.1.ebuild
deleted file mode 100644
index 0d679f703fed..000000000000
--- a/sys-cluster/singularity/singularity-2.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Application containers for Linux"
-HOMEPAGE="http://singularity.lbl.gov/"
-SRC_URI="https://github.com/${PN}ware/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="cctbx-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-glibc-2.25.patch
-)
-
-src_configure() {
-	econf --with-userns
-}
-
-src_install() {
-	MAKEOPTS+=" -j1"
-	default
-	prune_libtool_files
-	dodoc ChangeLog
-	use examples && dodoc -r examples
-}
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-29 11:22:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-29 11:22:34 +0000
commit	bd7908c6630f38067350d396ac5d18c3cc2434a0 (patch)
tree	3559b3e11424f5529527f2474d8a977a91ee3389 /sys-cluster
parent	8b2628ad8526c806375e7b157889e4274b70248b (diff)