gentoo resync : 05.04.2019

128 files changed, 1765 insertions, 5723 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 553b9ba0dcbc..f292348c7d8a 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 77c269ab4284..cfac7f2599a0 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -13,6 +13,7 @@ AUX ceph-12.2.0-cflags.patch 536 BLAKE2B 9eb8dc48db09d35f86de280a36763b7a56d980a
 AUX ceph-12.2.0-use-provided-cpu-flag-values.patch 1590 BLAKE2B 684dfd301a144e2958497bf588515b0319d4e2c5cc5a6c5949d4c2c6f0d41f94aca2c43c020285f4b467f42f9f9a3944ce3a5600dc95e3b8443c8420cfb76128 SHA512 ecf4067776a146cf2aaf0b83298e508a6073147e555f4f9ba73cf2d9e0fe26d9ea72fff8af1c67eaa436e30d32ed260f75683c7d77b27a88fbb098b561d13f0d
 AUX ceph-12.2.1-systemd-unitdir.patch 345 BLAKE2B b97856edd071beb28e46301e97f996176dd62b6824ccc2154b7640ce629b1c0698c2d79e074a2df3af91ab34d6f7e84b2a5a04d41d8fa3b64b571a016ab14f19 SHA512 a29373704f645f5b52597f5482fb4538f3d335bb1020c206a089ba58707f988cf42d335f17a36911f373936f8e769613c3d3fa98f55c1fd91d433d036b769bcc
 AUX ceph-12.2.11-boost-sonames.patch 7971 BLAKE2B 259be2dd12c15d5951e0ea4f2da50a003352cef9e1228d70be0e62b426aa2e5e1ec8509707511986b9067dcb98d96b9b02ac9f5ddeca72bccdb162fdb20cf72b SHA512 03af0a0f2c287f3edc685857d51b8e8d370337f42a1e0630deb1f69c8bb2fad2aab065d43fa22ca099aa51d3b5b962e0aa63a5f7110bb2b39577df71b65c18e5
+AUX ceph-12.2.11-fix-min-call.patch 692 BLAKE2B 636938a262cbf640531481f3f5030f1975c96253f56baf34a059c3c0b2d4dfa7c80cfbced41b8a832614a26532a6de497ab004950e0bc7b197d33040c0d38646 SHA512 9eece21ea40f785cbc1003f6af1d05ba764969a9c0ff275fd28b10bb4be5efab322bf9154d9bae575b45e9229572162901668c963333a00d8e98a48e0a6a3df9
 AUX ceph-12.2.4-boost-build-none-options.patch 932 BLAKE2B 7925da8f8f18e26af24a00a4fe595f900d9f676769614576c059513299c05cae1c982db8bdd3a571c04ace1ff1ea6171631c1373c408f465261b73e05f66580e SHA512 6ff46a90d76f667fa23be0f9eb1ed2fb7e30af9a2621aec19944d0a22a431a0f5721603c588286e483ff55c14aac920adfccb039c9678a87cc59640dd70367ae
 AUX ceph-12.2.4-cflags.patch 1473 BLAKE2B 971ae7673ed21485248eb582762529c20991b487fae16221a7b6b6d30e29795e26ef83b5af3f7003f58a86784e9c846d2512cee76a440bf5f12b2b5b64968ec6 SHA512 402a5948e90f7daeb29c84a6204d88f6198fab17ac78ef69b5e7d8f54f9f61ed4995c4da2b37bed4448049077bd6167f69ad1c7c62105e924d5d8f8313f68f4e
 AUX ceph-12.2.4-rocksdb-cflags.patch 601 BLAKE2B e434a0e05148e4df0848d9d0d36c7894ecadef0f1c9254dcc1eda782002f473471803372130e12a6b070f857b5f0279e8a7ee2dcf3623b8ca8e02234d4b9d6c1 SHA512 324acb8b94a050bee19e149d6a48a73f596fdf921c5f06d75475069bafcf2a230e0c12f3bb25ec6cd78f1f12334702691b73c2e2643dac63ba4bc71ac9ad0a48
@@ -23,6 +24,14 @@ AUX ceph-13.2.0-cflags.patch 1011 BLAKE2B a7d911ed0ded1a1eb5426bae3a7b1cc1697746
 AUX ceph-13.2.0-mgr-python-version.patch 675 BLAKE2B 2458bd067f9947189b65c439df501f1c31eaf6a9ca7d46164e84a37aec7e99ac12456bd299604d18b2f0ac70898de90427a80390644a8e3d455c5e3caf297854 SHA512 aa0f3dab73573c1ac91513bca378a8441ace5f58a0e469f4f01d7ab22869b41e5d4a1e44c3fe8e2bc23ab5249fd1a52a4b72000d458521b6ee291512e51d474c
 AUX ceph-13.2.0-no-virtualenvs.patch 4466 BLAKE2B 9f5176b7d3ee3b3602341864af8eb2494cfcc2268492d7ecf9f43576963de913c9be52259dd16c2a3ad6440eeb33604ce609fc11e7e36236a37c02b84ad81890 SHA512 7b9ab0a7e22784f66253f873dd76bb3e76cfff4781632ed51d39beefacdd1a7f4d90441aff9fd93987837fadaa847906bba32eb18c86f8a8fe31205246cbfd8d
 AUX ceph-13.2.2-dont-install-sysvinit-script.patch 471 BLAKE2B 85ef94f49408496360fa24a433e9d6f3568749a6dfb415cbd17bfb950b9500f182c5141eab402686001f95e1611e60accdac7111ceca14f03b1ff8b4345c087f SHA512 ea069b75b786c22166c609b127b512802cc5c6e9512d792d7b7b34d276f5b86d57c8c35cfc7b5c855a59c0ba87ba1aabe2ca26da72b26bff46b6ba8410ddb27e
+AUX ceph-13.2.5-no-automagic-deps.patch 1056 BLAKE2B dbae76e4be1ca690ff59c0b905ef63b9fbcddcb25d181af2a514113f4bfd5028a8b5bce98c965d195ae69f8532731b2e9d9002f01bb91ccfcde5a29eb43b8f41 SHA512 60616eaaadbf4431769bc2e192718ee28842efc818ee561af1c2c7a5269e393efeb455260c36582d3265730d482a92fb911b4c501e486a3a6387ab4a10d1589d
+AUX ceph-14.2.0-boost-sonames.patch 14155 BLAKE2B 766a3e40c8a4d94d1cc52a511f0d440178c199cb37b1d06a792fe627df4f01793d8555005054604397d02d9e366521b10788f6e56381a6d967814370e4298844 SHA512 91184e32d3ef28a43bc8e0d53b4f359c5b2177250b39bbcc7921e38d044ba54610713826bc64450a0b2232450f68e724d23757cc5c6d39e50855060e86890ed2
+AUX ceph-14.2.0-cflags.patch 545 BLAKE2B 0f5c4e509b2252de7a4b914b99fb4abe13010a1c21b2b701530f6a29dcd41924e3b81841cb65b7b949af42b168ce9fe756b0551c31babf9c9498d394b2ea6aa8 SHA512 9e6bb46d5bbdc5d93f4f026b2a8d6bdb692d9ea6e7018c1bb0188d95ea8574c76238d968b340fd67ddaa3d8183b310e393e3549dc3a63a795fde696413b0ca94
+AUX ceph-14.2.0-cython-0.29.patch 946 BLAKE2B c251b6a171e5e0bab3f8716b79eb3138a177c1f39e7cf433ba52d03d73de4b45abc2db6742237c8044519337297025cf577d210ace81457ff05325073aa5bb43 SHA512 82c1608928ee669ef60b8930ce82c443152c446e669e7bde9ce32f78571afb19a9620c3818b69ac8cb3ea33e7d7ac40f77c89162c71b19b157336d907fa23e3d
+AUX ceph-14.2.0-dpdk-cflags.patch 1171 BLAKE2B a6815317d3828cee8d2476d6cc77b60d089db5b5ab0b30fd24c0ac10270ce930ce3049f1b22af71e5b39a6e323c672245fb78753e7ed901055afac8371cbcb9f SHA512 ece01fcaf0b82c441618eea1f37fc2658aa356de1128121d368769fdbf6316b226ea15a781353b115c0a81921c8872bb3d003ecbb1e8f1b456bb8cf6db8f091e
+AUX ceph-14.2.0-link-crc32-statically.patch 428 BLAKE2B d324855dab736eeecf5835e79c4f2fad9ea4d10aa29b2b03ab6274efa2f54a5cfdad710552662a49d5f61466e1cd9d6c2fc8a42373961e3334f39b806e647feb SHA512 3efe70f826ebc207f1ce8744483c9a82ebbf8f3cfa81c9cbb3152b40f5b540cc9cc21e6bd3370197bee9a27a01c3e3725754d044069bb760c3dbfbc97fe4276d
+AUX ceph-14.2.0-mgr-python-version.patch 685 BLAKE2B fbd36e0f5fe45be7cc58cf11b2b83613c2f7f7fdfd64d4f04729c36e5ebc110341aa4c5521d9be590bfb7a7812525130e773a346827461df0a108fbde359b161 SHA512 af0851913cf8b42bad71ece4e41017f71e91db19aeeebb5ea0306055d6d6d9e7eb9ba34224bb2583ca437d44827de8852727e8a9dd809d942d4c277ec3da3214
+AUX ceph-14.2.0-no-virtualenvs.patch 2349 BLAKE2B a012ab044f92c2a22c8f04661d2210585dbacb531ece528cc3d8d026ba692f46d1306b920826d02b93317de24c325542ac222a4e2b42684aa44f5c12019e2a29 SHA512 623eacb30565725768b80e56e876cef6f52c07b63d8a0f0cc9b16d82677014636f1fdffbf7ca77b21d6465fc84b7fa429153b5c51e6202c85b1fdd6c5ae96a38
 AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d
 AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8
 AUX ceph-osd_at.service 362 BLAKE2B 7ccbf3428d687d1dfc3a8e10d56083802bba621d7cc9b965b55677e7ae8ce19bd178d31be687e47ed4ae21eef017c8913339cb465822ceadecd2e90cf84d692d SHA512 99c932fa99679a26b288ad57ca725a50847199915368a07ae1bb589ca777cd6e6a68e84f4d506a1097a06ace06eede176ea573e694bcbe43b434381116d63300
@@ -31,14 +40,11 @@ AUX ceph.confd-r1 69 BLAKE2B 2e75612a1c36057ab41939b4022c8211e32082a812e9636862f
 AUX ceph.confd-r3 1315 BLAKE2B bf5c573be6bcfd2c7f077087c36f8e918f027ad81b18ec496348ed155c97332ad6d1567a9c69a3c887fa0bdd184b98cbe7b73198db32aae248e31c7599857a96 SHA512 1d192cc8eec9b294440ee6c43966ccc36669b94007dd6b990c5ee8d18ee1b36730a9a0082ef7170846dcc64adcc61481808e854b6c9bdb2eb1db1c71435d3f05
 AUX ceph.confd-r4 1502 BLAKE2B 51b3d14ce7078a1ba3c458e3c028ceb8b7de02f8187b242c856efab51e64f36ae5435bec761bd85f7b42bfe78ebc28c267ba80ee0b4123b960ffaf35b749ff25 SHA512 ea3e7b668f6fcdf7f1884968a33d06c86448426a83cb132f927c32d83e28adaf8789489e7e817d4349479e3647577ef40190fc75fa88553aac1c7b4f515184c9
 AUX ceph.confd-r5 619 BLAKE2B 6d495b970c7ff14972845e46aafc55d227c45817f5f8a9a1cad2e242398cc49f2c53896affe1373433db4175c426f1148242588207c7dee60f28a8c3ee543e5f SHA512 288560fee187c496402d46e3fa17fe99c4d3f2c0bbb389a5a91384a1015939f2389a81398045f0d1c978c4da5a1400e97126b98374185424bc5501d0b821ad5c
-AUX ceph.initd-r10 2771 BLAKE2B a10cc830065d2a836253925af908a405ea41c518a43d5cc3abbb909f0d87ada0500f5ca5354b34dce7ef76be28a4ad5e74b5cbc3ad7a620054d67b0719dd6bd6 SHA512 7d39caf261c4f354eb03ad1802749a103fea22699b6599a29726a520a56a2600b0eaf6f4284ecfb5979302493af5d7501e6399240478bdbdb1976ae99146f6ad
 AUX ceph.initd-r11 3070 BLAKE2B b8e875705720c323377dcedb2fddd76d199eb6430761a75d0da3b26a5a25295e33382ccc88843a894d81a7b07d76ec38faa9a292e67ec6102985d8002ecb3337 SHA512 e3b310a7f99b9226a80bbb9e0b4ed43b3bbe5b69e72f5c0dec5d2f9a7d5f5fc274b1f8e847183d92f27dd283511db8cf5428803bbc833708ce25a38a9da59a63
 AUX ceph.initd-r2 958 BLAKE2B 9aeda4d2a0bad2fc1c190b19b78dd165230aeef932a5335038e650439ff3420a41d2a43ac527fadf700919ba9944b6da551b2fc5a665f915104717ef45474421 SHA512 6f42b8540797d3f55d64b9842e190ca2973c1779c720b7c9923b8bcc06dddf95672bee066275599e4feafeff38652235746433305dd4d7df8ad086a8deb960c0
 AUX ceph.initd-r7 2197 BLAKE2B 7df3ab975cd14a3cc782ed58f8e6c2f0bfdc3f1b96383400490d7cab27b4d5afa6381cdb02843c1bbfe30f62e5d801ccecf2b61178013855e13ec504da84aa4c SHA512 93890b9e049ff5925ce56b524389873e22560315bf25c40ac86ec11dd2375d184215e7a217d863d4e32bb817a3e0577fdea71a76bb5d5c28ecbeb8544f1b763c
-AUX ceph.initd-r8 2363 BLAKE2B 43dd8f5eb9516b76609a91b1884cbe81d3afbd7634bc39987ecceab612a431e6b967d07c9b7d4a02352fe6545d999eaf1a137bb8d49865830a865ff2ed979186 SHA512 9061c97848e1826ae731202c763d8464f09dff013ae5855ce698d839f99d5184a533c3a81bba223d8f50051573e1fec92e915db32b26ac278b01bf17406cbba8
 AUX ceph.initd-r9 2435 BLAKE2B 2e1246f9d409bbe4d2895e9747490ddd108ef22c2060e151944ad2bda1e7ae13d61330cf9f33ec4900eb4fd4a26ff454dd081869901d21bff8309bf8db6d7533 SHA512 c7f0dd45bbada67e93b2e1acdafdb0ccd1de107d9d582b6b83889c5e0f91e524ea1324ab21e96d4c56d6016be6fed718a7791695c95c68813c6b9d6d3dc2a384
 AUX ceph.logrotate 427 BLAKE2B 9677f1a2a4872addff71527c800dd06bf65e18b589de3869e2a742c43070de789d5089f8739367efb913a64aeec5a8b82f47c129fac580e7c34e4f8cdc8b7332 SHA512 6edace611f46683ca3b8d2154b86ec77cc241909704e0362b728a5f51c2a809c22e83d69df0d58ec6b3a6b8dc8ef2518c220cac920f51e63fe668cdfe1b48bae
-AUX ceph.logrotate-r1 427 BLAKE2B 9677f1a2a4872addff71527c800dd06bf65e18b589de3869e2a742c43070de789d5089f8739367efb913a64aeec5a8b82f47c129fac580e7c34e4f8cdc8b7332 SHA512 6edace611f46683ca3b8d2154b86ec77cc241909704e0362b728a5f51c2a809c22e83d69df0d58ec6b3a6b8dc8ef2518c220cac920f51e63fe668cdfe1b48bae
 AUX ceph.logrotate-r2 545 BLAKE2B ef7dab92aa5fbbe7f5d5418feaae1a1f4400dce08ca4484fe5889888f4dcb6d180bfb5888d5c7d6d9bc32bb5c58443fb83c1cb4613a2810cab45e8a74c421279 SHA512 c30edd67b7cc064f09d4e02bac68a0aa26827d8d4e3c027393932587e8ce782893b93b53d7165d361602b29c90ef3d6b755e79d11a1edb054e0172decd4e627b
 AUX envd-tcmalloc 48 BLAKE2B 4a0799ac6bbedfe5e701eead67600312d86f06143dbfd11d2c594c03d09bf13dfa645e5a0bde1189211ad20036dc4fcfce6758d3a5829d943eb337cc65783af9 SHA512 d180b1a888ec6d870ff523a3b10fd00eca479ee2586a236458af5ffaba21c84e7b8098da6d4bc08fb86c82c61a861dd3c3596a01063d734c329a92808682fc8c
 AUX make-node-frontend-tarball.bash 3196 BLAKE2B 1779c8fe924d8a341bcf922da310c9e3543dd9875db79b2f08fd99419fc2a693e24a5d0c36e7db7b9c46f02bb78b51359e844c8265ff266e8a931a32b877b665 SHA512 4c13ebc9f2a7ba3d45a01cd72135a57b2dc6ad3edfe06a05645957c5522a053be940782f1148c117d8bf785937655083d3d1c74668e8c72d75ae000888a65d85
@@ -50,10 +56,12 @@ DIST ceph-12.2.11.tar.gz 79009034 BLAKE2B d8b1c188fe39603e90511eb436100ba14c0a9c
 DIST ceph-12.2.8.tar.gz 77243685 BLAKE2B 37c34396a0c276b8d79735e14934ac70da024822c2a060061531c234e03e5d41aad6c41dc64b05c2ce47f03287d0cae9ef9bed67e4a0861b6380c8ce1de4ea69 SHA512 91c5c11aaeef701b3e31c9f8a1192b6b79fd34f3b96c61595c65173c98bfce0009c5b7c9b29764f5e4d4b1f5ac2ca7109fed5ae598c176aba717a34a132fabac
 DIST ceph-13.2.4.tar.gz 90910119 BLAKE2B eb395f435552d91789869bd92fee2a8b2fef155205f13b118bd01be4ff78a8e1dde682425a24311822bb819ec8cf41a9d45245ffa3cb7a921d3269f6658bf920 SHA512 5055979067234ad7fd2774007d524ef4643d968bf7ce42fc8c3f8e469fd84cbd7afc163cd6ddda53584bd5677fdea2fecf8194a378d49724504f639b9f688ff7
 DIST ceph-13.2.5.tar.gz 91006057 BLAKE2B 68551e2f54d78aff7b0e9ec3c62e6a3394dd7c23e80924a5b400cd9666a05a42e5f22445deee4040f1b78201c6a6660b283109878d4c92d845821bff831c8a5e SHA512 6daea524523f829e725609328ea71f416b2c3a9530fa8956720a7bc69dc08e55a169654f500704579dc9ba693f04eedd7e04614c0850e9ab1169cd45f19039f8
+DIST ceph-14.2.0.tar.gz 118882504 BLAKE2B e650d99dceb11c7b035480c8cdd9f63ee4a5f81ffea27988e180a2956433e3e4b34e496a73bf5992c428eff859311c623b92a6f006eb694ebf928d8204dc9b06 SHA512 c86a335714fd5678988133ec0e60cb10cd948250a133c073d1ed055c5bba232fa6f1e102dd7fcb0c70b37a07c9c2d1220d4a1713720e4dcab9659152ee577480
 EBUILD ceph-10.2.10-r2.ebuild 7629 BLAKE2B 1aa3f1ada65198fa2591c51871c76158d60f64f2e631cdd3c8e87e7d5e76812365db79321ce01d642a400e5a2656aed57876ab2fa9713723ec3f88150ea59056 SHA512 f735d0c6642e80ce689a00719d4225effc113fc537668178a95914471065fa95dd65f21ba55cea2075c83541a74ceca4309097d86d3e16db3f8a6d5eefc54638
 EBUILD ceph-10.2.3-r2.ebuild 6108 BLAKE2B fa77d99bce7fbc4cc135a0f705551564e484659a5471d87edf9d412ca4b6f0d58b0f6f0f217a9487660f5040b0b5c73afcbb6b8e9d0ab9d2c087710f388dac52 SHA512 d0bfa7305db9b82be225871b1784a4b33bc7d8ff32a1cfabf441592ac9a5f161efb8df4bb06ed15ac56d61108c4a379c7ac30f8ef1d27b144123bc0f1d8f681f
-EBUILD ceph-12.2.11.ebuild 8009 BLAKE2B 2a4d5172fd5663da56b81ccf21a6a5fd7c789e0ec908ef62f836319e489e8e82fe4cd38dc3b200736137d408c4ebc2c02c20cc89cc35dd17acff5396d36d0517 SHA512 fb4c6e8542b0cebe3a66611575980de4a74fb12152ff338948e57d565de6f4b4fbe1567b6caa2c719dfb3d5aa6f2bd32ac94623465c03feae847725681964be1
+EBUILD ceph-12.2.11.ebuild 8056 BLAKE2B 33b201f83ef2371b154d155dc55769dfe8a4a4fc908eacacdedf56b247d0a1e2276af5499ce8797e7400e560dda06328f5ff74daf63cec8ad65d99a92cac18af SHA512 2c9b9485760727be5eb6bcdaebe1424baf6f3bc9f6e33d1f21e279bf91b7d43c1f160446411484a54bb6bbb5cfaea85134480056c84207c55211ab412974ca4e
 EBUILD ceph-12.2.8-r1.ebuild 7886 BLAKE2B 3be53d0061849ec367a2612bf6a67b94b97eb7e3f1ab2902eddbfe6e45bd4065fe38ad41e3306b83bb6a622854efa8239d2ff716933e59bf06d343fe341823d2 SHA512 c96e0af6586053b8ff827c049acc8e6cafc2ec31052ed90d2b1d6b3f4daa30ffd41d162eba3aa279b2a07190ed21840032589f88a21be730d06885814eb5f4a5
-EBUILD ceph-13.2.4.ebuild 8477 BLAKE2B bea9b2dd3544c7e6dcba8ef5afd32f6ab3808ef2f4ee5be118fcc65945323bd69583f02bb975e3fa1f5afe1c6732aad240792ab181678a5eb1229e166e8d5a40 SHA512 4097632dbd821352822c23c4d65eacfc1cf9ece17514d2a18ae7127540e0fc8ba9236a93039896e5562e1244ee81acde5d252cb06be2c15afa554bc9710693d8
-EBUILD ceph-13.2.5.ebuild 8477 BLAKE2B bea9b2dd3544c7e6dcba8ef5afd32f6ab3808ef2f4ee5be118fcc65945323bd69583f02bb975e3fa1f5afe1c6732aad240792ab181678a5eb1229e166e8d5a40 SHA512 4097632dbd821352822c23c4d65eacfc1cf9ece17514d2a18ae7127540e0fc8ba9236a93039896e5562e1244ee81acde5d252cb06be2c15afa554bc9710693d8
-MISC metadata.xml 1604 BLAKE2B 46a4c3d77a2c1a0863f15b509d6889462b8506dfc43fe75c233da5bf0658faeacf396229b6277b818d4d0b51183d3ef21009a11b9213adf1459d9fb46eb9e05f SHA512 7636cd12abd1d7c8e7b473c4019903e2eb29d18c829e045c55244dc7b311bace931bc8d6fa55ce5ab5d6e3d1b7f020d76884c2d3a625dcb4d9a92c5c65c1522a
+EBUILD ceph-13.2.4.ebuild 8681 BLAKE2B 8c0d1a86a68c47ffc7b370e31a3bda4c2ff39f1132f0e1418b19b44f4eb5b7f6b1313120b24bcc1a5fbda665b80a6957c96c1006887a7c0693c70e2146b565d0 SHA512 62420bd58b9a072eae10a44321e56f74e11a84db3c2913066e66dd5530f87cdd81b4933c973634e56b6f884f91486d9f8344e6a64ac107b1e5fbcd0dfc788600
+EBUILD ceph-13.2.5-r2.ebuild 8872 BLAKE2B 503074d72a7ebc721e54c245149dced8d3a5f49c28db8cd9f2e7a1514abc8f6160d6e2e00f223924d82a5ff194cf39d73dfc4322f60cf875c7de162294afa584 SHA512 e31c4522df6d4ddb5562ec4ba103dc04ca3025418e48598cb504ea945ea97c7cc119d695f2f4d2dbf684234027464f83f9ae15964596403293e21adde41c45a6
+EBUILD ceph-14.2.0-r4.ebuild 9051 BLAKE2B 76ae006c08bd0e10504a93771bad70cec94b96a8f5f73c154b74bca3e574ccd06c1374a7d55acbefac7934fdd78087209f3c1ffda3e92763d4847d73e933c07f SHA512 fb50e7b9f3328ad8a4a931124210db6194db69d12b77eb72dee97d21256c142ea36d7cff48c099fe15e65cc01b9e49dff0dd149e5acc62b15a8ad0652638c6f7
+MISC metadata.xml 1835 BLAKE2B c4f3c224c4a9f08f88b1eac1942f1fbc3244994c9d3924eabac2fda0dad6d1f4d0ffd41d372d7632d7b679a72346671695389bccf63cda1afe41bf50dd30567e SHA512 99f68c6250e02592d7cb5784e9ce5c2dc9ba31e7fc8e6283063f84d5891faa5b1eb5fdaca3a103cfabe7cb19fe131f75d37242fdbdf41f3ea206f10bf7f68bc5
diff --git a/sys-cluster/ceph/ceph-12.2.11.ebuild b/sys-cluster/ceph/ceph-12.2.11.ebuild
index d828bc7be4f3..761d8f534952 100644
--- a/sys-cluster/ceph/ceph-12.2.11.ebuild
+++ b/sys-cluster/ceph/ceph-12.2.11.ebuild
@@ -134,6 +134,7 @@ PATCHES=(
 	"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
 	"${FILESDIR}/ceph-12.2.5-no-werror.patch"
 	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
+	"${FILESDIR}/ceph-12.2.11-fix-min-call.patch"
 )
 
 check-reqs_export_vars() {
diff --git a/sys-cluster/ceph/ceph-13.2.4.ebuild b/sys-cluster/ceph/ceph-13.2.4.ebuild
index cca90b166f05..f0e6c5adacdf 100644
--- a/sys-cluster/ceph/ceph-13.2.4.ebuild
+++ b/sys-cluster/ceph/ceph-13.2.4.ebuild
@@ -26,7 +26,7 @@ SLOT="0"
 
 CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
 
-IUSE="babeltrace cephfs dpdk fuse jemalloc ldap lttng +mgr"
+IUSE="babeltrace cephfs dpdk fuse jemalloc ldap libressl lttng +mgr"
 IUSE+=" +radosgw +ssl static-libs +system-boost systemd +tcmalloc test"
 IUSE+=" xfs zfs"
 IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
@@ -54,13 +54,22 @@ COMMON_DEPEND="
 	ldap? ( net-nds/openldap:=[static-libs?] )
 	lttng? ( dev-util/lttng-ust:= )
 	fuse? ( sys-fs/fuse:0=[static-libs?] )
-	ssl? ( dev-libs/openssl:=[static-libs?] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:=[static-libs?] )
+		libressl? ( dev-libs/libressl:=[static-libs?] )
+	)
 	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
 	zfs? ( sys-fs/zfs:=[static-libs?] )
 	radosgw? (
 		dev-libs/expat:=[static-libs?]
-		dev-libs/openssl:=[static-libs?]
-		net-misc/curl:=[curl_ssl_openssl,static-libs?]
+		!libressl? (
+			dev-libs/openssl:=[static-libs?]
+			net-misc/curl:=[curl_ssl_openssl,static-libs?]
+		)
+		libressl? (
+			dev-libs/libressl:=[static-libs?]
+			net-misc/curl:=[curl_ssl_libressl,static-libs?]
+		)
 	)
 	system-boost? (
 		>=dev-libs/boost-1.67:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
diff --git a/sys-cluster/ceph/ceph-13.2.5.ebuild b/sys-cluster/ceph/ceph-13.2.5-r2.ebuild
index cca90b166f05..2ef0f19a4010 100644
--- a/sys-cluster/ceph/ceph-13.2.5.ebuild
+++ b/sys-cluster/ceph/ceph-13.2.5-r2.ebuild
@@ -26,9 +26,9 @@ SLOT="0"
 
 CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
 
-IUSE="babeltrace cephfs dpdk fuse jemalloc ldap lttng +mgr"
-IUSE+=" +radosgw +ssl static-libs +system-boost systemd +tcmalloc test"
-IUSE+=" xfs zfs"
+IUSE="babeltrace cephfs dpdk fuse jemalloc ldap libressl lttng +mgr"
+IUSE+=" numa +radosgw +ssl static-libs +system-boost systemd +tcmalloc"
+IUSE+=" test xfs zfs"
 IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
 
 # unbundling code commented out pending bugs 584056 and 584058
@@ -54,13 +54,23 @@ COMMON_DEPEND="
 	ldap? ( net-nds/openldap:=[static-libs?] )
 	lttng? ( dev-util/lttng-ust:= )
 	fuse? ( sys-fs/fuse:0=[static-libs?] )
-	ssl? ( dev-libs/openssl:=[static-libs?] )
+	numa? ( sys-process/numactl:=[static-libs?] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:=[static-libs?] )
+		libressl? ( dev-libs/libressl:=[static-libs?] )
+	)
 	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
 	zfs? ( sys-fs/zfs:=[static-libs?] )
 	radosgw? (
 		dev-libs/expat:=[static-libs?]
-		dev-libs/openssl:=[static-libs?]
-		net-misc/curl:=[curl_ssl_openssl,static-libs?]
+		!libressl? (
+			dev-libs/openssl:=[static-libs?]
+			net-misc/curl:=[curl_ssl_openssl,static-libs?]
+		)
+		libressl? (
+			dev-libs/libressl:=[static-libs?]
+			net-misc/curl:=[curl_ssl_libressl,static-libs?]
+		)
 	)
 	system-boost? (
 		>=dev-libs/boost-1.67:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
@@ -136,6 +146,8 @@ PATCHES=(
 	"${FILESDIR}/ceph-13.2.0-mgr-python-version.patch"
 	"${FILESDIR}/ceph-13.2.0-no-virtualenvs.patch"
 	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
+	"${FILESDIR}/ceph-13.2.5-no-automagic-deps.patch"
+	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
 )
 
 check-reqs_export_vars() {
@@ -193,6 +205,7 @@ ceph_src_configure() {
 		-DWITH_LTTNG=$(usex lttng)
 		-DWITH_MGR=$(usex mgr)
 		-DWITH_MGR_DASHBOARD_FRONTEND=NO
+		-DWITH_NUMA=$(usex numa)
 		-DWITH_OPENLDAP=$(usex ldap)
 		-DWITH_RADOSGW=$(usex radosgw)
 		-DWITH_SSL=$(usex ssl)
@@ -205,6 +218,7 @@ ceph_src_configure() {
 		-DWITH_SYSTEM_BOOST=$(usex system-boost)
 		-DBOOST_J=$(makeopts_jobs)
 		-DWITH_RDMA=no
+		-DWITH_TBB=no
 		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
 		-DEPYTHON_VERSION="${EPYTHON#python}"
 		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
diff --git a/sys-cluster/ceph/ceph-14.2.0-r4.ebuild b/sys-cluster/ceph/ceph-14.2.0-r4.ebuild
new file mode 100644
index 000000000000..61c4b21e9f8b
--- /dev/null
+++ b/sys-cluster/ceph/ceph-14.2.0-r4.ebuild
@@ -0,0 +1,343 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+DISTUTILS_OPTIONAL=1
+
+inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \
+		multiprocessing python-r1 udev user readme.gentoo-r1 toolchain-funcs \
+		systemd
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
+	SRC_URI=""
+else
+	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT"
+SLOT="0"
+
+CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl"
+IUSE+=" lttng +mgr numa rabbitmq +radosgw +ssl static-libs +system-boost"
+IUSE+=" systemd +tcmalloc test xfs zfs"
+IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+COMMON_DEPEND="
+	virtual/libudev:=
+	app-arch/bzip2:=[static-libs?]
+	app-arch/lz4:=[static-libs?]
+	app-arch/snappy:=[static-libs?]
+	app-arch/zstd:=[static-libs?]
+	app-misc/jq:=[static-libs?]
+	dev-libs/crypto++:=[static-libs?]
+	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
+	dev-libs/libaio:=[static-libs?]
+	dev-libs/libxml2:=[static-libs?]
+	dev-libs/nss:=
+	sys-auth/oath-toolkit:=
+	sys-apps/keyutils:=[static-libs?]
+	sys-apps/util-linux:=[static-libs?]
+	sys-libs/ncurses:0=[static-libs?]
+	sys-libs/zlib:=[static-libs?]
+	babeltrace? ( dev-util/babeltrace )
+	ldap? ( net-nds/openldap:=[static-libs?] )
+	lttng? ( dev-util/lttng-ust:= )
+	fuse? ( sys-fs/fuse:0=[static-libs?] )
+	kerberos? ( virtual/krb5 )
+	rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:=[static-libs?] )
+		libressl? ( dev-libs/libressl:=[static-libs?] )
+	)
+	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
+	zfs? ( sys-fs/zfs:=[static-libs?] )
+	radosgw? (
+		dev-libs/expat:=[static-libs?]
+		!libressl? (
+			dev-libs/openssl:=[static-libs?]
+			net-misc/curl:=[curl_ssl_openssl,static-libs?]
+		)
+		libressl? (
+			dev-libs/libressl:=[static-libs?]
+			net-misc/curl:=[curl_ssl_libressl,static-libs?]
+		)
+	)
+	system-boost? (
+		>=dev-libs/boost-1.67:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
+	)
+	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
+	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
+	${PYTHON_DEPS}
+	"
+DEPEND="${COMMON_DEPEND}
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-util/cunit
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		sys-apps/grep[pcre]
+		sys-fs/btrfs-progs
+	)
+	"
+BDEPEND="	app-arch/cpio
+	>=dev-util/cmake-3.5.0
+	dev-util/gperf
+	dev-util/valgrind
+	sys-apps/which
+	sys-devel/bc
+	virtual/pkgconfig
+	"
+RDEPEND="${COMMON_DEPEND}
+	net-misc/socat
+	sys-apps/gptfdisk
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/lvm2
+	!<sys-apps/openrc-0.26.3
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/cherrypy[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pecan[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( $(python_gen_useflags 'python3*') )
+	?? ( jemalloc tcmalloc )
+	rabbitmq? ( radosgw )
+	"
+
+# the tests need root access
+RESTRICT="test? ( userpriv )"
+
+# distribution tarball does not include everything needed for tests
+RESTRICT+=" test"
+
+# false positives unless all USE flags are on
+CMAKE_WARN_UNUSED_CLI="no"
+
+STRIP_MASK="/usr/lib*/rados-classes/*"
+
+UNBUNDLE_LIBS=(
+	src/erasure-code/jerasure/jerasure
+	src/erasure-code/jerasure/gf-complete
+)
+
+PATCHES=(
+	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
+	"${FILESDIR}/ceph-14.2.0-cflags.patch"
+	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
+	"${FILESDIR}/ceph-13.2.0-cflags.patch"
+	"${FILESDIR}/ceph-14.2.0-mgr-python-version.patch"
+	"${FILESDIR}/ceph-14.2.0-no-virtualenvs.patch"
+	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
+	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
+	"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
+	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
+)
+
+# dpdk and ninja don't get along
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+check-reqs_export_vars() {
+	if use amd64; then
+		CHECKREQS_DISK_BUILD="12G"
+		CHECKREQS_DISK_USR="460M"
+	else
+		CHECKREQS_DISK_BUILD="1400M"
+		CHECKREQS_DISK_USR="450M"
+	fi
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+user_setup() {
+	enewgroup ceph ${CEPH_GID}
+	enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_setup 'python3*'
+	check-reqs_export_vars
+	check-reqs_pkg_setup
+	user_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use system-boost; then
+		eapply "${FILESDIR}/ceph-14.2.0-boost-sonames.patch"
+	fi
+
+	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		src/bash_completion/CMakeLists.txt || die
+
+	# remove tests that need root access
+	rm src/test/cli/ceph-authtool/cap*.t || die
+
+	#rm -rf "${UNBUNDLE_LIBS[@]}"
+}
+
+ceph_src_configure() {
+	local flag
+	local mycmakeargs=(
+		-DWITH_BABELTRACE=$(usex babeltrace)
+		-DWITH_CEPHFS=$(usex cephfs)
+		-DWITH_DPDK=$(usex dpdk)
+		-DWITH_FUSE=$(usex fuse)
+		-DWITH_LTTNG=$(usex lttng)
+		-DWITH_GSSAPI=$(usex kerberos)
+		-DWITH_GRAFANA=$(usex grafana)
+		-DWITH_MGR=$(usex mgr)
+		-DWITH_MGR_DASHBOARD_FRONTEND=NO
+		-DWITH_NUMA=$(usex numa)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_RADOSGW=$(usex radosgw)
+		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
+		-DWITH_SSL=$(usex ssl)
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_XFS=$(usex xfs)
+		-DWITH_ZFS=$(usex zfs)
+		-DENABLE_SHARED=$(usex static-libs '' 'ON' 'OFF')
+		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
+		-DWITH_SYSTEM_BOOST=$(usex system-boost)
+		-DBOOST_J=$(makeopts_jobs)
+		-DWITH_RDMA=no
+		-DWITH_TBB=no
+		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
+		-DEPYTHON_VERSION="${EPYTHON#python}"
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-Wno-dev
+	)
+	if use amd64 || use x86; then
+		for flag in ${CPU_FLAGS_X86[@]}; do
+			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
+		done
+	fi
+
+	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt"
+	cmake-utils_src_configure
+
+	# bug #630232
+	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
+		"${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \
+		|| die "sed failed"
+}
+
+src_configure() {
+	ceph_src_configure
+}
+
+python_compile() {
+	local CMAKE_USE_DIR="${S}"
+	ceph_src_configure
+
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	emake VERBOSE=1 clean
+	emake VERBOSE=1 all
+
+	# python modules are only compiled with "make install" so we need to do this to
+	# prevent doing a bunch of compilation in src_install
+	DESTDIR="${T}" emake VERBOSE=1 install
+	popd >/dev/null || die
+}
+
+src_compile() {
+	cmake-utils_src_make VERBOSE=1 all
+
+	# we have to do this here to prevent from building everything multiple times
+	BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources
+	python_foreach_impl python_compile
+}
+
+src_test() {
+	make check || die "make check failed"
+}
+
+python_install() {
+	local CMAKE_USE_DIR="${S}"
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	DESTDIR="${ED}" emake install
+	popd >/dev/null || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_foreach_impl python_install
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
+
+	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
+
+	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
+
+	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
+	newinitd "${FILESDIR}/${PN}.initd-r11" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}"/sysctld 90-${PN}.conf
+
+	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
+
+	# units aren't installed by the build system unless systemd is enabled
+	# so no point installing these with the USE flag disabled
+	if use systemd; then
+		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
+			"ceph-mds@.service"
+
+		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
+			"ceph-osd@.service"
+	fi
+
+	udev_dorules udev/*.rules
+
+	readme.gentoo_create_doc
+
+	python_setup 'python3*'
+
+	# bug #630232
+	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \
+		|| die "sed failed"
+
+	python_fix_shebang "${ED}"/usr/{,s}bin/
+
+	# python_fix_shebang apparently is not idempotent
+	sed -i -r  's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
+		"${ED}"/usr/sbin/{mount.*,ceph-volume{,-systemd}} || die "sed failed"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-cluster/ceph/files/ceph-12.2.11-fix-min-call.patch b/sys-cluster/ceph/files/ceph-12.2.11-fix-min-call.patch
new file mode 100644
index 000000000000..cd9eb4891cb5
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-12.2.11-fix-min-call.patch
@@ -0,0 +1,13 @@
+diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
+index 0074c7964b..98991be7d2 100644
+--- a/src/osd/PrimaryLogPG.cc
++++ b/src/osd/PrimaryLogPG.cc
+@@ -1582,7 +1582,7 @@ void PrimaryLogPG::calc_trim_to()
+   if (limit != eversion_t() &&
+       limit != pg_trim_to &&
+       pg_log.get_log().approx_size() > target) {
+-    size_t num_to_trim = std::min(pg_log.get_log().approx_size() - target,
++    size_t num_to_trim = std::min((uint64_t)(pg_log.get_log().approx_size() - target),
+                              cct->_conf->osd_pg_log_trim_max);
+     if (num_to_trim < cct->_conf->osd_pg_log_trim_min &&
+         cct->_conf->osd_pg_log_trim_max >= cct->_conf->osd_pg_log_trim_min) {
diff --git a/sys-cluster/ceph/files/ceph-13.2.5-no-automagic-deps.patch b/sys-cluster/ceph/files/ceph-13.2.5-no-automagic-deps.patch
new file mode 100644
index 000000000000..1eb42b3e5ad6
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-13.2.5-no-automagic-deps.patch
@@ -0,0 +1,37 @@
+--- ceph-13.2.5.orig/src/rocksdb/CMakeLists.txt	2019-03-20 11:39:25.065954652 -0700
++++ ceph-13.2.5/src/rocksdb/CMakeLists.txt	2019-03-20 13:18:01.548085828 -0700
+@@ -286,18 +286,24 @@
+   endif()
+ endif()
+ 
+-find_package(NUMA)
+-if(NUMA_FOUND)
+-  add_definitions(-DNUMA)
+-  include_directories(${NUMA_INCLUDE_DIR})
+-  list(APPEND THIRDPARTY_LIBS ${NUMA_LIBRARIES})
++option(WITH_NUMA "build with UBSAN" OFF)
++if(WITH_NUMA)
++  find_package(NUMA)
++  if(NUMA_FOUND)
++    add_definitions(-DNUMA)
++    include_directories(${NUMA_INCLUDE_DIR})
++    list(APPEND THIRDPARTY_LIBS ${NUMA_LIBRARIES})
++  endif()
+ endif()
+ 
+-find_package(TBB)
+-if(TBB_FOUND)
+-  add_definitions(-DTBB)
+-  include_directories(${TBB_INCLUDE_DIR})
+-  list(APPEND THIRDPARTY_LIBS ${TBB_LIBRARIES})
++option(WITH_TBB "build with UBSAN" OFF)
++if(WITH_TBB)
++  find_package(TBB)
++  if(TBB_FOUND)
++    add_definitions(-DTBB)
++    include_directories(${TBB_INCLUDE_DIR})
++    list(APPEND THIRDPARTY_LIBS ${TBB_LIBRARIES})
++  endif()
+ endif()
+ 
+ # Used to run CI build and tests so we can run faster
diff --git a/sys-cluster/ceph/files/ceph-14.2.0-boost-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.0-boost-sonames.patch
new file mode 100644
index 000000000000..497d59530511
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.0-boost-sonames.patch
@@ -0,0 +1,334 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dbabecbe97..d12b696bb5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -640,7 +640,7 @@ set(BOOST_HEADER_COMPONENTS container)
+ 
+ if(WITH_MGR)
+   list(APPEND BOOST_COMPONENTS
+-    python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR})
++    python-${MGR_PYTHON_VERSION_MAJOR}.${MGR_PYTHON_VERSION_MINOR})
+ endif()
+ if(WITH_BOOST_CONTEXT)
+   list(APPEND BOOST_COMPONENTS context coroutine)
+diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake
+index bfab4ca436..90ed0cbb17 100644
+--- a/cmake/modules/FindBoost.cmake
++++ b/cmake/modules/FindBoost.cmake
+@@ -1181,10 +1181,10 @@ endif()
+ # on all platforms to keep end user code free from platform dependent
+ # code.  Also provide convenience targets to disable autolinking and
+ # enable dynamic linking.
+-if(NOT TARGET Boost::diagnostic_definitions)
+-  add_library(Boost::diagnostic_definitions INTERFACE IMPORTED)
+-  add_library(Boost::disable_autolinking INTERFACE IMPORTED)
+-  add_library(Boost::dynamic_linking INTERFACE IMPORTED)
++if(NOT TARGET boost_diagnostic_definitions)
++  add_library(boost_diagnostic_definitions INTERFACE IMPORTED)
++  add_library(boost_disable_autolinking INTERFACE IMPORTED)
++  add_library(boost_dynamic_linking INTERFACE IMPORTED)
+ endif()
+ if(WIN32)
+   # In windows, automatic linking is performed, so you do not have
+@@ -1205,11 +1205,11 @@ if(WIN32)
+   # code to emit a #pragma message each time a library is selected
+   # for linking.
+   set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC")
+-  set_target_properties(Boost::diagnostic_definitions PROPERTIES
++  set_target_properties(boost_diagnostic_definitions PROPERTIES
+     INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC")
+-  set_target_properties(Boost::disable_autolinking PROPERTIES
++  set_target_properties(boost_disable_autolinking PROPERTIES
+     INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB")
+-  set_target_properties(Boost::dynamic_linking PROPERTIES
++  set_target_properties(boost_dynamic_linking PROPERTIES
+     INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK")
+ endif()
+ 
+@@ -2018,52 +2018,52 @@ if(Boost_FOUND)
+   endif()
+ 
+   foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+-    if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost::${COMPONENT})
++    if(_Boost_IMPORTED_TARGETS AND NOT TARGET boost_${COMPONENT})
+       string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+       if(Boost_${UPPERCOMPONENT}_FOUND)
+         if(Boost_USE_STATIC_LIBS)
+-          add_library(Boost::${COMPONENT} STATIC IMPORTED)
++          add_library(boost_${COMPONENT} STATIC IMPORTED)
+         else()
+           # Even if Boost_USE_STATIC_LIBS is OFF, we might have static
+           # libraries as a result.
+-          add_library(Boost::${COMPONENT} UNKNOWN IMPORTED)
++          add_library(boost_${COMPONENT} UNKNOWN IMPORTED)
+         endif()
+         if(Boost_INCLUDE_DIRS)
+-          set_target_properties(Boost::${COMPONENT} PROPERTIES
++          set_target_properties(boost_${COMPONENT} PROPERTIES
+             INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
+         endif()
+         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY}")
+-          set_target_properties(Boost::${COMPONENT} PROPERTIES
++          set_target_properties(boost_${COMPONENT} PROPERTIES
+             IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+             IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}")
+         endif()
+         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
+-          set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
++          set_property(TARGET boost_${COMPONENT} APPEND PROPERTY
+             IMPORTED_CONFIGURATIONS RELEASE)
+-          set_target_properties(Boost::${COMPONENT} PROPERTIES
++          set_target_properties(boost_${COMPONENT} PROPERTIES
+             IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
+             IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
+         endif()
+         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
+-          set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
++          set_property(TARGET boost_${COMPONENT} APPEND PROPERTY
+             IMPORTED_CONFIGURATIONS DEBUG)
+-          set_target_properties(Boost::${COMPONENT} PROPERTIES
++          set_target_properties(boost_${COMPONENT} PROPERTIES
+             IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
+             IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
+         endif()
+         if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES)
+           unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES)
+           foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES})
+-            list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost::${dep})
++            list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES boost_${dep})
+           endforeach()
+           if(COMPONENT STREQUAL "thread")
+             list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Threads::Threads)
+           endif()
+-          set_target_properties(Boost::${COMPONENT} PROPERTIES
++          set_target_properties(boost_${COMPONENT} PROPERTIES
+             INTERFACE_LINK_LIBRARIES "${_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES}")
+         endif()
+         if(_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES)
+-          set_target_properties(Boost::${COMPONENT} PROPERTIES
++          set_target_properties(boost_${COMPONENT} PROPERTIES
+             INTERFACE_COMPILE_FEATURES "${_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES}")
+         endif()
+       endif()
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 1b1f19d464..21c222280f 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -353,12 +353,12 @@ set(ceph_common_objs
+ set(ceph_common_deps
+   json_spirit erasure_code arch crc32
+   ${LIB_RESOLV}
+-  Boost::thread
+-  Boost::system
+-  Boost::random
+-  Boost::program_options
+-  Boost::date_time
+-  Boost::iostreams
++  boost_thread
++  boost_system
++  boost_random
++  boost_program_options
++  boost_date_time
++  boost_iostreams
+   ${BLKID_LIBRARIES}
+   ${Backtrace_LIBRARIES}
+   ${BLKIN_LIBRARIES}
+@@ -518,7 +518,7 @@ if (WITH_CEPHFS)
+     ceph_mds.cc)
+   add_executable(ceph-mds ${ceph_mds_srcs})
+   target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common
+-    Boost::thread)
++    boost_thread)
+   install(TARGETS ceph-mds DESTINATION bin)
+ endif()
+ 
+diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt
+index d7b58521d4..e1533af33f 100644
+--- a/src/crimson/CMakeLists.txt
++++ b/src/crimson/CMakeLists.txt
+@@ -106,8 +106,8 @@ target_link_libraries(crimson-common
+   PRIVATE
+     crc32
+     crimson::cflags
+-    Boost::iostreams
+-    Boost::random
++    boost_iostreams
++    boost_random
+     ${NSS_LIBRARIES} ${NSPR_LIBRARIES} OpenSSL::Crypto)
+ 
+ set(crimson_auth_srcs
+diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
+index 252fb3e5e3..3f3823a68e 100644
+--- a/src/mgr/CMakeLists.txt
++++ b/src/mgr/CMakeLists.txt
+@@ -26,7 +26,7 @@ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
+ target_link_libraries(ceph-mgr
+   osdc client heap_profiler
+   global-static ceph-common
+-  Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
++  boost_python-${MGR_PYTHON_VERSION_MAJOR}.${MGR_PYTHON_VERSION_MINOR}
+   ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
+ set_target_properties(ceph-mgr PROPERTIES
+   POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE})
+diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt
+index e9d3804c5f..5c6eb58de1 100644
+--- a/src/rbd_replay/CMakeLists.txt
++++ b/src/rbd_replay/CMakeLists.txt
+@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE)
+     global
+     babeltrace
+     babeltrace-ctf
+-    Boost::date_time
++    boost_date_time
+     )
+   install(TARGETS rbd-replay-prep DESTINATION bin)
+ endif(HAVE_BABELTRACE)
+diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
+index ccc4f74cfe..854aa6e5e9 100644
+--- a/src/rgw/CMakeLists.txt
++++ b/src/rgw/CMakeLists.txt
+@@ -199,7 +199,7 @@ if(WITH_CURL_OPENSSL)
+ endif()
+ 
+ if(WITH_BOOST_CONTEXT)
+-  target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context)
++  target_link_libraries(rgw_a PRIVATE boost_coroutine boost_context)
+ endif()
+ 
+ set(rgw_libs rgw_a)
+@@ -341,7 +341,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT)
+   target_link_libraries(rgw_admin_user PRIVATE RabbitMQ::RabbitMQ)
+ endif()
+ if(WITH_BOOST_CONTEXT)
+-  target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context)
++  target_link_libraries(rgw_admin_user PRIVATE boost_coroutine boost_context)
+ endif()
+ 
+ if(WITH_TESTS)
+diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
+index 20a64fd41b..a8bb323614 100644
+--- a/src/test/CMakeLists.txt
++++ b/src/test/CMakeLists.txt
+@@ -158,7 +158,7 @@ add_executable(ceph_omapbench
+   )
+ target_link_libraries(ceph_omapbench
+   librados
+-  Boost::program_options
++  boost_program_options
+   global
+   ${BLKID_LIBRARIES}
+   ${CMAKE_DL_LIBS}
+diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt
+index 71fb77cda9..aff8fb6565 100644
+--- a/src/test/common/CMakeLists.txt
++++ b/src/test/common/CMakeLists.txt
+@@ -315,8 +315,8 @@ add_ceph_unittest(unittest_hobject)
+ 
+ add_executable(unittest_async_completion test_async_completion.cc)
+ add_ceph_unittest(unittest_async_completion)
+-target_link_libraries(unittest_async_completion Boost::system)
++target_link_libraries(unittest_async_completion boost_system)
+ 
+ add_executable(unittest_async_shared_mutex test_async_shared_mutex.cc)
+ add_ceph_unittest(unittest_async_shared_mutex)
+-target_link_libraries(unittest_async_shared_mutex ceph-common Boost::system)
++target_link_libraries(unittest_async_shared_mutex ceph-common boost_system)
+diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
+index 721f6c3675..1cd9635c77 100644
+--- a/src/test/erasure-code/CMakeLists.txt
++++ b/src/test/erasure-code/CMakeLists.txt
+@@ -2,15 +2,15 @@
+ add_executable(ceph_erasure_code_benchmark 
+   ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc
+   ceph_erasure_code_benchmark.cc)
+-target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
++target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS})
+ install(TARGETS ceph_erasure_code_benchmark
+   DESTINATION bin)
+ 
+ add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc)
+-target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
++target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS})
+ 
+ add_executable(ceph_erasure_code ceph_erasure_code.cc)
+-target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
++target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS})
+ install(TARGETS ceph_erasure_code
+   DESTINATION bin)
+ 
+diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt
+index 4fc53d2406..e6304394f8 100644
+--- a/src/test/librados/CMakeLists.txt
++++ b/src/test/librados/CMakeLists.txt
+@@ -62,7 +62,7 @@ add_executable(ceph_test_rados_api_asio asio.cc)
+ target_link_libraries(ceph_test_rados_api_asio global
+   librados ${UNITTEST_LIBS})
+ if(WITH_BOOST_CONTEXT)
+-  target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context)
++  target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context)
+ endif()
+ 
+ add_executable(ceph_test_rados_api_list
+@@ -132,7 +132,7 @@ add_executable(ceph_test_rados_api_tier_pp
+   tier_cxx.cc
+   $<TARGET_OBJECTS:unit-main>)
+ target_link_libraries(ceph_test_rados_api_tier_pp
+-  librados global ${UNITTEST_LIBS} Boost::system radostest-cxx)
++  librados global ${UNITTEST_LIBS} boost_system radostest-cxx)
+ 
+ add_executable(ceph_test_rados_api_snapshots
+   snapshots.cc)
+diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
+index 2bf6723c40..e99b8afa11 100644
+--- a/src/test/librbd/CMakeLists.txt
++++ b/src/test/librbd/CMakeLists.txt
+@@ -27,7 +27,7 @@ target_link_libraries(rbd_test PRIVATE
+   radostest
+   radostest-cxx
+   librados
+-  Boost::thread
++  boost_thread
+   GMock::GMock
+   GTest::GTest)
+ 
+diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt
+index 9b2c6b6321..80e4cb7829 100644
+--- a/src/test/rgw/CMakeLists.txt
++++ b/src/test/rgw/CMakeLists.txt
+@@ -143,7 +143,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler)
+ target_link_libraries(unittest_rgw_dmclock_scheduler ${rgw_libs} dmclock)
+ if(WITH_BOOST_CONTEXT)
+   target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING)
+-  target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context)
++  target_link_libraries(unittest_rgw_dmclock_scheduler boost_coroutine boost_context)
+ endif()
+ 
+ if(WITH_RADOSGW_AMQP_ENDPOINT)
+diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
+index d31f3d2408..6945018b11 100644
+--- a/src/tools/CMakeLists.txt
++++ b/src/tools/CMakeLists.txt
+@@ -35,20 +35,20 @@ install(PROGRAMS
+ endif(WITH_TESTS)
+ 
+ add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
+-target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
++target_link_libraries(ceph-osdomap-tool os global boost_program_options)
+ install(TARGETS ceph-osdomap-tool DESTINATION bin)
+ 
+ add_executable(ceph-monstore-tool
+   ceph_monstore_tool.cc
+   ../mgr/mgr_commands.cc)
+-target_link_libraries(ceph-monstore-tool os global Boost::program_options)
++target_link_libraries(ceph-monstore-tool os global boost_program_options)
+ install(TARGETS ceph-monstore-tool DESTINATION bin)
+ 
+ add_executable(ceph-objectstore-tool
+   ceph_objectstore_tool.cc
+   rebuild_mondb.cc
+   RadosDump.cc)
+-target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
++target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
+ if(WITH_FUSE)
+   target_link_libraries(ceph-objectstore-tool ${FUSE_LIBRARIES})
+ endif(WITH_FUSE)
diff --git a/sys-cluster/ceph/files/ceph-14.2.0-cflags.patch b/sys-cluster/ceph/files/ceph-14.2.0-cflags.patch
new file mode 100644
index 000000000000..3a9f52c879b7
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.0-cflags.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake
+index 5697dff85f..7fdcfe4112 100644
+--- a/cmake/modules/Distutils.cmake
++++ b/cmake/modules/Distutils.cmake
+@@ -61,7 +61,7 @@ function(distutils_add_cython_module name src)
+     CC="${PY_CC}"
+     CXX="${PY_CXX}"
+     LDSHARED="${PY_LDSHARED}"
+-    OPT=\"-DNDEBUG -g -fwrapv -O2 -w\"
++    OPT=\"-DNDEBUG -g -fwrapv -w\"
+     LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+     CYTHON_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}
+     CEPH_LIBDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
diff --git a/sys-cluster/ceph/files/ceph-14.2.0-cython-0.29.patch b/sys-cluster/ceph/files/ceph-14.2.0-cython-0.29.patch
new file mode 100644
index 000000000000..be133c121d0c
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.0-cython-0.29.patch
@@ -0,0 +1,17 @@
+--- ceph-13.2.1/cmake/modules/Distutils.cmake.old	2018-07-26 17:39:56.000000000 -0000
++++ ceph-13.2.1/cmake/modules/Distutils.cmake	2018-12-24 05:43:51.566174070 -0000
+@@ -58,8 +62,13 @@
+ function(distutils_install_cython_module name)
+   get_property(compiler_launcher GLOBAL PROPERTY RULE_LAUNCH_COMPILE)
+   get_property(link_launcher GLOBAL PROPERTY RULE_LAUNCH_LINK)
+-  set(PY_CC "${compiler_launcher} ${CMAKE_C_COMPILER}")
++  string(REPLACE " " ";" cflags ${CMAKE_C_FLAGS})
++  list(APPEND cflags -iquote${CMAKE_SOURCE_DIR}/src/include -w)
++  list(APPEND cflags -D'void0=dead_function\(void\)')
++  list(APPEND cflags -D'__Pyx_check_single_interpreter\(ARG\)=ARG \#\# 0')
++  string(REPLACE ";" " " cflags "${cflags}")
++  set(PY_CC "${compiler_launcher} ${CMAKE_C_COMPILER} ${cflags}")
+   set(PY_LDSHARED "${link_launcher} ${CMAKE_C_COMPILER} -shared")
+   install(CODE "
+     set(ENV{CC} \"${PY_CC}\")
+     set(ENV{LDSHARED} \"${PY_LDSHARED}\")
diff --git a/sys-cluster/ceph/files/ceph-14.2.0-dpdk-cflags.patch b/sys-cluster/ceph/files/ceph-14.2.0-dpdk-cflags.patch
new file mode 100644
index 000000000000..ab5d980cfbc9
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.0-dpdk-cflags.patch
@@ -0,0 +1,30 @@
+diff --git a/cmake/modules/BuildDPDK.cmake b/cmake/modules/BuildDPDK.cmake
+index 12a831a8b1..a5485aa205 100644
+--- a/cmake/modules/BuildDPDK.cmake
++++ b/cmake/modules/BuildDPDK.cmake
+@@ -16,17 +16,14 @@ function(do_build_dpdk dpdk_dir)
+     set(arch "x86_64")
+     set(machine "default")
+     set(machine_tmpl "native")
+-    set(rte_cflags "-march=core2")
+   elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm|ARM")
+     set(arch "arm")
+     set(machine "armv7a")
+     set(machine_tmpl "armv7a")
+-    set(rte_cflags "-march=armv7-a")
+   elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64")
+     set(arch "arm64")
+     set(machine "armv8a")
+     set(machine_tmpl "armv8a")
+-    set(rte_cflags "-march=armv8-a+crc")
+   elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(powerpc|ppc)64")
+     set(arch "ppc_64")
+     set(machine "power8")
+@@ -35,7 +32,6 @@ function(do_build_dpdk dpdk_dir)
+     message(FATAL_ERROR "not able to build DPDK support: "
+       "unknown arch \"${CMAKE_SYSTEM_PROCESSOR}\"")
+   endif()
+-  set(dpdk_rte_CFLAGS "${rte_cflags}" CACHE INTERNAL "")
+   if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+     set(execenv "linuxapp")
+   elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
diff --git a/sys-cluster/ceph/files/ceph-14.2.0-link-crc32-statically.patch b/sys-cluster/ceph/files/ceph-14.2.0-link-crc32-statically.patch
new file mode 100644
index 000000000000..ec7a4fb079b3
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.0-link-crc32-statically.patch
@@ -0,0 +1,11 @@
+--- ceph-14.2.0.orig/src/common/CMakeLists.txt	2019-03-18 04:08:29.000000000 -0600
++++ ceph-14.2.0/src/common/CMakeLists.txt	2019-03-21 18:42:32.903182824 -0600
+@@ -165,7 +165,7 @@
+     crc32c_aarch64.c)
+ endif(HAVE_INTEL)
+ 
+-add_library(crc32 ${crc32_srcs})
++add_library(crc32 STATIC ${crc32_srcs})
+ if(HAVE_ARMV8_CRC)
+   set_target_properties(crc32 PROPERTIES
+     COMPILE_FLAGS "${CMAKE_C_FLAGS} ${ARMV8_CRC_COMPILE_FLAGS}")
diff --git a/sys-cluster/ceph/files/ceph-14.2.0-mgr-python-version.patch b/sys-cluster/ceph/files/ceph-14.2.0-mgr-python-version.patch
new file mode 100644
index 000000000000..e4502a608ec2
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.0-mgr-python-version.patch
@@ -0,0 +1,17 @@
+diff --git a/src/pybind/CMakeLists.txt b/src/pybind/CMakeLists.txt
+index 664543172a..e74d73c084 100644
+--- a/src/pybind/CMakeLists.txt
++++ b/src/pybind/CMakeLists.txt
+@@ -62,12 +62,6 @@ foreach(python_version ${py_vers})
+ endforeach()
+ 
+ if(WITH_MGR)
+-  if(NOT WITH_PYTHON2 AND MGR_PYTHON_VERSION_MAJOR EQUAL 2)
+-    message(FATAL_ERROR "mgr plugins require python2 binding")
+-  elseif(NOT WITH_PYTHON3 AND MGR_PYTHON_VERSION_MAJOR EQUAL 3)
+-    message(FATAL_ERROR "mgr plugins require python3 binding")
+-  endif()
+-
+   if(USE_OPENSSL)
+     execute_process(
+       COMMAND ${PYTHON${PYTHON_VERSION}_EXECUTABLE} -c "import ssl; print('.'.join(map(str,ssl.OPENSSL_VERSION_INFO[0:3])))"
diff --git a/sys-cluster/ceph/files/ceph-14.2.0-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-14.2.0-no-virtualenvs.patch
new file mode 100644
index 000000000000..5647ac51674d
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.0-no-virtualenvs.patch
@@ -0,0 +1,54 @@
+diff --git a/.gitignore b/.gitignore
+index 2c2afc282e..80c05ee2f0 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -13,10 +13,8 @@
+ *.swp
+ *.swo
+ *.tmp
+-*.orig
+ *.patch
+ !debian/patches/*.patch
+-*.rej
+ *.rpm
+ *.pyc
+ ceph.spec
+diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
+index 24a2efc9e2..b11d4d0303 100644
+--- a/src/pybind/mgr/dashboard/CMakeLists.txt
++++ b/src/pybind/mgr/dashboard/CMakeLists.txt
+@@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv)
+ 
+ add_custom_target(mgr-dashboard-test-venv
+   COMMAND
+-  ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
++  #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
+   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard
+   COMMENT "dashboard tests virtualenv is being created")
+ add_dependencies(tests mgr-dashboard-test-venv)
+@@ -14,9 +14,9 @@ function(add_npm_command)
+   set(multi_kw COMMAND DEPENDS)
+   cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN})
+   string(REPLACE ";" " " command "${NC_COMMAND}")
+-  if(NC_NODEENV)
+-    string(REGEX REPLACE "^(npm .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
+-  endif()
++  #if(NC_NODEENV)
++  #  string(REGEX REPLACE "^(npm .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
++  #endif()
+   string(REPLACE " " ";" command "${command}")
+   add_custom_command(
+     OUTPUT "${NC_OUTPUT}"
+@@ -41,9 +41,9 @@ else()
+ 
+   add_custom_command(
+     OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm"
+-    COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
+-    COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
+-    COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=10.13.0
++	#COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
++	#COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
++	#COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=10.13.0
+     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+     COMMENT "dashboard nodeenv is being installed"
+   )
diff --git a/sys-cluster/ceph/files/ceph.initd-r10 b/sys-cluster/ceph/files/ceph.initd-r10
deleted file mode 100644
index 2f5150fc340e..000000000000
--- a/sys-cluster/ceph/files/ceph.initd-r10
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-: ${rundir:=/run/ceph}
-: ${user:=ceph}
-: ${group:=ceph}
-: ${rc_ulimit:=-n 1048576 -u 1048576}
-
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
-
-command="/usr/bin/${RC_SVCNAME%%.*}"
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
-command_args_foreground="--foreground"
-
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
-start_stop_daemon_args="--user ${user} --group ${group}"
-supervise_daemon_args="--user ${user} --group ${group}"
-
-: ${supervisor:=supervise-daemon}
-: ${stdout:=/var/log/ceph/ceph}
-: ${stderr:=/var/log/ceph/ceph}
-: ${respawn_delay:=10}
-: ${respawn_max:=5}
-: ${respawn_period:=1800}
-
-: ${osd_respawn_delay:=15}
-: ${osd_respawn_max:=10}
-
-: ${radosgw_respawn_max:=5}
-: ${radosgw_respawn_period:=30}
-
-depend() {
-	use dns logger
-	after net ntpd ntp-client chronyd
-	before netmount
-}
-
-is_type_valid() {
-	case ${daemon_type} in
-		mon|mds|osd|mgr|radosgw) return 0;;
-		*) return 1;;
-	esac
-}
-
-start_pre() {
-	local logdir
-	export CEPH_CONF="${ceph_conf}"
-
-	checkpath -d -q -o "${user}:${group}" "${rundir}"
-
-	if ! is_type_valid ;then
-		eerror "Please give valid Ceph Server Type: mds, mon, osd"
-		return 1
-
-	elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
-		eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
-		return 1
-	fi
-
-	if [ -n "${bluestore_osd_fsid}" ]; then
-		einfo "Mounting Bluestore"
-		ceph-volume lvm activate "${daemon_id}" "${bluestore_osd_fsid}" --no-systemd
-	fi
-
-	if [ ${daemon_type} = radosgw ] && [ ${RADOSGW_WANT_NAME_PARAM} = y ]; then
-		command_args="${command_args} --name client.${daemon_id}"
-	fi
-
-	local arg_name arg_val
-	for arg_name in std{out,err} respawn_{delay,max,period}; do
-		eval arg_val="\${${daemon_type}_${arg_name}}"
-
-		if [ -z "${arg_val}" ]; then
-			eval arg_val="\${${arg_name}}"
-		else
-			eval "${arg_name}=\"${arg_val}\""
-		fi
-
-		if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
-			local log_file log_postfix
-			log_postfix=".${daemon_id}-${arg_name}.log"
-			log_file="${arg_val}"
-
-			if [ "${log_file}" != /dev/null ]; then
-				log_file="${log_file}${log_postfix}"
-			fi
-
-			log_dir="$(dirname "${log_file}")"
-			checkpath -m 0755 -o "${user}:${group}" -d "${log_dir}"
-
-			supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${log_file}"
-		fi
-	done
-}
-
-reload() {
-	ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
-	start-stop-daemon --signal 1 "${start_stop_daemon_args}"
-	eend ${?}
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/ceph/files/ceph.initd-r8 b/sys-cluster/ceph/files/ceph.initd-r8
deleted file mode 100644
index 2ef2ed1890de..000000000000
--- a/sys-cluster/ceph/files/ceph.initd-r8
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-: ${rundir:=/run/ceph}
-: ${user:=ceph}
-: ${group:=ceph}
-: ${rc_ulimit:=-n 1048576 -u 1048576}
-
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
-
-command="/usr/bin/${RC_SVCNAME%%.*}"
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
-command_args_foreground="--foreground"
-
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
-start_stop_daemon_args="--user ${user} --group ${group}"
-supervise_daemon_args="--user ${user} --group ${group}"
-
-: ${supervisor:=supervise-daemon}
-: ${stdout:=/var/log/ceph/ceph}
-: ${stderr:=/var/log/ceph/ceph}
-: ${respawn_delay:=10}
-: ${respawn_max:=5}
-: ${respawn_period:=1800}
-
-: ${osd_respawn_delay:=15}
-: ${osd_respawn_max:=10}
-
-: ${radosgw_respawn_max:=5}
-: ${radosgw_respawn_period:=30}
-
-depend() {
-	use dns logger
-	after net ntpd ntp-client chronyd
-	before netmount
-}
-
-is_type_valid() {
-	case ${daemon_type} in
-		mon|mds|osd|mgr|radosgw) return 0;;
-		*) return 1;;
-	esac
-}
-
-start_pre() {
-	export CEPH_CONF="${ceph_conf}"
-
-	checkpath -d -q -o "${user}:${group}" "${rundir}"
-
-	if ! is_type_valid ;then
-		eerror "Please give valid Ceph Server Type: mds, mon, osd"
-		return 1
-
-	elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
-		eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
-		return 1
-	fi
-
-	local arg_name arg_val
-	for arg_name in std{out,err} respawn_{delay,max,period}; do
-		eval arg_val="\${${daemon_type}_${arg_name}}"
-
-		if [ -z "${arg_val}" ]; then
-			eval arg_val="\${${arg_name}}"
-		else
-			eval "${arg_name}=\"${arg_val}\""
-		fi
-
-		if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
-			local log_file log_postfix
-			log_postfix=".${daemon_id}-${arg_name}.log"
-			log_file="${arg_val}"
-
-			if [ "${log_file}" != /dev/null ]; then
-				log_file="${log_file}${log_postfix}"
-			fi
-
-			supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${log_file}"
-		fi
-	done
-}
-
-reload() {
-	ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
-	start-stop-daemon --signal 1 "${start_stop_daemon_args}"
-	eend ${?}
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/ceph/files/ceph.logrotate-r1 b/sys-cluster/ceph/files/ceph.logrotate-r1
deleted file mode 100644
index df03f5e69a4b..000000000000
--- a/sys-cluster/ceph/files/ceph.logrotate-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-/var/log/ceph/*.log
-{
-    rotate 7
-    daily
-    compress
-    sharedscripts
-    prerotate
-	for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do
-		ceph --admin-daemon /run/ceph/${dmn} log flush 2>/dev/null >/dev/null
-	done
-    endscript
-    postrotate
-	for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do
-		ceph --admin-daemon /run/ceph/${dmn} log reopen 2>/dev/null >/dev/null
-        done
-    endscript
-    missingok
-}
diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml
index a483dc67c04b..03215bde3fda 100644
--- a/sys-cluster/ceph/metadata.xml
+++ b/sys-cluster/ceph/metadata.xml
@@ -22,11 +22,14 @@
     <flag name="cephfs">Build support for cephfs, a POSIX compatible filesystem built on top of ceph</flag>
     <flag name="dpdk">Enable DPDK messaging</flag>
     <flag name="fuse">Build fuse client</flag>
+    <flag name="grafana">Install grafana dashboards</flag>
     <flag name="libatomic">Use libatomic instead of builtin atomic operations</flag>
     <flag name="libaio">Use libaio as asynchronous input/output library</flag>
     <flag name="lttng">Add support for LTTng</flag>
     <flag name="mgr">Build the ceph-mgr daemon</flag>
     <flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography</flag>
+    <flag name="numa">Use <pkg>sys-process/numactl</pkg> for numa support in rocksdb</flag>
+    <flag name="rabbitmq">Use rabbitmq-c to build rgw amqp push endpoint</flag>
     <flag name="radosgw">Add radosgw support</flag>
     <flag name="system-boost">Use system <pkg>dev-libs/boost</pkg> instead of the bundled one</flag>
     <flag name="xfs">Add xfs support</flag>
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 5f31065ce050..6314fab566f7 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,18 +1,11 @@
 AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c1d1f3a84b9f1c1e7c596361ec5d2aab650f1ebf3f0f053e313f2e15be64995d1309a6eafc8a69 SHA512 be3c2e6798b08527487cfd2b1cd66a03d891526a45f52c97a536b15a08d46a4162e3b036dcae86911c7dba25c5d7f02e73a089d4dd720526bf38ecd0f44c59b0
 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
-DIST cinder-11.1.1.tar.gz 5808526 BLAKE2B 1b773e45673c35faff1a327d73608949e088f3635adb6dd6c7e779e708dd8f2270b85086378d48042b86e60ad7ca94754d56c1d0193f1d715112a03cf3163c77 SHA512 10ecf0068c57077a24bb0445a0901e07e7ad211cd7fac67ed016b770b477e9ba0e9954de70f165aae69e079f6b2e9416d8292ec701db4c97b987c7dac8f69a43
-DIST cinder-11.2.0.tar.gz 5832600 BLAKE2B 3d06bef947ffd8b38bb178de79f592b678793bb53ccec23d2b46132d78180d58aa11ea760c9ad5d3923d32452c700aeb6e097d84261e86bdce79d34bff1c2402 SHA512 4ef77c0d0423286d1ce2aa1174b65b17999819f719f061811c24f277e41b8463bf4971982c4d9f5e085aac75fcd964353ae26bcf7b395023a0aa37e964000014
-DIST cinder-12.0.5.tar.gz 5358388 BLAKE2B 7ee078eb4cc4c4b16053453f1f3e5bd37c29766f80bedd1b3fe6e9d44387c8215d0fed1f79d92576254bf51b567227193a7175db7d06ef35d7f3fff5d82dd4da SHA512 80788d2b10a4a0bf83e61db8e58f54dd8bbcd9fa06cd4025d37809f310bc7ed148ea9c180f4e6f02cf06f8b388384cbb9cb8a8f29a327acfe8188503550a7097
 DIST cinder-13.0.3.tar.gz 5464871 BLAKE2B 3d2beebe7503d673ebc8a3f6b07da2a6799d276578823cb1abb518894f88cf97ec051337016b177ddc45614d70b9a5350a49c144011b0d1e41beaf901b4a73da SHA512 2e358f7f0220aa6b6b88dedc8c942abcf5c54c53a690d18d84bee6d63b4f28b75c463f1d37a5e24925431e441f26066dbb0b4d33750429efbe7663d0e69de3a4
+DIST cinder-13.0.4.tar.gz 5466572 BLAKE2B de5511f74faa9a096fa1183a78e65b0950fa95cc9e746ac750ecfd6ce840bda7f4f9899b2af4bcacb4cef6e8f5bb94bf706263df5055ed973ecc43ea1834ef68 SHA512 a492580718cb2cdd47bf1dc74d95ef9b3a6afdf50351e20e840c6a9805aed434e520be30c4126ba26216011b16e16007bc6e8816bb8aa7aea1e20d7cc2d622dd
 DIST cinder.conf.sample-13.0.3 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
+DIST cinder.conf.sample-13.0.4 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-2018.2.9999 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
-DIST pike-cinder.conf.sample 185310 BLAKE2B 6f6a626537098107d63cd33ef6f8cc63dd5064711fcab3b6a7ebd0bb4170d3cc18e1cc414491859c63ca02d39602f496068823975f1cd5de731402696ade0868 SHA512 12c44b7a31888fbf4c70e037a2f5d0b778018e10bd0fc1cb97391bbe2fc6f97bbe4bec0d1504513ee0235ce50decda6883fe64a7d8fd5e329d8ad73e6bb74654
-DIST queens-cinder.conf.sample 179467 BLAKE2B 00c229a6d9882740460c633db69bf3f5ff3d77a2a8e78f38528f1b5e6e03c2371141ba219c24b8dc82e51c20a5e784af142c1a0192791ff356e5841a9991d713 SHA512 346f9ad4ddcfed26dd3b9b34e65c2edaf08a7d649d4af5bd3a5ebf1047c78d6cdc4e4712666e022f56acd3b2a0b323850b40cc4d0008f2c140507342a00b2908
-EBUILD cinder-11.1.1.ebuild 7748 BLAKE2B fee1f56d529fd4aa3969d4af66d793c419f1c2215d4e8715d8a4faa0c4cc82c5af2e125ea8de35e3496354c323bf0fbd55159fde814ff070415b025c0a435a34 SHA512 ff37f6b3906eba212691312b9c689d62a848e2db4c05e20acf233edf502423b4ac466639f9c073d9c70e08e570e8a411513b224c881b227fae52f0cedb72fd7d
-EBUILD cinder-11.2.0.ebuild 7747 BLAKE2B c00bf247b5500ebbf92de7b6c972d0cdb46bcd4f1bad37d472980c49aa78e079fb0ff0b1f38c4c6caea809a3674591426cb22f7211a2a8d3281a8e885fa8bcce SHA512 5f1dfbc83e16d31ba75128fb5973b3e5f0f4de4fa7e1a96ac7873692af37991353109064437d31e23dd4fbb558ebe12a17675af8e1635960099a86607c0fc851
-EBUILD cinder-12.0.5.ebuild 8042 BLAKE2B 688709ee140593bb931674a7147775d8e819d3177121a329f8139238419200ca1f4d438c6718a804e75d9e5e4b0567c1a2b163b62cc79d6a4d7cbcbe349d7baa SHA512 759311173f80ee02324552ff2fce079aaa00949cf57616110b78ced759a1b69ba179b5186747747d4d74c8e420d89261cd2a6beca05cf28a7cf098591da3133f
 EBUILD cinder-13.0.3.ebuild 7809 BLAKE2B eac04abb8fede52a183b7908b4be44e7d5cb38b536c63c68eb50b4d41ad71607b94768b49dd159ff3f32599268c8f92dabee65427a0b1736150860924384f469 SHA512 83a0e6742a08a8e65a084f0f07025c35d8615ea0041e4e1edbc1b76df59c88e57e00e0b6c6eee33da53b0a2568588fa799ec831616b2993d3c69f6cd7c6ff0f4
-EBUILD cinder-2017.2.9999.ebuild 7774 BLAKE2B f1c7f6f21eed9724ca1ba3a4461be1c1c8c7d17b6bd6e0d7eaa2f3f9ad56cf6c96946266eaafca58624a5501d5560307a776cb8c4209f18525589738aa388b16 SHA512 0d985ee9d439aaaad712d065ed66c3b603688f516172d50f004c4a4793554755fc7bcf2c787bd85ecc7076ea2b489f971567efa042a718764b64c23edaa21ddf
-EBUILD cinder-2018.1.9999.ebuild 8047 BLAKE2B 9d4be05868caddcf9d8bc1d7355c1c9efba7860f5d3adc01fac2be8376ea7c6dbda724de54c5cd5bc505c01dd36962c24d0e53eb8e6dfb749bacfa7676c0c2f1 SHA512 4ccc67e7c2a7603b48268f548662e0b974e688383f546b4b35346cd248705221536f25408936cac050c1b366ffa4a06b7d9254a9480c4e6c656440743247bed1
+EBUILD cinder-13.0.4.ebuild 7811 BLAKE2B f903b27a6a07b69413fadabd0e94a368b4553438fe89404b9fdceefe4f77a80924bbabc84460393c6437583c34e6fb9d108d222e1e84a387c8864f7fe731390a SHA512 8ace1323dad4c04e7ef36042104552c870f560ab376b4b192a28923dafad60915ea9f0631fe239ec47a8ffa65b1d15daf66f4ad7a19b44497e234a7b953b27b4
 EBUILD cinder-2018.2.9999.ebuild 7814 BLAKE2B 6755862a53601c6f2afce2f3d07583e59b737cb8d3ff788099b4f9bccb8cc6a7084306fb999c55be18cf7281b62cae16625b4125b166dc68281d845e57fa0b3a SHA512 35ff4a9673ff4ba9af192853ee30997b86cf28866951a520d34149c02f8196365754bcaf8337834b4254581abd9e3067e09439840a1d97d8333bf2aa290c4270
 MISC metadata.xml 1244 BLAKE2B bac3f4931079ae89c48d66ed2fe689978fcf609638ade7b26d8f07ffbd6562d7c4a16b42dec4390654747c6d2dfcb92b73d27c90356f1928199469d42432ef69 SHA512 fda201e6974bb0af9c24c1384a3bb2dd0a0c630439d7f1955de336f53804070a68426919fd4dc6f864d502c7e9e99a80d1920c740b6dc179f7b46c7f7fb7aef9
diff --git a/sys-cluster/cinder/cinder-11.1.1.ebuild b/sys-cluster/cinder/cinder-11.1.1.ebuild
deleted file mode 100644
index b0f15626d2d7..000000000000
--- a/sys-cluster/cinder/cinder-11.1.1.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2018 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="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
-HOMEPAGE="https://launchpad.net/cinder"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/pike/cinder.conf.sample -> pike-cinder.conf.sample
-https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
-REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	dev-python/enum34[$(python_gen_usedep 'python2_7')]
-	>=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/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.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/oauth2client-1.5.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-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.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-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-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${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.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/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	~dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-1.15.2[${PYTHON_USEDEP}]
-	>=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.47.0[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	iscsi? (
-		tgt? ( sys-block/tgt )
-		sys-block/open-iscsi
-	)
-	lvm? ( sys-fs/lvm2 )
-	memcached? ( net-misc/memcached )
-	app-emulation/qemu
-	sys-fs/sysfsutils"
-# qemu is needed for image conversion
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES=""
-	if use tcp; then
-		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
-	fi
-	if use rdma; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
-	fi
-	if use infiniband; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	fi
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewgroup cinder
-	enewuser cinder -1 -1 /var/lib/cinder cinder
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
-	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-
-	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
-	done
-
-	insinto /etc/cinder
-	insopts -m0640 -o cinder -g cinder
-	doins "etc/cinder/api-httpd.conf"
-	doins "etc/cinder/logging_sample.conf"
-	doins "etc/cinder/rootwrap.conf"
-	doins "etc/cinder/api-paste.ini"
-	doins "etc/cinder/policy.json"
-	doins "etc/cinder/resource_filters.json"
-	newins "${DISTDIR}/pike-cinder.conf.sample" "cinder.conf.sample"
-	insinto /etc/cinder/rootwrap.d
-	doins "etc/cinder/rootwrap.d/volume.filters"
-
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/cinder.sudoersd" cinder
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "Cinder needs tgtd to be installed and running to work with iscsi"
-		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
-	fi
-}
diff --git a/sys-cluster/cinder/cinder-11.2.0.ebuild b/sys-cluster/cinder/cinder-11.2.0.ebuild
deleted file mode 100644
index a95e329fad9a..000000000000
--- a/sys-cluster/cinder/cinder-11.2.0.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
-HOMEPAGE="https://launchpad.net/cinder"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/pike/cinder.conf.sample -> pike-cinder.conf.sample
-https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
-REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	dev-python/enum34[$(python_gen_usedep 'python2_7')]
-	>=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/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.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/oauth2client-1.5.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-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.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-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-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${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.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/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	~dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-1.15.2[${PYTHON_USEDEP}]
-	>=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.47.0[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	iscsi? (
-		tgt? ( sys-block/tgt )
-		sys-block/open-iscsi
-	)
-	lvm? ( sys-fs/lvm2 )
-	memcached? ( net-misc/memcached )
-	app-emulation/qemu
-	sys-fs/sysfsutils"
-# qemu is needed for image conversion
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES=""
-	if use tcp; then
-		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
-	fi
-	if use rdma; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
-	fi
-	if use infiniband; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	fi
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewgroup cinder
-	enewuser cinder -1 -1 /var/lib/cinder cinder
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
-	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-
-	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
-	done
-
-	insinto /etc/cinder
-	insopts -m0640 -o cinder -g cinder
-	doins "etc/cinder/api-httpd.conf"
-	doins "etc/cinder/logging_sample.conf"
-	doins "etc/cinder/rootwrap.conf"
-	doins "etc/cinder/api-paste.ini"
-	doins "etc/cinder/policy.json"
-	doins "etc/cinder/resource_filters.json"
-	newins "${DISTDIR}/pike-cinder.conf.sample" "cinder.conf.sample"
-	insinto /etc/cinder/rootwrap.d
-	doins "etc/cinder/rootwrap.d/volume.filters"
-
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/cinder.sudoersd" cinder
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "Cinder needs tgtd to be installed and running to work with iscsi"
-		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
-	fi
-}
diff --git a/sys-cluster/cinder/cinder-12.0.5.ebuild b/sys-cluster/cinder/cinder-13.0.4.ebuild
index 696f299b97f8..f3ef098f76ee 100644
--- a/sys-cluster/cinder/cinder-12.0.5.ebuild
+++ b/sys-cluster/cinder/cinder-13.0.4.ebuild
@@ -11,13 +11,13 @@ HOMEPAGE="https://launchpad.net/cinder"
 
 if [[ ${PV} == *9999 ]];then
 	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample"
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}"
 	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
-	EGIT_BRANCH="stable/queens"
+	EGIT_BRANCH="stable/rocky"
 else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
@@ -40,20 +40,19 @@ RDEPEND="
 	dev-python/enum34[$(python_gen_usedep 'python2_7')]
 	>=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/greenlet-0.4.1[${PYTHON_USEDEP}]
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
 	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
 	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
 	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
 	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
 	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
 	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
@@ -77,9 +76,7 @@ RDEPEND="
 	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
 	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
 	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
 	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
 	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
@@ -90,10 +87,7 @@ RDEPEND="
 	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
 	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.64[${PYTHON_USEDEP}]
+	>=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}]
 	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	sqlite? (
@@ -131,8 +125,8 @@ RDEPEND="
 	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
 	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
 	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
 	iscsi? (
 		tgt? ( sys-block/tgt )
 		sys-block/open-iscsi
@@ -172,6 +166,8 @@ pkg_setup() {
 
 python_prepare_all() {
 	sed -i '/^hacking/d' test-requirements.txt || die
+	# only used for docs
+	sed -i '/^sphinx-feature-classification/d' requirements.txt || die
 	distutils-r1_python_prepare_all
 }
 
@@ -196,7 +192,7 @@ python_install_all() {
 	doins "etc/cinder/rootwrap.conf"
 	doins "etc/cinder/api-paste.ini"
 	doins "etc/cinder/resource_filters.json"
-	newins "${DISTDIR}/queens-cinder.conf.sample" "cinder.conf.sample"
+	newins "${DISTDIR}/cinder.conf.sample-${PV}" "cinder.conf.sample"
 	insinto /etc/cinder/rootwrap.d
 	doins "etc/cinder/rootwrap.d/volume.filters"
 
diff --git a/sys-cluster/cinder/cinder-2017.2.9999.ebuild b/sys-cluster/cinder/cinder-2017.2.9999.ebuild
deleted file mode 100644
index 21735a00e684..000000000000
--- a/sys-cluster/cinder/cinder-2017.2.9999.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 eutils git-r3 linux-info user
-
-DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
-HOMEPAGE="https://launchpad.net/cinder"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/pike/cinder.conf.sample -> pike-cinder.conf.sample"
-EGIT_REPO_URI="https://github.com/openstack/cinder.git"
-EGIT_BRANCH="stable/pike"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
-REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	dev-python/enum34[$(python_gen_usedep 'python2_7')]
-	>=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/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.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/oauth2client-1.5.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-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.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-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-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${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.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/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	~dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-1.15.2[${PYTHON_USEDEP}]
-	>=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.47.0[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	iscsi? (
-		tgt? ( sys-block/tgt )
-		sys-block/open-iscsi
-	)
-	lvm? ( sys-fs/lvm2 )
-	memcached? ( net-misc/memcached )
-	app-emulation/qemu
-	sys-fs/sysfsutils"
-# qemu is needed for image conversion
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES=""
-	if use tcp; then
-		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
-	fi
-	if use rdma; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
-	fi
-	if use infiniband; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	fi
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewgroup cinder
-	enewuser cinder -1 -1 /var/lib/cinder cinder
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
-	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-
-	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
-	done
-
-	insinto /etc/cinder
-	insopts -m0640 -o cinder -g cinder
-	doins "etc/cinder/api-httpd.conf"
-	doins "etc/cinder/logging_sample.conf"
-	doins "etc/cinder/rootwrap.conf"
-	doins "etc/cinder/api-paste.ini"
-	doins "etc/cinder/policy.json"
-	doins "etc/cinder/resource_filters.json"
-	newins "${DISTDIR}/pike-cinder.conf.sample" "cinder.conf.sample"
-	insinto /etc/cinder/rootwrap.d
-	doins "etc/cinder/rootwrap.d/volume.filters"
-
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/cinder.sudoersd" cinder
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "Cinder needs tgtd to be installed and running to work with iscsi"
-		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
-	fi
-}
diff --git a/sys-cluster/cinder/cinder-2018.1.9999.ebuild b/sys-cluster/cinder/cinder-2018.1.9999.ebuild
deleted file mode 100644
index b4978e98b3f0..000000000000
--- a/sys-cluster/cinder/cinder-2018.1.9999.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
-HOMEPAGE="https://launchpad.net/cinder"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample"
-	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
-	EGIT_BRANCH="stable/queens"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
-REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
-	dev-python/enum34[$(python_gen_usedep 'python2_7')]
-	>=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/greenlet-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.64[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${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/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	~dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	iscsi? (
-		tgt? ( sys-block/tgt )
-		sys-block/open-iscsi
-	)
-	lvm? ( sys-fs/lvm2 )
-	memcached? ( net-misc/memcached )
-	app-emulation/qemu
-	sys-fs/sysfsutils"
-# qemu is needed for image conversion
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES=""
-	if use tcp; then
-		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
-	fi
-	if use rdma; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
-	fi
-	if use infiniband; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	fi
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewgroup cinder
-	enewuser cinder -1 -1 /var/lib/cinder cinder
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
-	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-
-	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
-	done
-
-	insinto /etc/cinder
-	insopts -m0640 -o cinder -g cinder
-	doins "etc/cinder/api-httpd.conf"
-	doins "etc/cinder/logging_sample.conf"
-	doins "etc/cinder/rootwrap.conf"
-	doins "etc/cinder/api-paste.ini"
-	doins "etc/cinder/resource_filters.json"
-	newins "${DISTDIR}/queens-cinder.conf.sample" "cinder.conf.sample"
-	insinto /etc/cinder/rootwrap.d
-	doins "etc/cinder/rootwrap.d/volume.filters"
-
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/cinder.sudoersd" cinder
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "Cinder needs tgtd to be installed and running to work with iscsi"
-		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
-	fi
-}
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 5ac50540745f..ff67ab69d36b 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,10 +1,9 @@
 AUX galera-3.15-strip-extra-cflags.patch 2397 BLAKE2B 7d1d9e7b775e8ee26da152fb42c4b19e65e1084e471d4c7613a661206ee05fa280c29266be4ae66c0b1001de3062a6396c3b45917fcf3d4090b8afe229a7e680 SHA512 4f41398faaa138543ff6fd24b2aac9aa329dabf74d6355ea5c620db64e3112e27e17c15bf7e1dae1e7ddbe92795cedd65a9d6e52bd07b66f3fe27dde2ffc7cad
+AUX galera-4.1-strip-extra-cflags.patch 2747 BLAKE2B 314e020bdbce2d3080d28c4d5bf5ad438affc8075736c38b77d713e59749a4eabce3a38b6c918b1768f48b99ec5c860813c3441291d0834ebf6d6ed545d30576 SHA512 0458705897861d4bc225326077ae379fb1c921aa65a102a24f2fba5c866c52a549c47bed929801c06ebb0c484136c1179a56b2fd750abd6aabc7a6a74fc18c2f
 AUX garb.cnf 612 BLAKE2B 6597e77fd29aacece48e89217004abc62ecaf7f6477b62d5a29ff1c3b5f18dca3cfbe6a4a115c324c945f6949e8fe227b8b9e4e94816d48eda53e9e2723100e5 SHA512 97b921109b242ad1a19326564b5f9da8a09eadd4771c2c86c727c1c30e35f92ffadbb38ce7d81bc88572d2c7b04466ad212432954e09d81417c4ed7f69ec4648
 AUX garb.sh 1029 BLAKE2B 452a4f3bf50b25f040784e03d428ba10a3580cee486a5cb283db90bee4bcefe951813fbfd4e38024fb05d1681adb74a697dfe48c4d0c47aaddf094204a818a95 SHA512 780eb8e7584d31ce24559e46724c7b981320f4706af0b9f0cd8d157247f853f51d3980178d0d234f64bcb097a4ee5493fe299d6800513403dbc7e0184c020902
-DIST galera-3-25.3.23.tar.gz 3328961 BLAKE2B d11c6d00fda367fc961a5387865afa74e1ed0ed04094a4ab3c5ab23c7a915131b867a85f74079dc472df745762346b8b9fd371d5d0d0406e20274d51917129b5 SHA512 5b6a61ddd1505f9e2f9e3c592d65e17ee55ee78187d423f8f963d9c7b8deed2c1ade3425262d0a89622693853dff95d429861c955b2d051433dda8929d9f92d1
-DIST galera-3-25.3.24.tar.gz 3373375 BLAKE2B db837add9d74e2acb312bd974f00b52d269f1c5995036b468f309da43605b817fac16f17c30e96c27e17657708870d329b41eafa9ad214d8cb5f1b4fbb468182 SHA512 874c6ee77be54a0bcd6d36b67f8e99d12dabd85433dd1f0e026b7994746679cc7ffebcf721445dfd1714f89c7594fc0b0137e725d220d3bb45fd325e64e16185
+DIST galera-25.3.26.tar.gz 3386588 BLAKE2B ca78a32dbaa6fd9eb46c40ddb26c97c788e529ad44040b4f720099b7aef2cee13631663cc5ecb7153288c12e7b4b156f988ff56633885e7ee75a0664cb1a90d4 SHA512 c462e70e8394ac4cfebca94320199ca4e012db100369788f3efdf1a04a8185908954e575fdb5714524931feeea432c2ed6f8d6ff985b1a47bdb16b4c4f54bdc4
 DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B 892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216 SHA512 bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03
-EBUILD galera-25.3.23.ebuild 1834 BLAKE2B c9c0ce726168b44adebd8a862f0446865e9acfb22dee871c322a60c3a2bbd1b1e02fc363ed2840f09cad7f7ca984128319fb49fab2470e5dee97586f8d2b51de SHA512 f5389646c9d5ef832a430440e31c27e99488352a645657a2044f4739c45ef185207e0a3466a35b731b68a9d53c362b28ca4aa9ef91e403a506ee1a435e1a1aae
-EBUILD galera-25.3.24.ebuild 1838 BLAKE2B 0803ea202f990158eb9b9dd2f8b019885c71d24337543bb465d36f498bdaf8444275b0d0e45dafd182b69ada8d2e530701fbb32377f909c257d81fd9212bf4e9 SHA512 d1a86a5aee5cf7087cd76af06764274dde519494da74367e5068bc5b2e530dda33e2869a8755ea327a3615d7ad87cb8973118f25c523fa2183ff1f01d06b06f7
 EBUILD galera-25.3.25.ebuild 1898 BLAKE2B 233d5916fa1859a43ac111ecc8ae5051851a30527a8e635880a0fefe2bec46a3415164b01faeb9808ee2b23909febf2750b8603de0b3c201e5b70393316f1868 SHA512 965e5874a357095dd6b410eb2aaa6d8bb20c11b636a40a1276dc2009a536a3cb6745a1ad6c76bbff19b2b6707f45743699716fe1104c8be471ca1e770807638f
+EBUILD galera-25.3.26.ebuild 1913 BLAKE2B 928d84e64eaf0691173b9ebe663c66d2b91635ef818bb12bac0b720393686d0500727226fb99e8e02568feb39ed91964029d278fdcda7389c072194af8eb713c SHA512 c17cac0dd0c4f8c5e7915c20dcc81db99651acb93edf65858947478f3a52f1668ac880180519600a85cc2f296c3e17b92d2f316a2d4ad3283d169bff711037ed
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch
new file mode 100644
index 000000000000..dfa1642c7d7e
--- /dev/null
+++ b/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch
@@ -0,0 +1,78 @@
+diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript
+--- a/galerautils/src/SConscript	2019-02-25 10:37:25.000000000 -0500
++++ b/galerautils/src/SConscript	2019-03-07 09:51:27.163226469 -0500
+@@ -1,4 +1,4 @@
+-Import('env', 'x86', 'sysname', 'machine')
++Import('env', 'sysname', 'machine')
+ 
+ libgalerautils_env = env.Clone()
+ 
+@@ -39,22 +39,6 @@
+ crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ]
+ crc32c_objs = crc32c_env.SharedObject(crc32c_sources)
+ 
+-if x86:
+-    if machine != 'ppc64' and machine != 'ppc64le':
+-        crc32c_env.Append(CFLAGS = ' -msse4.2')
+-    if sysname == 'sunos':
+-        # Ideally we want to simply strip SSE4.2 flag from the resulting
+-        # crc32.pic.o
+-        # (see http://ffmpeg.org/pipermail/ffmpeg-user/2013-March/013977.html)
+-        # but that requires some serious scons-fu, so we just don't
+-        # compile hardware support in if host CPU does not have it.
+-        from subprocess import check_call
+-        try:
+-            check_call("isainfo -v | grep sse4.2 >/dev/null 2>&1", shell=True);
+-        except:
+-            libgalerautils_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
+-            crc32c_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
+-
+ libgalerautils_env.StaticLibrary('galerautils',
+                                  libgalerautils_objs + crc32c_objs)
+ 
+diff -aurN a/SConstruct b/SConstruct
+--- a/SConstruct	2019-03-07 09:44:38.588841625 -0500
++++ b/SConstruct	2019-03-07 09:50:06.305952407 -0500
+@@ -67,7 +67,7 @@
+ build_target = 'all'
+ 
+ # Optimization level
+-opt_flags    = ' -g -O3 -DNDEBUG'
++opt_flags    = ' -DNDEBUG'
+ 
+ # Architecture (defaults to build host type)
+ compile_arch = ''
+@@ -120,33 +120,6 @@
+ if gcov:
+     opt_flags = opt_flags + ' --coverage -g'
+ 
+-if sysname == 'sunos':
+-    compile_arch = ' -mtune=native'
+-elif x86:
+-    if bits == 32:
+-        if machine == 'x86_64':
+-            compile_arch = ' -mx32'
+-        else:
+-            compile_arch = ' -m32 -march=i686'
+-            if sysname == 'linux':
+-                link_arch = ' -Wl,-melf_i386'
+-    else:
+-        if machine == 'ppc64':
+-          compile_arch = ' -mtune=native'
+-          link_arch = ' -Wl,-melf64ppc'
+-        elif machine == 'ppc64le':
+-          compile_arch = ' -mtune=native'
+-          link_arch = ' -Wl,-melf64lppc'
+-        else:
+-          compile_arch = ' -m64'
+-          if sysname == 'linux':
+-            link_arch = ' -Wl,-melf_x86_64'
+-        link_arch = compile_arch + link_arch
+-elif machine == 's390x':
+-    compile_arch = ' -mzarch'
+-    if bits == 32:
+-        compile_arch += ' -m32'
+-
+ boost      = int(ARGUMENTS.get('boost', 1))
+ boost_pool = int(ARGUMENTS.get('boost_pool', 0))
+ system_asio= int(ARGUMENTS.get('system_asio', 1))
diff --git a/sys-cluster/galera/galera-25.3.23.ebuild b/sys-cluster/galera/galera-25.3.23.ebuild
deleted file mode 100644
index bcb3d49b1677..000000000000
--- a/sys-cluster/galera/galera-25.3.23.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-3-${PV}"
-
-inherit scons-utils toolchain-funcs user flag-o-matic
-DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="http://galeracluster.com"
-SRC_URI="http://releases.galeracluster.com/${PN}-3/source/galera-3-${PV}.tar.gz"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
-IUSE="cpu_flags_x86_sse4_2 garbd test"
-
-CDEPEND="
-	dev-libs/openssl:0=
-	>=dev-libs/boost-1.41:0=
-	"
-DEPEND="${DEPEND}
-	${CDEPEND}
-	dev-libs/check
-	>=sys-devel/gcc-4.4
-	>=dev-cpp/asio-1.10.1[ssl]
-	<dev-cpp/asio-1.12.0
-	"
-#Run time only
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-# Respect {C,LD}FLAGS.
-PATCHES=( "${FILESDIR}/galera-3.15-strip-extra-cflags.patch" )
-
-pkg_preinst() {
-	if use garbd ; then
-		enewgroup garbd
-		enewuser garbd -1 -1 -1 garbd
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Remove bundled dev-cpp/asio
-	rm -r "${S}/asio" || die
-
-	#Remove optional garbd daemon
-	if ! use garbd ; then
-		rm -r "${S}/garb" || die
-	fi
-}
-
-src_configure() {
-	tc-export CC CXX
-	# Uses hardware specific code that seems to depend on SSE4.2
-	if use cpu_flags_x86_sse4_2 ; then
-		append-cflags -msse4.2
-	else
-		append-cflags -DCRC32C_NO_HARDWARE
-	fi
-	# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
-	# and -Wold-style-cast
-	MYSCONS=(
-		tests=$(usex test 1 0)
-		strict_build_flags=0
-		system_asio=1
-	)
-}
-
-src_compile() {
-	escons --warn=no-missing-sconscript "${MYSCONS[@]}"
-}
-
-src_install() {
-	dodoc scripts/packages/README scripts/packages/README-MySQL
-	if use garbd ; then
-		dobin garb/garbd
-		newconfd "${FILESDIR}/garb.cnf" garbd
-		newinitd "${FILESDIR}/garb.sh" garbd
-		doman man/garbd.8
-	fi
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-25.3.24.ebuild b/sys-cluster/galera/galera-25.3.26.ebuild
index b86933238352..cb0e18917305 100644
--- a/sys-cluster/galera/galera-25.3.24.ebuild
+++ b/sys-cluster/galera/galera-25.3.26.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 MY_P="${PN}-3-${PV}"
 
-inherit scons-utils toolchain-funcs user flag-o-matic
+inherit python-any-r1 scons-utils toolchain-funcs user flag-o-matic
 DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
 HOMEPAGE="http://galeracluster.com"
-SRC_URI="http://releases.galeracluster.com/${PN}-3/source/galera-3-${PV}.tar.gz"
+SRC_URI="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.14/${P}/src/${P}.tar.gz"
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
@@ -20,19 +22,19 @@ CDEPEND="
 	dev-libs/openssl:0=
 	>=dev-libs/boost-1.41:0=
 	"
-DEPEND="${DEPEND}
+BDEPEND=">=sys-devel/gcc-4.4"
+DEPEND="${BDEPEND}
 	${CDEPEND}
 	dev-libs/check
-	>=sys-devel/gcc-4.4
 	>=dev-cpp/asio-1.10.1[ssl]
 	<dev-cpp/asio-1.12.0
 	"
 #Run time only
 RDEPEND="${CDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
+#S="${WORKDIR}/${MY_P}"
 # Respect {C,LD}FLAGS.
-PATCHES=( "${FILESDIR}/galera-3.15-strip-extra-cflags.patch" )
+PATCHES=( "${FILESDIR}/galera-4.1-strip-extra-cflags.patch" )
 
 pkg_preinst() {
 	if use garbd ; then
diff --git a/sys-cluster/gasnet/Manifest b/sys-cluster/gasnet/Manifest
index b8f5bc0f978f..6fdff0bb958d 100644
--- a/sys-cluster/gasnet/Manifest
+++ b/sys-cluster/gasnet/Manifest
@@ -2,9 +2,9 @@ DIST GASNet-1.26.4.tar.gz 2656498 BLAKE2B 0c203e42b8d55d28ab1cb055b9218afef34a9f
 DIST GASNet-1.28.0.tar.gz 2654757 BLAKE2B 2c55ba6d2278b874f5e836e871c14acc29daa684746094c8982d3e62c06fa27725d5f6e3c31eb69f4b130dc1a6545beb498624b55cdaf69aa08e3e92675d0e9e SHA512 3edef7efc55833d286b1d562f670b9605b1c8c37f9cf5582a46a5e7d8b2fbb7deca695597accda6f39c75e840da1879e8bb3d8b9f25da6be4aad60eca4aad169
 DIST GASNet-1.28.2.tar.gz 2691394 BLAKE2B de428d4cf606672b68b4065a96b3938a89ba2e4d0b95784959ad167554dd7c2c301238027a372a9aec44afbcd5a588cecaada0d6250daba23c46833a836c87b1 SHA512 df472c55642891405cd86b9cc573cb1cd7607af7cd0ed931cb423ce0274f1a000f5f0b3481950cac710f154a5068088e8c101f1ea0cb9ceb4aaf73444cb3cef5
 DIST GASNet-1.30.0.tar.gz 2686524 BLAKE2B c42bc87dd387a356be254dee5cf57d5c4ce086dc14e08ea137a6886656890e355a9f3305142688922966b46eb2b2338b1ba7e65c75ee9af4248ea5cab91c2ce0 SHA512 c95825906b2298be16087fa817baf14076c2d70b1e6420feef07da0c01d2e780415904dac5ec9b4debdffb0749b706f40ac50c4574425978783d7121506c99a6
-EBUILD gasnet-1.26.4-r1.ebuild 1831 BLAKE2B 47592a2667ed2786085a2f03ba5548fba2402e9bdd299769a2c8703558a6c098fdbee7bd42ebfe4a9811ee84bd661eb20a4e94f55365de821ddac0f82702466e SHA512 51a5f3e49102838e24d1c2233d45a926b15fcf361e9ec365d2f2fe08b63bf8c38019d090122443502dda9338b58ed54e563e2d1ff47cd4481cefcabad6528952
-EBUILD gasnet-1.26.4.ebuild 687 BLAKE2B bb4bfdd9262db5f00d546774f9698d0ec00b48df7dbf86e9be2b964b01a236eb74fb577be7376893cc5a44e51aa0306700a8ec2a9dd7448ca0faa5c2a7335274 SHA512 1724a3a0e5dd23192581d0faa595a0d2eeaa17c8ad945ad708906562d16ab188af18a5bec124be52571a64e3d4abd0f8dccd0d8997d93634dccd813bd5195727
-EBUILD gasnet-1.28.0.ebuild 2487 BLAKE2B 23fcd4e227f4bcdc4f04d818b8f44935b93ba52e1a8a6b5059bae57b2baa474b70a5e9458cc282b4d9bb5a1d03217aae66f518dc732365a40a1848707979f371 SHA512 823b553adfb0a5d55c2f687eba4c0f2abfc8b3fdf46f3af6025a361dd30dcb8cfcdaf06ff614a2549b5677f934a5f483d38ab17408a3ff186e2890837df27ce0
-EBUILD gasnet-1.28.2.ebuild 2505 BLAKE2B 94963f1a6e64e87525258920a764fa6e9dcfa7b04865caab89ac3717103f979e1e622d5e298310c6cd44c011a4408f01d52a381fd78b678a770ed7dc2f48f0c6 SHA512 259ba3b1026794153ed72728b8f403aa3a848763526d35faeb4b2f771cc223ba074284cca171b2dfe422752337aedaec9c451d1dc1fc0c989e95ea369da395f3
-EBUILD gasnet-1.30.0.ebuild 2505 BLAKE2B 94963f1a6e64e87525258920a764fa6e9dcfa7b04865caab89ac3717103f979e1e622d5e298310c6cd44c011a4408f01d52a381fd78b678a770ed7dc2f48f0c6 SHA512 259ba3b1026794153ed72728b8f403aa3a848763526d35faeb4b2f771cc223ba074284cca171b2dfe422752337aedaec9c451d1dc1fc0c989e95ea369da395f3
+EBUILD gasnet-1.26.4-r1.ebuild 1839 BLAKE2B c14d999d1901e92fb48aab585f057d7345c0eb114d150bcde98c0edce4ab4fbfddf9521d84d940c84672193568ab4dd8d797b0c6dc26c4e61aad036908cc7891 SHA512 1260cc4029eed68734232cdafb2d141ec82e98acab30aebefd5ba5b16301b6e29b4d3e528dd130b7c3a0795c060be03a812f04d1746d3a99b7dd104364ad81bc
+EBUILD gasnet-1.26.4.ebuild 695 BLAKE2B 8da44d83a4257a7b4837dbb390d9b42e2d84516759d6f26db2be32203d567588a14f428888615be11c47dd4d3a98e83c856e9db72bf26eac220b4ce3bc6b15c1 SHA512 590b7b0bfe1fe47e4d85a0f048e1adff438f371328c7c87142bee4b076303c14d5876ccb07fcb0a1ed83e60675048f56bec965688517ddbf2c3a497cc649c275
+EBUILD gasnet-1.28.0.ebuild 2495 BLAKE2B bd1b7f103000a731e35756ed9573e4a37b04d22a1d8ade637236a90abb4cb0dc6422b7eb4f49a4bab3d5d46c03125ae4e9379cc861f12bce80569d19971873ca SHA512 aef949dbcf284edcf45f0c551a4b01169cd7a43cff1f3541f64ff87236593c24b148148d471998e1c98a1afb91c543097d91dd1d497b769e61019593fc9c7cfc
+EBUILD gasnet-1.28.2.ebuild 2513 BLAKE2B 886115bc06a793d6ac380c91f8e86f50ebfaf21ddfeee56dacaaf364786e8ceba9dce87ca98b59bdf5f04452a16b7322edc74394a97cc12e9a448fa623c5111b SHA512 eb3cbf1b8cc167d1e94c852b9893d2ff4e1f7cf1879488d5b3ce2f93bbd28f687ce544da4ec3200cf7242be2daab2a7a21b5fdb617bf75a281025f46883b2187
+EBUILD gasnet-1.30.0.ebuild 2513 BLAKE2B 886115bc06a793d6ac380c91f8e86f50ebfaf21ddfeee56dacaaf364786e8ceba9dce87ca98b59bdf5f04452a16b7322edc74394a97cc12e9a448fa623c5111b SHA512 eb3cbf1b8cc167d1e94c852b9893d2ff4e1f7cf1879488d5b3ce2f93bbd28f687ce544da4ec3200cf7242be2daab2a7a21b5fdb617bf75a281025f46883b2187
 MISC metadata.xml 383 BLAKE2B 086ea4988f6f00546a59c90169c5cb3e49beb41eda1cc74c2eb3524ee3f546d7e5e3a81399c8abddbe229d6a96b618109e41ece7382d0c3e17bbb13a78f4c728 SHA512 036b39c9387179e4589ba7d893ea99d17b847bf409e6625a8fe9c798d4d548dd1d34c52b4dd9653f54d09c196873b7c04a3e3f653e5453800bdc3ad7f8087502
diff --git a/sys-cluster/gasnet/gasnet-1.26.4-r1.ebuild b/sys-cluster/gasnet/gasnet-1.26.4-r1.ebuild
index c7f53bc60cd8..32c182d224bd 100644
--- a/sys-cluster/gasnet/gasnet-1.26.4-r1.ebuild
+++ b/sys-cluster/gasnet/gasnet-1.26.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ inherit autotools toolchain-funcs multilib
 
 MY_P="${PN^^[gasn]}-${PV}"
 DESCRIPTION="Networking middleware for partitioned global address space (PGAS) language"
-HOMEPAGE="http://gasnet.lbl.gov/"
-SRC_URI="http://gasnet.lbl.gov/${MY_P}.tar.gz"
+HOMEPAGE="https://gasnet.lbl.gov/"
+SRC_URI="https://gasnet.lbl.gov/download/${MY_P}.tar.gz"
 
 SOVER="${PV%%.*}"
 LICENSE="BSD"
diff --git a/sys-cluster/gasnet/gasnet-1.26.4.ebuild b/sys-cluster/gasnet/gasnet-1.26.4.ebuild
index 67055d3a67af..ddb38e2c5e14 100644
--- a/sys-cluster/gasnet/gasnet-1.26.4.ebuild
+++ b/sys-cluster/gasnet/gasnet-1.26.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ inherit autotools
 
 MY_P="${PN^^[gasn]}-${PV}"
 DESCRIPTION="Networking middleware for partitioned global address space (PGAS) language"
-HOMEPAGE="http://gasnet.lbl.gov/"
-SRC_URI="http://gasnet.lbl.gov/${MY_P}.tar.gz"
+HOMEPAGE="https://gasnet.lbl.gov/"
+SRC_URI="https://gasnet.lbl.gov/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/sys-cluster/gasnet/gasnet-1.28.0.ebuild b/sys-cluster/gasnet/gasnet-1.28.0.ebuild
index 9a32e2c0b5c5..ffe4c765a461 100644
--- a/sys-cluster/gasnet/gasnet-1.28.0.ebuild
+++ b/sys-cluster/gasnet/gasnet-1.28.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ inherit autotools toolchain-funcs multilib
 
 MY_P="${PN^^[gasn]}-${PV}"
 DESCRIPTION="Networking middleware for partitioned global address space (PGAS) language"
-HOMEPAGE="http://gasnet.lbl.gov/"
-SRC_URI="http://gasnet.lbl.gov/${MY_P}.tar.gz"
+HOMEPAGE="https://gasnet.lbl.gov/"
+SRC_URI="https://gasnet.lbl.gov/download/${MY_P}.tar.gz"
 
 SOVER="${PV%%.*}"
 LICENSE="BSD"
diff --git a/sys-cluster/gasnet/gasnet-1.28.2.ebuild b/sys-cluster/gasnet/gasnet-1.28.2.ebuild
index 52282995fdde..4af06d5d78c8 100644
--- a/sys-cluster/gasnet/gasnet-1.28.2.ebuild
+++ b/sys-cluster/gasnet/gasnet-1.28.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ inherit autotools toolchain-funcs multilib
 
 MY_P="${PN^^[gasn]}-${PV}"
 DESCRIPTION="Networking middleware for partitioned global address space (PGAS) language"
-HOMEPAGE="http://gasnet.lbl.gov/"
-SRC_URI="http://gasnet.lbl.gov/${MY_P}.tar.gz"
+HOMEPAGE="https://gasnet.lbl.gov/"
+SRC_URI="https://gasnet.lbl.gov/download/${MY_P}.tar.gz"
 
 SOVER="${PV%%.*}"
 LICENSE="BSD"
diff --git a/sys-cluster/gasnet/gasnet-1.30.0.ebuild b/sys-cluster/gasnet/gasnet-1.30.0.ebuild
index 52282995fdde..4af06d5d78c8 100644
--- a/sys-cluster/gasnet/gasnet-1.30.0.ebuild
+++ b/sys-cluster/gasnet/gasnet-1.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ inherit autotools toolchain-funcs multilib
 
 MY_P="${PN^^[gasn]}-${PV}"
 DESCRIPTION="Networking middleware for partitioned global address space (PGAS) language"
-HOMEPAGE="http://gasnet.lbl.gov/"
-SRC_URI="http://gasnet.lbl.gov/${MY_P}.tar.gz"
+HOMEPAGE="https://gasnet.lbl.gov/"
+SRC_URI="https://gasnet.lbl.gov/download/${MY_P}.tar.gz"
 
 SOVER="${PV%%.*}"
 LICENSE="BSD"
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 54ef0def2183..74e781e55781 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -12,8 +12,10 @@ AUX glusterfs.vim 139 BLAKE2B 73fdcb49c0c252784718b461541d5483e118bf1b83f445a6ce
 DIST glusterfs-4.0.0.tar.gz 7632629 BLAKE2B 9367d2c99452d261d889cf564f3a055e1459ee54377cbf8cf6cc46c8d7f153bb258892fb73fc492d1dc6c5bea156d204971256fefc96f9f4825583d9c1086563 SHA512 acd3c462a8e15fb31f4b30d2e217928488e32d66ae7d1061df3e166354a4ddcdeb0ba0bcc994b7563f83376c882800fad07e190e0086fda987915c195266421f
 DIST glusterfs-4.0.2.tar.gz 7643713 BLAKE2B 6314f81fe1474bcf8c577aa68a32c46a6d1e586b32c698a9e30850080408958c0541c1afe72520574fcabebb0884cf3bf315b22582d932876bbb5a4393e167f0 SHA512 33afed4fb4f6d63f1d2b7caedae1ce41e7f6aa4299fb4a7ee2f5e4bc14c97d66f68097171fded6d1f2141dd7127eb408596cce4f5f7287038a14e387ad5ec5e6
 DIST glusterfs-4.1.5.tar.gz 7783999 BLAKE2B ac1e7732430fe25eec34a8b85b9cd5ce4f43076befec2d91c0156959887d8a0589adb8afb1ee9290e436ce40ab7e5567c3c4ec90017b4398919637e2047f18b9 SHA512 ae557472b6a263e815b8c4d630b606f8e1334b6604799e499e6f53ea6ff60c2a696160fa427943cc3d01ffee91a57787c91f93a1b914179679038e63d291401f
+DIST glusterfs-4.1.8.tar.gz 7835272 BLAKE2B 2546b9c0fe38989df71b8f72b193ce42c499621dcaaa4c5e3deeacfba68179f2280fc699cebeb87486171442152fa8b56b42a0d17465b739769eb227c82307d7 SHA512 950cd2fd774e3eb00f1ec06d54566736b6fbe8d1aed54477a19d9b2727eff8a70ef7ac32815cc7e01d45b5d357fc01af786e16c451f6ad314d472e61ba04ce85
 EBUILD glusterfs-4.0.0-r1.ebuild 6833 BLAKE2B 1cc152dd9040a1186f3948742141895e5465e8d0148f8bd613f1dc51fac107037358dd2cd26a1d0c6179ed3dc088be07304ebff577475c69ba9deed73ec4dd13 SHA512 71876a48177fb52e11ae3c33085fb5266e74e9e7e96fb24b558df125bcb2ad5d5fb2b68d0687a85bb551b15665d7042cc96732fb17cc8f930df3f0d0246cadb1
 EBUILD glusterfs-4.0.2.ebuild 6969 BLAKE2B 7c68b82b15d0754a5b41c9c4a04f4aa2fdcf13215d1af453c726566f7256c646e3cc6da66ac96697d842089a66a0f4e41244d789449a58d5fcb03d7f5d4c18ca SHA512 7a08d139a1c9c81a51d3456c70208c6c2649cd1f124742c3310fa3c33d15d74da54ac115fc7dcccffa4d4473cd88380c8ecb5c85be326a9dd947906369961350
-EBUILD glusterfs-4.1.5.ebuild 6773 BLAKE2B 95ed052a25b4b66c72a95f5cbff2757ff8aa7d567b8555d266f96ea36b6490e06d45ce861e53b5caa2fa2da1cc163eead934ba728525c81666f108c50bb51e7d SHA512 6b4a5fdbacedcfe7f01e3ec9ae45e418f1baeda22a32aa6cfe0dc1516f7237b3e7aa28c306c0974e1e8236785bf62b0c45a9e9b143953211e6952e83a9db3b01
+EBUILD glusterfs-4.1.5.ebuild 6772 BLAKE2B a13e90db6317fa727cb64f9f1cf244a9276e8a9b3f9fd0c4808e2572fe5802d12663b5b768ee223fd78f92ae781d8d3a6f31706ab7f5e83d3eaa3cf1fe98bd82 SHA512 5436e666878df02b3b4af43a3c448329e4b94a2255fd91d35d9f520184a91aea6d381428e423baebef7c233c4ecee6c0142cc8b5ba223341f5b34ae79945bf2f
+EBUILD glusterfs-4.1.8.ebuild 6775 BLAKE2B f6b805ea80edbde4b559de6fee78e5be3db4d9df7682b38840a5eebda1aba0a7f474c55ef4554bf03684c480684acbe1bc946def79ab452a5d6e696e224cbdbf SHA512 035637bfb1682268be7ec4cec1cb7e4f45cda45628c69ac55531424db89e18469495523c7f5bbd6e0f17ac4a2de7e73b1c68e57b1672e726da6d92b4a684ad66
 EBUILD glusterfs-9999.ebuild 6779 BLAKE2B 0461134fcea8e8f237c6fcd4a7579426fa107e1d2c642ac009381e8a102623d37b15c33b696ecd5c127fe2db96e050dcccb2d100539fc16a506dd71a749401b4 SHA512 437fc1cda7440cf04a1c35c8d724542b20faf71fe70da2bf2f4a7048902c576fd5c4c4ee055585fa685933116e60eb161370faf1997bf35497faeb8c7fcad174
 MISC metadata.xml 1724 BLAKE2B 8d164da1feb4e49490543de9841ec60282199451f2dcd6920c6781bcff41cb1248fcea7895501db0501f01a1b87b27e91a068adacd87842630f17efebf4d8954 SHA512 5bc076910d574a03f1b29db15fe1933e1b9b6f0f2cde654a6934397f7fa6f10c5063dd0318248d522da508af1ce56d16f1a204bc4be8429430f189143baaf043
diff --git a/sys-cluster/glusterfs/glusterfs-4.1.5.ebuild b/sys-cluster/glusterfs/glusterfs-4.1.5.ebuild
index 4e83d53ebf84..61cb827c0e8f 100644
--- a/sys-cluster/glusterfs/glusterfs-4.1.5.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-4.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
 	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
 else
 	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut '1-2')/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
diff --git a/sys-cluster/glusterfs/glusterfs-4.1.8.ebuild b/sys-cluster/glusterfs/glusterfs-4.1.8.ebuild
new file mode 100644
index 000000000000..b6b9a5597e93
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-4.1.8.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools elisp-common python-single-r1 systemd user
+
+if [[ ${PV#9999} != ${PV} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
+else
+	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut '1-2')/${PV}/${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="https://www.gluster.org/"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0"
+IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband ipv6 libressl +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml"
+
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
+	glupy? ( ${PYTHON_REQUIRED_USE} )
+	ipv6? ( libtirpc )"
+
+# the tests must be run as root
+RESTRICT="test"
+
+# sys-apps/util-linux is required for libuuid
+RDEPEND="bd-xlator? ( sys-fs/lvm2 )
+	!elibc_glibc? ( sys-libs/argp-standalone )
+	emacs? ( virtual/emacs )
+	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
+	libtirpc? ( net-libs/libtirpc:= )
+	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+	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
+	!libressl? ( dev-libs/openssl:=[-bindist] )
+	libressl? ( dev-libs/libressl:= )
+	dev-libs/userspace-rcu:=
+	net-libs/rpcsvc-proto
+	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}-4.1.0-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) \
+		$(use libtirpc || echo --without-libtirpc) \
+		$(use ipv6 && echo --with-ipv6-default) \
+		--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/{events,glusterfind/.keys}
+
+	# 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_$(ver_cut '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 aa607dc13fde..7449dd972de4 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1,17 +1,7 @@
 AUX heat.initd 463 BLAKE2B c855fe1b4fe73fe93874add659c49133d1f83653acbb37e7ab9927641883196abb620f53e6b31f5cc39e7c59875d4af29b3d5b14eb2a1d67556e7fbf129c7705 SHA512 d6685d7751dfd6ece714c2b96c2d07419f13556f6f3d065a108943cb3bc90c4a51b66313b3e53db4f47f0577c411e859c89984d4764462857eb1ca1990ca847c
-DIST heat-10.0.2.tar.gz 2355489 BLAKE2B 5fe952f029bc4ad510b300ebc7d1be069e110a2c96312d254c1f5a44be580b5204cc2e58faa6371bed47a46cd21896f68790a93e8cc1a52ce65e5569b0bd1fa3 SHA512 b028b5ddee6b17edab91ecd2f78fa5fd29bcc431d21af34104d2c4a1023ef355affd4391061986056c21c72374c528f46178c1fcafe1c39b1cba6fe8f205ff86
 DIST heat-11.0.0.tar.gz 2316538 BLAKE2B c7c56d273761af1846ef69d2a29563f96550afa97022ef749ac5fbd5c62117214bcfd0bd802a315168ea97d94cdf647c5e9c655803dc6f798ca7d64e0f1a9339 SHA512 bc38b062e273d4dfb11ba72c558b4c0ed7a9220a083cf1cc22b42583b864cc4bce8fb80acaa5a88f8f3e1658d585ee2950466d35ca5cb367390141a28aed1e6f
-DIST heat-9.0.5.tar.gz 2365613 BLAKE2B 36ae4d2e4221d5ae21607ee5833c7a6486e9b8c603276ae34ac18be9d662fc69b62bebb99ab6d64daeab18645ff1804a2cce1c8424f8f5122b9b23f6f7eefd54 SHA512 9aab590769c764e46b3d5e0ea88e7e7bdd410b36a00740d5a3b503d328b2c8fba70547b07db56548809feb3ece0e2579278b9cd662ae81ecc40d461754c4416e
-DIST heat.conf.sample-10.0.2 92161 BLAKE2B 745cdb4eb6006079201cfe31b6486a5d759a93d1deceb42c3e9c5224b9512437013a5f44eb0f81694949efad648559a1b4e436992a91986206e50b65c69a09b8 SHA512 44b9f0e5779a21afc73a2720181ffaf778d5e54f61db7b177b59a777985c6155dac1d6b535eed311be372236f4d39d0601a8814c5ad7aa0c48acf3771bf65120
 DIST heat.conf.sample-11.0.0 89219 BLAKE2B 6db6b6476c90bedb8bccb88d6e792fd62d599bf4721153f9cd79fc22d6e99f5096dbbbb560d5ead9ee2388529a9ff0514e591444c462621e37ecdc0879ed6f78 SHA512 aedde1cea25ecbdff4de8fe410bcb13cf937a4479b9fa27aab8170f92956499c678c2546cc3f373f58c287f13576b1561613b5ff71e6fae5b60bb3d580a90f4f
-DIST heat.conf.sample-2017.2.9999 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
-DIST heat.conf.sample-2018.1.9999 92161 BLAKE2B 745cdb4eb6006079201cfe31b6486a5d759a93d1deceb42c3e9c5224b9512437013a5f44eb0f81694949efad648559a1b4e436992a91986206e50b65c69a09b8 SHA512 44b9f0e5779a21afc73a2720181ffaf778d5e54f61db7b177b59a777985c6155dac1d6b535eed311be372236f4d39d0601a8814c5ad7aa0c48acf3771bf65120
 DIST heat.conf.sample-2018.2.9999 89219 BLAKE2B 6db6b6476c90bedb8bccb88d6e792fd62d599bf4721153f9cd79fc22d6e99f5096dbbbb560d5ead9ee2388529a9ff0514e591444c462621e37ecdc0879ed6f78 SHA512 aedde1cea25ecbdff4de8fe410bcb13cf937a4479b9fa27aab8170f92956499c678c2546cc3f373f58c287f13576b1561613b5ff71e6fae5b60bb3d580a90f4f
-DIST heat.conf.sample-9.0.5 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
-EBUILD heat-10.0.2.ebuild 6377 BLAKE2B 76d9ae4b7318e0a7aed1918cf24ed57c20cf4edc920b448192a3d7d85aff6f4c424940d6ff2b632342dd60de6dbd172a72e1ccdde3b048b7e8cf926f082bfae1 SHA512 b56104a573053f46cdadab2db9a4be64925ddfc773d0416755511ebf22d3f29d8da923ce644f7c296c100f281d221be11fb3d926fe47841416f64ba4aa1bfeab
 EBUILD heat-11.0.0.ebuild 6204 BLAKE2B b309e0aa1643aad43e7253471a57f28ba37bbc4d16a947861d11ac6b4ffd81148ed0059073a9838d3656d0cc372c3bd204f61906d9091eced61291fe912b6019 SHA512 c8e46729ae2527f904cb4d4e4d3cc8360b80ea01c55bd6a0a765097eb07fe9e64b41361ed7dddecf4e9d7efd45d89a38d22d7539866da9e6f9130e7d4b7d0997
-EBUILD heat-2017.2.9999.ebuild 6633 BLAKE2B 9ac7826e08f75f131fd61b262fbf4940156c0883f7a7f93dc632e0c9c46bddfdd626e4783fa3f85a3fa2ef860a2214be9f0d9d4fd7d2c671b415fd725550ff50 SHA512 24b1943cd66cb52325f600ce2c17f65fdb06ccc0f6010694143a7f17617015a9b77c4ae01cf1d90faf1ecd42c191db67e4666ae53b9fcfc29db019e2ae0a3fd7
-EBUILD heat-2018.1.9999.ebuild 6323 BLAKE2B b650076d87b382a95ca87f24701a2bc45f65d5cae8673a946261c9eaff9cb5cccfde7cd1d7ea7fa6f4e8a22293171df45dc1426e496b6306f06a3f63481fff17 SHA512 c3e40ae09f702dc788a389ecc79da6084c6b595e15935141f8aa0f22c64b331f89271c2a4258b23738acd101e12469011a53c7fb50897dbb50cc909864a6246d
 EBUILD heat-2018.2.9999.ebuild 6209 BLAKE2B ef231d0e1412d79bab18a809973bef1476be4821e77679981fca172908ed5d76957efd3b95bdcfca9396d1f32569603f7b2e441a733a32645694795e74cb06d1 SHA512 e10b1808e5f15cd6f3f28cce53b79b932b8ad8930b40ce14c49b9342c2248bad013b8b90f943450d0855174a2b2f866076bc096d3799d7b7a087405e98a47fac
-EBUILD heat-9.0.5.ebuild 6626 BLAKE2B 418a44bf31731752ff1c6333be77c4b997c29256131d0d1a2825110010ffc2a583f632792697562d34b412d939b27b7beec98a7c9f57ac9730824a91bd2d6c07 SHA512 aed31abfcdf97df82f7646257a1cc386cf527a573e7616aaddb0621c838d3f5221ac709b0d8841af87e65a30cf8b3336f6636a3853049b4c4ad28c43defe1efa
 MISC metadata.xml 631 BLAKE2B 566d35b5533177a6d8b0ef428c9bd1a320aace6b43e186139c4b53cde224c1bf488340be8b6bcac14bf6c7a51212952dc13940d34edc38e24d7d2fbea5ce0c68 SHA512 44e741975cc462454bfd08fce461b019c5ef141997f272796052f7f3aa7297646304cdc7d75a2ed01319bcba753475ba5861306c3ac74f3d97218bce60d42429
diff --git a/sys-cluster/heat/heat-10.0.2.ebuild b/sys-cluster/heat/heat-10.0.2.ebuild
deleted file mode 100644
index ee55018f59c3..000000000000
--- a/sys-cluster/heat/heat-10.0.2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine."
-HOMEPAGE="https://launchpad.net/heat"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.queens -> heat.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/heat.git"
-	EGIT_BRANCH="stable/queens"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.queens -> heat.conf.sample-${PV}
-		https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+mysql +memcached postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0.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/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.9.19[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/aodhclient-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-ceilometerclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-heatclient-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-magnumclient-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-manilaclient-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/python-mistralclient-3.1.0[${PYTHON_USEDEP}]
-	!~dev-python/python-mistralclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-monascaclient-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-octaviaclient-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/python-saharaclient-1.4.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/python-zunclient-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${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/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/yaql-1.1.3[${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"
-	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/heat/heat-2017.2.9999.ebuild b/sys-cluster/heat/heat-2017.2.9999.ebuild
deleted file mode 100644
index 05527326a70b..000000000000
--- a/sys-cluster/heat/heat-2017.2.9999.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine."
-HOMEPAGE="https://launchpad.net/heat"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/heat.git"
-	EGIT_BRANCH="stable/pike"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}
-		https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+mysql +memcached postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.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/keystoneauth-3.1.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/openstacksdk-0.9.17[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.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-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.23.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-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.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-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-ceilometerclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.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-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-monascaclient-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.11.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/python-zunclient-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${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.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/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${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/heat/heat-2018.1.9999.ebuild b/sys-cluster/heat/heat-2018.1.9999.ebuild
deleted file mode 100644
index 89045903e72f..000000000000
--- a/sys-cluster/heat/heat-2018.1.9999.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine."
-HOMEPAGE="https://launchpad.net/heat"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.queens -> heat.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/heat.git"
-	EGIT_BRANCH="stable/queens"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.queens -> heat.conf.sample-${PV}
-		https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+mysql +memcached postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0.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/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.9.19[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/aodhclient-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-ceilometerclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-heatclient-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-magnumclient-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-manilaclient-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/python-mistralclient-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-monascaclient-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-octaviaclient-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/python-saharaclient-1.4.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/python-zunclient-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${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/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/yaql-1.1.3[${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"
-	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/heat/heat-9.0.5.ebuild b/sys-cluster/heat/heat-9.0.5.ebuild
deleted file mode 100644
index bcba975dd5c1..000000000000
--- a/sys-cluster/heat/heat-9.0.5.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 orchestration engine."
-HOMEPAGE="https://launchpad.net/heat"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/heat.git"
-	EGIT_BRANCH="stable/pike"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}
-		https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+mysql +memcached postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.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/keystoneauth-3.1.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/openstacksdk-0.9.17[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.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-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.23.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-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.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-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-ceilometerclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.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-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-monascaclient-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.11.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/python-zunclient-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${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.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/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${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/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 55af403e37b2..a08feefdb158 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -10,5 +10,6 @@ DIST keepalived-2.0.13.tar.gz 955953 BLAKE2B f6a8d23cdcf4b8484c37da9d48c12394617
 EBUILD keepalived-2.0.10-r1.ebuild 1795 BLAKE2B a49c8683b3ab56e6443df8d81c0656f00d1fd1ef846ab53fa75410200dbb910535368fd4ce82154d246ce5be701bc0866ce9bf52c5754c3cc0c772d8b7c47003 SHA512 c3d213f9b6a390cc0ce6b4daea61b5436322d70d6ae2ded53910177cf7bd8b914c7fca87a8691ee1e5d81549a1ae7f1239c321afe0fb56f921eb84bc52ffb486
 EBUILD keepalived-2.0.11.ebuild 1748 BLAKE2B eee8b1e5ee726cb119d19d4db1b703aea78bf27eb5fc3bc38d7b49253c7ca809fa13019e2fcc4fa08bd9943e20e5e83a705beb35fed1d1a6f020590239728d3d SHA512 173bbc36860b1e39290ed16d89376ece5e9c404ea9a48d4c65ca2223e49b05ca893ae04fd8f6813e09f7f36f0260669ac7f5f4ba881e065efc4ab1f4ca24fc1b
 EBUILD keepalived-2.0.12.ebuild 1748 BLAKE2B eee8b1e5ee726cb119d19d4db1b703aea78bf27eb5fc3bc38d7b49253c7ca809fa13019e2fcc4fa08bd9943e20e5e83a705beb35fed1d1a6f020590239728d3d SHA512 173bbc36860b1e39290ed16d89376ece5e9c404ea9a48d4c65ca2223e49b05ca893ae04fd8f6813e09f7f36f0260669ac7f5f4ba881e065efc4ab1f4ca24fc1b
+EBUILD keepalived-2.0.13-r1.ebuild 2236 BLAKE2B ff2a2f40dcfcaa41d5c6412d3ba8ac655e52a2f094a7c3579cf9a5d847267de1dff4ec42096aaae2cd6713950117599986025f59c2f1fb5a5a6af637ea3d60bd SHA512 891114868ffb2a43ea369e91f4e7e171f60147aecdc28843865f8296864f216536130f4a02b309d320a05ccd2742aaae9e185c04b8b7904f43079661d3e9e913
 EBUILD keepalived-2.0.13.ebuild 1748 BLAKE2B eee8b1e5ee726cb119d19d4db1b703aea78bf27eb5fc3bc38d7b49253c7ca809fa13019e2fcc4fa08bd9943e20e5e83a705beb35fed1d1a6f020590239728d3d SHA512 173bbc36860b1e39290ed16d89376ece5e9c404ea9a48d4c65ca2223e49b05ca893ae04fd8f6813e09f7f36f0260669ac7f5f4ba881e065efc4ab1f4ca24fc1b
-MISC metadata.xml 471 BLAKE2B 2dfba9fe3d7d39f8484baa1f1be9a59b5da8f6cc0da4a3af1ec07e5daf4f2522f802af51048463dfad54bfbffe0286ce8a3b9ff8889139ca32693bad378937e3 SHA512 203c93aaf60f7d0dcc6150fff2a4a3dd61fa4d6cfab26452d8efeed1d79096b17db7e47700582475b7e6607ae70521c32cc91015e7852dde22a7d828740946af
+MISC metadata.xml 640 BLAKE2B 5644b98bf487637c431299fe61e1185731d9fc22e9a19b9a3218855318a9c40500339c628671eb958c2bcee99d867a8e9c93903fdcdad25ad566659422dd2119 SHA512 6fd4981067e0a2e74511db7be79d656c62b39c1f43f860e0d981b6c9770cb2da6b4fd3e40af1ed23adc8bbbd01202e6c45e58b6f86480a807d193aae1a3f7ad3
diff --git a/sys-cluster/keepalived/keepalived-2.0.13-r1.ebuild b/sys-cluster/keepalived/keepalived-2.0.13-r1.ebuild
new file mode 100644
index 000000000000..678e3d34ca81
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-2.0.13-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
+HOMEPAGE="http://www.keepalived.org/"
+SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+bfd dbus debug -json regex snmp"
+
+RDEPEND="dev-libs/libnl:=
+	dev-libs/openssl:=
+	dev-libs/popt
+	net-libs/libnfnetlink
+	sys-apps/iproute2
+	regex? ( >=dev-libs/libpcre2-8 )
+	dbus? ( sys-apps/dbus )
+	json? ( dev-libs/json-c:= )
+	snmp? ( net-analyzer/net-snmp )"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-4.4"
+
+DOCS=(
+	README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
+	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# keepalived has support to dynamically use some libraries instead of
+	# linking them:
+	#--enable-dynamic-linking \
+	#--enable-libiptc-dynamic \
+	#--enable-libnl-dynamic \
+	#--enable-libxtables-dynamic \
+	STRIP=/bin/true \
+	econf \
+		--with-init=custom \
+		--with-kernel-dir=/usr \
+		--enable-sha1 \
+		--enable-vrrp \
+		$(use_enable bfd) \
+		$(use_enable dbus) \
+		$(use_enable dbus dbus-create-instance) \
+		$(use_enable debug) \
+		$(use_enable json) \
+		$(use_enable regex) \
+		$(use_enable regex regex-timers ) \
+		$(use_enable snmp) \
+		$(use_enable snmp snmp-checker) \
+		$(use_enable snmp snmp-rfc) \
+		$(use_enable snmp snmp-rfcv2) \
+		$(use_enable snmp snmp-rfcv3) \
+		$(use_enable snmp snmp-vrrp)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/keepalived.init-r1 keepalived
+	newconfd "${FILESDIR}"/keepalived.confd-r1 keepalived
+
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+
+	use snmp && dodoc doc/*MIB.txt
+
+	docinto genhash
+	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog
+	# This was badly named by upstream, it's more HOWTO than anything else.
+	newdoc INSTALL INSTALL+HOWTO
+
+	# Security risk to bundle SSL certs
+	rm -v "${ED}"/etc/keepalived/samples/*.pem || die
+	# Clean up sysvinit files
+	rm -rv "${ED}"/etc/sysconfig || die
+}
diff --git a/sys-cluster/keepalived/metadata.xml b/sys-cluster/keepalived/metadata.xml
index 4de8679ae129..8c58db840582 100644
--- a/sys-cluster/keepalived/metadata.xml
+++ b/sys-cluster/keepalived/metadata.xml
@@ -9,6 +9,8 @@
 		VRRP2 implementation. Used for setting up high availability clusters.
 	</longdescription>
 	<use>
+		<flag name="bfd">compile with support for Bidirectional Forwarding Detection (BFD).</flag>
 		<flag name="json">compile with signal to dump configuration and stats as JSON.</flag>
+		<flag name="regex">compile with support for regex in health checks</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index bf1a79a4b15b..925430b08d8c 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,28 +1,18 @@
 AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7334eedcb2593855e7481d5969ed458d322ac29de0e9a9c7f9f041911ee7aeca750ff77ce04fd60bf3a3d3 SHA512 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
-DIST kubernetes-1.10.11.tar.gz 25085442 BLAKE2B 1cd758c8f042f9ccd797e67690f31038595a1162e8d50aed849e35dcc522aff3af2ce074f3c27f8dfce536ffb290af5d6bf0f684089eb76567f1bfb33f2764c6 SHA512 db7feafe398436123e66c90a271f714a645da5f170241d01371bfe613e87e2c177610f32325f85e02b63df9e847b19fd6000bff0b35d2635e8f03b31a40b9d11
 DIST kubernetes-1.10.12.tar.gz 25091359 BLAKE2B 8bc053ba737bdbe0cf65a2061f6ed9c959b85af19bf64b7c8c08738ac443b84486ebf229d6eec245b2414dc459987c855ae0d295d35e02c62ec83f8f789966d9 SHA512 74f476617d64e1ae0b520a2a8424c27e76dc5a7829b3565e132da9df6d7b0d6ad20592c4330d8cb5be714d4e40098dfb4d267a278a46df3baee762fd5d797e41
-DIST kubernetes-1.11.5.tar.gz 24813001 BLAKE2B 71c631b53246b9364ca29f5c2aebbf4303e7dbe103dc1d779c5e4f0aa26ee6caf5aab8023a8beb9a9fb513567283fcef4e584218c8cf30d1083f42344139cbfd SHA512 60a28bb32a469517974d1ba6d950d7f1550fea47d951a993edea0036d1b5baf35719edc73c2022291b70532c22241518f8324d70a86083c65fe38863ed04ac1c
 DIST kubernetes-1.11.6.tar.gz 24827575 BLAKE2B 095adccef1b5618f7e5d3a46cbf835f10513a667f663a673e2dedad5820ce59a4fde2208550447677a6693c11d4820db3f12c2e265153a1e33aaca71eadf6798 SHA512 cffe96ae56a6a9e3549090afd84e9e43955ce00f8089a71771c5171ce33b23ef164a67d3f3506326f95c1a602b53ec9d631b7160f6b8a51658c41b6eb048c670
-DIST kubernetes-1.12.3.tar.gz 28042821 BLAKE2B 79c2020608e4e94532b2d525c2c68dfbf9e7660f9047a215675e24f08eb00d145155ea09d9b05f92732c964d47c65138ea9170f6e8fd13ff9d63208a78b60f7d SHA512 6c4ef50240626f97246ed71229463e3649f42674d64bca3a8171728f67807cd0509da9156f53d0e7a8d4967e081cff0f03e0e1469ce5c81313eff67201d49b72
-DIST kubernetes-1.12.4.tar.gz 28064009 BLAKE2B 96cb269796628cde2665cb17bd6918d51a8d2cdebdaf75c65e352beebf7da4bee5da311ddf93931250471e46dd30dbd238727716542c688f364b1f14578d9146 SHA512 f7135a2dd7dac19512db13c0e72264b32c07f4a2f9fbc3573e31fa346415c99738446bd48463c3dd9bee3a716e040dd0c9e681c970603507649eefceca5926d7
-DIST kubernetes-1.12.5.tar.gz 28128559 BLAKE2B add647a579e75e877552fbde0800064d9170022619e236e9d280dc17f245adc8218458e12d0c7643a2a105c988ae7a4fa0176e19cc56989c54eb7edebd8d9dfc SHA512 bb391858b040fd75b03f5dcaf7e7f1b776d288443a833412c34c2fea8bbf23a8b76c4dd89da0b6fbd6ebfc1172407620aef8d8c5873b6f103dd118817dc17ad6
 DIST kubernetes-1.12.6.tar.gz 28142622 BLAKE2B 7f3541356aebb3f60c27ba1ae1c9c50867bf77ae8cb585955b38addc1015ef0dbbf0bd21e454610ee2fe6c9811c0d32fe912de368f7bf5d95fe60cab7a538354 SHA512 bd4b28fb6ecb7212c9bd6fb24b3ba59466ed9d684a4ba4e403e0270fc96ac5d1bcdcf8ea0be0085353af29bbfe73ab6ff1cda5127ea123ad7660c3022cab4703
-DIST kubernetes-1.13.1.tar.gz 28715812 BLAKE2B f51d456264348cc89aa00b6bbda2c90acfc881ff9d9ff80af77a405c3cf302626e8be96c3bec1f7f3f4df3250e48d02778c1918320484acb7827e8f411ab4bda SHA512 95a5558c9ae2b1e8207d76157f4f52d17236c6aa315ca4c7cac0f18fbe59b061156c05a5d886321b589a6cb675c142754e48f9e0ca7e966116749a32120e92c7
-DIST kubernetes-1.13.3.tar.gz 28781320 BLAKE2B 7ae1a6ddeff5b8d19bacc868ad5970cc8ea81239f1ce709207e321ab97c0f155c6c363b3b0f9af25f6e6ce68d99678cf2b10c841a45f082f486bd9dee7be5e3a SHA512 45c2639a88e04d16511c92ca48ca6326b12422f0765df92fb883a1afe7fda9adefcf111d76855532f69b48c6e681774ee0c7e08f74594de808b50e11f8ec52c5
 DIST kubernetes-1.13.4.tar.gz 28793464 BLAKE2B 0a637bf1003e4fd6ebabe09ebc0f3ca54e0258e7efb1578be727d5019c1f44638358462acccafa91bed2320d6392c54416079bb54bed12977739092965aeaeb5 SHA512 aa07877bc141ceedab56d9dd65920d86121724a0d20b86ee4925c88d805df8235162f235a957d24c053a60869ab2084062a1607f43c8eeea736fd72eb328c800
+DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4cc0f5556f6245b8e87aee5244e96ed6beede646f8b95b118d79ac715e988111f7fd2ddfb4c478af7a9bfe19c4dd227be SHA512 aced7b8dae452c62f4751785ad106c3747054ccb075b3d04dd82bd816d74f4002844e3cfa7aee138c9661e5c30a9aa9743f10a0dd807bbd590fffb60ce72f617
+DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
-EBUILD kube-apiserver-1.10.11.ebuild 1205 BLAKE2B 99915c582f694b4c7fd81cb123c65343f782936095e4b1a3a19c2a07d78a3ed62f8fa62b616358df07a6d3c85b246525376f28990bb9ee1597f01727ceeea277 SHA512 2327cffe4fa9c552edfaa4724f8c10e0850909e691c90a08cf1440b6d518cdc62ead618e692bbbc016879c270721ffdf71231f0b3d3eeb9cbf69a09866761c45
 EBUILD kube-apiserver-1.10.12.ebuild 1205 BLAKE2B 22fe7038d07b4117cbb0d41983ab2236a2d762c527e245cbb23c0a2552cf258a25c8879ee7f0b8ec1091b63d435de3fc8b413171d9d0ce079ee7d01b31caede7 SHA512 893cde4c3c495038eb19d62f5e51e849d5f2586f6b0a6738c6066c951874386a990bde2c4917a0620037af99883ab3fd6d996f6de3e87962c719b915a2b22137
-EBUILD kube-apiserver-1.11.5.ebuild 1205 BLAKE2B 99915c582f694b4c7fd81cb123c65343f782936095e4b1a3a19c2a07d78a3ed62f8fa62b616358df07a6d3c85b246525376f28990bb9ee1597f01727ceeea277 SHA512 2327cffe4fa9c552edfaa4724f8c10e0850909e691c90a08cf1440b6d518cdc62ead618e692bbbc016879c270721ffdf71231f0b3d3eeb9cbf69a09866761c45
 EBUILD kube-apiserver-1.11.6.ebuild 1205 BLAKE2B 22fe7038d07b4117cbb0d41983ab2236a2d762c527e245cbb23c0a2552cf258a25c8879ee7f0b8ec1091b63d435de3fc8b413171d9d0ce079ee7d01b31caede7 SHA512 893cde4c3c495038eb19d62f5e51e849d5f2586f6b0a6738c6066c951874386a990bde2c4917a0620037af99883ab3fd6d996f6de3e87962c719b915a2b22137
-EBUILD kube-apiserver-1.12.3.ebuild 1205 BLAKE2B 99915c582f694b4c7fd81cb123c65343f782936095e4b1a3a19c2a07d78a3ed62f8fa62b616358df07a6d3c85b246525376f28990bb9ee1597f01727ceeea277 SHA512 2327cffe4fa9c552edfaa4724f8c10e0850909e691c90a08cf1440b6d518cdc62ead618e692bbbc016879c270721ffdf71231f0b3d3eeb9cbf69a09866761c45
-EBUILD kube-apiserver-1.12.4.ebuild 1205 BLAKE2B 22fe7038d07b4117cbb0d41983ab2236a2d762c527e245cbb23c0a2552cf258a25c8879ee7f0b8ec1091b63d435de3fc8b413171d9d0ce079ee7d01b31caede7 SHA512 893cde4c3c495038eb19d62f5e51e849d5f2586f6b0a6738c6066c951874386a990bde2c4917a0620037af99883ab3fd6d996f6de3e87962c719b915a2b22137
-EBUILD kube-apiserver-1.12.5.ebuild 1205 BLAKE2B 22fe7038d07b4117cbb0d41983ab2236a2d762c527e245cbb23c0a2552cf258a25c8879ee7f0b8ec1091b63d435de3fc8b413171d9d0ce079ee7d01b31caede7 SHA512 893cde4c3c495038eb19d62f5e51e849d5f2586f6b0a6738c6066c951874386a990bde2c4917a0620037af99883ab3fd6d996f6de3e87962c719b915a2b22137
 EBUILD kube-apiserver-1.12.6.ebuild 1205 BLAKE2B 22fe7038d07b4117cbb0d41983ab2236a2d762c527e245cbb23c0a2552cf258a25c8879ee7f0b8ec1091b63d435de3fc8b413171d9d0ce079ee7d01b31caede7 SHA512 893cde4c3c495038eb19d62f5e51e849d5f2586f6b0a6738c6066c951874386a990bde2c4917a0620037af99883ab3fd6d996f6de3e87962c719b915a2b22137
-EBUILD kube-apiserver-1.13.1.ebuild 1225 BLAKE2B 4cbeca88c998d0b110d39db217d62026a7b86f8228ee07306108a8a4fe1ba24c7bae71e16672d55ba9875ba7c78d0a5f1b5720a8e8417ef9fe1a68e7c9df5d38 SHA512 1bf6cae63276cd9c8c45c13d7a8153d77e3ade28d794e0e5dfd313666d1ad855b0b8842ff00533537c6a153361a2cf627878bb10f1389368cd9a0304246adbc2
-EBUILD kube-apiserver-1.13.3.ebuild 1225 BLAKE2B 4cbeca88c998d0b110d39db217d62026a7b86f8228ee07306108a8a4fe1ba24c7bae71e16672d55ba9875ba7c78d0a5f1b5720a8e8417ef9fe1a68e7c9df5d38 SHA512 1bf6cae63276cd9c8c45c13d7a8153d77e3ade28d794e0e5dfd313666d1ad855b0b8842ff00533537c6a153361a2cf627878bb10f1389368cd9a0304246adbc2
 EBUILD kube-apiserver-1.13.4.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
+EBUILD kube-apiserver-1.13.5.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
+EBUILD kube-apiserver-1.14.0.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
 EBUILD kube-apiserver-1.9.11.ebuild 1205 BLAKE2B 99915c582f694b4c7fd81cb123c65343f782936095e4b1a3a19c2a07d78a3ed62f8fa62b616358df07a6d3c85b246525376f28990bb9ee1597f01727ceeea277 SHA512 2327cffe4fa9c552edfaa4724f8c10e0850909e691c90a08cf1440b6d518cdc62ead618e692bbbc016879c270721ffdf71231f0b3d3eeb9cbf69a09866761c45
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.10.11.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.10.11.ebuild
deleted file mode 100644
index 6e2ee447e5a0..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.10.11.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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} GOFLAGS=-v
-}
-
-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.11.5.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.11.5.ebuild
deleted file mode 100644
index 6e2ee447e5a0..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.11.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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} GOFLAGS=-v
-}
-
-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.12.3.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.12.3.ebuild
deleted file mode 100644
index 6e2ee447e5a0..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.12.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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} GOFLAGS=-v
-}
-
-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.12.4.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.12.4.ebuild
deleted file mode 100644
index 386be89ec764..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.12.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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} GOFLAGS=-v
-}
-
-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.12.5.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.12.5.ebuild
deleted file mode 100644
index 386be89ec764..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.12.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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} GOFLAGS=-v
-}
-
-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.13.1.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.13.5.ebuild
index 26362b266881..a1931590ff31 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.13.1.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.13.5.ebuild
@@ -27,7 +27,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
 	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
 }
 
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.13.3.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.14.0.ebuild
index 26362b266881..a1931590ff31 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.13.3.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.14.0.ebuild
@@ -27,7 +27,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
 	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
 }
 
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 1e044f5614c3..f849471869b3 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,24 +1,18 @@
 AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2cf815b25ac4e91354e3fce756a1955e71ec762fab1091074ef4233fff22667aba50417c0d6a896055f8f52b6630bb4e SHA512 b0227a7431018a6742b3931fda0f14b4a040107ecd6821c84593180919ba8a5af9b99b7a507645a5488792f14accd686acc4cc6f70a5084bbdfcdd494021aafc
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
-DIST kubernetes-1.10.11.tar.gz 25085442 BLAKE2B 1cd758c8f042f9ccd797e67690f31038595a1162e8d50aed849e35dcc522aff3af2ce074f3c27f8dfce536ffb290af5d6bf0f684089eb76567f1bfb33f2764c6 SHA512 db7feafe398436123e66c90a271f714a645da5f170241d01371bfe613e87e2c177610f32325f85e02b63df9e847b19fd6000bff0b35d2635e8f03b31a40b9d11
 DIST kubernetes-1.10.12.tar.gz 25091359 BLAKE2B 8bc053ba737bdbe0cf65a2061f6ed9c959b85af19bf64b7c8c08738ac443b84486ebf229d6eec245b2414dc459987c855ae0d295d35e02c62ec83f8f789966d9 SHA512 74f476617d64e1ae0b520a2a8424c27e76dc5a7829b3565e132da9df6d7b0d6ad20592c4330d8cb5be714d4e40098dfb4d267a278a46df3baee762fd5d797e41
-DIST kubernetes-1.11.5.tar.gz 24813001 BLAKE2B 71c631b53246b9364ca29f5c2aebbf4303e7dbe103dc1d779c5e4f0aa26ee6caf5aab8023a8beb9a9fb513567283fcef4e584218c8cf30d1083f42344139cbfd SHA512 60a28bb32a469517974d1ba6d950d7f1550fea47d951a993edea0036d1b5baf35719edc73c2022291b70532c22241518f8324d70a86083c65fe38863ed04ac1c
 DIST kubernetes-1.11.6.tar.gz 24827575 BLAKE2B 095adccef1b5618f7e5d3a46cbf835f10513a667f663a673e2dedad5820ce59a4fde2208550447677a6693c11d4820db3f12c2e265153a1e33aaca71eadf6798 SHA512 cffe96ae56a6a9e3549090afd84e9e43955ce00f8089a71771c5171ce33b23ef164a67d3f3506326f95c1a602b53ec9d631b7160f6b8a51658c41b6eb048c670
-DIST kubernetes-1.12.3.tar.gz 28042821 BLAKE2B 79c2020608e4e94532b2d525c2c68dfbf9e7660f9047a215675e24f08eb00d145155ea09d9b05f92732c964d47c65138ea9170f6e8fd13ff9d63208a78b60f7d SHA512 6c4ef50240626f97246ed71229463e3649f42674d64bca3a8171728f67807cd0509da9156f53d0e7a8d4967e081cff0f03e0e1469ce5c81313eff67201d49b72
-DIST kubernetes-1.12.4.tar.gz 28064009 BLAKE2B 96cb269796628cde2665cb17bd6918d51a8d2cdebdaf75c65e352beebf7da4bee5da311ddf93931250471e46dd30dbd238727716542c688f364b1f14578d9146 SHA512 f7135a2dd7dac19512db13c0e72264b32c07f4a2f9fbc3573e31fa346415c99738446bd48463c3dd9bee3a716e040dd0c9e681c970603507649eefceca5926d7
 DIST kubernetes-1.12.5.tar.gz 28128559 BLAKE2B add647a579e75e877552fbde0800064d9170022619e236e9d280dc17f245adc8218458e12d0c7643a2a105c988ae7a4fa0176e19cc56989c54eb7edebd8d9dfc SHA512 bb391858b040fd75b03f5dcaf7e7f1b776d288443a833412c34c2fea8bbf23a8b76c4dd89da0b6fbd6ebfc1172407620aef8d8c5873b6f103dd118817dc17ad6
-DIST kubernetes-1.13.1.tar.gz 28715812 BLAKE2B f51d456264348cc89aa00b6bbda2c90acfc881ff9d9ff80af77a405c3cf302626e8be96c3bec1f7f3f4df3250e48d02778c1918320484acb7827e8f411ab4bda SHA512 95a5558c9ae2b1e8207d76157f4f52d17236c6aa315ca4c7cac0f18fbe59b061156c05a5d886321b589a6cb675c142754e48f9e0ca7e966116749a32120e92c7
 DIST kubernetes-1.13.3.tar.gz 28781320 BLAKE2B 7ae1a6ddeff5b8d19bacc868ad5970cc8ea81239f1ce709207e321ab97c0f155c6c363b3b0f9af25f6e6ce68d99678cf2b10c841a45f082f486bd9dee7be5e3a SHA512 45c2639a88e04d16511c92ca48ca6326b12422f0765df92fb883a1afe7fda9adefcf111d76855532f69b48c6e681774ee0c7e08f74594de808b50e11f8ec52c5
+DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4cc0f5556f6245b8e87aee5244e96ed6beede646f8b95b118d79ac715e988111f7fd2ddfb4c478af7a9bfe19c4dd227be SHA512 aced7b8dae452c62f4751785ad106c3747054ccb075b3d04dd82bd816d74f4002844e3cfa7aee138c9661e5c30a9aa9743f10a0dd807bbd590fffb60ce72f617
+DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
-EBUILD kube-controller-manager-1.10.11.ebuild 1213 BLAKE2B 5f7e5092f8489d609514ce0d88dab1fe3e4ccac0542dbf62320043e5bb9a15ef71d0c137f2926d7b13e119b475cfb384ddf36e57539a468cf08c194f503c24ab SHA512 df087bbb7af6c7b48a80aab811678b306e026e25ef0203e68e549e6d6f2d1b9ea2676a9c545dd658310faf52ff267202c6de3621d0679a81823426ed6c804a39
 EBUILD kube-controller-manager-1.10.12.ebuild 1213 BLAKE2B 6b6fa87bd507baac038712357a693ff423e19ba7bfbd15e4ad6a7f9a6fd0205a6ec7f0f62bd67627cf969985aee17cb92df24eff042a3d1158b401a89b262005 SHA512 b36227fed5d1e407ae148bbb14f21acf6226c49dfc381d3258a8be9c70fdda1a213018a436aca89b721cd082f3b500780705d33c701bfe1a33f2dfe67ac1a7d3
-EBUILD kube-controller-manager-1.11.5.ebuild 1213 BLAKE2B 5f7e5092f8489d609514ce0d88dab1fe3e4ccac0542dbf62320043e5bb9a15ef71d0c137f2926d7b13e119b475cfb384ddf36e57539a468cf08c194f503c24ab SHA512 df087bbb7af6c7b48a80aab811678b306e026e25ef0203e68e549e6d6f2d1b9ea2676a9c545dd658310faf52ff267202c6de3621d0679a81823426ed6c804a39
 EBUILD kube-controller-manager-1.11.6.ebuild 1213 BLAKE2B 6b6fa87bd507baac038712357a693ff423e19ba7bfbd15e4ad6a7f9a6fd0205a6ec7f0f62bd67627cf969985aee17cb92df24eff042a3d1158b401a89b262005 SHA512 b36227fed5d1e407ae148bbb14f21acf6226c49dfc381d3258a8be9c70fdda1a213018a436aca89b721cd082f3b500780705d33c701bfe1a33f2dfe67ac1a7d3
-EBUILD kube-controller-manager-1.12.3.ebuild 1213 BLAKE2B 5f7e5092f8489d609514ce0d88dab1fe3e4ccac0542dbf62320043e5bb9a15ef71d0c137f2926d7b13e119b475cfb384ddf36e57539a468cf08c194f503c24ab SHA512 df087bbb7af6c7b48a80aab811678b306e026e25ef0203e68e549e6d6f2d1b9ea2676a9c545dd658310faf52ff267202c6de3621d0679a81823426ed6c804a39
-EBUILD kube-controller-manager-1.12.4.ebuild 1213 BLAKE2B 6b6fa87bd507baac038712357a693ff423e19ba7bfbd15e4ad6a7f9a6fd0205a6ec7f0f62bd67627cf969985aee17cb92df24eff042a3d1158b401a89b262005 SHA512 b36227fed5d1e407ae148bbb14f21acf6226c49dfc381d3258a8be9c70fdda1a213018a436aca89b721cd082f3b500780705d33c701bfe1a33f2dfe67ac1a7d3
 EBUILD kube-controller-manager-1.12.5.ebuild 1213 BLAKE2B 6b6fa87bd507baac038712357a693ff423e19ba7bfbd15e4ad6a7f9a6fd0205a6ec7f0f62bd67627cf969985aee17cb92df24eff042a3d1158b401a89b262005 SHA512 b36227fed5d1e407ae148bbb14f21acf6226c49dfc381d3258a8be9c70fdda1a213018a436aca89b721cd082f3b500780705d33c701bfe1a33f2dfe67ac1a7d3
-EBUILD kube-controller-manager-1.13.1.ebuild 1233 BLAKE2B 64c7d8543d7a77630b52299210c032f46ac996ea4807f9a83cca79897b3b5029ca0ab74d0644bcf685ef8ef7c92fac7b479968a6d36194599651364e421df6ac SHA512 a8687dff5900fa745804450376b4b0ed178d41fe3503164900731744a354bf51bb7e7b107e34fd5520d910608fe97f8dc2286b17ce2b8f69b00d88bf6ca397db
 EBUILD kube-controller-manager-1.13.3.ebuild 1233 BLAKE2B 64c7d8543d7a77630b52299210c032f46ac996ea4807f9a83cca79897b3b5029ca0ab74d0644bcf685ef8ef7c92fac7b479968a6d36194599651364e421df6ac SHA512 a8687dff5900fa745804450376b4b0ed178d41fe3503164900731744a354bf51bb7e7b107e34fd5520d910608fe97f8dc2286b17ce2b8f69b00d88bf6ca397db
+EBUILD kube-controller-manager-1.13.5.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
+EBUILD kube-controller-manager-1.14.0.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
 EBUILD kube-controller-manager-1.9.11.ebuild 1213 BLAKE2B 5f7e5092f8489d609514ce0d88dab1fe3e4ccac0542dbf62320043e5bb9a15ef71d0c137f2926d7b13e119b475cfb384ddf36e57539a468cf08c194f503c24ab SHA512 df087bbb7af6c7b48a80aab811678b306e026e25ef0203e68e549e6d6f2d1b9ea2676a9c545dd658310faf52ff267202c6de3621d0679a81823426ed6c804a39
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.11.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.11.ebuild
deleted file mode 100644
index f985f1f4f06f..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.11.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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} GOFLAGS=-v
-}
-
-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.11.5.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.11.5.ebuild
deleted file mode 100644
index f985f1f4f06f..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.11.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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} GOFLAGS=-v
-}
-
-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.12.3.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.12.3.ebuild
deleted file mode 100644
index f985f1f4f06f..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.12.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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} GOFLAGS=-v
-}
-
-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.12.4.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.12.4.ebuild
deleted file mode 100644
index 7c35c4fb9213..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.12.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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} GOFLAGS=-v
-}
-
-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.13.1.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.13.5.ebuild
index f7d005c3d17a..6aa71f51b8b1 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.13.1.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.13.5.ebuild
@@ -27,7 +27,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
 	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
 }
 
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.0.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.0.ebuild
new file mode 100644
index 000000000000..6aa71f51b8b1
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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
+	>=dev-lang/go-1.11"
+
+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" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN}
+	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-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 862d6934e1af..0231203e5248 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,24 +1,18 @@
 AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8810268f894e3466cea4d82c7882e56d6a0bf425311adbf6a55e3e3fe351b9a1a7ce1d9e1e087018b SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
-DIST kubernetes-1.10.11.tar.gz 25085442 BLAKE2B 1cd758c8f042f9ccd797e67690f31038595a1162e8d50aed849e35dcc522aff3af2ce074f3c27f8dfce536ffb290af5d6bf0f684089eb76567f1bfb33f2764c6 SHA512 db7feafe398436123e66c90a271f714a645da5f170241d01371bfe613e87e2c177610f32325f85e02b63df9e847b19fd6000bff0b35d2635e8f03b31a40b9d11
 DIST kubernetes-1.10.12.tar.gz 25091359 BLAKE2B 8bc053ba737bdbe0cf65a2061f6ed9c959b85af19bf64b7c8c08738ac443b84486ebf229d6eec245b2414dc459987c855ae0d295d35e02c62ec83f8f789966d9 SHA512 74f476617d64e1ae0b520a2a8424c27e76dc5a7829b3565e132da9df6d7b0d6ad20592c4330d8cb5be714d4e40098dfb4d267a278a46df3baee762fd5d797e41
-DIST kubernetes-1.11.5.tar.gz 24813001 BLAKE2B 71c631b53246b9364ca29f5c2aebbf4303e7dbe103dc1d779c5e4f0aa26ee6caf5aab8023a8beb9a9fb513567283fcef4e584218c8cf30d1083f42344139cbfd SHA512 60a28bb32a469517974d1ba6d950d7f1550fea47d951a993edea0036d1b5baf35719edc73c2022291b70532c22241518f8324d70a86083c65fe38863ed04ac1c
 DIST kubernetes-1.11.6.tar.gz 24827575 BLAKE2B 095adccef1b5618f7e5d3a46cbf835f10513a667f663a673e2dedad5820ce59a4fde2208550447677a6693c11d4820db3f12c2e265153a1e33aaca71eadf6798 SHA512 cffe96ae56a6a9e3549090afd84e9e43955ce00f8089a71771c5171ce33b23ef164a67d3f3506326f95c1a602b53ec9d631b7160f6b8a51658c41b6eb048c670
-DIST kubernetes-1.12.3.tar.gz 28042821 BLAKE2B 79c2020608e4e94532b2d525c2c68dfbf9e7660f9047a215675e24f08eb00d145155ea09d9b05f92732c964d47c65138ea9170f6e8fd13ff9d63208a78b60f7d SHA512 6c4ef50240626f97246ed71229463e3649f42674d64bca3a8171728f67807cd0509da9156f53d0e7a8d4967e081cff0f03e0e1469ce5c81313eff67201d49b72
-DIST kubernetes-1.12.4.tar.gz 28064009 BLAKE2B 96cb269796628cde2665cb17bd6918d51a8d2cdebdaf75c65e352beebf7da4bee5da311ddf93931250471e46dd30dbd238727716542c688f364b1f14578d9146 SHA512 f7135a2dd7dac19512db13c0e72264b32c07f4a2f9fbc3573e31fa346415c99738446bd48463c3dd9bee3a716e040dd0c9e681c970603507649eefceca5926d7
 DIST kubernetes-1.12.5.tar.gz 28128559 BLAKE2B add647a579e75e877552fbde0800064d9170022619e236e9d280dc17f245adc8218458e12d0c7643a2a105c988ae7a4fa0176e19cc56989c54eb7edebd8d9dfc SHA512 bb391858b040fd75b03f5dcaf7e7f1b776d288443a833412c34c2fea8bbf23a8b76c4dd89da0b6fbd6ebfc1172407620aef8d8c5873b6f103dd118817dc17ad6
-DIST kubernetes-1.13.1.tar.gz 28715812 BLAKE2B f51d456264348cc89aa00b6bbda2c90acfc881ff9d9ff80af77a405c3cf302626e8be96c3bec1f7f3f4df3250e48d02778c1918320484acb7827e8f411ab4bda SHA512 95a5558c9ae2b1e8207d76157f4f52d17236c6aa315ca4c7cac0f18fbe59b061156c05a5d886321b589a6cb675c142754e48f9e0ca7e966116749a32120e92c7
 DIST kubernetes-1.13.3.tar.gz 28781320 BLAKE2B 7ae1a6ddeff5b8d19bacc868ad5970cc8ea81239f1ce709207e321ab97c0f155c6c363b3b0f9af25f6e6ce68d99678cf2b10c841a45f082f486bd9dee7be5e3a SHA512 45c2639a88e04d16511c92ca48ca6326b12422f0765df92fb883a1afe7fda9adefcf111d76855532f69b48c6e681774ee0c7e08f74594de808b50e11f8ec52c5
+DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4cc0f5556f6245b8e87aee5244e96ed6beede646f8b95b118d79ac715e988111f7fd2ddfb4c478af7a9bfe19c4dd227be SHA512 aced7b8dae452c62f4751785ad106c3747054ccb075b3d04dd82bd816d74f4002844e3cfa7aee138c9661e5c30a9aa9743f10a0dd807bbd590fffb60ce72f617
+DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
-EBUILD kube-proxy-1.10.11.ebuild 1117 BLAKE2B 399c883d474fb02f41f1784b4d4370c913f09ffc44438336eced438bdecb2579a8985e584299f6a435c9ed23e3ac8932056125439036fccb34b4a7a6a39d60a5 SHA512 cfb9378b244419075ab4d1a614a0c8b9bc838f032733b5acf80dcc036d76200a3c2894c9e24bb1070101389a7812d1af896e30b51d348eef57b5a25bb3318387
 EBUILD kube-proxy-1.10.12.ebuild 1117 BLAKE2B d52df182032ff67ae4c2e52180a3ec368a0b957076133f7d5225cab3286c4535a608dc03bb926cc892e8acac461a2c2b5abf66dbaab4dfb3124a1a807117aada SHA512 6665f98db3f1879ef801f087656fa5fb3ab8129fa4df7743ee0c23e433db8bbfd702ceedf17433f91ff9755d52fa109bb022ebd18f5a5ba300ae4eb37a6cb277
-EBUILD kube-proxy-1.11.5.ebuild 1117 BLAKE2B 399c883d474fb02f41f1784b4d4370c913f09ffc44438336eced438bdecb2579a8985e584299f6a435c9ed23e3ac8932056125439036fccb34b4a7a6a39d60a5 SHA512 cfb9378b244419075ab4d1a614a0c8b9bc838f032733b5acf80dcc036d76200a3c2894c9e24bb1070101389a7812d1af896e30b51d348eef57b5a25bb3318387
 EBUILD kube-proxy-1.11.6.ebuild 1117 BLAKE2B d52df182032ff67ae4c2e52180a3ec368a0b957076133f7d5225cab3286c4535a608dc03bb926cc892e8acac461a2c2b5abf66dbaab4dfb3124a1a807117aada SHA512 6665f98db3f1879ef801f087656fa5fb3ab8129fa4df7743ee0c23e433db8bbfd702ceedf17433f91ff9755d52fa109bb022ebd18f5a5ba300ae4eb37a6cb277
-EBUILD kube-proxy-1.12.3.ebuild 1117 BLAKE2B 399c883d474fb02f41f1784b4d4370c913f09ffc44438336eced438bdecb2579a8985e584299f6a435c9ed23e3ac8932056125439036fccb34b4a7a6a39d60a5 SHA512 cfb9378b244419075ab4d1a614a0c8b9bc838f032733b5acf80dcc036d76200a3c2894c9e24bb1070101389a7812d1af896e30b51d348eef57b5a25bb3318387
-EBUILD kube-proxy-1.12.4.ebuild 1117 BLAKE2B d52df182032ff67ae4c2e52180a3ec368a0b957076133f7d5225cab3286c4535a608dc03bb926cc892e8acac461a2c2b5abf66dbaab4dfb3124a1a807117aada SHA512 6665f98db3f1879ef801f087656fa5fb3ab8129fa4df7743ee0c23e433db8bbfd702ceedf17433f91ff9755d52fa109bb022ebd18f5a5ba300ae4eb37a6cb277
 EBUILD kube-proxy-1.12.5.ebuild 1117 BLAKE2B d52df182032ff67ae4c2e52180a3ec368a0b957076133f7d5225cab3286c4535a608dc03bb926cc892e8acac461a2c2b5abf66dbaab4dfb3124a1a807117aada SHA512 6665f98db3f1879ef801f087656fa5fb3ab8129fa4df7743ee0c23e433db8bbfd702ceedf17433f91ff9755d52fa109bb022ebd18f5a5ba300ae4eb37a6cb277
-EBUILD kube-proxy-1.13.1.ebuild 1137 BLAKE2B 52d86c985e37cd01c32721f21b892ed79e08971436372eddf7ab16e2498ef55bd4caec7f85e1969210fd2fdc1131c365958e3ccdf6671a679c1756bd13d3d8c9 SHA512 afd924929ad466945cad79764bd8d593fa719c850d77b9429f363709c858e932e8db7b8320deb47406ff7110bf96f0a899761c07305beeaf7abc372986df1f83
 EBUILD kube-proxy-1.13.3.ebuild 1137 BLAKE2B 52d86c985e37cd01c32721f21b892ed79e08971436372eddf7ab16e2498ef55bd4caec7f85e1969210fd2fdc1131c365958e3ccdf6671a679c1756bd13d3d8c9 SHA512 afd924929ad466945cad79764bd8d593fa719c850d77b9429f363709c858e932e8db7b8320deb47406ff7110bf96f0a899761c07305beeaf7abc372986df1f83
+EBUILD kube-proxy-1.13.5.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
+EBUILD kube-proxy-1.14.0.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 EBUILD kube-proxy-1.9.11.ebuild 1117 BLAKE2B 399c883d474fb02f41f1784b4d4370c913f09ffc44438336eced438bdecb2579a8985e584299f6a435c9ed23e3ac8932056125439036fccb34b4a7a6a39d60a5 SHA512 cfb9378b244419075ab4d1a614a0c8b9bc838f032733b5acf80dcc036d76200a3c2894c9e24bb1070101389a7812d1af896e30b51d348eef57b5a25bb3318387
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.10.11.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.10.11.ebuild
deleted file mode 100644
index ecd6ebd729ef..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.10.11.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.11.5.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.11.5.ebuild
deleted file mode 100644
index ecd6ebd729ef..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.11.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.12.3.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.12.3.ebuild
deleted file mode 100644
index ecd6ebd729ef..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.12.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.13.1.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.13.5.ebuild
index 25f9544b2a65..f519690e8b2f 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.13.1.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.13.5.ebuild
@@ -18,11 +18,13 @@ SLOT="0"
 DEPEND="dev-go/go-bindata
 	>=dev-lang/go-1.11"
 
+RDEPEND="net-firewall/conntrack-tools"
+
 RESTRICT="test"
 
 src_prepare() {
 	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
 	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
 }
 
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.12.4.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.14.0.ebuild
index 9c91e87318db..f519690e8b2f 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.12.4.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.14.0.ebuild
@@ -15,13 +15,16 @@ SRC_URI="${ARCHIVE_URI}"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-DEPEND="dev-go/go-bindata"
+DEPEND="dev-go/go-bindata
+	>=dev-lang/go-1.11"
+
+RDEPEND="net-firewall/conntrack-tools"
 
 RESTRICT="test"
 
 src_prepare() {
 	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
 	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
 }
 
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index b2d079be4b83..9e65923fe415 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,24 +1,18 @@
 AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c269129b483d650fd7dd63376e366825f483178c26e931db226478ce9d0b85412fc264d4d600a8232d0bac149e7 SHA512 d7326f34b26aaebf4b5c25a03abcff3bc3d397382ad4fed0f4718ee425e71399febf6fec6dc817813490671692d3f1b454fd5d14d9c47c3d41b0d3405a01a6c2
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
-DIST kubernetes-1.10.11.tar.gz 25085442 BLAKE2B 1cd758c8f042f9ccd797e67690f31038595a1162e8d50aed849e35dcc522aff3af2ce074f3c27f8dfce536ffb290af5d6bf0f684089eb76567f1bfb33f2764c6 SHA512 db7feafe398436123e66c90a271f714a645da5f170241d01371bfe613e87e2c177610f32325f85e02b63df9e847b19fd6000bff0b35d2635e8f03b31a40b9d11
 DIST kubernetes-1.10.12.tar.gz 25091359 BLAKE2B 8bc053ba737bdbe0cf65a2061f6ed9c959b85af19bf64b7c8c08738ac443b84486ebf229d6eec245b2414dc459987c855ae0d295d35e02c62ec83f8f789966d9 SHA512 74f476617d64e1ae0b520a2a8424c27e76dc5a7829b3565e132da9df6d7b0d6ad20592c4330d8cb5be714d4e40098dfb4d267a278a46df3baee762fd5d797e41
-DIST kubernetes-1.11.5.tar.gz 24813001 BLAKE2B 71c631b53246b9364ca29f5c2aebbf4303e7dbe103dc1d779c5e4f0aa26ee6caf5aab8023a8beb9a9fb513567283fcef4e584218c8cf30d1083f42344139cbfd SHA512 60a28bb32a469517974d1ba6d950d7f1550fea47d951a993edea0036d1b5baf35719edc73c2022291b70532c22241518f8324d70a86083c65fe38863ed04ac1c
 DIST kubernetes-1.11.6.tar.gz 24827575 BLAKE2B 095adccef1b5618f7e5d3a46cbf835f10513a667f663a673e2dedad5820ce59a4fde2208550447677a6693c11d4820db3f12c2e265153a1e33aaca71eadf6798 SHA512 cffe96ae56a6a9e3549090afd84e9e43955ce00f8089a71771c5171ce33b23ef164a67d3f3506326f95c1a602b53ec9d631b7160f6b8a51658c41b6eb048c670
-DIST kubernetes-1.12.3.tar.gz 28042821 BLAKE2B 79c2020608e4e94532b2d525c2c68dfbf9e7660f9047a215675e24f08eb00d145155ea09d9b05f92732c964d47c65138ea9170f6e8fd13ff9d63208a78b60f7d SHA512 6c4ef50240626f97246ed71229463e3649f42674d64bca3a8171728f67807cd0509da9156f53d0e7a8d4967e081cff0f03e0e1469ce5c81313eff67201d49b72
-DIST kubernetes-1.12.4.tar.gz 28064009 BLAKE2B 96cb269796628cde2665cb17bd6918d51a8d2cdebdaf75c65e352beebf7da4bee5da311ddf93931250471e46dd30dbd238727716542c688f364b1f14578d9146 SHA512 f7135a2dd7dac19512db13c0e72264b32c07f4a2f9fbc3573e31fa346415c99738446bd48463c3dd9bee3a716e040dd0c9e681c970603507649eefceca5926d7
 DIST kubernetes-1.12.5.tar.gz 28128559 BLAKE2B add647a579e75e877552fbde0800064d9170022619e236e9d280dc17f245adc8218458e12d0c7643a2a105c988ae7a4fa0176e19cc56989c54eb7edebd8d9dfc SHA512 bb391858b040fd75b03f5dcaf7e7f1b776d288443a833412c34c2fea8bbf23a8b76c4dd89da0b6fbd6ebfc1172407620aef8d8c5873b6f103dd118817dc17ad6
-DIST kubernetes-1.13.1.tar.gz 28715812 BLAKE2B f51d456264348cc89aa00b6bbda2c90acfc881ff9d9ff80af77a405c3cf302626e8be96c3bec1f7f3f4df3250e48d02778c1918320484acb7827e8f411ab4bda SHA512 95a5558c9ae2b1e8207d76157f4f52d17236c6aa315ca4c7cac0f18fbe59b061156c05a5d886321b589a6cb675c142754e48f9e0ca7e966116749a32120e92c7
 DIST kubernetes-1.13.3.tar.gz 28781320 BLAKE2B 7ae1a6ddeff5b8d19bacc868ad5970cc8ea81239f1ce709207e321ab97c0f155c6c363b3b0f9af25f6e6ce68d99678cf2b10c841a45f082f486bd9dee7be5e3a SHA512 45c2639a88e04d16511c92ca48ca6326b12422f0765df92fb883a1afe7fda9adefcf111d76855532f69b48c6e681774ee0c7e08f74594de808b50e11f8ec52c5
+DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4cc0f5556f6245b8e87aee5244e96ed6beede646f8b95b118d79ac715e988111f7fd2ddfb4c478af7a9bfe19c4dd227be SHA512 aced7b8dae452c62f4751785ad106c3747054ccb075b3d04dd82bd816d74f4002844e3cfa7aee138c9661e5c30a9aa9743f10a0dd807bbd590fffb60ce72f617
+DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
-EBUILD kube-scheduler-1.10.11.ebuild 1204 BLAKE2B 0c0d6fda619356d4e8227a6e145081818d083f39a11af96f601f5ddcc0ac8e0b539b90987419834e93c6f55d52aaf9471835f7fa9c87743a3ebab64bef79bacc SHA512 537c3ce70bc02d7ed1b29029e343d9246d5b2c4c493dc55fdbddf7ed4e376970d7da799202b09d2d1d9c3700c0daa2a5762649475c516aa57ec8767cc4efcd09
 EBUILD kube-scheduler-1.10.12.ebuild 1204 BLAKE2B 31644b91c9eb0f6e9ca3eae3700092486a8cc760f973e7f2e14be1c48d5bf26ae83a2750fc3ed344419e6c94fb831045d579c9827e874352ca8ecf2d5022a23b SHA512 b948b730fd717ee73a9b8c922b65e8c7d200dbfea29be0420f5f7d15c08416db91708b68057522227ded88b76ba26aeee483cb058dbbc68286a6cbc734d21e2d
-EBUILD kube-scheduler-1.11.5.ebuild 1204 BLAKE2B 0c0d6fda619356d4e8227a6e145081818d083f39a11af96f601f5ddcc0ac8e0b539b90987419834e93c6f55d52aaf9471835f7fa9c87743a3ebab64bef79bacc SHA512 537c3ce70bc02d7ed1b29029e343d9246d5b2c4c493dc55fdbddf7ed4e376970d7da799202b09d2d1d9c3700c0daa2a5762649475c516aa57ec8767cc4efcd09
 EBUILD kube-scheduler-1.11.6.ebuild 1204 BLAKE2B 31644b91c9eb0f6e9ca3eae3700092486a8cc760f973e7f2e14be1c48d5bf26ae83a2750fc3ed344419e6c94fb831045d579c9827e874352ca8ecf2d5022a23b SHA512 b948b730fd717ee73a9b8c922b65e8c7d200dbfea29be0420f5f7d15c08416db91708b68057522227ded88b76ba26aeee483cb058dbbc68286a6cbc734d21e2d
-EBUILD kube-scheduler-1.12.3.ebuild 1204 BLAKE2B 0c0d6fda619356d4e8227a6e145081818d083f39a11af96f601f5ddcc0ac8e0b539b90987419834e93c6f55d52aaf9471835f7fa9c87743a3ebab64bef79bacc SHA512 537c3ce70bc02d7ed1b29029e343d9246d5b2c4c493dc55fdbddf7ed4e376970d7da799202b09d2d1d9c3700c0daa2a5762649475c516aa57ec8767cc4efcd09
-EBUILD kube-scheduler-1.12.4.ebuild 1204 BLAKE2B 31644b91c9eb0f6e9ca3eae3700092486a8cc760f973e7f2e14be1c48d5bf26ae83a2750fc3ed344419e6c94fb831045d579c9827e874352ca8ecf2d5022a23b SHA512 b948b730fd717ee73a9b8c922b65e8c7d200dbfea29be0420f5f7d15c08416db91708b68057522227ded88b76ba26aeee483cb058dbbc68286a6cbc734d21e2d
 EBUILD kube-scheduler-1.12.5.ebuild 1204 BLAKE2B 31644b91c9eb0f6e9ca3eae3700092486a8cc760f973e7f2e14be1c48d5bf26ae83a2750fc3ed344419e6c94fb831045d579c9827e874352ca8ecf2d5022a23b SHA512 b948b730fd717ee73a9b8c922b65e8c7d200dbfea29be0420f5f7d15c08416db91708b68057522227ded88b76ba26aeee483cb058dbbc68286a6cbc734d21e2d
-EBUILD kube-scheduler-1.13.1.ebuild 1224 BLAKE2B a293e45658d31ce7adce5daa465921283e4023a6890b3f921260418aca307b03012d0edf354fea699b36468cd605e36b0b5b4e0f2441fbb82b33df32dd890799 SHA512 626b0d94496aeee539ee4bbcb9068a9e8831e2267213666a501d480e0c1eb16a60e7f68a665f06fe68e07643f154361bbb3803c94913c86f7885d916f2a1a95f
 EBUILD kube-scheduler-1.13.3.ebuild 1224 BLAKE2B a293e45658d31ce7adce5daa465921283e4023a6890b3f921260418aca307b03012d0edf354fea699b36468cd605e36b0b5b4e0f2441fbb82b33df32dd890799 SHA512 626b0d94496aeee539ee4bbcb9068a9e8831e2267213666a501d480e0c1eb16a60e7f68a665f06fe68e07643f154361bbb3803c94913c86f7885d916f2a1a95f
+EBUILD kube-scheduler-1.13.5.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
+EBUILD kube-scheduler-1.14.0.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
 EBUILD kube-scheduler-1.9.11.ebuild 1220 BLAKE2B 032c4eb322e2c7f7d9a898472b0b68a5907f963119b53098bed3bb3336af5098546a273c4c4493e20d3881bd94db22f36a8956832241be7845f16c565cdd7d8e SHA512 c1f9ab8c156c9ce96ab8e4fd31b811739d9859f17b502e32922e904805d791b85fb6529b7e305791ce8329b34a189a0c4a941e11961960cf01aa8b6abb4537f7
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.10.11.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.10.11.ebuild
deleted file mode 100644
index 81b22a7c9dea..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.10.11.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 Scheduler"
-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} GOFLAGS=-v
-}
-
-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.11.5.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.11.5.ebuild
deleted file mode 100644
index 81b22a7c9dea..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.11.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 Scheduler"
-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} GOFLAGS=-v
-}
-
-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.12.3.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.12.3.ebuild
deleted file mode 100644
index 81b22a7c9dea..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.12.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 Scheduler"
-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} GOFLAGS=-v
-}
-
-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.12.4.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.12.4.ebuild
deleted file mode 100644
index ec32edd4fa82..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.12.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 Scheduler"
-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} GOFLAGS=-v
-}
-
-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.13.1.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.13.5.ebuild
index 3bdd045abba7..2830ac40ff36 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.13.1.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.13.5.ebuild
@@ -27,7 +27,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
 	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
 }
 
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.14.0.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.14.0.ebuild
new file mode 100644
index 000000000000..2830ac40ff36
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.14.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 Scheduler"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata
+	>=dev-lang/go-1.11"
+
+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" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN}
+	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/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 62939bd174fa..d3728615f93a 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,7 +1,9 @@
-DIST kubernetes-1.13.2.tar.gz 28771642 BLAKE2B 4a5c5a8e0c05faab3fb6a26854e7c8643b893c2a1f5d5b56aacea869d86426dffe358222034b826d66dfd19855bee71cad7356ff483c27218019e4adda499ce7 SHA512 2f24119fc21d7bdbb60174b46da94ce3f2f6a3c638e9d96323c93c20039aeb06f9c9a3a48c43bb36b71eff25cf72967e780e3339b35ad7ad7a7a7c35662c96bd
-DIST kubernetes-1.13.3.tar.gz 28781320 BLAKE2B 7ae1a6ddeff5b8d19bacc868ad5970cc8ea81239f1ce709207e321ab97c0f155c6c363b3b0f9af25f6e6ce68d99678cf2b10c841a45f082f486bd9dee7be5e3a SHA512 45c2639a88e04d16511c92ca48ca6326b12422f0765df92fb883a1afe7fda9adefcf111d76855532f69b48c6e681774ee0c7e08f74594de808b50e11f8ec52c5
+AUX kubeadm-1.14-openrc.patch 3523 BLAKE2B bbcc45a82984afe2a8ab567ce1319b6c14c84eade26aba21393ba6fe44de35b654000468e15fd44e49da329c85cd4d3dac3fe643d8c83183ab126edaf4a5f4c9 SHA512 8aec0a1cda24fcd7001e34ff6163aee7eaf679dea953068b58df3578c016f70e1406903e032a51519bc16ac0dbe583159d1cf4d504adbb2930d811cc2f762cfe
 DIST kubernetes-1.13.4.tar.gz 28793464 BLAKE2B 0a637bf1003e4fd6ebabe09ebc0f3ca54e0258e7efb1578be727d5019c1f44638358462acccafa91bed2320d6392c54416079bb54bed12977739092965aeaeb5 SHA512 aa07877bc141ceedab56d9dd65920d86121724a0d20b86ee4925c88d805df8235162f235a957d24c053a60869ab2084062a1607f43c8eeea736fd72eb328c800
-EBUILD kubeadm-1.13.2.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
-EBUILD kubeadm-1.13.3.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
+DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4cc0f5556f6245b8e87aee5244e96ed6beede646f8b95b118d79ac715e988111f7fd2ddfb4c478af7a9bfe19c4dd227be SHA512 aced7b8dae452c62f4751785ad106c3747054ccb075b3d04dd82bd816d74f4002844e3cfa7aee138c9661e5c30a9aa9743f10a0dd807bbd590fffb60ce72f617
+DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
 EBUILD kubeadm-1.13.4.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
+EBUILD kubeadm-1.13.5.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
+EBUILD kubeadm-1.14.0-r1.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
+EBUILD kubeadm-1.14.0.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
 MISC metadata.xml 1128 BLAKE2B b5ad31ef126f2d95646a37c256b82d2ad5e008968f928fb56b05c39514d4a9e0a252ebcefbeac8679f5349acac170886859af44f095aafea97fc8bf00a34bc44 SHA512 b9246624712068cf304fc5329ae851c26d52204b684b5f547892b23e68948b04b4ed4654a49d7bb5fe7eea658b58fbdbbe51a7a9ba1f4a94c5d0499a033b7f5a
diff --git a/sys-cluster/kubeadm/files/kubeadm-1.14-openrc.patch b/sys-cluster/kubeadm/files/kubeadm-1.14-openrc.patch
new file mode 100644
index 000000000000..f4da52f0823c
--- /dev/null
+++ b/sys-cluster/kubeadm/files/kubeadm-1.14-openrc.patch
@@ -0,0 +1,110 @@
+Needed for OpenRC support until https://github.com/kubernetes/kubernetes/pull/73101 is merged.
+
+Brought to attention by https://bugs.alpinelinux.org/issues/10179
+
+---------------------------------
+--- a/pkg/util/initsystem/initsystem.go
++++ b/pkg/util/initsystem/initsystem.go
+@@ -1,5 +1,5 @@
+ /*
+-Copyright 2016 The Kubernetes Authors.
++Copyright 2019 The Kubernetes Authors.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+@@ -23,6 +23,9 @@
+ )
+ 
+ type InitSystem interface {
++	// return a string describing how to enable a service
++	EnableCommand(service string) string
++
+ 	// ServiceStart tries to start a specific service
+ 	ServiceStart(service string) error
+ 
+@@ -42,8 +45,63 @@
+ 	ServiceIsActive(service string) bool
+ }
+ 
++type OpenRCInitSystem struct{}
++
++func (openrc OpenRCInitSystem) ServiceStart(service string) error {
++	args := []string{service, "start"}
++	return exec.Command("rc-service", args...).Run()
++}
++
++func (openrc OpenRCInitSystem) ServiceStop(service string) error {
++	args := []string{service, "stop"}
++	return exec.Command("rc-service", args...).Run()
++}
++
++func (openrc OpenRCInitSystem) ServiceRestart(service string) error {
++	args := []string{service, "restart"}
++	return exec.Command("rc-service", args...).Run()
++}
++
++// openrc writes to stderr if a service is not found or not enabled
++// this is in contrast to systemd which only writes to stdout.
++// Hence, we use the Combinedoutput, and ignore the error.
++func (openrc OpenRCInitSystem) ServiceExists(service string) bool {
++	args := []string{service, "status"}
++	outBytes, _ := exec.Command("rc-service", args...).CombinedOutput()
++	if strings.Contains(string(outBytes), "does not exist") {
++		return false
++	}
++	return true
++}
++
++func (openrc OpenRCInitSystem) ServiceIsEnabled(service string) bool {
++	args := []string{"show", "default"}
++	outBytes, _ := exec.Command("rc-update", args...).Output()
++	if strings.Contains(string(outBytes), service) {
++		return true
++	}
++	return false
++}
++
++func (openrc OpenRCInitSystem) ServiceIsActive(service string) bool {
++	args := []string{service, "status"}
++	outBytes, _ := exec.Command("rc-service", args...).Output()
++	if strings.Contains(string(outBytes), "stopped") {
++		return false
++	}
++	return true
++}
++
++func (openrc OpenRCInitSystem) EnableCommand(service string) string {
++	return fmt.Sprintf("rc-update add %s default", service)
++}
++
+ type SystemdInitSystem struct{}
+ 
++func (sysd SystemdInitSystem) EnableCommand(service string) string {
++	return fmt.Sprintf("systemctl enable %s.service", service)
++}
++
+ func (sysd SystemdInitSystem) reloadSystemd() error {
+ 	if err := exec.Command("systemctl", "daemon-reload").Run(); err != nil {
+ 		return fmt.Errorf("failed to reload systemd: %v", err)
+@@ -110,6 +168,10 @@
+ // WindowsInitSystem is the windows implementation of InitSystem
+ type WindowsInitSystem struct{}
+ 
++func (sysd WindowsInitSystem) EnableCommand(service string) string {
++	return fmt.Sprintf("Set-Service '%s' -StartupType Automatic", service)
++}
++
+ func (sysd WindowsInitSystem) ServiceStart(service string) error {
+ 	args := []string{"Start-Service", service}
+ 	err := exec.Command("powershell", args...).Run()
+@@ -170,6 +232,10 @@
+ 	_, err := exec.LookPath("systemctl")
+ 	if err == nil {
+ 		return &SystemdInitSystem{}, nil
++	}
++	_, err = exec.LookPath("openrc")
++	if err == nil {
++		return &OpenRCInitSystem{}, nil
+ 	}
+ 	_, err = exec.LookPath("wininit.exe")
+ 	if err == nil {
diff --git a/sys-cluster/kubeadm/kubeadm-1.13.2.ebuild b/sys-cluster/kubeadm/kubeadm-1.13.5.ebuild
index 6c4b699b7594..6c4b699b7594 100644
--- a/sys-cluster/kubeadm/kubeadm-1.13.2.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.13.5.ebuild
diff --git a/sys-cluster/kubectl/kubectl-1.13.3.ebuild b/sys-cluster/kubeadm/kubeadm-1.14.0-r1.ebuild
index 93cda65f0ea1..763c3838067b 100644
--- a/sys-cluster/kubectl/kubectl-1.13.3.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.14.0-r1.ebuild
@@ -8,7 +8,7 @@ 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"
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
 HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
 SRC_URI="${ARCHIVE_URI}"
 
@@ -16,7 +16,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
-DEPEND=">=dev-lang/go-1.11
+DEPEND=">=dev-lang/go-1.12
 	dev-go/go-bindata"
 
 RESTRICT="test"
@@ -25,6 +25,9 @@ src_prepare() {
 	default
 	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
 	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+	pushd src/${EGO_PN} || die
+	eapply "${FILESDIR}/${PN}-1.14-openrc.patch"
+	popd || die
 }
 
 src_compile() {
diff --git a/sys-cluster/kubeadm/kubeadm-1.13.3.ebuild b/sys-cluster/kubeadm/kubeadm-1.14.0.ebuild
index 6c4b699b7594..6c4b699b7594 100644
--- a/sys-cluster/kubeadm/kubeadm-1.13.3.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.14.0.ebuild
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index b3e0f39b6516..2e999949b149 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,27 +1,13 @@
-DIST kubernetes-1.10.11.tar.gz 25085442 BLAKE2B 1cd758c8f042f9ccd797e67690f31038595a1162e8d50aed849e35dcc522aff3af2ce074f3c27f8dfce536ffb290af5d6bf0f684089eb76567f1bfb33f2764c6 SHA512 db7feafe398436123e66c90a271f714a645da5f170241d01371bfe613e87e2c177610f32325f85e02b63df9e847b19fd6000bff0b35d2635e8f03b31a40b9d11
 DIST kubernetes-1.10.12.tar.gz 25091359 BLAKE2B 8bc053ba737bdbe0cf65a2061f6ed9c959b85af19bf64b7c8c08738ac443b84486ebf229d6eec245b2414dc459987c855ae0d295d35e02c62ec83f8f789966d9 SHA512 74f476617d64e1ae0b520a2a8424c27e76dc5a7829b3565e132da9df6d7b0d6ad20592c4330d8cb5be714d4e40098dfb4d267a278a46df3baee762fd5d797e41
-DIST kubernetes-1.11.5.tar.gz 24813001 BLAKE2B 71c631b53246b9364ca29f5c2aebbf4303e7dbe103dc1d779c5e4f0aa26ee6caf5aab8023a8beb9a9fb513567283fcef4e584218c8cf30d1083f42344139cbfd SHA512 60a28bb32a469517974d1ba6d950d7f1550fea47d951a993edea0036d1b5baf35719edc73c2022291b70532c22241518f8324d70a86083c65fe38863ed04ac1c
 DIST kubernetes-1.11.6.tar.gz 24827575 BLAKE2B 095adccef1b5618f7e5d3a46cbf835f10513a667f663a673e2dedad5820ce59a4fde2208550447677a6693c11d4820db3f12c2e265153a1e33aaca71eadf6798 SHA512 cffe96ae56a6a9e3549090afd84e9e43955ce00f8089a71771c5171ce33b23ef164a67d3f3506326f95c1a602b53ec9d631b7160f6b8a51658c41b6eb048c670
-DIST kubernetes-1.12.3.tar.gz 28042821 BLAKE2B 79c2020608e4e94532b2d525c2c68dfbf9e7660f9047a215675e24f08eb00d145155ea09d9b05f92732c964d47c65138ea9170f6e8fd13ff9d63208a78b60f7d SHA512 6c4ef50240626f97246ed71229463e3649f42674d64bca3a8171728f67807cd0509da9156f53d0e7a8d4967e081cff0f03e0e1469ce5c81313eff67201d49b72
-DIST kubernetes-1.12.4.tar.gz 28064009 BLAKE2B 96cb269796628cde2665cb17bd6918d51a8d2cdebdaf75c65e352beebf7da4bee5da311ddf93931250471e46dd30dbd238727716542c688f364b1f14578d9146 SHA512 f7135a2dd7dac19512db13c0e72264b32c07f4a2f9fbc3573e31fa346415c99738446bd48463c3dd9bee3a716e040dd0c9e681c970603507649eefceca5926d7
-DIST kubernetes-1.12.5.tar.gz 28128559 BLAKE2B add647a579e75e877552fbde0800064d9170022619e236e9d280dc17f245adc8218458e12d0c7643a2a105c988ae7a4fa0176e19cc56989c54eb7edebd8d9dfc SHA512 bb391858b040fd75b03f5dcaf7e7f1b776d288443a833412c34c2fea8bbf23a8b76c4dd89da0b6fbd6ebfc1172407620aef8d8c5873b6f103dd118817dc17ad6
 DIST kubernetes-1.12.6.tar.gz 28142622 BLAKE2B 7f3541356aebb3f60c27ba1ae1c9c50867bf77ae8cb585955b38addc1015ef0dbbf0bd21e454610ee2fe6c9811c0d32fe912de368f7bf5d95fe60cab7a538354 SHA512 bd4b28fb6ecb7212c9bd6fb24b3ba59466ed9d684a4ba4e403e0270fc96ac5d1bcdcf8ea0be0085353af29bbfe73ab6ff1cda5127ea123ad7660c3022cab4703
-DIST kubernetes-1.13.1.tar.gz 28715812 BLAKE2B f51d456264348cc89aa00b6bbda2c90acfc881ff9d9ff80af77a405c3cf302626e8be96c3bec1f7f3f4df3250e48d02778c1918320484acb7827e8f411ab4bda SHA512 95a5558c9ae2b1e8207d76157f4f52d17236c6aa315ca4c7cac0f18fbe59b061156c05a5d886321b589a6cb675c142754e48f9e0ca7e966116749a32120e92c7
-DIST kubernetes-1.13.2.tar.gz 28771642 BLAKE2B 4a5c5a8e0c05faab3fb6a26854e7c8643b893c2a1f5d5b56aacea869d86426dffe358222034b826d66dfd19855bee71cad7356ff483c27218019e4adda499ce7 SHA512 2f24119fc21d7bdbb60174b46da94ce3f2f6a3c638e9d96323c93c20039aeb06f9c9a3a48c43bb36b71eff25cf72967e780e3339b35ad7ad7a7a7c35662c96bd
-DIST kubernetes-1.13.3.tar.gz 28781320 BLAKE2B 7ae1a6ddeff5b8d19bacc868ad5970cc8ea81239f1ce709207e321ab97c0f155c6c363b3b0f9af25f6e6ce68d99678cf2b10c841a45f082f486bd9dee7be5e3a SHA512 45c2639a88e04d16511c92ca48ca6326b12422f0765df92fb883a1afe7fda9adefcf111d76855532f69b48c6e681774ee0c7e08f74594de808b50e11f8ec52c5
-DIST kubernetes-1.13.4.tar.gz 28793464 BLAKE2B 0a637bf1003e4fd6ebabe09ebc0f3ca54e0258e7efb1578be727d5019c1f44638358462acccafa91bed2320d6392c54416079bb54bed12977739092965aeaeb5 SHA512 aa07877bc141ceedab56d9dd65920d86121724a0d20b86ee4925c88d805df8235162f235a957d24c053a60869ab2084062a1607f43c8eeea736fd72eb328c800
+DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4cc0f5556f6245b8e87aee5244e96ed6beede646f8b95b118d79ac715e988111f7fd2ddfb4c478af7a9bfe19c4dd227be SHA512 aced7b8dae452c62f4751785ad106c3747054ccb075b3d04dd82bd816d74f4002844e3cfa7aee138c9661e5c30a9aa9743f10a0dd807bbd590fffb60ce72f617
+DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
-EBUILD kubectl-1.10.11.ebuild 1218 BLAKE2B 2a7acaf7bd113c2439512a3150bdc025afb0afe088cfe1d3bc1972361c3ff5d1bf325583adb81018f9b3e4c40f925dc2067e70682c5481a0b70a04d022996b4d SHA512 036b7de703d6650fea7d2047582883f0cfef2eeb2af7031d9a02ab545339d2cf8ee0649f28d3217a45bbdd9a26ea47881368f492530ade1515e92bd963ff358e
 EBUILD kubectl-1.10.12.ebuild 1218 BLAKE2B 07e3137d8a56d669cfa1fb05dedc4526b2376fdda9cdfc4c4d8a67f740687404cec372691f4e55a34d2fd1ddc8487ea0207f1699658910d010d22d19f9a0bc13 SHA512 747a24d27b67332c1c427825368a0e4f1feb3194fc9a7c6107d3463a049c998ff756b325eab950dab45b8b4a8236b0e202ea8bd302915d4f1feacc3335aa3b55
-EBUILD kubectl-1.11.5.ebuild 1218 BLAKE2B 2a7acaf7bd113c2439512a3150bdc025afb0afe088cfe1d3bc1972361c3ff5d1bf325583adb81018f9b3e4c40f925dc2067e70682c5481a0b70a04d022996b4d SHA512 036b7de703d6650fea7d2047582883f0cfef2eeb2af7031d9a02ab545339d2cf8ee0649f28d3217a45bbdd9a26ea47881368f492530ade1515e92bd963ff358e
 EBUILD kubectl-1.11.6.ebuild 1218 BLAKE2B 07e3137d8a56d669cfa1fb05dedc4526b2376fdda9cdfc4c4d8a67f740687404cec372691f4e55a34d2fd1ddc8487ea0207f1699658910d010d22d19f9a0bc13 SHA512 747a24d27b67332c1c427825368a0e4f1feb3194fc9a7c6107d3463a049c998ff756b325eab950dab45b8b4a8236b0e202ea8bd302915d4f1feacc3335aa3b55
-EBUILD kubectl-1.12.3.ebuild 1218 BLAKE2B 2a7acaf7bd113c2439512a3150bdc025afb0afe088cfe1d3bc1972361c3ff5d1bf325583adb81018f9b3e4c40f925dc2067e70682c5481a0b70a04d022996b4d SHA512 036b7de703d6650fea7d2047582883f0cfef2eeb2af7031d9a02ab545339d2cf8ee0649f28d3217a45bbdd9a26ea47881368f492530ade1515e92bd963ff358e
-EBUILD kubectl-1.12.4.ebuild 1218 BLAKE2B 07e3137d8a56d669cfa1fb05dedc4526b2376fdda9cdfc4c4d8a67f740687404cec372691f4e55a34d2fd1ddc8487ea0207f1699658910d010d22d19f9a0bc13 SHA512 747a24d27b67332c1c427825368a0e4f1feb3194fc9a7c6107d3463a049c998ff756b325eab950dab45b8b4a8236b0e202ea8bd302915d4f1feacc3335aa3b55
-EBUILD kubectl-1.12.5.ebuild 1218 BLAKE2B 07e3137d8a56d669cfa1fb05dedc4526b2376fdda9cdfc4c4d8a67f740687404cec372691f4e55a34d2fd1ddc8487ea0207f1699658910d010d22d19f9a0bc13 SHA512 747a24d27b67332c1c427825368a0e4f1feb3194fc9a7c6107d3463a049c998ff756b325eab950dab45b8b4a8236b0e202ea8bd302915d4f1feacc3335aa3b55
 EBUILD kubectl-1.12.6.ebuild 1218 BLAKE2B 07e3137d8a56d669cfa1fb05dedc4526b2376fdda9cdfc4c4d8a67f740687404cec372691f4e55a34d2fd1ddc8487ea0207f1699658910d010d22d19f9a0bc13 SHA512 747a24d27b67332c1c427825368a0e4f1feb3194fc9a7c6107d3463a049c998ff756b325eab950dab45b8b4a8236b0e202ea8bd302915d4f1feacc3335aa3b55
-EBUILD kubectl-1.13.1.ebuild 1238 BLAKE2B 3ad462c2d023292f9a96a4b091f8143ee57105d1b921205e5bf82f6cd18fbf57c3c2d0a9b86637a16190969f0837fc88c23c29d8d82c159f648a9d8ccaf87730 SHA512 73730998885fe748c361d6991c0eb9703363ebdbf2db778ab7ff9333e1a9579973b7dcf0ebcb4d02fea764625f5b8e80aa8aabc38d21a8230d28b3742bc23156
-EBUILD kubectl-1.13.2.ebuild 1255 BLAKE2B 780babfc4390b252a5e0a462c7c7f742db71e8334dad63d716d673c78084c6059a022400f55694a6dd24460dd0168d5a77a468ec27de67819d4f63247a20f1de SHA512 0b1becd62a82972e38eb1dba03eb2c6ce412a6bff2fa857b01ffe2cbd10f4ac7be01a558befadd2ae57968376482ebfa805102522edb6f1e15b7cf348e936c0b
-EBUILD kubectl-1.13.3.ebuild 1255 BLAKE2B 780babfc4390b252a5e0a462c7c7f742db71e8334dad63d716d673c78084c6059a022400f55694a6dd24460dd0168d5a77a468ec27de67819d4f63247a20f1de SHA512 0b1becd62a82972e38eb1dba03eb2c6ce412a6bff2fa857b01ffe2cbd10f4ac7be01a558befadd2ae57968376482ebfa805102522edb6f1e15b7cf348e936c0b
-EBUILD kubectl-1.13.4.ebuild 1255 BLAKE2B 780babfc4390b252a5e0a462c7c7f742db71e8334dad63d716d673c78084c6059a022400f55694a6dd24460dd0168d5a77a468ec27de67819d4f63247a20f1de SHA512 0b1becd62a82972e38eb1dba03eb2c6ce412a6bff2fa857b01ffe2cbd10f4ac7be01a558befadd2ae57968376482ebfa805102522edb6f1e15b7cf348e936c0b
+EBUILD kubectl-1.13.5.ebuild 1255 BLAKE2B 780babfc4390b252a5e0a462c7c7f742db71e8334dad63d716d673c78084c6059a022400f55694a6dd24460dd0168d5a77a468ec27de67819d4f63247a20f1de SHA512 0b1becd62a82972e38eb1dba03eb2c6ce412a6bff2fa857b01ffe2cbd10f4ac7be01a558befadd2ae57968376482ebfa805102522edb6f1e15b7cf348e936c0b
+EBUILD kubectl-1.14.0.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
 EBUILD kubectl-1.9.11.ebuild 1217 BLAKE2B bc8d5c0dea2db716297e051807bce2ab809dcf59d02a145221c502965993873b82d1df96dcdbed218a488b70e3241323e138817e9fcecd4e10f2d549f4c4073c SHA512 65e0bb08dec59b7f8c211766ff5aff25b0bb12819072834e2d86e768ba175b45b125b04dd0a316f47169e1ae2c9199e44d66408efeff067c8c2cbba248bb534b
 MISC metadata.xml 331 BLAKE2B 5af758a2aff067b1d7e94cb6d87a27fb96825c56490b5a4c7d9554cbb5057cf10b0dfb7d069f3edf8f7bcdce88b0f6b4286c4622c3cdcf5e5b283c75760f6a1d SHA512 d44cef89f9f902c706b0f9c0c4106bfd6ca094d64c273d0a13da53aec7ba2b238cd6ff489f13765e895ee4a6f2bb4638436839c7c60cce2ece3013fdc27232a4
diff --git a/sys-cluster/kubectl/kubectl-1.10.11.ebuild b/sys-cluster/kubectl/kubectl-1.10.11.ebuild
deleted file mode 100644
index f12e63e59957..000000000000
--- a/sys-cluster/kubectl/kubectl-1.10.11.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot 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} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	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.11.5.ebuild b/sys-cluster/kubectl/kubectl-1.11.5.ebuild
deleted file mode 100644
index f12e63e59957..000000000000
--- a/sys-cluster/kubectl/kubectl-1.11.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot 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} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	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.12.3.ebuild b/sys-cluster/kubectl/kubectl-1.12.3.ebuild
deleted file mode 100644
index f12e63e59957..000000000000
--- a/sys-cluster/kubectl/kubectl-1.12.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot 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} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	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.12.4.ebuild b/sys-cluster/kubectl/kubectl-1.12.4.ebuild
deleted file mode 100644
index 716e34ce9279..000000000000
--- a/sys-cluster/kubectl/kubectl-1.12.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	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.12.5.ebuild b/sys-cluster/kubectl/kubectl-1.12.5.ebuild
deleted file mode 100644
index 716e34ce9279..000000000000
--- a/sys-cluster/kubectl/kubectl-1.12.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	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.13.1.ebuild b/sys-cluster/kubectl/kubectl-1.13.1.ebuild
deleted file mode 100644
index 776d0d2bd8b7..000000000000
--- a/sys-cluster/kubectl/kubectl-1.13.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot 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-lang/go-1.11
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	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.13.2.ebuild b/sys-cluster/kubectl/kubectl-1.13.5.ebuild
index 93cda65f0ea1..93cda65f0ea1 100644
--- a/sys-cluster/kubectl/kubectl-1.13.2.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.13.5.ebuild
diff --git a/sys-cluster/kubectl/kubectl-1.13.4.ebuild b/sys-cluster/kubectl/kubectl-1.14.0.ebuild
index 93cda65f0ea1..7a61b25dce90 100644
--- a/sys-cluster/kubectl/kubectl-1.13.4.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.14.0.ebuild
@@ -16,7 +16,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
-DEPEND=">=dev-lang/go-1.11
+DEPEND=">=dev-lang/go-1.12
 	dev-go/go-bindata"
 
 RESTRICT="test"
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 024971070a44..5a6020f7df11 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -3,28 +3,20 @@ AUX kubelet.env 547 BLAKE2B db9144a0e155450f08a665700edbb05f3fa093d209f72320fdbc
 AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a00585489864c262d90ad8347763753f99eccec6fe6670c6fa016674dee4dea0fa838991abb503db97bd983a SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
-DIST kubernetes-1.10.11.tar.gz 25085442 BLAKE2B 1cd758c8f042f9ccd797e67690f31038595a1162e8d50aed849e35dcc522aff3af2ce074f3c27f8dfce536ffb290af5d6bf0f684089eb76567f1bfb33f2764c6 SHA512 db7feafe398436123e66c90a271f714a645da5f170241d01371bfe613e87e2c177610f32325f85e02b63df9e847b19fd6000bff0b35d2635e8f03b31a40b9d11
 DIST kubernetes-1.10.12.tar.gz 25091359 BLAKE2B 8bc053ba737bdbe0cf65a2061f6ed9c959b85af19bf64b7c8c08738ac443b84486ebf229d6eec245b2414dc459987c855ae0d295d35e02c62ec83f8f789966d9 SHA512 74f476617d64e1ae0b520a2a8424c27e76dc5a7829b3565e132da9df6d7b0d6ad20592c4330d8cb5be714d4e40098dfb4d267a278a46df3baee762fd5d797e41
-DIST kubernetes-1.11.5.tar.gz 24813001 BLAKE2B 71c631b53246b9364ca29f5c2aebbf4303e7dbe103dc1d779c5e4f0aa26ee6caf5aab8023a8beb9a9fb513567283fcef4e584218c8cf30d1083f42344139cbfd SHA512 60a28bb32a469517974d1ba6d950d7f1550fea47d951a993edea0036d1b5baf35719edc73c2022291b70532c22241518f8324d70a86083c65fe38863ed04ac1c
 DIST kubernetes-1.11.6.tar.gz 24827575 BLAKE2B 095adccef1b5618f7e5d3a46cbf835f10513a667f663a673e2dedad5820ce59a4fde2208550447677a6693c11d4820db3f12c2e265153a1e33aaca71eadf6798 SHA512 cffe96ae56a6a9e3549090afd84e9e43955ce00f8089a71771c5171ce33b23ef164a67d3f3506326f95c1a602b53ec9d631b7160f6b8a51658c41b6eb048c670
-DIST kubernetes-1.12.3.tar.gz 28042821 BLAKE2B 79c2020608e4e94532b2d525c2c68dfbf9e7660f9047a215675e24f08eb00d145155ea09d9b05f92732c964d47c65138ea9170f6e8fd13ff9d63208a78b60f7d SHA512 6c4ef50240626f97246ed71229463e3649f42674d64bca3a8171728f67807cd0509da9156f53d0e7a8d4967e081cff0f03e0e1469ce5c81313eff67201d49b72
-DIST kubernetes-1.12.4.tar.gz 28064009 BLAKE2B 96cb269796628cde2665cb17bd6918d51a8d2cdebdaf75c65e352beebf7da4bee5da311ddf93931250471e46dd30dbd238727716542c688f364b1f14578d9146 SHA512 f7135a2dd7dac19512db13c0e72264b32c07f4a2f9fbc3573e31fa346415c99738446bd48463c3dd9bee3a716e040dd0c9e681c970603507649eefceca5926d7
-DIST kubernetes-1.12.5.tar.gz 28128559 BLAKE2B add647a579e75e877552fbde0800064d9170022619e236e9d280dc17f245adc8218458e12d0c7643a2a105c988ae7a4fa0176e19cc56989c54eb7edebd8d9dfc SHA512 bb391858b040fd75b03f5dcaf7e7f1b776d288443a833412c34c2fea8bbf23a8b76c4dd89da0b6fbd6ebfc1172407620aef8d8c5873b6f103dd118817dc17ad6
 DIST kubernetes-1.12.6.tar.gz 28142622 BLAKE2B 7f3541356aebb3f60c27ba1ae1c9c50867bf77ae8cb585955b38addc1015ef0dbbf0bd21e454610ee2fe6c9811c0d32fe912de368f7bf5d95fe60cab7a538354 SHA512 bd4b28fb6ecb7212c9bd6fb24b3ba59466ed9d684a4ba4e403e0270fc96ac5d1bcdcf8ea0be0085353af29bbfe73ab6ff1cda5127ea123ad7660c3022cab4703
-DIST kubernetes-1.13.1.tar.gz 28715812 BLAKE2B f51d456264348cc89aa00b6bbda2c90acfc881ff9d9ff80af77a405c3cf302626e8be96c3bec1f7f3f4df3250e48d02778c1918320484acb7827e8f411ab4bda SHA512 95a5558c9ae2b1e8207d76157f4f52d17236c6aa315ca4c7cac0f18fbe59b061156c05a5d886321b589a6cb675c142754e48f9e0ca7e966116749a32120e92c7
 DIST kubernetes-1.13.3.tar.gz 28781320 BLAKE2B 7ae1a6ddeff5b8d19bacc868ad5970cc8ea81239f1ce709207e321ab97c0f155c6c363b3b0f9af25f6e6ce68d99678cf2b10c841a45f082f486bd9dee7be5e3a SHA512 45c2639a88e04d16511c92ca48ca6326b12422f0765df92fb883a1afe7fda9adefcf111d76855532f69b48c6e681774ee0c7e08f74594de808b50e11f8ec52c5
 DIST kubernetes-1.13.4.tar.gz 28793464 BLAKE2B 0a637bf1003e4fd6ebabe09ebc0f3ca54e0258e7efb1578be727d5019c1f44638358462acccafa91bed2320d6392c54416079bb54bed12977739092965aeaeb5 SHA512 aa07877bc141ceedab56d9dd65920d86121724a0d20b86ee4925c88d805df8235162f235a957d24c053a60869ab2084062a1607f43c8eeea736fd72eb328c800
+DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4cc0f5556f6245b8e87aee5244e96ed6beede646f8b95b118d79ac715e988111f7fd2ddfb4c478af7a9bfe19c4dd227be SHA512 aced7b8dae452c62f4751785ad106c3747054ccb075b3d04dd82bd816d74f4002844e3cfa7aee138c9661e5c30a9aa9743f10a0dd807bbd590fffb60ce72f617
+DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
-EBUILD kubelet-1.10.11.ebuild 1214 BLAKE2B f3c48603723146398aa863671ace8f8ce2c88b2c0ee34ac27abac8472e9d2db8615a8e29e4a5d6112f78a71fc0234f05f54737f96e3e02792fc9048b984e4417 SHA512 0510752405f29359032aa9a640a5e321bd40a90d3538bb1e327f36552350f0ecb708a5f0cccc3bad17fb1700de76be4c991202e8f207336d4df84767c9fd02cc
 EBUILD kubelet-1.10.12.ebuild 1214 BLAKE2B a2b8a51455ab201eb5e3b39cefaaa9a120633340a240a0aa94b1c044d7bf83e3babc2b00f1f75f080d1cdaaa87736588f39890edb677e1dd2c59397d2eee0436 SHA512 772ba0ab7060ab606070ab6bba7ff512e2eaf15acbcc634fc40fc7a0834f750be757c9d7a24b1e59e5c52d60f828ae458f51b533da479cfcab65f0a6145adfbd
-EBUILD kubelet-1.11.5.ebuild 1214 BLAKE2B f3c48603723146398aa863671ace8f8ce2c88b2c0ee34ac27abac8472e9d2db8615a8e29e4a5d6112f78a71fc0234f05f54737f96e3e02792fc9048b984e4417 SHA512 0510752405f29359032aa9a640a5e321bd40a90d3538bb1e327f36552350f0ecb708a5f0cccc3bad17fb1700de76be4c991202e8f207336d4df84767c9fd02cc
 EBUILD kubelet-1.11.6.ebuild 1214 BLAKE2B a2b8a51455ab201eb5e3b39cefaaa9a120633340a240a0aa94b1c044d7bf83e3babc2b00f1f75f080d1cdaaa87736588f39890edb677e1dd2c59397d2eee0436 SHA512 772ba0ab7060ab606070ab6bba7ff512e2eaf15acbcc634fc40fc7a0834f750be757c9d7a24b1e59e5c52d60f828ae458f51b533da479cfcab65f0a6145adfbd
-EBUILD kubelet-1.12.3.ebuild 1214 BLAKE2B f3c48603723146398aa863671ace8f8ce2c88b2c0ee34ac27abac8472e9d2db8615a8e29e4a5d6112f78a71fc0234f05f54737f96e3e02792fc9048b984e4417 SHA512 0510752405f29359032aa9a640a5e321bd40a90d3538bb1e327f36552350f0ecb708a5f0cccc3bad17fb1700de76be4c991202e8f207336d4df84767c9fd02cc
-EBUILD kubelet-1.12.4.ebuild 1214 BLAKE2B a2b8a51455ab201eb5e3b39cefaaa9a120633340a240a0aa94b1c044d7bf83e3babc2b00f1f75f080d1cdaaa87736588f39890edb677e1dd2c59397d2eee0436 SHA512 772ba0ab7060ab606070ab6bba7ff512e2eaf15acbcc634fc40fc7a0834f750be757c9d7a24b1e59e5c52d60f828ae458f51b533da479cfcab65f0a6145adfbd
-EBUILD kubelet-1.12.5.ebuild 1214 BLAKE2B a2b8a51455ab201eb5e3b39cefaaa9a120633340a240a0aa94b1c044d7bf83e3babc2b00f1f75f080d1cdaaa87736588f39890edb677e1dd2c59397d2eee0436 SHA512 772ba0ab7060ab606070ab6bba7ff512e2eaf15acbcc634fc40fc7a0834f750be757c9d7a24b1e59e5c52d60f828ae458f51b533da479cfcab65f0a6145adfbd
 EBUILD kubelet-1.12.6.ebuild 1214 BLAKE2B a2b8a51455ab201eb5e3b39cefaaa9a120633340a240a0aa94b1c044d7bf83e3babc2b00f1f75f080d1cdaaa87736588f39890edb677e1dd2c59397d2eee0436 SHA512 772ba0ab7060ab606070ab6bba7ff512e2eaf15acbcc634fc40fc7a0834f750be757c9d7a24b1e59e5c52d60f828ae458f51b533da479cfcab65f0a6145adfbd
-EBUILD kubelet-1.13.1.ebuild 1234 BLAKE2B 4018bb7dded556007c17c0af6f89c29d0032ee2f25309de7146dcb77cfce4ba84b9aabf79e6f54ad39826546db7ff1b1bb7822e32938a867c12d9ff203f0f5c2 SHA512 23ba4e0ec56f97d3aa2ea211f02503df8a82e1a09fcfcaf6cd1976953867bd20d50185d50b9a936d6c311e1a5e84c21abde91c25d3220607d6e1129c1f050afb
 EBUILD kubelet-1.13.3.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
 EBUILD kubelet-1.13.4.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
+EBUILD kubelet-1.13.5.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
+EBUILD kubelet-1.14.0.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
 EBUILD kubelet-1.9.11.ebuild 1214 BLAKE2B f3c48603723146398aa863671ace8f8ce2c88b2c0ee34ac27abac8472e9d2db8615a8e29e4a5d6112f78a71fc0234f05f54737f96e3e02792fc9048b984e4417 SHA512 0510752405f29359032aa9a640a5e321bd40a90d3538bb1e327f36552350f0ecb708a5f0cccc3bad17fb1700de76be4c991202e8f207336d4df84767c9fd02cc
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kubelet/kubelet-1.10.11.ebuild b/sys-cluster/kubelet/kubelet-1.10.11.ebuild
deleted file mode 100644
index 27288752d60b..000000000000
--- a/sys-cluster/kubelet/kubelet-1.10.11.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes 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} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kubelet/kubelet-1.11.5.ebuild b/sys-cluster/kubelet/kubelet-1.11.5.ebuild
deleted file mode 100644
index 27288752d60b..000000000000
--- a/sys-cluster/kubelet/kubelet-1.11.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes 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} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kubelet/kubelet-1.12.3.ebuild b/sys-cluster/kubelet/kubelet-1.12.3.ebuild
deleted file mode 100644
index 27288752d60b..000000000000
--- a/sys-cluster/kubelet/kubelet-1.12.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes 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} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kubelet/kubelet-1.12.4.ebuild b/sys-cluster/kubelet/kubelet-1.12.4.ebuild
deleted file mode 100644
index 33670d2ae36b..000000000000
--- a/sys-cluster/kubelet/kubelet-1.12.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes 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} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kubelet/kubelet-1.13.1.ebuild b/sys-cluster/kubelet/kubelet-1.13.5.ebuild
index e3a65e93f14b..f38ce59e625d 100644
--- a/sys-cluster/kubelet/kubelet-1.13.1.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.13.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit golang-build golang-vcs-snapshot
+inherit golang-build golang-vcs-snapshot systemd
 
 EGO_PN="k8s.io/kubernetes"
 ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
@@ -23,7 +23,7 @@ RESTRICT="test"
 
 src_prepare() {
 	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
 	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
 }
 
@@ -41,4 +41,7 @@ src_install() {
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
 }
diff --git a/sys-cluster/kubelet/kubelet-1.12.5.ebuild b/sys-cluster/kubelet/kubelet-1.14.0.ebuild
index 33670d2ae36b..f38ce59e625d 100644
--- a/sys-cluster/kubelet/kubelet-1.12.5.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.14.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit golang-build golang-vcs-snapshot
+inherit golang-build golang-vcs-snapshot systemd
 
 EGO_PN="k8s.io/kubernetes"
 ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
@@ -16,13 +16,14 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="hardened"
 
-DEPEND="dev-go/go-bindata"
+DEPEND="dev-go/go-bindata
+	>=dev-lang/go-1.11"
 
 RESTRICT="test"
 
 src_prepare() {
 	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
 	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
 }
 
@@ -40,4 +41,7 @@ src_install() {
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
 }
diff --git a/sys-cluster/minikube/Manifest b/sys-cluster/minikube/Manifest
index 2035ceff7ba6..83fe46503c22 100644
--- a/sys-cluster/minikube/Manifest
+++ b/sys-cluster/minikube/Manifest
@@ -1,13 +1,7 @@
-DIST minikube-0.30.0.tar.gz 9180859 BLAKE2B cd6efd166e01ea14b7593530ac3b7448851c5666146b7f1fac06a2c931ae3781d522fb3be1970663db1dcc51b41ca5382048e4ce9d3c4d747cd8e0f5d29715ee SHA512 1c78caf2865c0ea200de9cc2f6fa0de7f9f8170e9c4927dc3190e6658d69a59cfb57b05e947c22d60d8990f62bc7b625f86b18a548981fbd6e2c73d69607683f
-DIST minikube-0.31.0.tar.gz 9213283 BLAKE2B 97440d26d724e54d265ee9c3602c2dc0cfd455d75616b4053d1ab8a04efbcbe93c74535577c3a881d665374dd753d629f16f90210c50066180e1fe2baaa733a0 SHA512 5f2d911deac1e51f82e27d174bf8be4dd1ceb5ce29aa45865077e0cf3524b8f62b2717e95a19d636e0c65d39748ef7522c9379a9d85839c7c97f4fe67d2f4a92
-DIST minikube-0.32.0.tar.gz 9216759 BLAKE2B 0b823ea3e9d912d3caeb7fe4cb28390c718fcc77c509bf4fac9b8e318fc70ca8152795de28c56f1a117f42181b4e668f267a710c058003727f4e07a1be2ea0b4 SHA512 e760f92155accd27b5851e45931207222170027ac26e16285df0cb876fd6f49f51c5c258a159cb2595656f5a0f20115cb94f34e8368c344f2ecc39c863d6f67c
-DIST minikube-0.33.0.tar.gz 9433237 BLAKE2B bf05d05d6323b3a4d656a7522fec464d01c1d02d69c6079dc520a6e9ca356a25c231cb661aaf037d2a20d2091ca1b030fc7e3609576644efe1413f620eee0ef3 SHA512 1204618591048878c9160f2b3d69f6cb6e6139a603071407b5539e9747a79eb73481cb515e7cb413d7925b981f69ced044eb8a0a7dd3aa3fee9042e75372b13e
 DIST minikube-0.33.1.tar.gz 9434081 BLAKE2B a29c3293f67e33fa0f5ece632db1a852a3bbd6f2c522699e59148a41277bf819c20d5d27034c71f89df2a5d7895c2dbf3166c11661e98be38267fbd5b2c25ab5 SHA512 c4a266c2d68264155ebc6dcbd3788ed77678c86310be469e595cd6f1d89677082cd8445e9dd456ec7d7433922fd0e7d4315614c2a62640ce9efc7adceb0e7cb8
 DIST minikube-0.34.1.tar.gz 11048222 BLAKE2B 7451d310079f58c5a81383b3801faa153aeca9be6a93dd553d4220e203ce5ad06c2c5b1d0a7601bd76c9f05881c99ceabd959d1b290daa9c0ffce8b2f59c4e69 SHA512 004e403be9300b93a734eabe0fadf01fbfb7f13e04564df08924a6681109b1c155979728561aadce94265920ff3706785390d7ee9000a5072789127185d2a1d4
-EBUILD minikube-0.30.0.ebuild 1622 BLAKE2B bc9bfd9a6b693bc71719750f01b81a313eabbd4bea23604a939588f06a3783604ae264f49376883b83a8599c5bca2259c4043afa3e1fbf3dfe9fe020467be13a SHA512 41801a7f65a66a4b0a6fbfeefde14b5f32fe09246bd76967ca34c28b56a0008acf0f7ffd6d7705966a83fa3d3e6f89063774b228bef59310e085d4ece9f2a39c
-EBUILD minikube-0.31.0.ebuild 1622 BLAKE2B bc9bfd9a6b693bc71719750f01b81a313eabbd4bea23604a939588f06a3783604ae264f49376883b83a8599c5bca2259c4043afa3e1fbf3dfe9fe020467be13a SHA512 41801a7f65a66a4b0a6fbfeefde14b5f32fe09246bd76967ca34c28b56a0008acf0f7ffd6d7705966a83fa3d3e6f89063774b228bef59310e085d4ece9f2a39c
-EBUILD minikube-0.32.0.ebuild 1622 BLAKE2B bc9bfd9a6b693bc71719750f01b81a313eabbd4bea23604a939588f06a3783604ae264f49376883b83a8599c5bca2259c4043afa3e1fbf3dfe9fe020467be13a SHA512 41801a7f65a66a4b0a6fbfeefde14b5f32fe09246bd76967ca34c28b56a0008acf0f7ffd6d7705966a83fa3d3e6f89063774b228bef59310e085d4ece9f2a39c
-EBUILD minikube-0.33.0.ebuild 1622 BLAKE2B b2273eeb591682b876038d482d59e1c1c87ae2fac757898989381c7a5222441a91594037fc3d359c7136fd8ae77a13180997dd8c8c57818c7e559faea962f44b SHA512 6e22477460f56a96428ad103b22c9df7daaa8fe3d04269206ca732826b3ec9ea3173ecf050bcaa6015a1d5094cb878eeea4e40bf46626f6ae4a63f2fe37a6691
+DIST minikube-1.0.0.tar.gz 11078450 BLAKE2B 4773ab9afd769e479674f4ce2ddf50220c1fc8b48a93b15541940db1805118e601d538bc93eb64f6978a6cdf7f9ea7e4300b947a3f819247f04dacd4c81f2a93 SHA512 9cf064192adad21270ea0c86dae2085482f0763d538210e4b35478277edf6b20ac9d212119f79eaa7ad8679dbeb7c1e2d0a4a0efeb3d6033f858e5dd7c296df5
 EBUILD minikube-0.33.1.ebuild 1622 BLAKE2B b2273eeb591682b876038d482d59e1c1c87ae2fac757898989381c7a5222441a91594037fc3d359c7136fd8ae77a13180997dd8c8c57818c7e559faea962f44b SHA512 6e22477460f56a96428ad103b22c9df7daaa8fe3d04269206ca732826b3ec9ea3173ecf050bcaa6015a1d5094cb878eeea4e40bf46626f6ae4a63f2fe37a6691
 EBUILD minikube-0.34.1.ebuild 1622 BLAKE2B b2273eeb591682b876038d482d59e1c1c87ae2fac757898989381c7a5222441a91594037fc3d359c7136fd8ae77a13180997dd8c8c57818c7e559faea962f44b SHA512 6e22477460f56a96428ad103b22c9df7daaa8fe3d04269206ca732826b3ec9ea3173ecf050bcaa6015a1d5094cb878eeea4e40bf46626f6ae4a63f2fe37a6691
+EBUILD minikube-1.0.0.ebuild 1618 BLAKE2B 9065eb65010b5804f0a2e976fd42239bb5dfd0f80c2087b71938d12afefff71cc2ee3fdc01e339f55e6d848c9a57d41550197b00c78651c6ea2a2fce1a48621f SHA512 cb1fc1030f67221a28896374cc43ce733b95314ab72610e223124c8520968c4cf725bc879be7ab09e5e71b05aac218f53654716f691af28b56c165dacf8df1c0
 MISC metadata.xml 394 BLAKE2B ca9fbc7af4a84d99a6d22c00cb28c09747675dc66ef21a43b3011bdccd129df698cacad0375f4ef360de2874d1cf6282834c6b901cd86c6c4dd213f67f006f45 SHA512 0690f97963d432904a0f002273d73ac4d998cde1d2f2fafddc2eeb5d841970b634c58ffa534fd5982a8166a40159164422771baa000566561b4f428ebe818bd8
diff --git a/sys-cluster/minikube/minikube-0.30.0.ebuild b/sys-cluster/minikube/minikube-0.30.0.ebuild
deleted file mode 100644
index 4a324bff4ad4..000000000000
--- a/sys-cluster/minikube/minikube-0.30.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 libvirt"
-
-DEPEND="dev-go/go-bindata
-	${PYTHON_DEPS}
-	libvirt? ( app-emulation/libvirt[qemu] )"
-RDEPEND=">=sys-cluster/kubectl-1.10.0"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e 's/ -s -w/ -w/' -e 's#.*GOBIN=$(GOPATH)/bin go get github.com/jteeuwen/go-bindata/...##' -e 's#$(GOPATH)/bin/go-bindata#/usr/bin/go-bindata#g' src/${EGO_PN}/Makefile || die
-	sed -i -e "s/get_commit(), get_tree_state(), get_version()/get_commit(), 'gitTreeState=clean', get_version()/"  src/${EGO_PN}/hack/get_k8s_version.py || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOFLAGS="-v" GOPATH="${WORKDIR}/${P}" emake -C src/${EGO_PN}  $(usex libvirt "out/docker-machine-driver-kvm2" "") out/minikube-linux-amd64
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	newbin out/minikube-linux-amd64 minikube
-	use libvirt && dobin out/docker-machine-driver-kvm2
-	dodoc -r docs CHANGELOG.md README.md
-	popd || die
-}
-
-pkg_postinst() {
-	elog "You may want to install the following optional dependency:"
-	elog "  app-emulation/virtualbox or app-emulation/virtualbox-bin"
-}
diff --git a/sys-cluster/minikube/minikube-0.31.0.ebuild b/sys-cluster/minikube/minikube-0.31.0.ebuild
deleted file mode 100644
index 4a324bff4ad4..000000000000
--- a/sys-cluster/minikube/minikube-0.31.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 libvirt"
-
-DEPEND="dev-go/go-bindata
-	${PYTHON_DEPS}
-	libvirt? ( app-emulation/libvirt[qemu] )"
-RDEPEND=">=sys-cluster/kubectl-1.10.0"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e 's/ -s -w/ -w/' -e 's#.*GOBIN=$(GOPATH)/bin go get github.com/jteeuwen/go-bindata/...##' -e 's#$(GOPATH)/bin/go-bindata#/usr/bin/go-bindata#g' src/${EGO_PN}/Makefile || die
-	sed -i -e "s/get_commit(), get_tree_state(), get_version()/get_commit(), 'gitTreeState=clean', get_version()/"  src/${EGO_PN}/hack/get_k8s_version.py || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOFLAGS="-v" GOPATH="${WORKDIR}/${P}" emake -C src/${EGO_PN}  $(usex libvirt "out/docker-machine-driver-kvm2" "") out/minikube-linux-amd64
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	newbin out/minikube-linux-amd64 minikube
-	use libvirt && dobin out/docker-machine-driver-kvm2
-	dodoc -r docs CHANGELOG.md README.md
-	popd || die
-}
-
-pkg_postinst() {
-	elog "You may want to install the following optional dependency:"
-	elog "  app-emulation/virtualbox or app-emulation/virtualbox-bin"
-}
diff --git a/sys-cluster/minikube/minikube-0.32.0.ebuild b/sys-cluster/minikube/minikube-0.32.0.ebuild
deleted file mode 100644
index 4a324bff4ad4..000000000000
--- a/sys-cluster/minikube/minikube-0.32.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 libvirt"
-
-DEPEND="dev-go/go-bindata
-	${PYTHON_DEPS}
-	libvirt? ( app-emulation/libvirt[qemu] )"
-RDEPEND=">=sys-cluster/kubectl-1.10.0"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e 's/ -s -w/ -w/' -e 's#.*GOBIN=$(GOPATH)/bin go get github.com/jteeuwen/go-bindata/...##' -e 's#$(GOPATH)/bin/go-bindata#/usr/bin/go-bindata#g' src/${EGO_PN}/Makefile || die
-	sed -i -e "s/get_commit(), get_tree_state(), get_version()/get_commit(), 'gitTreeState=clean', get_version()/"  src/${EGO_PN}/hack/get_k8s_version.py || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOFLAGS="-v" GOPATH="${WORKDIR}/${P}" emake -C src/${EGO_PN}  $(usex libvirt "out/docker-machine-driver-kvm2" "") out/minikube-linux-amd64
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	newbin out/minikube-linux-amd64 minikube
-	use libvirt && dobin out/docker-machine-driver-kvm2
-	dodoc -r docs CHANGELOG.md README.md
-	popd || die
-}
-
-pkg_postinst() {
-	elog "You may want to install the following optional dependency:"
-	elog "  app-emulation/virtualbox or app-emulation/virtualbox-bin"
-}
diff --git a/sys-cluster/minikube/minikube-0.33.0.ebuild b/sys-cluster/minikube/minikube-1.0.0.ebuild
index dfa9435d5830..b49a012ebec2 100644
--- a/sys-cluster/minikube/minikube-0.33.0.ebuild
+++ b/sys-cluster/minikube/minikube-1.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit python-any-r1 golang-build golang-vcs-snapshot
 
@@ -21,7 +21,7 @@ IUSE="hardened libvirt"
 DEPEND="dev-go/go-bindata
 	${PYTHON_DEPS}
 	libvirt? ( app-emulation/libvirt[qemu] )"
-RDEPEND=">=sys-cluster/kubectl-1.10.0"
+RDEPEND=">=sys-cluster/kubectl-1.14.0"
 
 RESTRICT="test"
 
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 2bf2318a1e09..9e20bd4c51e9 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -6,25 +6,11 @@ AUX neutron-openvswitch-agent.confd 142 BLAKE2B 32c521f734854608173a41625bc037ee
 AUX neutron-server.confd 70 BLAKE2B 88309872ce864e4dfa9072c1472bd6f1e8116f71106ff7e055f6386563ef1077b41f538a72e183ae00e700262d2bcf82434077f0b7e5753389077be3f276b178 SHA512 79f1a40486c37b2c3486b4ef015864f6b20ee89b05d788ce6ade8af934e2c160da9e0495d22e941a717072c1d8ca3b77963a3ec06f3ec25a3f8af8b24a4e40a0
 AUX neutron.initd 530 BLAKE2B 48900bdde5770a0b0db90490d6ae8541dafc96e3fa2aa1c8d75eab5f547be35fa5adb792db8960f71a98bbeb71d56b29e5f5166a47735ebe85804019aa4e1f11 SHA512 c9c7386ae8d97205859f02edb0c7d601059af78def3f232f87e676131c5e6fcdb6e880ccee5b1b15397b1dffe83446421145c90ed448f5e9d55994efd1629f92
 AUX neutron.sudoersd 117 BLAKE2B 30e903fd3d681b779ad7e4758b56bfd78df6165ae030f0a5017dccd1873570db450efd3e7b232f77d6d2e3fcb81cb64d9d44901802310ebe2d88f882d334acda SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366
-DIST neutron-11.0.6.tar.gz 10516797 BLAKE2B 3d7ece145a96a299a2619e592b1d055365495938506ea357f10bfc951a5ac76588c18c3201f239529e999c670d483ee91b867db61d49948fd5edf0a1aff6ff0f SHA512 35e1e95ff5a08986577b95457d09da078bcc5d9f67d3c0f325d2f934a489bc0481a2e3b6300ac37d91e4ba4c3a3523e39ff1bc53dc9cc7e757d12648f3f7ab1e
-DIST neutron-12.0.5.tar.gz 10454003 BLAKE2B 9aa617a824e00dcb8979e476bd902940f306a44d7b92f22e273e7793d93d121c0b2a5ab2d2ee21962b3aee124d00a31187df6cffa2319f799add1494fecd9afb SHA512 a9e54ab43ae0a2b6798d37aad6a7cfa87ef6fa80d6121ca1b01817b93bf9480d436cffd0c526fe5d08a46256d885eb1d610039a0412a7a8cc69641db8bf1562b
 DIST neutron-13.0.2.tar.gz 10596419 BLAKE2B 5d18c5ada86c2676ecab1c0121834c04e5c12d2c81a42ddb9554d0bdc2b7d472b5941b7290dc701c22b21b69442d04a44768c9423ff5d317b51d8cd37aa076bf SHA512 4fb343039a6f6a6930d9770b02d58be732c57910e36739c8364bf8027a7ed55dafc40201ef8c349278310afc2ab6ee80fea562af94896e38891c35eaeb1faced
-DIST neutron-configs-11.0.6.tar.gz 25030 BLAKE2B 6ca7507571983cdf576cb943bb2981623351c3de4220ccf990ba478147bcbaea06f4d5218ba6ad65c98f2a0c60c820be03429e8a22a624cf10339b80fcf17bbd SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a
-DIST neutron-configs-12.0.5.tar.gz 26252 BLAKE2B c1493e313dc590445e60dcf8df9fc2b89a8e96e57ce072577b3a73fe247218a9ef9805ca9c61b79d2bd4c7aa088933762389258c1184e4572975db03c1674869 SHA512 05c8774d142a59da3e294f2351f1cc89f8cd275aedf3771c11d8176305ceec472980673f0ed07b3f4219a8ff4b4bb6e79f836a1f11ddd8e003d1ccd49051e5ac
 DIST neutron-configs-13.0.2.tar.gz 26109 BLAKE2B 5de3b90dcb6f8c86ce659b3ab439a79dd920aaf57b66a1e1b29f1b0d0fd433b222335a634dca01ce2b0e07acc3011ff6bf25983071dc0ff00e78ac847ee3fdd6 SHA512 498f41ffec6c14597e9785da9a36c2d906138215b34017aa93f56d051078682279bcce05288d2534ff7ab8208b8251c9f721256488f6850173210e41bc6dd51c
-DIST neutron-configs-2017.2.9999.tar.gz 25030 BLAKE2B 6ca7507571983cdf576cb943bb2981623351c3de4220ccf990ba478147bcbaea06f4d5218ba6ad65c98f2a0c60c820be03429e8a22a624cf10339b80fcf17bbd SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a
-DIST neutron-configs-2018.1.9999.tar.gz 26252 BLAKE2B c1493e313dc590445e60dcf8df9fc2b89a8e96e57ce072577b3a73fe247218a9ef9805ca9c61b79d2bd4c7aa088933762389258c1184e4572975db03c1674869 SHA512 05c8774d142a59da3e294f2351f1cc89f8cd275aedf3771c11d8176305ceec472980673f0ed07b3f4219a8ff4b4bb6e79f836a1f11ddd8e003d1ccd49051e5ac
 DIST neutron-configs-2018.2.9999.tar.gz 26109 BLAKE2B 5de3b90dcb6f8c86ce659b3ab439a79dd920aaf57b66a1e1b29f1b0d0fd433b222335a634dca01ce2b0e07acc3011ff6bf25983071dc0ff00e78ac847ee3fdd6 SHA512 498f41ffec6c14597e9785da9a36c2d906138215b34017aa93f56d051078682279bcce05288d2534ff7ab8208b8251c9f721256488f6850173210e41bc6dd51c
-DIST neutron-ml2-plugins-11.0.6.tar.gz 6885 BLAKE2B c953d7222932d09c545dcfe01923f77cbc9e76157f78e5cb85a8e3bb03c8f3b4ab2bcc7eb2fc213578f71cf70543c4182c98bc6e5947fc1a0cbffe3d845bce20 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd
-DIST neutron-ml2-plugins-12.0.5.tar.gz 7060 BLAKE2B 7690218233971ab50623900e01fe4311e2b599661838a232616cdc4b56bff1a7fd6e6c3b7fe77f79c78c024eb571525b0e21a306c18fd884bd0dfdd6b814f2b4 SHA512 259db5513c014c6dda97432834f90744dec3732292a2de71d488e537f0f660959ea09890cf3dd3d22206295b259dad83440a60ee28e84a5b125547f869e0016b
 DIST neutron-ml2-plugins-13.0.2.tar.gz 7068 BLAKE2B fa27bd84c1d67bd36c7c7e47b6e8f98dd100e09c7a3bfa7aec615ed24e3dadf240f8ef44874c868ff92f79452afbf4a21fba46b1b9aec191bad53a62767b1861 SHA512 add4697c78c592dfe5ebadd3b0cf9b9c2a2c33bd05130a8e1422abf7456d8a0cc926a0d46f6b49ceee87017304d7c9c3486c975086e46f178e3bc142844f836f
-DIST neutron-ml2-plugins-2017.2.9999.tar.gz 6885 BLAKE2B c953d7222932d09c545dcfe01923f77cbc9e76157f78e5cb85a8e3bb03c8f3b4ab2bcc7eb2fc213578f71cf70543c4182c98bc6e5947fc1a0cbffe3d845bce20 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd
-DIST neutron-ml2-plugins-2018.1.9999.tar.gz 7060 BLAKE2B 7690218233971ab50623900e01fe4311e2b599661838a232616cdc4b56bff1a7fd6e6c3b7fe77f79c78c024eb571525b0e21a306c18fd884bd0dfdd6b814f2b4 SHA512 259db5513c014c6dda97432834f90744dec3732292a2de71d488e537f0f660959ea09890cf3dd3d22206295b259dad83440a60ee28e84a5b125547f869e0016b
 DIST neutron-ml2-plugins-2018.2.9999.tar.gz 7068 BLAKE2B fa27bd84c1d67bd36c7c7e47b6e8f98dd100e09c7a3bfa7aec615ed24e3dadf240f8ef44874c868ff92f79452afbf4a21fba46b1b9aec191bad53a62767b1861 SHA512 add4697c78c592dfe5ebadd3b0cf9b9c2a2c33bd05130a8e1422abf7456d8a0cc926a0d46f6b49ceee87017304d7c9c3486c975086e46f178e3bc142844f836f
-EBUILD neutron-11.0.6-r1.ebuild 9540 BLAKE2B d660158d15ededf0b56edd381ba8b84f8abd50abf50c6992eebae54f6234b37339ab16d3b65c7286c83d16c842166cb658dd51f74ee6ec94735d21abd2caf3f6 SHA512 9d5fceb7ec0e8ec95099e7d0f5cb5a85dc9783b21dbfe621cd0ab69895163d70fa80b7e7b420c1047dd7f8b97a24f72b89e656f3eb9a4223f28e07f4f866a254
-EBUILD neutron-12.0.5-r1.ebuild 9608 BLAKE2B 01d3ea631001259413f98e2c85e65c758cea115a64e78767d7c7732fcab258b1bf41ce366709d39d700fdbaf6658cc5bb63c182105945fa2311d1ee2e7d0de30 SHA512 e40030076c8992ec9da815983de458889973c6b60c9f32ce38b50bcc951bae0f1fcb10236016368f3d94017f014ff8028b4783bc076ed060aac6e2e715ea81b4
 EBUILD neutron-13.0.2-r1.ebuild 8373 BLAKE2B 1cec37720970b276e892e7e826ecab17e5d063d0cb5703df568aeb4ad8d97881d52dbc088554eddcda03f83309d4615e83949813bc9aca866cd1768bda090167 SHA512 1788a996f6525d0a7b9d1e1a9a2c4e8b14938afc8ebf32e598828c5de6af0bd7d20eb28429328c86cd6cee13289eea84f6b5047a3c7d1b6419c3c47401cdf794
-EBUILD neutron-2017.2.9999.ebuild 9564 BLAKE2B 6915b8a7c8aad305aa22e58121d927b476d5c5fc9758407f312716a20c5723df7fb5ea58090a0f91793125c877f20b545dcaa00a41ccfc04e19d95e628d05312 SHA512 dfac3573de2c88d918dcb287c55cdd9cda380122328deb9bafba0e2d73199ff2afa3b4116f8694ba6c18e860f1fbc6d62cd95cb3697a8e1cb1c1097dab17620c
-EBUILD neutron-2018.1.9999.ebuild 9610 BLAKE2B 4d5b83aeb400f971f6b885c4df3251f856f07dcecbd813b40a2ea7658b90d900695595e48e97ed806c9cd3262521fb51f5fcb2637809d652c3ea089e35e80120 SHA512 d40eb3e49940506840045983b235a2a7e9c34550758e81d08c510d087e13545c2cc7b10f6dbd0a4be995e2a7105b4a34e9ebca441d3b5099c7f1f715186ae9f0
 EBUILD neutron-2018.2.9999.ebuild 8375 BLAKE2B d88b9e1112d96c762185f2e376ae00e58457fdf22a1b869ca9610ba2d4bc4439aa58f571d7518653becda1e91eaa616cc6698c33802ea96da6e0955603d04979 SHA512 51bcb6827e7bcbb943de8978dd6ac8403b9f6ff9cadafee53ab641c1837df9c8dd051123e288366913a41de1c567aad7a6b8857df83cc54bd5036695d8083fde
 MISC metadata.xml 1619 BLAKE2B 462b212e519778c98632ec3230e5f0d1a006a229edef034ed0d462559cb0c1763dafb997198241cca4f9c7cb056ebada214c82745dce35b269c2c27d554145a4 SHA512 8f9075719eeec3c3a939e8a1b05a5604bc1e801b227feb5775bfa9f2812e67c41165dc0b2b377685645d9fd9988523356ac77a8db8e73139ab3f035ae59b70ce
diff --git a/sys-cluster/neutron/neutron-11.0.6-r1.ebuild b/sys-cluster/neutron/neutron-11.0.6-r1.ebuild
deleted file mode 100644
index e365f19ed75b..000000000000
--- a/sys-cluster/neutron/neutron-11.0.6-r1.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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/pike/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/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 haproxy 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-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-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-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.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/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/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.9.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/ryu-4.14[${PYTHON_USEDEP}]
-	compute-only? (
-		>=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}]
-	)
-	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/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.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-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-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.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-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-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/ovs-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/ovsdbapp-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.4.21[${PYTHON_USEDEP}]
-	>=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
-	>=dev-python/python-novaclient-9.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.2.0[${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
-	haproxy? ( net-proxy/haproxy )
-	openvswitch? ( net-misc/openvswitch )
-	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-12.0.5-r1.ebuild b/sys-cluster/neutron/neutron-12.0.5-r1.ebuild
deleted file mode 100644
index 3713f7728404..000000000000
--- a/sys-cluster/neutron/neutron-12.0.5-r1.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-# 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"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
-	EGIT_REPO_URI="https://github.com/openstack/neutron.git"
-	EGIT_BRANCH="stable/queens"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="compute-only dhcp haproxy 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-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.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/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.9.1[${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/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/neutron-lib-1.13.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/ryu-4.14[${PYTHON_USEDEP}]
-	compute-only? (
-		>=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}]
-	)
-	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/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/ovsdbapp-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.4.21[${PYTHON_USEDEP}]
-	>=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.3.1[${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
-	haproxy? ( net-proxy/haproxy )
-	openvswitch? ( net-misc/openvswitch )
-	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-2017.2.9999.ebuild b/sys-cluster/neutron/neutron-2017.2.9999.ebuild
deleted file mode 100644
index 8c2472f7637e..000000000000
--- a/sys-cluster/neutron/neutron-2017.2.9999.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 git-r3 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/pike/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
-EGIT_REPO_URI="https://github.com/openstack/neutron.git"
-EGIT_BRANCH="stable/pike"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="compute-only dhcp haproxy 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-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-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-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.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/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/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.9.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/ryu-4.14[${PYTHON_USEDEP}]
-	compute-only? (
-		>=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}]
-	)
-	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/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.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-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-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.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-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-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/ovs-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/ovsdbapp-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.4.21[${PYTHON_USEDEP}]
-	>=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
-	>=dev-python/python-novaclient-9.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.2.0[${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
-	haproxy? ( net-proxy/haproxy )
-	openvswitch? ( net-misc/openvswitch )
-	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-2018.1.9999.ebuild b/sys-cluster/neutron/neutron-2018.1.9999.ebuild
deleted file mode 100644
index 46113c47be21..000000000000
--- a/sys-cluster/neutron/neutron-2018.1.9999.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-# 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"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
-	EGIT_REPO_URI="https://github.com/openstack/neutron.git"
-	EGIT_BRANCH="stable/queens"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="compute-only dhcp haproxy 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-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.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/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.9.1[${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/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/neutron-lib-1.13.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/ryu-4.14[${PYTHON_USEDEP}]
-	compute-only? (
-		>=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}]
-	)
-	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/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/ovsdbapp-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.4.21[${PYTHON_USEDEP}]
-	>=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.3.1[${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
-	haproxy? ( net-proxy/haproxy )
-	openvswitch? ( net-misc/openvswitch )
-	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/nova/Manifest b/sys-cluster/nova/Manifest
index 96081e39ac1b..89696aef6169 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -3,19 +3,12 @@ AUX nova-sudoers 78 BLAKE2B d2df2db0a2905e3a6aec56dc70afab046933d675715c9c16f0e9
 AUX nova.initd 745 BLAKE2B 3242a38313147eaffc096752b35cbed34e16f1133cb482515086afcd9159264d7c357731aa565f857257ae5591599704f7524a8005e531dcd6d848cd197ef79d SHA512 42b029745341b7516f3f158d214053123d894c1e3f7d354d7a83009630ce371a297b10b59bb4a655cd43e226ed8c045b4fbf4d9b20b73dd490e2181dabc70077
 AUX openstack-scsi-disk.rules 134 BLAKE2B c1e3e150d93ab51b4da48caf2a0f83513fe63b5dde1e449a9c4c4dbfad65589b6326c799958736da86390142a914acbf9acf5b78bb1042e2c156eaf01cec8250 SHA512 6c3734d0b9ce9de887e15b1ddd5f5486dd1d0a55f463f9824ef067d3fe64a93d08ad2ef2b9d288f0dd42d570a5061e7a06976f7223df44b98bd321b73f9d036b
 AUX scsi-openscsi-link.sh 2777 BLAKE2B 84c14df2b1c49fe6210a4abf4387229aaa4fcd0c956b374b719285a20d8309f1bb58d51061084f34d284624d279bc64d53a629ec57702314c23e9b129c4a16b4 SHA512 3e7f6fc872f27b6a4d6c991346bd8eafcbc8f2b74439f1c77e93362e57fa1010ff002813cf21bf12d0550bfc165f79c70430862cd4ed5aaa15056777baf34409
-DIST nova-16.1.7.tar.gz 11004656 BLAKE2B 342ab3efad95b85f07f9fcb6ac4de177270254f5f051348ac9a25992b9a118027965c60b06e56683484fe3c2c5227782991f0874dbcb9319bdccd37e6c60e263 SHA512 024694be9d9d5acc446ca89b6f8597dd9d255c72e32041c9a62200bf5ab72c7caee26e769a93c80b4e7cf144e4e03df1704aa12dc859e39e9835bbe80481021d
-DIST nova-17.0.9.tar.gz 11110881 BLAKE2B 9c6e79844462cce14d95bb8796c72e30a953e3fb4fa6de0ccdd359dc571997c06d34e0946f13dadd480661aee4ec9726ead099f1aa39085d64be41abe9d481af SHA512 4e0b487d6eeb17c8c2e34a1823170a2e1f12df1e048b15d67fab92f3d9d5d66bfa433ee6dc8316819ca9f2f23ac57714d5a8431f3e0017c8f71a6207a5ad33d0
 DIST nova-18.1.0.tar.gz 11391992 BLAKE2B 5dd417661908cae6e12b4a0f3af5c620bd29d3a022661c6f852cd8954940a3a0a2e84d0cf72d43ff926a13836aeb8ed2ecfe0e9be39dc882d705ab0389297891 SHA512 d5112d2528a70338a9293423ede81b9a5dee10cf7872e3070c33d0e16d728d1a1612b8af45ba8424400fd67322238dec299bc85bb84c10989272496b684f8cbd
-DIST nova.conf.sample-16.1.7 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378
-DIST nova.conf.sample-17.0.9 361499 BLAKE2B 3d5543fbec2b2688d8cc1a2dbc5d954302c4168999ddd9349f3602035259439e7b1daac05bd7d60d61e9296a37ae62aaedd63cc4d77f2e03cec4614a4b3d470e SHA512 c1d14671ecb2c1941a98b80a267ed47969c1ed5c27d88a2f9fa9857b318c6ff6aae9a0fe22e6c28c964221b3c38df26c632a7bbd24ca4110bd03aafa4db0f459
+DIST nova-18.2.0.tar.gz 11417157 BLAKE2B ec3480eeb7e9b6d41f20a473b639e5b71eea0c533d10748f62d5037a09af9ca1c056c2e0e36a7c6e34e207adb80f4ce3fd9478e1bb282cb83ff4dc9fda11fdcb SHA512 3620e4aeb43cfefe8349e78355abd9d5c3537b52c0c6dee1ca14ebbed3eb20015c63f492c55cf1415a586ca96a97667cd90f562891c2a2be2d1805efa805aa17
 DIST nova.conf.sample-18.1.0 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
-DIST nova.conf.sample-2017.2.9999 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378
-DIST nova.conf.sample-2018.1.9999 361499 BLAKE2B 3d5543fbec2b2688d8cc1a2dbc5d954302c4168999ddd9349f3602035259439e7b1daac05bd7d60d61e9296a37ae62aaedd63cc4d77f2e03cec4614a4b3d470e SHA512 c1d14671ecb2c1941a98b80a267ed47969c1ed5c27d88a2f9fa9857b318c6ff6aae9a0fe22e6c28c964221b3c38df26c632a7bbd24ca4110bd03aafa4db0f459
+DIST nova.conf.sample-18.2.0 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
 DIST nova.conf.sample-2018.2.9999 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
-EBUILD nova-16.1.7.ebuild 9542 BLAKE2B db2c394b2286c294cac76b8cc1d515024265ddc21537dc1dc3a6b27d262577040597aaebd078cf09ab33b029f86f3eef6b52c7639e102bb702d368a10c6d12cb SHA512 e9743e4945f6424ae5a52b32545bf45aeba5c979dd2bb16636c44fd01acda586a7f200bcf8c929c31b5a1cf2f26ef8b861b59ddcd351e1797b1e5f05481abd4b
-EBUILD nova-17.0.9.ebuild 9716 BLAKE2B c382dbbdd10c09ca6957eebcb88cbb36c0788394b71d144c5967cba4a7b57b94a2feb1087e72170b7fed7aae02da9875ad9a456fa4e67805b4fb78d00df4c1e3 SHA512 03ee2990ec09059aaf0cae781e88b36823538844edd167f59341cd5c88ca141a245451ea0e494240bc4cf85b2dcb28430f5fd0670d8cf59ef418e32597ad9803
 EBUILD nova-18.1.0.ebuild 9502 BLAKE2B eda492089469f6fc053144f843ab32dc95119dc0c7ebb474707a8b58ad3632b58c6ce9b470c1fd89c9d8854025e701a70c8f538a548328ad5cd5918c72f6ad3a SHA512 3eef28b0debd8d230f40c95a393fd5527356ef31c80cd48a1860f38f116555f7bfc81f4be882026d05813a23d69263be60e5b69730a11b2fdf1e23028755d84b
-EBUILD nova-2017.2.9999.ebuild 9568 BLAKE2B 0b26430ff222e0b4d373a67a6f2d3bf116a147be3731d2fd891555b032de32b14fa08f3f6fbab5a7f0adfdb02772d76df04630c52ab66cee2633a8a36bbb9b4a SHA512 780468c60c5ec932044014d9e6e2e95eebaad6c668b8d8e226706f4044c0a16a4d3f5adebf3497a3877727f24e5ff9d7a7d02c455e521942ecad34cd092e511a
-EBUILD nova-2018.1.9999.ebuild 9721 BLAKE2B 60cde2747c9d1f3316988bedc480141d174abf3e647391b53708854abb6d1d6a55deb41f4e3896c21ff9cf3c4bdf6a5295cd6ec931c58d7075a99df0eb7bb534 SHA512 416f1b4c6295afe9d9a5b0c3aee22030fa1442e973b73a0b93ca2f064f2bfb89c8d3970163f2cfcd5d1f53bfa6130aae570d748a6f38869016217b5023da49a6
+EBUILD nova-18.2.0.ebuild 9504 BLAKE2B 5d344dbd98a118e426c4f58507cf55d9fe3b0d19fa06632871c3a48550784e55ca054ffeec2ddb7e46cedf6f7cb6772451e11b42de02ecd4d72354687e41e627 SHA512 bdab5973c19d7e85fb5b055a7237b476107a262496613ab61fb7015cfdc3fe610ccc45e020528185b22cdcd3aa05a7658ed593e9fd41060dd14166624650ca35
 EBUILD nova-2018.2.9999.ebuild 9507 BLAKE2B 8090cacd3c743e7c924d2b6774e68597c1fcad3cc6daa7abaac674716ed61d50a9bb73ebfa79a9de9e2a2a5bd33b496dc1709767ca229728daf7c22e5ae838cc SHA512 0c0665f8948c2a6d1b8296a6477bc9c7c9df93c3f79e1c83e5fe88dd697b9ad2a3b61ab53fe7094e941be99aebe89b579c4008538b92676b020adf4ee36e57f5
 MISC metadata.xml 1172 BLAKE2B aa85fe6bed1e40717884d721c2633c5f6d380914c69cb8a4a4c31b3e4c779db52b90fdaa5ee63b66ad9bc6694f666dd37dceeffb8de4676014ef3bb688476ef7 SHA512 bb506fa680b064c3d6a48710cac11efedc9e8a340603e234bf5c4c48aaab773e4527d7a8fc66ae36ec894230a1d02a5be995e521d222914f652e03b6f72642e4
diff --git a/sys-cluster/nova/nova-16.1.7.ebuild b/sys-cluster/nova/nova-16.1.7.ebuild
deleted file mode 100644
index dd7d99903626..000000000000
--- a/sys-cluster/nova/nova-16.1.7.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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" "nova-${svc}"
-		done
-	fi
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "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/nova/nova-17.0.9.ebuild b/sys-cluster/nova/nova-18.2.0.ebuild
index a94885dc9d26..15e36f5f487c 100644
--- a/sys-cluster/nova/nova-17.0.9.ebuild
+++ b/sys-cluster/nova/nova-18.2.0.ebuild
@@ -11,13 +11,13 @@ HOMEPAGE="https://launchpad.net/nova"
 
 if [[ ${PV} == *9999 ]];then
 	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-${PV}"
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/rocky/nova.conf.sample -> nova.conf.sample-${PV}"
 	EGIT_REPO_URI="https://github.com/openstack/nova.git"
-	EGIT_BRANCH="stable/queens"
+	EGIT_BRANCH="stable/rocky"
 else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-${PV}
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/rocky/nova.conf.sample -> nova.conf.sample-${PV}
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
@@ -28,7 +28,7 @@ REQUIRED_USE="
 	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
 
 CDEPEND="
-	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-21.0.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}]
@@ -83,21 +83,15 @@ RDEPEND="
 	>=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/jinja-2.10[${PYTHON_USEDEP}]
 	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
 	>=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
 	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
 	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
+	!~dev-python/greenlet-0.4.14[${PYTHON_USEDEP}]
 	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
 	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
@@ -113,16 +107,16 @@ RDEPEND="
 	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
 	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.9.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
 	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
 	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
 	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
@@ -131,8 +125,8 @@ RDEPEND="
 	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.35.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
 	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
@@ -141,19 +135,23 @@ RDEPEND="
 	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
 	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
 	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/os-traits-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/os-vif-1.7.0[${PYTHON_USEDEP}]
 	!~dev-python/os-vif-1.8.0[${PYTHON_USEDEP}]
 	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.3.3[${PYTHON_USEDEP}]
 	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
 	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pypowervm-1.1.10[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/zVMCloudConnector-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/futures-3.0.0[$(python_gen_usedep 'python2_7')]
 	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	app-emulation/libvirt[iscsi?]
 	novncproxy? ( www-apps/novnc )
@@ -246,8 +244,6 @@ 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() {
diff --git a/sys-cluster/nova/nova-2017.2.9999.ebuild b/sys-cluster/nova/nova-2017.2.9999.ebuild
deleted file mode 100644
index ff5e260f79f8..000000000000
--- a/sys-cluster/nova/nova-2017.2.9999.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 eutils git-r3 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}"
-EGIT_REPO_URI="https://github.com/openstack/nova.git"
-EGIT_BRANCH="stable/pike"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-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" "nova-${svc}"
-		done
-	fi
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "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/nova/nova-2018.1.9999.ebuild b/sys-cluster/nova/nova-2018.1.9999.ebuild
deleted file mode 100644
index 6e9e9e8165eb..000000000000
--- a/sys-cluster/nova/nova-2018.1.9999.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-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"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/nova.git"
-	EGIT_BRANCH="stable/queens"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-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.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${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.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.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.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.7.0[${PYTHON_USEDEP}]
-	!~dev-python/os-vif-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pypowervm-1.1.10[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.16.0[${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" "nova-${svc}"
-		done
-	fi
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "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/openstack-meta/Manifest b/sys-cluster/openstack-meta/Manifest
index b64e02ab87ef..904ee19f188c 100644
--- a/sys-cluster/openstack-meta/Manifest
+++ b/sys-cluster/openstack-meta/Manifest
@@ -1,4 +1,2 @@
-EBUILD openstack-meta-2017.2.9999.ebuild 616 BLAKE2B d34653e8af995e4f5416f1063d4ba1f780f732fc755c8fb92be4e3752e6f6fd7ff4043adfe243d2fd77d762308c2d3818de06020d5770dee96c78a38d03a2ba4 SHA512 c81135f7019bb9dafbb5da967a559848cac7445728beb76749dbac3881ae5945e8518cf21b3528daf2f8010887e3cccd22d1148797d054f24b9a62278d6e82c3
-EBUILD openstack-meta-2018.1.9999.ebuild 604 BLAKE2B 4fbfae95d9d0086cbdaa27702cd6297ae1bcd1686c69fb03318a1ce74dce98f145b062bbaa8a7fde79924a33c85aaebdbde6d0517a327aab7df793f5aeac52ea SHA512 9b50a6cc30ed4cf7a6d55e2dca95531d05faeb2ba8ba114df340118e13ebfc816a10b06e81cae39bd9405e777c7fca12c0337827bc82f66444007445f890c4b6
 EBUILD openstack-meta-2018.2.9999.ebuild 604 BLAKE2B 4fbfae95d9d0086cbdaa27702cd6297ae1bcd1686c69fb03318a1ce74dce98f145b062bbaa8a7fde79924a33c85aaebdbde6d0517a327aab7df793f5aeac52ea SHA512 9b50a6cc30ed4cf7a6d55e2dca95531d05faeb2ba8ba114df340118e13ebfc816a10b06e81cae39bd9405e777c7fca12c0337827bc82f66444007445f890c4b6
 MISC metadata.xml 868 BLAKE2B d769c2b15440a48958819d31501f01020d65e667105bef5299bfc13d06d6f2ea19d2f461063e733ba9bff4426f803ef13062d1820f267437a458c972d363747f SHA512 20cad66e79a57fbe4e17bd8bd53a30b71746f5efa8ddaa9c6c7bebfa8db5fd64275dc213f927c433f1e6621d1b5d053efaef38c1144806cf736c44b56c5d967c
diff --git a/sys-cluster/openstack-meta/openstack-meta-2017.2.9999.ebuild b/sys-cluster/openstack-meta/openstack-meta-2017.2.9999.ebuild
deleted file mode 100644
index 59b9ec4d4271..000000000000
--- a/sys-cluster/openstack-meta/openstack-meta-2017.2.9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A openstack meta-package for installing the various openstack pieces"
-HOMEPAGE="https://openstack.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="cinder glance heat keystone neutron nova swift"
-
-DEPEND=""
-RDEPEND="
-	keystone? ( ~sys-auth/keystone-${PV} )
-	swift? ( ~sys-cluster/swift-${PV} )
-	neutron? ( ~sys-cluster/neutron-${PV} )
-	glance? ( ~app-admin/glance-${PV} )
-	cinder? ( ~sys-cluster/cinder-${PV} )
-	nova? ( ~sys-cluster/nova-${PV} )
-	heat? ( ~sys-cluster/heat-${PV} )
-"
diff --git a/sys-cluster/openstack-meta/openstack-meta-2018.1.9999.ebuild b/sys-cluster/openstack-meta/openstack-meta-2018.1.9999.ebuild
deleted file mode 100644
index ea5f7467b125..000000000000
--- a/sys-cluster/openstack-meta/openstack-meta-2018.1.9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A openstack meta-package for installing the various openstack pieces"
-HOMEPAGE="https://openstack.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cinder glance heat keystone neutron nova swift"
-
-DEPEND=""
-RDEPEND="
-	keystone? ( ~sys-auth/keystone-${PV} )
-	swift? ( ~sys-cluster/swift-${PV} )
-	neutron? ( ~sys-cluster/neutron-${PV} )
-	glance? ( ~app-admin/glance-${PV} )
-	cinder? ( ~sys-cluster/cinder-${PV} )
-	nova? ( ~sys-cluster/nova-${PV} )
-	heat? ( ~sys-cluster/heat-${PV} )
-"
diff --git a/sys-cluster/sanlock/Manifest b/sys-cluster/sanlock/Manifest
index 4180128b0f07..0d70b3dd8718 100644
--- a/sys-cluster/sanlock/Manifest
+++ b/sys-cluster/sanlock/Manifest
@@ -3,5 +3,5 @@ AUX wdmd.initd 261 BLAKE2B 65b393f2f084896d3c17aa0345f9930badeec7a3ee4cc7e47bd0a
 DIST sanlock-3.4.0.tar.xz 157016 BLAKE2B 9d588214d260b88cfa3978e831bcd8086ae80aafc1a04b616274da141140a22c2765083632f29402cdae67cdbbdfcefdaff1539e5d45485c6f271e3ee7f6471a SHA512 8a10faaa5b9ce9f0506ca16620ad482804c9ca860b84a60a6f0b525a256059229a202163d366a57fb59169c0f4f822ced570b42562e412747f6f716509341f19
 DIST sanlock-3.6.0.tar.gz 221666 BLAKE2B 7fe95bd6813c13b76993b343a5ad605c7ba642583987ffa5fef583f34c053ee62b0f9e5979f5b5cb9e4fcde53268ae3debc5ec36b04f6651cc4cb902dff52df9 SHA512 59eb2a6f12e95d54886fdf6d56fd9a6814dd20fe11f39664f2bb82a56326fee48c9465ae30e6d04f970c8f1b0d9c2e22b90d21ab1f657c6d6b61ff9f02332443
 EBUILD sanlock-3.4.0-r1.ebuild 2103 BLAKE2B 2e4c00ef232d4711d6229cb39839f0d4728e31d2117502470e83909d57e3bf6f9e9b710e83274b5addce6779c2fe6095967e2ba336b4984384483dde832909c9 SHA512 92bc7470371a63bca5a1d2a8b2ded9b75821b996c78ba43f52e0a0b18102d75aa85f6fa6264ce0e59f90bd500ad590e1d9de33931fa5f8f209f12b4294190063
-EBUILD sanlock-3.6.0.ebuild 2084 BLAKE2B 046fbbb1fd82b78db777ad92dc1be6facbbceaec7e8c7cdeed899c519f895f5904faf0042fc1c66793bdd9e82e4fdb31b8b14aff652a37156bed803bdf6e33ba SHA512 68fb7b4d90b12cb4cd4c27bff9e38dc2f11507b9390348041a11b3d42fdb9f5833b2683c467e1b3383ca1233850918863852259709cbf65737a2076f53c65063
+EBUILD sanlock-3.6.0.ebuild 2082 BLAKE2B b178031818a4c7098b9f364f7e1a8ff9d4df019a7c34b92ba7b83adb64657bdde7a64340ce691841531daec057510bd0b255d2081ff871662f3c7e293fa8962b SHA512 3dc492b1b7babf2356d5c21003c2f027804774fbde40995ef66ca2119e795e79d25513616c4548cb5ef837882b00cdbbca13dd99762219fbf8242d693271f0a2
 MISC metadata.xml 368 BLAKE2B a15a411ea20eb7649f299e38704b394344194d7526f9bc92b27c0a26760d7dba05b1e5d483ff5f9ce73a6d1cd527a18ac905344a614c8dc31a0c1180b2be07e7 SHA512 2cc3ec3c99cfff2e0c576ab6c7b0a39460af875ba826ce0cf3c5a1a4f0f3def6170753c8d42af2fc7a139ad7f2135e309c3165bde83b4e7574292768c96e8086
diff --git a/sys-cluster/sanlock/sanlock-3.6.0.ebuild b/sys-cluster/sanlock/sanlock-3.6.0.ebuild
index b428c4943470..4edcd7da1466 100644
--- a/sys-cluster/sanlock/sanlock-3.6.0.ebuild
+++ b/sys-cluster/sanlock/sanlock-3.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2+ GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 71218c2d37da..1a9fcba97588 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -2,17 +2,10 @@ AUX swift-account.initd 867 BLAKE2B 12a01902f520b2c25261a229e1239c3f85ba05dd708e
 AUX swift-container.initd 877 BLAKE2B f45f04d6d6d4fefdf153d40d1480535cb6552daa812854328e845ff8afb96ffd4f947a0a38437ec401a10c493701f328667e1b7e314ea39510c957ec3e7be2bc SHA512 46ae66806db3cb8b9416ccde1a08f0f8af5dd1bbeeda23fc547f8ed29f979c554b47ff0c9ca13f8944ec8c3f4c2d0ffd0616bead4ac9b42078ffaf0ba238d52b
 AUX swift-object.initd 862 BLAKE2B 2a062873ab613e7d98d78758ccae793d8d952cb66922d900353a516738014cfe72f98a6830d0af523757e15b432b88f991753572a3e1b8e248af8e1bf43d2b70 SHA512 a977e3d81e22785b4999e5dbe6c51c020f98fe4ba08d52ff971477fca606a7fbd8e80f4c45ac6ba6afa213ddca7b81acc6238d91bb5c45635cc68c174575aa05
 AUX swift-proxy.initd 1379 BLAKE2B 56453a557c0abfd6b07f65778ef14d8920bedc4133e0efa1aa4a5466a72103e9b57b361f481e0b5cb816471161196755de7794bd3ea3d6f5120cc1f159489c22 SHA512 dd32e4249686b51d2ed6add8e2e91eb9e520c662ebdf068f68b4e52faf4d508d3c87e996c6c2f7ba2a7d1f5fdf639d08e1e6878cd4c9918408e007ccbd7c84ec
-DIST swift-2.17.0.tar.gz 2527561 BLAKE2B baf8d2363bfd39062263542ddd01702e5f5847f3bbd2d227234da44ba742fa7e2bb6954569aab12082de67cfd785496a5530a0fc7613a0ad28d88bd62dbec9f8 SHA512 d5b13a63f549f1118eb1a27505a7444e09bedb532eed8e1ea34d370163dde2ce3e3911b9e4d6bea0d96f0a5c7d99bb103ed80ee8a547051fa29e9b4a09cced16
-DIST swift-2.17.1.tar.gz 2497165 BLAKE2B c400734ac42831bcecbff575aded3efce6ae33ccf46d4e48c58dc24409e5388663d2e81801b290f77550764a41de1393865e1175ab5995bd1044535844fdf595 SHA512 223fa5d9f47b3ffb81cc05b83e7f015392a568f3631344c5713c12f2667362c7bdd0a0a8b657a8caf2bcd1aec11dbcd5a0d582b50109b9b8f24ca6b53321411d
-DIST swift-2.19.0.tar.gz 2977206 BLAKE2B 05f53e7deb7948924ed36f7fcef164dd72254a90329e88a20ffae1f97ca632967d2e4de34a95c29008f8d636ec95b6860238f77f28b2f9f7ebe78ddb8c784a6c SHA512 fa6f08bacb7488762efaf8dd067cacd82adbc0ca773ee9b9c4a23d05d448eea9d79af2c9fbd619f4a458634e0af3cc3ce8fb8eb0d7cf0c10c7d3c28955000afd
-DIST swift-2.19.1.tar.gz 2936438 BLAKE2B 35f4c0d5ae3b5f0add9f3a076bcad7d707a6ea034e167fd6d648e9f02ef7c68e1e2d6538fd1934270e7db950320260b44abc5ae373890ecf39b24fa9bfce1d61 SHA512 1d6f9889cf29c747a50dc3a4983eb2a2be1dfedf07ce38167a2204d3c2690a2ff3cba58705afb0de60c702ffa63d3dfb84237925689d956df55cb11c59c26de6
 DIST swift-2.20.0.tar.gz 3012428 BLAKE2B 48cfb52bce8d89836ede3d82cde197e282b55cec7fa9366c18102a2259a2c96553c573c92b884e6471a3ff5a5fc88ff3eeadbb200c691db3c6b20b6881132576 SHA512 15f1082a94f16684001b1d6eaa635500d41dd2ed0b65b87d8fc2363f96179cbc4d40a6faee10e966ad954e45035ed77c31dc265daa2c7c9d17a0e81890e6bc79
-EBUILD swift-2.17.0.ebuild 3698 BLAKE2B 4b120f81788a76de5a14012714fe0dc94d9d51cc6261737d6498cdbd1130c32e6553128ee8e268553c1fc8b51277ceba6b61c32cdcbf087647d806718e83c51e SHA512 d805c50cec482f3a76a283c7f604a8de8e0c3b580f0c43ab9d2ce7c0cb4e4735cfb4e08fdba05598625bc4dc4ab7e2157acaafc70bf568b5a8fb928cb94c91ea
-EBUILD swift-2.17.1.ebuild 3697 BLAKE2B b3b8d3e99ae4642f75aaab7e20374f911db6c35c9b0cbe3cc19a5a53a4f7bba00eaba748c17ccd7827af13308533f1060e64e034d11ea5bdf988266ca7567823 SHA512 7e86b6ad65dddac26ba284cedb6cf45c4d98dd43f23588de46e55debd33b429f58d0070a6e917976eef3a4f4c0137c9a78cfde3d3c332fe70c144c9e319f9072
-EBUILD swift-2.19.0.ebuild 3930 BLAKE2B cc022f6b23f888b2f934ad55dc5ae71772cdfa98e5b1ea86b99e1ad42c3fa6f1945267d2494c5443f8b3210a7673bc12c11bb63aee88eb6d1fc25fce60ae7528 SHA512 71aaa9d9c9f21077e759857bffc22d7f8ae1f3d7b1517adae9365826a34d77ae0761e44d22e15ab6551e353744009a6238ae61068dd858da20108fd0e4b89410
-EBUILD swift-2.19.1.ebuild 3932 BLAKE2B 5956f4849b661edda0353e69f74c73ea51a97c4868e4586b35da52c72768c356d6d0e48d3961802b02bb4e317d0c9db26273b09304c109a7655313add22a8643 SHA512 6d598527b7cef356574adc1e222e8d9f1871490bcee81da7faeea4eadc579ac622c409c1e7d536ab7abfb5da8bfe6cf7895601171ec37536cffc515389e5b657
+DIST swift-2.21.0.tar.gz 3025042 BLAKE2B 847b11fa61620cdd07acadd1d4fcc43c9fc53ecfc958e8cb617dde6b643bce116662df74b9b2a01df8551847c4577fedd25aab3951ce437cf5d046552e3b22e0 SHA512 ceb96401aa5d1ab36dc0a08455970f9c1704868d778970cad9783463bf8a25dddc7431df0aa73e4d2d7d4f6ef2908fa5faede749fe94e32d5f67e61768edd964
 EBUILD swift-2.20.0.ebuild 3930 BLAKE2B a34c98f02fe58bf7091945fc3730b40d8b8ffc4523dabf7b6e74daf665d5f41ace12f1907a2dafc96262ed13ab64601aef3d055963602d807d01da794a860ec9 SHA512 0e9f6d58e26c77ade950c749e91cfa0239c0f94ab116600ce20e4250c29618a56492ba93435225373edf2f165a9a6f4a2c3a6781381f571190d1e6e3db72f518
-EBUILD swift-2017.2.9999.ebuild 3711 BLAKE2B 1ede70612136464f13d35f97decc571eb37b28e2bbb9a5414e0b0d74d14bdc5d68e54123e74e066fa4eaeb4071b19816415faccf524b4a4aef79aa7709b2ffc0 SHA512 9aaf45d59410e93fe55c9aacdd2c0de697ce6d076af71b703b7c51df14eecf5fb1edc0d0e62a95240092a624f586a7e79167b33688087a2363208f22f4191bff
-EBUILD swift-2018.1.9999.ebuild 3840 BLAKE2B 1a700bd807c4cc9e6e62da8f29f72e8d45877230d08f7d8fc2047c936c7bfac9788e50c69215f47b6e6b498a8f8fa065b8bbf8c830dc5c6bb1fe10e6fed500fa SHA512 7aff849abb17a19ec0f9feb5c1d1d26428aaa91a764617e662c9bb89c4760d6ab2a36550b60f2674a4867a681af69b79ba3b6d69d9122f335b1c10345eb4187c
+EBUILD swift-2.21.0-r1.ebuild 4018 BLAKE2B ded5587949b6bcb9db88032898134cf177990cc6248618cece257093e018253dd343887c8ec106025fa0d999a3f87ffac2e071706b9b968f4522ffe6a2e94557 SHA512 263739a2220d4933511bd3ca8f7d0525f3cfca78511924125d84a02ce7012bc63e7b6c284af31908e769dd0fbb5e2b69eb09b4a436470f17d873f27e92ad7093
 EBUILD swift-2018.2.9999.ebuild 3936 BLAKE2B 8aedceb1506d24c0a6f4c0d219c3d1a734eb220bb5528c1f4e71e036b78da65bb96a656ba1d253a2a2181362711ec3d121106b3bd2013f3db103f5a61f63745e SHA512 d14f2c823a0d900aab54f7d4c919874372f3f996a4dfcb54595564bc2bafdec9761c5fecb041c54308851b7a1ad1da0ccc3136a399ccf0dd9b94fd329c11918f
+EBUILD swift-2019.1.9999.ebuild 4018 BLAKE2B ded5587949b6bcb9db88032898134cf177990cc6248618cece257093e018253dd343887c8ec106025fa0d999a3f87ffac2e071706b9b968f4522ffe6a2e94557 SHA512 263739a2220d4933511bd3ca8f7d0525f3cfca78511924125d84a02ce7012bc63e7b6c284af31908e769dd0fbb5e2b69eb09b4a436470f17d873f27e92ad7093
 MISC metadata.xml 898 BLAKE2B 3d502769ba44cdc1e3a500929d60a1ed82d8540297b2dfddb6d6745ec9b5b56bd9fe7130a738858b9bac653b49634efae1841600325194d69ec30222b2e8b3f2 SHA512 3f9d2cf7538fe32010b811d3a49802eb085dde793b29d9590fe3032d63a743f620e3c1dcf1226b59aa5938ea239f440997a3d4d489f9887816621879e19a0c4c
diff --git a/sys-cluster/swift/swift-2.17.0.ebuild b/sys-cluster/swift/swift-2.17.0.ebuild
deleted file mode 100644
index 9c09fe33ba4d..000000000000
--- a/sys-cluster/swift/swift-2.17.0.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="proxy account container object +memcached"
-REQUIRED_USE="|| ( proxy account container object )"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/dnspython-1.14.0:0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/pyxattr[${PYTHON_USEDEP}]
-	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	memcached? ( net-misc/memcached )
-	net-misc/rsync[xattr]"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
-	~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
-	~ZFS"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewuser swift
-	enewgroup swift
-}
-
-src_prepare() {
-	sed -i 's/xattr/pyxattr/g' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-src_test () {
-	# https://bugs.launchpad.net/swift/+bug/1249727
-	find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
-	SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/swift
-	insinto /etc/swift
-
-	newins "etc/swift.conf-sample" "swift.conf"
-	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
-	newins "etc/mime.types-sample" "mime.types-sample"
-	newins "etc/memcache.conf-sample" "memcache.conf-sample"
-	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
-	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
-
-	if use proxy; then
-		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
-		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
-		if use memcached; then
-			sed -i '/depend/a\
-    need memcached' "${D}/etc/init.d/swift-proxy"
-		fi
-	fi
-	if use account; then
-		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
-		newins "etc/account-server.conf-sample" "account-server.conf"
-	fi
-	if use container; then
-		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
-		newins "etc/container-server.conf-sample" "container-server.conf"
-	fi
-	if use object; then
-		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
-		newins "etc/object-server.conf-sample" "object-server.conf"
-		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
-	fi
-
-	fowners root:swift "/etc/swift" || die "fowners failed"
-	fperms 0750 /etc/swift
-}
-
-pkg_postinst() {
-	elog "Openstack swift will default to using insecure http unless a"
-	elog "certificate is created in /etc/swift/cert.crt and the associated key"
-	elog "in /etc/swift/cert.key.  These can be created with the following:"
-	elog "  * cd /etc/swift"
-	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
-}
diff --git a/sys-cluster/swift/swift-2.17.1.ebuild b/sys-cluster/swift/swift-2.17.1.ebuild
deleted file mode 100644
index b754a1d21116..000000000000
--- a/sys-cluster/swift/swift-2.17.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="proxy account container object +memcached"
-REQUIRED_USE="|| ( proxy account container object )"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/dnspython-1.14.0:0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/pyxattr[${PYTHON_USEDEP}]
-	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	memcached? ( net-misc/memcached )
-	net-misc/rsync[xattr]"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
-	~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
-	~ZFS"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewuser swift
-	enewgroup swift
-}
-
-src_prepare() {
-	sed -i 's/xattr/pyxattr/g' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-src_test () {
-	# https://bugs.launchpad.net/swift/+bug/1249727
-	find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
-	SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/swift
-	insinto /etc/swift
-
-	newins "etc/swift.conf-sample" "swift.conf"
-	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
-	newins "etc/mime.types-sample" "mime.types-sample"
-	newins "etc/memcache.conf-sample" "memcache.conf-sample"
-	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
-	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
-
-	if use proxy; then
-		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
-		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
-		if use memcached; then
-			sed -i '/depend/a\
-    need memcached' "${D}/etc/init.d/swift-proxy"
-		fi
-	fi
-	if use account; then
-		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
-		newins "etc/account-server.conf-sample" "account-server.conf"
-	fi
-	if use container; then
-		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
-		newins "etc/container-server.conf-sample" "container-server.conf"
-	fi
-	if use object; then
-		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
-		newins "etc/object-server.conf-sample" "object-server.conf"
-		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
-	fi
-
-	fowners root:swift "/etc/swift" || die "fowners failed"
-	fperms 0750 /etc/swift
-}
-
-pkg_postinst() {
-	elog "Openstack swift will default to using insecure http unless a"
-	elog "certificate is created in /etc/swift/cert.crt and the associated key"
-	elog "in /etc/swift/cert.key.  These can be created with the following:"
-	elog "  * cd /etc/swift"
-	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
-}
diff --git a/sys-cluster/swift/swift-2.19.1.ebuild b/sys-cluster/swift/swift-2.21.0-r1.ebuild
index 5faee1df0e08..ec5ee0cd41ee 100644
--- a/sys-cluster/swift/swift-2.19.1.ebuild
+++ b/sys-cluster/swift/swift-2.21.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://launchpad.net/swift"
 if [[ ${PV} == *9999 ]];then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/openstack/swift.git"
-	EGIT_BRANCH="stable/pike"
+	EGIT_BRANCH="stable/stein"
 else
 	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
@@ -19,7 +19,7 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="proxy account container object +memcached"
+IUSE="account container doc +memcached object proxy"
 REQUIRED_USE="|| ( proxy account container object )"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
@@ -109,6 +109,11 @@ python_install_all() {
 		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
 	fi
 
+	if use doc; then
+		doman doc/manpages/*
+		dodoc -r doc/{s3api,saio,source}
+	fi
+
 	fowners root:swift "/etc/swift" || die "fowners failed"
 	fperms 0750 /etc/swift
 }
diff --git a/sys-cluster/swift/swift-2017.2.9999.ebuild b/sys-cluster/swift/swift-2017.2.9999.ebuild
deleted file mode 100644
index bba5692f08cc..000000000000
--- a/sys-cluster/swift/swift-2017.2.9999.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils git-r3 linux-info user
-
-DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-EGIT_REPO_URI="https://github.com/openstack/swift.git"
-EGIT_BRANCH="stable/pike"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="proxy account container object +memcached"
-REQUIRED_USE="|| ( proxy account container object )"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/dnspython-1.14.0:0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/pyxattr[${PYTHON_USEDEP}]
-	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	memcached? ( net-misc/memcached )
-	net-misc/rsync[xattr]"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
-	~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
-	~ZFS"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewuser swift
-	enewgroup swift
-}
-
-src_prepare() {
-	sed -i 's/xattr/pyxattr/g' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-src_test () {
-	# https://bugs.launchpad.net/swift/+bug/1249727
-	find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
-	SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/swift
-	insinto /etc/swift
-
-	newins "etc/swift.conf-sample" "swift.conf"
-	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
-	newins "etc/mime.types-sample" "mime.types-sample"
-	newins "etc/memcache.conf-sample" "memcache.conf-sample"
-	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
-	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
-
-	if use proxy; then
-		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
-		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
-		if use memcached; then
-			sed -i '/depend/a\
-    need memcached' "${D}/etc/init.d/swift-proxy"
-		fi
-	fi
-	if use account; then
-		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
-		newins "etc/account-server.conf-sample" "account-server.conf"
-	fi
-	if use container; then
-		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
-		newins "etc/container-server.conf-sample" "container-server.conf"
-	fi
-	if use object; then
-		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
-		newins "etc/object-server.conf-sample" "object-server.conf"
-		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
-	fi
-
-	fowners root:swift "/etc/swift" || die "fowners failed"
-	fperms 0750 /etc/swift
-}
-
-pkg_postinst() {
-	elog "Openstack swift will default to using insecure http unless a"
-	elog "certificate is created in /etc/swift/cert.crt and the associated key"
-	elog "in /etc/swift/cert.key.  These can be created with the following:"
-	elog "  * cd /etc/swift"
-	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
-}
diff --git a/sys-cluster/swift/swift-2018.1.9999.ebuild b/sys-cluster/swift/swift-2018.1.9999.ebuild
deleted file mode 100644
index 39349853cf67..000000000000
--- a/sys-cluster/swift/swift-2018.1.9999.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openstack/swift.git"
-	EGIT_BRANCH="stable/queens"
-else
-	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="proxy account container object +memcached"
-REQUIRED_USE="|| ( proxy account container object )"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/dnspython-1.14.0:0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/pyxattr[${PYTHON_USEDEP}]
-	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	memcached? ( net-misc/memcached )
-	net-misc/rsync[xattr]"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
-	~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
-	~ZFS"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewuser swift
-	enewgroup swift
-}
-
-src_prepare() {
-	sed -i 's/xattr/pyxattr/g' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-src_test () {
-	# https://bugs.launchpad.net/swift/+bug/1249727
-	find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
-	SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/swift
-	insinto /etc/swift
-
-	newins "etc/swift.conf-sample" "swift.conf"
-	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
-	newins "etc/mime.types-sample" "mime.types-sample"
-	newins "etc/memcache.conf-sample" "memcache.conf-sample"
-	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
-	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
-
-	if use proxy; then
-		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
-		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
-		if use memcached; then
-			sed -i '/depend/a\
-    need memcached' "${D}/etc/init.d/swift-proxy"
-		fi
-	fi
-	if use account; then
-		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
-		newins "etc/account-server.conf-sample" "account-server.conf"
-	fi
-	if use container; then
-		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
-		newins "etc/container-server.conf-sample" "container-server.conf"
-	fi
-	if use object; then
-		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
-		newins "etc/object-server.conf-sample" "object-server.conf"
-		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
-	fi
-
-	fowners root:swift "/etc/swift" || die "fowners failed"
-	fperms 0750 /etc/swift
-}
-
-pkg_postinst() {
-	elog "Openstack swift will default to using insecure http unless a"
-	elog "certificate is created in /etc/swift/cert.crt and the associated key"
-	elog "in /etc/swift/cert.key.  These can be created with the following:"
-	elog "  * cd /etc/swift"
-	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
-}
diff --git a/sys-cluster/swift/swift-2.19.0.ebuild b/sys-cluster/swift/swift-2019.1.9999.ebuild
index 9127cdea86c1..ec5ee0cd41ee 100644
--- a/sys-cluster/swift/swift-2.19.0.ebuild
+++ b/sys-cluster/swift/swift-2019.1.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,15 +11,15 @@ HOMEPAGE="https://launchpad.net/swift"
 if [[ ${PV} == *9999 ]];then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/openstack/swift.git"
-	EGIT_BRANCH="stable/pike"
+	EGIT_BRANCH="stable/stein"
 else
 	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="proxy account container object +memcached"
+IUSE="account container doc +memcached object proxy"
 REQUIRED_USE="|| ( proxy account container object )"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
@@ -109,6 +109,11 @@ python_install_all() {
 		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
 	fi
 
+	if use doc; then
+		doman doc/manpages/*
+		dodoc -r doc/{s3api,saio,source}
+	fi
+
 	fowners root:swift "/etc/swift" || die "fowners failed"
 	fperms 0750 /etc/swift
 }
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index f3a612bb2b0d..1a5f19de0fe0 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,6 +1,7 @@
 AUX bash_completion 7568 BLAKE2B 853a448c7675888ae8e8a79218c2f156684a0189e27e94a0c512477dd1065c3f178485810d8ef2242e7e4a5b3c17533f8e6279d4fe3dc720f4ea9864f0f66dc2 SHA512 b9e5745775121107da14540103bbf4943692a514cf3cd69b71c999a5e0eb1c81253b6ac4ca635cdb6e64cd1f1c1204dfecd4a6f83cbe7d5448625c53f80ed3bb
+AUX util-vserver-0.30.216_pre3120-dietlibc.patch 977 BLAKE2B 61c4ad978f314b657c8841e5e3638399c25657b81566ff1cd13aff623bd41221d16cfd4e373b4569a3192777da635cde7c92792e383c7237e1470be60807af20 SHA512 cc6bb0f5a9231da5871244548f0ffbff8b81f6991100ab80e0d4ebef609a41cd6c81d4f1f4cb5c47091b6bfae04504c1aececd779be67985b6a85f1c4097fabf
 AUX util-vserver-0.30.216_pre3120-vserver-init-functions.patch 476 BLAKE2B 29479f8de5f7f0b455ce98cededff4b54535ffffa1762681646fd594d3f84b2c10674cb2269987c3b1106ac64cfab8aaf9c747a0f75e7d2ee0127cc08e2e459b SHA512 0d973356d9b2cb403d7f0895836850f7500e42b1d304880da6542584a37d877b840ab1a134bc754915fbcc702b4824158004f22d3acee3eaf64e298620bed987
 DIST util-vserver-0.30.216-pre3120.tar.gz 990833 BLAKE2B a9227d4b4074300f188617c48ec7884f8cf34e8b2c2685eab7678b00fbca6ea5ad4bc9dd926f88e49633165b0402802a3077d029ee4c75447112705fdb41ca4c SHA512 eca7680a8b06fecd678b4dad5824c92b53d872b3e7ec9cc275425437fb7fcfb3991f58770096f20d8274e37927a39b64ed9db082ef806e76d0c603b2cd64ef32
-EBUILD util-vserver-0.30.216_pre3120-r1.ebuild 2697 BLAKE2B 4ff53e547164d2a34b79ec2d0e1e1f686d20b73fb6078a2fb0fc0d1b82540105c117317f4cdb1340f61eb3a2221b787a899c3be3d39d00e4bf6b53760ad23825 SHA512 124764e5c8c57086a3b0c57c2d1cdfdba58f8e31ceb18df95b6f411ec5b2ec2a1e6546d93c3a133f946bf4455b5a52173390782deacfb3abc83aba8425bc2777
+EBUILD util-vserver-0.30.216_pre3120-r1.ebuild 2732 BLAKE2B feed2ad501c17626a8f1246c1e6323f7035e156011dc75596b4c25679593f594ef9f552f487dc8f8b9a2d0e4f0e7fb2aa69e44fbdec494732117be769e6a7122 SHA512 348aef5c1496c5b806694b52010c186eff6afb5d42d16b200b279249be17c5f86c1cb2dc291fe2a13e1cc5b496234f57fa0878d31e19d55010054a396e8b408a
 EBUILD util-vserver-0.30.216_pre3120.ebuild 2626 BLAKE2B 8687a97b2e603e34f39cbaaf4d9dc89fa6a6e0cc848df90b106a6771ac181b5f28804697afa53b3bed83599756e0bd6eb279df6240790f4dd68a33c135588a16 SHA512 aca3576606941549fcdbd51b7e5ffec420013dd1763e6f4af48aaba281fe9796e5c4ec84ca9289b7bfec1fc78e73832fcf7eaaaea60766ad6c33b4fc1cba3d44
 MISC metadata.xml 608 BLAKE2B 08f33a158673400b65c252f2baefce7e21cbc227ff8e8f0d5fb0470dfb721d8c1936784958d67b9575ba56bd466af4d8a7c369d8712ff9d600f45b48cd88c9c6 SHA512 38db9a382d90e296630c14ab82f175f955f82429fb1dae2e63c1b8cc9924dc527772bd5d6aa302a41dbacc2d3d330e2bc67a010570179c265ebd6f377d214931
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.216_pre3120-dietlibc.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.216_pre3120-dietlibc.patch
new file mode 100644
index 000000000000..cde8ccc500a6
--- /dev/null
+++ b/sys-cluster/util-vserver/files/util-vserver-0.30.216_pre3120-dietlibc.patch
@@ -0,0 +1,23 @@
+diff -puriN util-vserver-0.30.216-pre3120.orig/lib_internal/util-cleanupmount.c util-vserver-0.30.216-pre3120/lib_internal/util-cleanupmount.c
+--- util-vserver-0.30.216-pre3120.orig/lib_internal/util-cleanupmount.c	2015-05-30 10:18:50.000000000 -0500
++++ util-vserver-0.30.216-pre3120/lib_internal/util-cleanupmount.c	2019-02-19 02:36:55.000000000 -0600
+@@ -22,7 +22,6 @@
+ 
+ #include <stdio.h>
+ #include <sys/mount.h>
+-#include <linux/fs.h>
+ 
+ #ifndef MS_REC
+ #define MS_REC		0x4000
+diff -puriN util-vserver-0.30.216-pre3120.orig/src/secure-mount.c util-vserver-0.30.216-pre3120/src/secure-mount.c
+--- util-vserver-0.30.216-pre3120.orig/src/secure-mount.c	2015-05-30 10:18:50.000000000 -0500
++++ util-vserver-0.30.216-pre3120/src/secure-mount.c	2019-02-19 02:37:17.000000000 -0600
+@@ -46,7 +46,7 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/file.h>
+-#include <linux/fs.h>
++#include <limits.h>
+ #include <assert.h>
+ #include <ctype.h>
+ #include <sys/wait.h>
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120-r1.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120-r1.ebuild
index d9776666cc1a..b64a51e52729 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120-r1.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120-r1.ebuild
@@ -32,6 +32,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-vserver-init-functions.patch"
+	"${FILESDIR}/${P}-dietlibc.patch"
 )
 
 DOCS=( README ChangeLog NEWS AUTHORS THANKS util-vserver.spec )
diff --git a/sys-cluster/wulfware/Manifest b/sys-cluster/wulfware/Manifest
index 8942ad60110f..a9d7731f4b3b 100644
--- a/sys-cluster/wulfware/Manifest
+++ b/sys-cluster/wulfware/Manifest
@@ -1,4 +1,5 @@
 AUX wulfware-2.6.0-opts_and_strip.patch 5085 BLAKE2B 91f47591019cb6a3134a2713f7768ad9a82ae26863251784166b5a4974a7729fdd55b8796c85f39f90af3a19642f65cdc84dbbbe813b49b13be2787a9de7c516 SHA512 2c2f897374a5a81feef97a0db425961b4e58cbc62cfebe026dd3661bacd1737ce5e023385f0e6725160087c9a549c37c23be02cdfa0c680b473b94cd6ed212a0
+AUX wulfware-2.6.0-tinfo.patch 762 BLAKE2B 1ef928141e186ec8dceeea98c14123a0bbd71fa9707500a5ee9fbd7075877c0d993b86df5212780f7fcf072976dcfc4bb2ca267003ed67ffdcfc883eee0846bb SHA512 e0b0ae730078f083b5546d98a6f6b60d7df6083ad20fd31b0d7a277e3baab8f384bd0c1bb45315231743e2cf24764e8f1cf55edcbb6d30d515148884efb7ebc5
 DIST wulfware-2.6.0.tgz 469000 BLAKE2B 23730adeeafcef0761455fd62e744fec0fad1d8f1b13eabe256b27fa16a7bb468ff33b08ebff29e9c2c69c044e15fbf3b4d0ea2c39081ed7015089989bffa7b9 SHA512 626314124c836ee937f860a4093272d5b6e12b5d3aca631647bde6ef03880e2dd7916ab2805f34c4863e915ea3295e5c5d69ced9c5ec05b224cdf849738c78cd
-EBUILD wulfware-2.6.0.ebuild 1317 BLAKE2B 15390d2bff3810d81172648140b81c9690f31dbf1b67f9a62b4db3a3f636187a387f86b49766b87e1e73848ca288535ae057f52dc99ea0acadcdb3256c206832 SHA512 510da00cb0594b57e84a3d488504e7f5d239daedd41bd1aedf82c73c70084110b0de5280795cc18aa281e08a9f98542f024704523a6f4a1248e9553e648f0928
+EBUILD wulfware-2.6.0.ebuild 1348 BLAKE2B 6e802bc18fe3ac1699c2863e39e3c7c0c9f56d9e1ebbaf0e26c1e3124a554bf96bf4b05927ed470d0c757d4eb8095f7d2803c5f789102b7bd435637bca8533e0 SHA512 ecb0b7887bddea09bc84639855ed77c38ac994f768a49ee18d8cc1b31be327cadbc538da3b4c1787d2409afa3453f1bb6491106e6d0a39c2a629fdc0eb702e03
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-cluster/wulfware/files/wulfware-2.6.0-tinfo.patch b/sys-cluster/wulfware/files/wulfware-2.6.0-tinfo.patch
new file mode 100644
index 000000000000..7e88e621d91e
--- /dev/null
+++ b/sys-cluster/wulfware/files/wulfware-2.6.0-tinfo.patch
@@ -0,0 +1,22 @@
+--- wulfware-2.6.0/configure.ac
++++ wulfware-2.6.0/configure.ac
+@@ -61,6 +61,8 @@
+ 
+ # Checks for libraries.
+ # FIXME: Replace `main' with a function in `-lcurses':
++AC_CHECK_LIB([tinfo], [main], TINFO_LIBS=-ltinfo, TINFO_LIBS=)
++AC_SUBST(TINFO_LIBS)
+ AC_CHECK_LIB([curses], [main])
+ # FIXME: Replace `main' with a function in `-lm':
+ AC_CHECK_LIB([m], [main])
+--- wulfware-2.6.0/wulfstat/Makefile.am
++++ wulfware-2.6.0/wulfstat/Makefile.am
+@@ -63,7 +63,7 @@
+ LDFLAGS =
+ 
+ # Libraries
+-LIBS = -L ../libwulf -lwulf -lpthread -lcurses -lxml2 -lm 
++LIBS = -L ../libwulf -lwulf -lpthread -lcurses $(TINFO_LIBS) -lxml2 -lm 
+ 
+ #========================================================================
+ # List of variants one can make.  all is the default.  We always
diff --git a/sys-cluster/wulfware/wulfware-2.6.0.ebuild b/sys-cluster/wulfware/wulfware-2.6.0.ebuild
index 0dd9e8708cd8..dee0715397e4 100644
--- a/sys-cluster/wulfware/wulfware-2.6.0.ebuild
+++ b/sys-cluster/wulfware/wulfware-2.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit autotools eutils multilib toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Applications to monitor on a beowulf- or GRID-style clusters"
 HOMEPAGE="http://www.phy.duke.edu/~rgb/Beowulf/wulfware.php"
@@ -14,24 +14,34 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-libs/libxml2
-	sys-libs/ncurses
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
+RDEPEND="
+	dev-libs/libxml2:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
+"
+DEPEND="
+	${RDEPEND}
 	!sys-cluster/wulfstat
-	!sys-cluster/xmlsysd"
+	!sys-cluster/xmlsysd
+"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-opts_and_strip.patch
+PATCHES=(
+	"${FILESDIR}"/${P}-opts_and_strip.patch
+	"${FILESDIR}"/${P}-tinfo.patch #528588
+)
+
+src_prepare() {
+	default
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	tc-export CC
 	econf --disable-dependency-tracking
-	emake -j1 || die "emake failed."
+}
+
+src_compile() {
+	emake -j1
 }
 
 src_install() {
@@ -42,7 +52,7 @@ src_install() {
 	dodoc AUTHORS ChangeLog NEWS NOTES README xmlsysd/DESIGN
 
 	# FIXME: Update to Gentoo style init script.
-	rm -rf "${D}"/etc/init.d/wulf2html
+	rm -r "${ED}"/etc/init.d/wulf2html || die
 }
 
 pkg_postinst() {