gentoo resync : 28.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
commit: b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree: e318514216845acb8f2e49fff7a5cba4027e9d91 /sys-cluster
parent: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
118 files changed, 2889 insertions, 2742 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index f292348c7d8a..7114e7c4a818 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index cfac7f2599a0..49b24289e95d 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,19 +1,13 @@
 AUX README.gentoo 1085 BLAKE2B 761a88dbcb3126a47ae6257409d47c3e936743d102430cfc71fac90ea4b8ed876af9815b445e06d88ef407a47963eacd8027cf912ab3fcde724af22fd6a43741 SHA512 cee1b5fb9823333eda0750c04db0c56d71cca1cbf6fed6887ac4ba68949114df74aace3861343bdacd2a1dc4fc38932de805cc03074f981d26891673e454f250
-AUX ceph-10.2.0-dont-use-virtualenvs.patch 3253 BLAKE2B 099d80efbccfb4ce8ac6c7809c70b2fb66b44f3c6ee5fbea64988576320df9b5ea6c420088fc4dba2d899c9410979dae3a7609676271c53b1eaef5187ab33cfa SHA512 f6351c97ca6766aa5eb4ebb91bc013aaf8222029743c95f5c88b9bd8a6caca48908315e8850ffc83651573377b48e5feb170c310b42e2447fec739379169b500
-AUX ceph-10.2.1-libzfs.patch 440 BLAKE2B 8d0c46d54917a0d8f61f913562b4e8f9a54efd04ccf548a2290832a765f69b4db120bab6e72b94295bf1fd3214512db8c598af6ec514b1e9e4361f964b7fe4d9 SHA512 5afe85113f310b86a13fb18ba57030d50ae5bd9afbf4d6f5aacd7cca415dd13544522c5d903eb58ec90cc0f6ae2cbb022941debe7036d1b7fa6c5af26af9b9db
-AUX ceph-10.2.1-unbundle-jerasure.patch 16190 BLAKE2B 6a5969ca39389ae26ed83c7a76c69adf049f32d6f183d602a460d844427d18825846d034b9753a359fd18bb19828532ba770318fd8c9c0294954d68b10c1e0ff SHA512 8076a69bb81f89f8892576c4e2ceb03131cbd7ffee82a0d4d66016120f6c79b906172d1a1c30d7642a32ef7afd46d77d7311b65ca55d065995f305cb0e89485a
-AUX ceph-10.2.3-CVE-2016-8626.patch 1102 BLAKE2B 394efc3b3cf743790ef46a1ed5941081f6c5da89fb6b72a7d0413f1ae0b90d0142f4d1a60b5f1986beafd7f3f77de45b00632f7c251c9801802bd821fe9b6c2b SHA512 e924b4719f0c4a0aa27ed383c816d0d24d7a979b73fb2962193dbdc31cd23c02061904a696222d73e58e1892b2ca51e9c6df6674fec5c17f013c2f4664790fbd
-AUX ceph-10.2.3-build-without-openldap.patch 1209 BLAKE2B 5ba29095421ebbcc7362814627b3459ee364f7a2f5d4256b9b5b85d39c15aabbba8faf725e6a67cee77d4a391e09087f12d15a94b22ffd1124dfc08cc94c9c48 SHA512 2b0476eeb78246f252bd294eabc66c6fe5724d753d0cc2dde56720aada2517e42df3387eb368a53fa553617d436d18393a4e856d6fe7395022b249d522d1ec88
-AUX ceph-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch 794 BLAKE2B d6448cfed9a67d38ed82fa7d7d3a5ba6aa26d629912cb5450cad628eb8c498b4934534404e70d2fea3db12c8e28e84e0c914e86d294071d7662a0fbee05c6cdd SHA512 1261d3f088ffc4514069e73e49f627c6f87e89683cedc0048dba6d0e18f53f9a784f6c558478ebe72dff70669e5a453809a720cde77f5b89675d92840e6609b7
-AUX ceph-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch 2155 BLAKE2B 65ecae6fe095c9b61f26d80a5f12a6d5d22ea3f65d37837e382b24e608ef1bf47bb275183b136c49a95383c9d38e2839e2c7999d21708b95d1bb678a5e2ad729 SHA512 c64b4def2ee9cdc9109ff6c32391384980d5ac4e33d425454fe1ff59910ba622ecb458a6722a5ed0f988e021b83ace5d89cb3974a1cf65862e8766595d8cfb0e
-AUX ceph-10.2.7-fix-compilation-with-zstd.patch 1782 BLAKE2B 35c63ded6f1a4740befe952e3685743f0f4cb2500f6451406133d3074179cba0703389c07a9936ecee7d2afc83db24aa212aaea3a856f240230bb6ea76fcb975 SHA512 5929217f64deb45fd803e33cd277443cbb5f5f956fc4be05490a07dae0b02467317426993c7fc44173a18955261e3a73e603775db12e788a93c851f992539ad6
-AUX ceph-10.2.9-cflags.patch 449 BLAKE2B a1fc3d1a1e5bb891932d0697631b9a604a47e4c564dc99ef1247cb9e5c26ba7bb5e421b4ca624e78b31d279c93db2965eab31d38f1d3b8fd93d247789ae9408c SHA512 17a165710b0effacc34257daf077f70f55e27f0bddd4dd58bbc8638653ebd13eeabffbb4ead40ddc3a69586c65e01f911ee5f8e1bde94576d66928f0928fa510
-AUX ceph-10.2.9-dont-run-lsb_release.patch 2862 BLAKE2B 94e31ddba114ff798f3334c71df551fd267ca716a4aa4aa8e8ebf534a5e38d1b55d7a102306b60cb7dc7337ba009898c02f953a74b34580a85369788a7169018 SHA512 e97a0c2a40c886029bbff12f8591147b88d5eae86dc79a63b267f10745a465da62786cf41c9fd0f01f51805907633c1fe954ebe09b0730660cf690f2c53a8252
 AUX ceph-12.2.0-cflags.patch 536 BLAKE2B 9eb8dc48db09d35f86de280a36763b7a56d980adbaa2d68045e6378cb68904e939d8e7f7325fc5102151ea4e1f5133751b620885d1d0b3d6fe565291272b4b2a SHA512 9864da1a83c1145d143eedd73fd3ff142b354fd0bffa73a25f30eabd68d7eddee82208be7b7da74536ba4c996808aa77fc55bcf562a409240d69cbd249ef1d75
 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.12-civetweb-openssl-1.1.1.patch 383 BLAKE2B 77d2c5bde22b2239faf5d81ad6e8cc59b5d538e41cda50dc505c860421d392c9e3c53eeb9ad6c626fc3f610851b3ab03b013a33e88a5f28dedc7f7f9bd4f68bb SHA512 52a7fb10fed600e390d207e32aef7e1f53c7e3d0866e8cf607709cc233811a2ff697a342295f05b6787ea64b7e914487f1bbfd1f9f7d258a328d34ce2758be9f
+AUX ceph-12.2.12-dont-use-bad-namespace.patch 416 BLAKE2B 10018739a4a726bdf4eef44904a1e0a95eb9e6ce43750606a4159c8577190d2cf07fe7a50cc41f9aff6135f1aecb3d0d836b49594322f443ddf8d92bb9941364 SHA512 50e6d0ddbac9380ddf68b259e99ec585e9b1b5b26ac813e9ed947f417706adcf128a9c49e36af0373762233a1020611addab05832effd7a4fce7bca928264bdc
+AUX ceph-12.2.12-ncurses-tinfo.patch 573 BLAKE2B 87a2bb90dbebfeaa538697020a0d94d3b96a25e2d576a2b7b1281db81ee93db98c42b72f5cbda8b6a8b66e84b20429ceae9bb6a16110c1db371f6447c79a0287 SHA512 e0d24fe288f56fdb4ffabb25701a1b343083932fd97dc00fe66dda4c339409f922a4b3b5803534467b1138deaa5f8b886a1bbd9f10636c38fce7f656aede18f2
+AUX ceph-12.2.12-qa-warning.patch 494 BLAKE2B eeee0d451264390f8b6c712b08592b5dca5670b09771225833831c9a052cd227a5528d52521d6fd9420723bef291adb082970df58bdb0e1b14a964345098a315 SHA512 75ea26415a54a5e1c670adf1461516b01473728a9768429c4df6bdb9b9a28073acb7372167651dcc5680e268e5ef7641ef0643ea1ae90d4611feca912819581f
 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
@@ -32,17 +26,14 @@ AUX ceph-14.2.0-dpdk-cflags.patch 1171 BLAKE2B a6815317d3828cee8d2476d6cc77b60d0
 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-14.2.1-ncurses-tinfo.patch 959 BLAKE2B f13e6fd85401cba869cc459568e731ff43176b75ff427ee7b16ed714cc0ac49437c4d8532cffd79e724dc2a48a142391f138c8669fda78a1091dcb98b9d8dd96 SHA512 7ea763a87ce14fc1a1a33f84e96d6fbd36af8833080e53eaa7ea674219e86c76a087766ef28091d6ea0667b170340a46ceca2300501a61265ae6cb66904eb82e
 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
 AUX ceph-osd_at.service.conf 115 BLAKE2B d234b9bd718585baf43f229f583e211607aab02942590f90e41d646205c44c9d4c7778c844fcc268d69410a6e76ca825882a5e1d4b1e86b0123905b1d6c081de SHA512 8f169a73f21968f550c6fb21ca7b1efde522b7cccaae0e0c4e22c67ee9c7ccfec7845de3cf84af1075ac9f8840b044dc9440e7936fb9079899df06df350ff9f2
-AUX ceph.confd-r1 69 BLAKE2B 2e75612a1c36057ab41939b4022c8211e32082a812e9636862fd97b4250594fbf3fbd6739e4faf84c056a8b5402a9089250ea84ce504f2bf2453c09f34dc2fee SHA512 b7f7ebb48b94398eaabb6df2cf3a5697d9a055ea4dd9b73c40d2bbf0e1445f418ed760b1f4ebb13cbb7315b2583847eb97b8649f67b6b7cf98081c0599c86aaa
-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-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-r9 2435 BLAKE2B 2e1246f9d409bbe4d2895e9747490ddd108ef22c2060e151944ad2bda1e7ae13d61330cf9f33ec4900eb4fd4a26ff454dd081869901d21bff8309bf8db6d7533 SHA512 c7f0dd45bbada67e93b2e1acdafdb0ccd1de107d9d582b6b83889c5e0f91e524ea1324ab21e96d4c56d6016be6fed718a7791695c95c68813c6b9d6d3dc2a384
 AUX ceph.logrotate 427 BLAKE2B 9677f1a2a4872addff71527c800dd06bf65e18b589de3869e2a742c43070de789d5089f8739367efb913a64aeec5a8b82f47c129fac580e7c34e4f8cdc8b7332 SHA512 6edace611f46683ca3b8d2154b86ec77cc241909704e0362b728a5f51c2a809c22e83d69df0d58ec6b3a6b8dc8ef2518c220cac920f51e63fe668cdfe1b48bae
 AUX ceph.logrotate-r2 545 BLAKE2B ef7dab92aa5fbbe7f5d5418feaae1a1f4400dce08ca4484fe5889888f4dcb6d180bfb5888d5c7d6d9bc32bb5c58443fb83c1cb4613a2810cab45e8a74c421279 SHA512 c30edd67b7cc064f09d4e02bac68a0aa26827d8d4e3c027393932587e8ce782893b93b53d7165d361602b29c90ef3d6b755e79d11a1edb054e0172decd4e627b
@@ -50,18 +41,14 @@ AUX envd-tcmalloc 48 BLAKE2B 4a0799ac6bbedfe5e701eead67600312d86f06143dbfd11d2c5
 AUX make-node-frontend-tarball.bash 3196 BLAKE2B 1779c8fe924d8a341bcf922da310c9e3543dd9875db79b2f08fd99419fc2a693e24a5d0c36e7db7b9c46f02bb78b51359e844c8265ff266e8a931a32b877b665 SHA512 4c13ebc9f2a7ba3d45a01cd72135a57b2dc6ad3edfe06a05645957c5522a053be940782f1148c117d8bf785937655083d3d1c74668e8c72d75ae000888a65d85
 AUX rbdmap.initd 2373 BLAKE2B b88d79efc722e2de3d1f0269664a976ed45fbb0a1c9d46fcfd058ea64d3ae7fe27d13455f2ac5ca06663d77cfac1d2f9d86d12bba926541042ac09a8778a3a52 SHA512 bbd48d6987e52eaf6d02bccf3aecd06596465af4d3ac93063f9a814106de162a27bf1a33ae1646e669efb3c754f3ba57f395523293ad643b0d81ee588252216b
 AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8aa98ae97349b42b56c65a531b207c5f970f873a79c41789941cdd10b279e38f1616f84d SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a
-DIST ceph-10.2.10.tar.gz 14573701 BLAKE2B 78c68deb8537cae8394b4d35569983431e938eff42b01f448dea68016b33ca5770c83d1e1d382bfd6c8164d5259e821779c6515f8c8fb4d5d52ee90b7df43180 SHA512 883d1b8340aaefc7a1eee4bbfb5b1d1cc15bffed8f35fb1e8fb86b1208a4d0d16753eb6c688ea0e661c4877d3d148b2b6c2b41620c4e8a61e47c69f46f98e537
-DIST ceph-10.2.3.tar.gz 11596171 BLAKE2B c24c879649f0d42f58cfb1d03701797bc685d83c157031156d13308c731412a4a0149b658193722b358ebf0c4f9760d9664668cd797b69d207e81dc572f49700 SHA512 9de1e6851fc343d2c52c72cec3f7887d998d5b588f1251ee3a1fda14427badfa10408e6691fb03a374a10f4ec9844868423fee70fbbe2c0d962af98481412f19
 DIST ceph-12.2.11.tar.gz 79009034 BLAKE2B d8b1c188fe39603e90511eb436100ba14c0a9c4d9531f1a4ca52e78449462aacd274b80f8d0549918979fcb1ca4632ae0eaade1ae311a730fbe6657be044fc35 SHA512 14f46cc6f38d7d894cc657a040b428309632e5c163109a8a4a79a346ba2901a37d79966a0bc09148810c22b89375d9a4cb3b23f16364685b094c518bfafe9bef
+DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7881cd9c2e185eca12096efb79d21578659d248eb5bae678924983d57452d370e23ab7e78663764d7bea834a461 SHA512 e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc
 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 8056 BLAKE2B 33b201f83ef2371b154d155dc55769dfe8a4a4fc908eacacdedf56b247d0a1e2276af5499ce8797e7400e560dda06328f5ff74daf63cec8ad65d99a92cac18af SHA512 2c9b9485760727be5eb6bcdaebe1424baf6f3bc9f6e33d1f21e279bf91b7d43c1f160446411484a54bb6bbb5cfaea85134480056c84207c55211ab412974ca4e
-EBUILD ceph-12.2.8-r1.ebuild 7886 BLAKE2B 3be53d0061849ec367a2612bf6a67b94b97eb7e3f1ab2902eddbfe6e45bd4065fe38ad41e3306b83bb6a622854efa8239d2ff716933e59bf06d343fe341823d2 SHA512 c96e0af6586053b8ff827c049acc8e6cafc2ec31052ed90d2b1d6b3f4daa30ffd41d162eba3aa279b2a07190ed21840032589f88a21be730d06885814eb5f4a5
-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
+EBUILD ceph-12.2.11.ebuild 8025 BLAKE2B 0b7a0acd31afef011b05907332ecafd8ca72fe6d90244bcdfd879eb1b554a6293349b16638ad151052048019863ede89da0aa5024a6561c9016fab15f24f1778 SHA512 b6d0203fb1aec6ba62a2d7db6ee62794efab5389f4ac9a86cb4ad796f6f81985f8d8e107d55abfdc669a6beb55ecaeaa2e71d4283f3d93ee135803bc2d17293f
+EBUILD ceph-12.2.12-r1.ebuild 8390 BLAKE2B 7cbb4f10b7deb154c6ad7a4e1796faedaa6a35d567f931d58a412329dfe5084c573112b46c20a1b7394d1c732cfc7e16a9638746f2b390f323ac95976f410160 SHA512 80001c80c09a9dc021e47d02f225778be34d1f5b1d218809bace78c9046f4c7ce1fcc78cf4e4618d905870a469020086484b19768e84a859cf867ab2fe0cd9ca
+EBUILD ceph-12.2.8-r1.ebuild 7886 BLAKE2B e99590739ce73d96895c282108d3b945bb0e13bdb73e34b06d2da5c9e7d74dc4fdceddfb6330a106b775c612c7cca6b67325b83389f1c6d5af712e59a6f1fd55 SHA512 ab8d2a1ee7c4a7d7179f81e18dc601a18da365663351d88cf6dfee32e2aaaf40412bc2fde98d7c07012f79f8b6c19bac773ef97b872a32b663748ce41a5954c1
+EBUILD ceph-13.2.5-r3.ebuild 8988 BLAKE2B 7eeef2b9ebdc34167657126d2ef86e1ed204fcdd5ac8af2c004607f291106dd38e486e17a2d1044e7d4adfa9c6067dfa556504d54eb8b75c03f4fbd2820b6586 SHA512 ba79137aefa69c7320ba88f8a3409b752033aa89c8424863e8b21cf6d0c0079440daee98a338ce01314ce4969a5b7a3f074f7c006a2235aee856d7ad29ae9371
+EBUILD ceph-14.2.0-r5.ebuild 9111 BLAKE2B 9d2f2c126e5f715e83cfde6801875b7cbe29e8cef634ba5c1a89022ad7d3d325a499e4733034e0eb7ee301800062612c019c4ec3429358a029db7757257fb75e SHA512 2666e7e54405a3e7f2dc4b97fc9d41268d2dea87802d1dc32ae25fcf8daf5082f74b32fb4f22355a9ac4d1c1e303af877cd3fd07c2cd2723652fe52d8ee5a8f7
+MISC metadata.xml 1588 BLAKE2B c3a1f7afa0e61fc589e60ec00bc1702a6f953bbbbc1ab6a8582fe08bad9f6af9217350641399bc7de4dfb69a79ee0e41b46d971eef53348f3b568c6dcd439273 SHA512 ac2196349f897b7dfafaa924cda3f4eb094233bd04e7949b9f8fafd135775202c3c1bdc11cc4a931e752fb40b9d1c86524cdd849a23d364e4f2aa240bbdf1250
diff --git a/sys-cluster/ceph/ceph-10.2.10-r2.ebuild b/sys-cluster/ceph/ceph-10.2.10-r2.ebuild
deleted file mode 100644
index 74ca90cef62b..000000000000
--- a/sys-cluster/ceph/ceph-10.2.10-r2.ebuild
+++ /dev/null
@@ -1,306 +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,5,6}} )
-
-inherit check-reqs autotools eutils python-r1 udev user \
-	readme.gentoo-r1 systemd versionator flag-o-matic toolchain-funcs
-
-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 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio"
-IUSE+=" libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs"
-
-# unbundling code commented out pending bugs 584056 and 584058
-#>=dev-libs/jerasure-2.0.0-r1
-#>=dev-libs/gf-complete-2.0.0
-COMMON_DEPEND="
-	app-arch/snappy:=
-	sys-libs/zlib:=
-	app-arch/lz4:=
-	app-arch/bzip2:=
-	app-arch/zstd:=
-	dev-libs/boost:=[threads]
-	dev-libs/libaio:=
-	dev-libs/leveldb:=[snappy]
-	nss? ( dev-libs/nss:= )
-	libatomic? ( dev-libs/libatomic_ops:= )
-	cryptopp? ( dev-libs/crypto++:= )
-	sys-apps/keyutils
-	sys-apps/util-linux
-	dev-libs/libxml2:=
-	radosgw? ( dev-libs/fcgi:= )
-	ldap? ( net-nds/openldap:= )
-	babeltrace? ( dev-util/babeltrace )
-	fuse? ( sys-fs/fuse:0= )
-	xfs? ( sys-fs/xfsprogs:= )
-	zfs? ( sys-fs/zfs:= )
-	gtk? (
-		x11-libs/gtk+:2=
-		dev-cpp/gtkmm:2.4
-		gnome-base/librsvg:=
-	)
-	radosgw? (
-		dev-libs/fcgi:=
-		dev-libs/expat:=
-		net-misc/curl:=
-	)
-	jemalloc? ( dev-libs/jemalloc:= )
-	!jemalloc? ( =dev-util/google-perftools-2.4*:= )
-	lttng? ( dev-util/lttng-ust:= )
-	${PYTHON_DEPS}
-	"
-DEPEND="${COMMON_DEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	app-arch/cpio
-	dev-lang/yasm
-	virtual/pkgconfig
-	dev-python/sphinx
-	test? (
-		sys-fs/btrfs-progs
-		sys-apps/grep[pcre]
-		dev-python/tox[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/hdparm
-	sys-block/parted
-	sys-fs/cryptsetup
-	sys-apps/gptfdisk
-	!<sys-apps/openrc-0.26.3
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	"
-REQUIRED_USE="
-	$(python_gen_useflags 'python2*')
-	${PYTHON_REQUIRED_USE}
-	^^ ( nss cryptopp )
-	?? ( jemalloc tcmalloc )
-	"
-
-# work around bug in ceph compilation (rgw/ceph_dencoder-rgw_dencoder.o... undefined reference to `vtable for RGWZoneGroup')
-REQUIRED_USE+=" radosgw"
-
-#RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-UNBUNDLE_LIBS=(
-	src/erasure-code/jerasure/jerasure
-	src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
-	"${FILESDIR}/ceph-10.2.0-dont-use-virtualenvs.patch"
-	#"${FILESDIR}/ceph-10.2.1-unbundle-jerasure.patch"
-	"${FILESDIR}/${PN}-10.2.1-libzfs.patch"
-	"${FILESDIR}/${PN}-10.2.3-build-without-openldap.patch"
-	"${FILESDIR}/${PN}-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch"
-	"${FILESDIR}/${PN}-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch"
-	"${FILESDIR}/${PN}-10.2.7-fix-compilation-with-zstd.patch"
-	"${FILESDIR}/${PN}-10.2.9-cflags.patch"
-	"${FILESDIR}/${PN}-10.2.9-dont-run-lsb_release.patch"
-)
-
-check-reqs_export_vars() {
-	if use debug; then
-		CHECKREQS_DISK_BUILD="23G"
-		CHECKREQS_DISK_USR="7G"
-	elif use amd64; then
-		CHECKREQS_DISK_BUILD="12G"
-		CHECKREQS_DISK_USR="450M"
-	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
-}
-
-emake_python_bindings() {
-	local action="${1}" params binding module
-	shift
-	params=("${@}")
-
-	__emake_python_bindings_do_impl() {
-		ceph_run_econf "${EPYTHON}"
-		emake "${params[@]}" PYTHON="${EPYTHON}" "${binding}-pybind-${action}"
-
-		# these don't work and aren't needed on python3
-		if [[ ${EBUILD_PHASE} == install ]]; then
-			for module in "${S}"/src/pybind/*.py; do
-				module_basename="$(basename "${module}")"
-				if [[ ${module_basename} == ceph_volume_client.py ]] && ! use cephfs; then
-					continue
-				elif [[ ! -e "${ED}/$(python_get_sitedir)/${module_basename}" ]]; then
-					python_domodule ${module}
-				fi
-			done
-		fi
-	}
-
-	pushd "${S}/src"
-	for binding in rados rbd $(use cephfs && echo cephfs); do
-		python_foreach_impl __emake_python_bindings_do_impl
-	done
-	popd
-
-	unset __emake_python_bindings_do_impl
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-	user_setup
-}
-
-src_prepare() {
-	default
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t
-
-	#rm -rf "${UNBUNDLE_LIBS[@]}"
-
-	append-flags -fPIC
-
-	if tc-is-gcc && [[ $(gcc-fullversion) == "7.2.0" ]] && is-flag "-g*"; then
-		ewarn "Filtering out -g* flags since gcc-7.2 tends to ICE with them and ceph"
-		filter-flags "-g*"
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	ECONFARGS=(
-		--without-hadoop
-		--includedir=/usr/include
-		$(use_with cephfs)
-		$(use_with debug)
-		$(use_with fuse)
-		$(use_with libaio)
-		$(use_with libatomic libatomic-ops)
-		$(use_with nss)
-		$(use_with cryptopp)
-		$(use_with radosgw)
-		$(use_with gtk gtk2)
-		$(use_enable static-libs static)
-		$(use_with jemalloc)
-		$(use_with xfs libxfs)
-		$(use_with zfs libzfs)
-		$(use_with lttng )
-		$(use_with babeltrace)
-		$(use_with ldap openldap)
-		$(use jemalloc || usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal")
-		--with-mon
-		--with-eventfd
-		--with-cython
-		--without-kinetic
-		--without-librocksdb
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	# we can only use python2.7 for building at the moment
-	ceph_run_econf "python2*"
-}
-
-ceph_run_econf() {
-	[[ -z ${ECONFARGS} ]] && die "called ${FUNCNAME[0]} with ECONFARGS unset"
-	[[ -z ${1} ]] && die "called ${FUNCNAME[0]} without passing python implementation"
-
-	pushd "${S}" >/dev/null || die
-	#
-	# This generates a QA warning about running econf in src_compile
-	# and src_install. Unfortunately the only other way to do this would
-	# involve building all of for each python implementation times, which
-	# wastes a _lot_ of CPU time and disk space. This hack will no longer
-	# be needed with >=ceph-11.2.
-	#
-	python_setup "${1}"
-	econf "${ECONFARGS[@]}"
-
-	popd >/dev/null || die
-}
-
-src_compile() {
-	emake
-	emake_python_bindings all
-
-	use test && emake check-local
-}
-
-src_test() {
-	make check || die "make check failed"
-}
-
-src_install() {
-	default
-	emake_python_bindings install-exec "DESTDIR=\"${D}\""
-
-	prune_libtool_files --all
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe src/init-ceph ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate ${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-r7" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
-	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
-	systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
-	systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
-
-	udev_dorules udev/*.rules
-
-	readme.gentoo_create_doc
-
-	python_setup 'python2*'
-	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/ceph-disk,bin/ceph-detect-init} || die "sed failed"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/ceph-10.2.3-r2.ebuild b/sys-cluster/ceph/ceph-10.2.3-r2.ebuild
deleted file mode 100644
index 74e61b4aceb4..000000000000
--- a/sys-cluster/ceph/ceph-10.2.3-r2.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
-
-inherit check-reqs autotools eutils python-r1 udev user \
-	readme.gentoo-r1 systemd versionator flag-o-matic
-
-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 ~arm ~ppc ~ppc64 x86"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio"
-IUSE+=" libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs"
-
-# unbundling code commented out pending bugs 584056 and 584058
-#>=dev-libs/jerasure-2.0.0-r1
-#>=dev-libs/gf-complete-2.0.0
-COMMON_DEPEND="
-	app-arch/snappy
-	app-arch/lz4:=
-	app-arch/bzip2
-	dev-libs/boost:=[threads]
-	dev-libs/libaio
-	dev-libs/leveldb:=[snappy]
-	nss? ( dev-libs/nss )
-	libatomic? ( dev-libs/libatomic_ops )
-	cryptopp? ( dev-libs/crypto++:= )
-	sys-apps/keyutils
-	sys-apps/util-linux
-	dev-libs/libxml2
-	radosgw? ( dev-libs/fcgi )
-	ldap? ( net-nds/openldap )
-	babeltrace? ( dev-util/babeltrace )
-	fuse? ( sys-fs/fuse:0 )
-	xfs? ( sys-fs/xfsprogs )
-	zfs? ( sys-fs/zfs )
-	gtk? (
-		x11-libs/gtk+:2
-		dev-cpp/gtkmm:2.4
-		gnome-base/librsvg
-	)
-	radosgw? (
-		dev-libs/fcgi
-		dev-libs/expat
-		net-misc/curl
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	!jemalloc? ( dev-util/google-perftools )
-	lttng? ( dev-util/lttng-ust )
-	${PYTHON_DEPS}
-	"
-DEPEND="${COMMON_DEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	app-arch/cpio
-	sys-apps/lsb-release
-	virtual/pkgconfig
-	dev-python/sphinx
-	test? (
-		sys-fs/btrfs-progs
-		sys-apps/grep[pcre]
-		dev-python/tox[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/hdparm
-	sys-block/parted
-	sys-fs/cryptsetup
-	sys-apps/gptfdisk
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	"
-REQUIRED_USE="
-	$(python_gen_useflags 'python2*')
-	${PYTHON_REQUIRED_USE}
-	^^ ( nss cryptopp )
-	?? ( jemalloc tcmalloc )
-	"
-
-# work around bug in ceph compilation (rgw/ceph_dencoder-rgw_dencoder.o... undefined reference to `vtable for RGWZoneGroup')
-REQUIRED_USE+=" radosgw"
-
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-UNBUNDLE_LIBS=(
-	src/erasure-code/jerasure/jerasure
-	src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
-	"${FILESDIR}/ceph-10.2.0-dont-use-virtualenvs.patch"
-	#"${FILESDIR}/ceph-10.2.1-unbundle-jerasure.patch"
-	"${FILESDIR}/${PN}-10.2.1-libzfs.patch"
-	"${FILESDIR}/${PN}-10.2.3-build-without-openldap.patch"
-	"${FILESDIR}/${PN}-10.2.3-CVE-2016-8626.patch"
-)
-
-check-reqs_export_vars() {
-	if use debug; then
-		CHECKREQS_DISK_BUILD="23G"
-		CHECKREQS_DISK_USR="7G"
-	elif use amd64; then
-		CHECKREQS_DISK_BUILD="12G"
-		CHECKREQS_DISK_USR="450M"
-	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
-}
-
-emake_python_bindings() {
-	local action="${1}" params binding
-	shift
-	params=("${@}")
-
-	__emake_python_bindings_do_impl() {
-		emake "${params[@]}" PYTHON="${EPYTHON}" "${binding}-pybind-${action}"
-
-		# these don't work and aren't needed on python3
-		if [[ ${EBUILD_PHASE} == install ]] && python_is_python3; then
-			rm -f "${ED}/$(python_get_sitedir)"/ceph_{argparse,volume_client}.py
-		fi
-	}
-
-	pushd "${S}/src"
-	for binding in rados rbd $(use cephfs && echo cephfs); do
-		python_foreach_impl __emake_python_bindings_do_impl
-	done
-	popd
-
-	unset __emake_python_bindings_do_impl
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-	user_setup
-}
-
-src_prepare() {
-	default
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t
-
-	#rm -rf "${UNBUNDLE_LIBS[@]}"
-
-	append-flags -fPIC
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--without-hadoop
-		--includedir=/usr/include
-		$(use_with cephfs)
-		$(use_with debug)
-		$(use_with fuse)
-		$(use_with libaio)
-		$(use_with libatomic libatomic-ops)
-		$(use_with nss)
-		$(use_with cryptopp)
-		$(use_with radosgw)
-		$(use_with gtk gtk2)
-		$(use_enable static-libs static)
-		$(use_with jemalloc)
-		$(use_with xfs libxfs)
-		$(use_with zfs libzfs)
-		$(use_with lttng )
-		$(use_with babeltrace)
-		$(use_with ldap openldap)
-		$(use jemalloc || usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal")
-		--with-mon
-		--with-eventfd
-		--with-cython
-		--without-kinetic
-		--without-librocksdb
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	# we can only use python2.7 for building at the moment
-	python_setup 'python2*'
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake
-	emake_python_bindings all
-
-	use test && emake check-local
-}
-
-src_test() {
-	make check || die "make check failed"
-}
-
-src_install() {
-	default
-	emake_python_bindings install-exec "DESTDIR=\"${D}\""
-
-	prune_libtool_files --all
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe src/init-ceph ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate ${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-r2" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-
-	systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
-	systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
-
-	udev_dorules udev/*.rules
-
-	readme.gentoo_create_doc
-
-	python_setup 'python2*'
-	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/ceph-disk,bin/ceph-detect-init} || die "sed failed"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/ceph-12.2.11.ebuild b/sys-cluster/ceph/ceph-12.2.11.ebuild
index 761d8f534952..7c67f5867f62 100644
--- a/sys-cluster/ceph/ceph-12.2.11.ebuild
+++ b/sys-cluster/ceph/ceph-12.2.11.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,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 DISTUTILS_OPTIONAL=1
 
 inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Ceph distributed filesystem"
@@ -53,10 +53,7 @@ COMMON_DEPEND="
 	fuse? ( sys-fs/fuse:0=[static-libs?] )
 	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
 	zfs? ( sys-fs/zfs:=[static-libs?] )
-	ssl? (
-		<dev-libs/openssl-1.1:=[static-libs?]
-		!dev-libs/openssl:1.0.0
-	)
+	ssl? ( <dev-libs/openssl-1.1:0=[static-libs?] )
 	radosgw? (
 		dev-libs/expat:=[static-libs?]
 		<dev-libs/openssl-1.1:=[static-libs?]
diff --git a/sys-cluster/ceph/ceph-13.2.4.ebuild b/sys-cluster/ceph/ceph-12.2.12-r1.ebuild
index f0e6c5adacdf..783210078a84 100644
--- a/sys-cluster/ceph/ceph-13.2.4.ebuild
+++ b/sys-cluster/ceph/ceph-12.2.12-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 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
+inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
+	python-r1 udev user readme.gentoo-r1 systemd
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -15,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Ceph distributed filesystem"
@@ -26,9 +25,8 @@ SLOT="0"
 
 CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
 
-IUSE="babeltrace cephfs dpdk fuse jemalloc ldap libressl lttng +mgr"
-IUSE+=" +radosgw +ssl static-libs +system-boost systemd +tcmalloc test"
-IUSE+=" xfs zfs"
+IUSE="babeltrace cephfs fuse jemalloc ldap lttng +mgr nss +radosgw +ssl"
+IUSE+=" static-libs +system-boost systemd +tcmalloc test xfs zfs"
 IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
 
 # unbundling code commented out pending bugs 584056 and 584058
@@ -41,58 +39,45 @@ COMMON_DEPEND="
 	app-arch/snappy:=[static-libs?]
 	app-arch/zstd:=[static-libs?]
 	app-misc/jq:=[static-libs?]
-	dev-libs/crypto++:=[static-libs?]
+	<dev-libs/crypto++-7.0:=[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/zlib:=[static-libs?]
 	babeltrace? ( dev-util/babeltrace )
 	ldap? ( net-nds/openldap:=[static-libs?] )
 	lttng? ( dev-util/lttng-ust:= )
+	nss? ( dev-libs/nss:= )
 	fuse? ( sys-fs/fuse:0=[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?] )
+	ssl? ( dev-libs/openssl:0=[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?]
-		)
+		<dev-libs/openssl-1.1:=[static-libs?]
+		net-misc/curl:=[curl_ssl_openssl,static-libs?]
 	)
 	system-boost? (
-		>=dev-libs/boost-1.67:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
+		=dev-libs/boost-1.66*:=[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}
+	app-arch/cpio
 	amd64? ( dev-lang/yasm )
 	x86? ( dev-lang/yasm )
-	app-arch/cpio
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/sphinx
-	dev-util/cunit
 	dev-util/gperf
 	dev-util/valgrind
 	sys-apps/which
 	sys-devel/bc
 	virtual/pkgconfig
 	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
 		sys-apps/grep[pcre]
 		sys-fs/btrfs-progs
@@ -101,10 +86,10 @@ RDEPEND="${COMMON_DEPEND}
 	net-misc/socat
 	sys-apps/gptfdisk
 	sys-block/parted
+	sys-fs/e2fsprogs
 	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}]
@@ -115,12 +100,12 @@ RDEPEND="${COMMON_DEPEND}
 	dev-python/werkzeug[${PYTHON_USEDEP}]
 	"
 REQUIRED_USE="
+	$(python_gen_useflags 'python2*')
 	${PYTHON_REQUIRED_USE}
-	|| ( $(python_gen_useflags 'python3*') )
+	?? ( ssl nss )
 	?? ( jemalloc tcmalloc )
 	"
 
-# the tests need root access
 RESTRICT="test? ( userpriv )"
 
 # distribution tarball does not include everything needed for tests
@@ -129,7 +114,8 @@ RESTRICT+=" test"
 # false positives unless all USE flags are on
 CMAKE_WARN_UNUSED_CLI="no"
 
-STRIP_MASK="/usr/lib*/rados-classes/*"
+# ninja does not work at all
+CMAKE_MAKEFILE_GENERATOR="emake"
 
 UNBUNDLE_LIBS=(
 	src/erasure-code/jerasure/jerasure
@@ -139,12 +125,17 @@ UNBUNDLE_LIBS=(
 PATCHES=(
 	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
 	"${FILESDIR}/ceph-12.2.0-cflags.patch"
+	"${FILESDIR}/ceph-12.2.1-systemd-unitdir.patch"
 	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
-	"${FILESDIR}/ceph-13.2.0-cflags.patch"
+	"${FILESDIR}/ceph-12.2.4-cflags.patch"
 	"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
-	"${FILESDIR}/ceph-13.2.0-mgr-python-version.patch"
-	"${FILESDIR}/ceph-13.2.0-no-virtualenvs.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"
+	"${FILESDIR}/ceph-12.2.12-dont-use-bad-namespace.patch"
+	"${FILESDIR}/ceph-12.2.12-civetweb-openssl-1.1.1.patch"
+	"${FILESDIR}/ceph-12.2.12-qa-warning.patch"
+	"${FILESDIR}/ceph-12.2.12-ncurses-tinfo.patch"
 )
 
 check-reqs_export_vars() {
@@ -170,7 +161,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	python_setup 'python3*'
+	python_setup 'python2*'
 	check-reqs_export_vars
 	check-reqs_pkg_setup
 	user_setup
@@ -180,14 +171,11 @@ src_prepare() {
 	cmake-utils_src_prepare
 
 	if use system-boost; then
-		eapply "${FILESDIR}/ceph-13.2.0-boost-sonames.patch"
+		eapply "${FILESDIR}/ceph-12.2.11-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 src/test/cli/ceph-authtool/cap*.t
 
 	#rm -rf "${UNBUNDLE_LIBS[@]}"
 }
@@ -195,13 +183,14 @@ src_prepare() {
 ceph_src_configure() {
 	local flag
 	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
 		-DWITH_BABELTRACE=$(usex babeltrace)
 		-DWITH_CEPHFS=$(usex cephfs)
-		-DWITH_DPDK=$(usex dpdk)
 		-DWITH_FUSE=$(usex fuse)
 		-DWITH_LTTNG=$(usex lttng)
 		-DWITH_MGR=$(usex mgr)
-		-DWITH_MGR_DASHBOARD_FRONTEND=NO
+		-DWITH_NSS=$(usex nss)
 		-DWITH_OPENLDAP=$(usex ldap)
 		-DWITH_RADOSGW=$(usex radosgw)
 		-DWITH_SSL=$(usex ssl)
@@ -216,9 +205,6 @@ ceph_src_configure() {
 		-DWITH_RDMA=no
 		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
 		-DEPYTHON_VERSION="${EPYTHON#python}"
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-Wno-dev
 	)
 	if use amd64 || use x86; then
 		for flag in ${CPU_FLAGS_X86[@]}; do
@@ -231,7 +217,7 @@ ceph_src_configure() {
 
 	# bug #630232
 	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \
+		"${BUILD_DIR:--${S}}"/include/acconfig.h \
 		|| die "sed failed"
 }
 
@@ -241,12 +227,9 @@ src_configure() {
 
 python_compile() {
 	local CMAKE_USE_DIR="${S}"
-	ceph_src_configure
-
-	rm -r "${BUILD_DIR}/lib/cython_modules" || die
 
+	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
@@ -256,10 +239,10 @@ python_compile() {
 }
 
 src_compile() {
-	cmake-utils_src_make VERBOSE=1 all
+	cmake-utils_src_make all
 
 	# we have to do this here to prevent from building everything multiple times
-	BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources
+	python_copy_sources
 	python_foreach_impl python_compile
 }
 
@@ -278,10 +261,10 @@ src_install() {
 	cmake-utils_src_install
 	python_foreach_impl python_install
 
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 
 	exeinto /usr/$(get_libdir)/ceph
-	newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh
+	newexe "${BUILD_DIR}/bin/init-ceph" ceph_init.sh
 
 	insinto /etc/logrotate.d/
 	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
@@ -313,7 +296,7 @@ src_install() {
 
 	readme.gentoo_create_doc
 
-	python_setup 'python3*'
+	python_setup 'python2*'
 
 	# bug #630232
 	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \
@@ -324,6 +307,9 @@ src_install() {
 	# 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/ceph-disk,bin/ceph-detect-init} || die "sed failed"
+
+	local -a rados_classes=( "${D}/usr/$(get_libdir)/rados-classes"/* )
+	dostrip -x "${rados_classes[@]#${D}}"
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/ceph/ceph-12.2.8-r1.ebuild b/sys-cluster/ceph/ceph-12.2.8-r1.ebuild
index 5ccb12358e2f..9a0d16e9f3ae 100644
--- a/sys-cluster/ceph/ceph-12.2.8-r1.ebuild
+++ b/sys-cluster/ceph/ceph-12.2.8-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 DISTUTILS_OPTIONAL=1
 
 inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
@@ -51,12 +51,12 @@ COMMON_DEPEND="
 	lttng? ( dev-util/lttng-ust:= )
 	nss? ( dev-libs/nss:= )
 	fuse? ( sys-fs/fuse:0=[static-libs?] )
-	ssl? ( dev-libs/openssl:=[static-libs?] )
+	ssl? ( dev-libs/openssl:0=[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?]
+		dev-libs/openssl:0=[static-libs?]
 		net-misc/curl:=[curl_ssl_openssl,static-libs?]
 	)
 	system-boost? (
diff --git a/sys-cluster/ceph/ceph-13.2.5-r2.ebuild b/sys-cluster/ceph/ceph-13.2.5-r3.ebuild
index 2ef0f19a4010..d6e08fe9ba96 100644
--- a/sys-cluster/ceph/ceph-13.2.5-r2.ebuild
+++ b/sys-cluster/ceph/ceph-13.2.5-r3.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 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
+inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
+	python-r1 udev user readme.gentoo-r1 systemd
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -93,7 +92,6 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	test? (
 		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
 		sys-apps/grep[pcre]
 		sys-fs/btrfs-progs
@@ -103,7 +101,7 @@ RDEPEND="${COMMON_DEPEND}
 	sys-apps/gptfdisk
 	sys-block/parted
 	sys-fs/cryptsetup
-	sys-fs/lvm2
+	sys-fs/lvm2[-device-mapper-only(-)]
 	!<sys-apps/openrc-0.26.3
 	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/cherrypy[${PYTHON_USEDEP}]
@@ -130,7 +128,8 @@ RESTRICT+=" test"
 # false positives unless all USE flags are on
 CMAKE_WARN_UNUSED_CLI="no"
 
-STRIP_MASK="/usr/lib*/rados-classes/*"
+# ninja does not work at all
+CMAKE_MAKEFILE_GENERATOR="emake"
 
 UNBUNDLE_LIBS=(
 	src/erasure-code/jerasure/jerasure
@@ -148,6 +147,7 @@ PATCHES=(
 	"${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"
+	"${FILESDIR}/ceph-12.2.12-ncurses-tinfo.patch"
 )
 
 check-reqs_export_vars() {
@@ -236,7 +236,7 @@ ceph_src_configure() {
 
 	# bug #630232
 	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \
+		"${BUILD_DIR:--${S}}"/include/acconfig.h \
 		|| die "sed failed"
 }
 
@@ -283,10 +283,10 @@ src_install() {
 	cmake-utils_src_install
 	python_foreach_impl python_install
 
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 
 	exeinto /usr/$(get_libdir)/ceph
-	newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh
+	newexe "${BUILD_DIR}/bin/init-ceph" ceph_init.sh
 
 	insinto /etc/logrotate.d/
 	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
@@ -329,6 +329,9 @@ src_install() {
 	# 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/ceph-disk,bin/ceph-detect-init} || die "sed failed"
+
+	local -a rados_classes=( "${D}/usr/$(get_libdir)/rados-classes"/* )
+	dostrip -x "${rados_classes[@]#${D}}"
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/ceph/ceph-14.2.0-r4.ebuild b/sys-cluster/ceph/ceph-14.2.0-r5.ebuild
index 61c4b21e9f8b..52a0a5582aba 100644
--- a/sys-cluster/ceph/ceph-14.2.0-r4.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.0-r5.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Ceph distributed filesystem"
@@ -72,7 +72,7 @@ COMMON_DEPEND="
 		)
 	)
 	system-boost? (
-		>=dev-libs/boost-1.67:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
+		~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?] )
@@ -86,7 +86,6 @@ DEPEND="${COMMON_DEPEND}
 	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
@@ -105,7 +104,7 @@ RDEPEND="${COMMON_DEPEND}
 	sys-apps/gptfdisk
 	sys-block/parted
 	sys-fs/cryptsetup
-	sys-fs/lvm2
+	sys-fs/lvm2[-device-mapper-only(-)]
 	!<sys-apps/openrc-0.26.3
 	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/cherrypy[${PYTHON_USEDEP}]
@@ -133,8 +132,6 @@ 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
@@ -151,6 +148,7 @@ PATCHES=(
 	"${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"
+	"${FILESDIR}/ceph-14.2.1-ncurses-tinfo.patch"
 )
 
 # dpdk and ninja don't get along
@@ -245,7 +243,7 @@ ceph_src_configure() {
 
 	# bug #630232
 	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \
+		"${BUILD_DIR:-${S}}"/include/acconfig.h \
 		|| die "sed failed"
 }
 
@@ -271,7 +269,7 @@ 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_copy_sources
 	python_foreach_impl python_compile
 }
 
@@ -336,6 +334,9 @@ src_install() {
 	# 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"
+
+	local -a rados_classes=( "${D}/usr/$(get_libdir)/rados-classes"/* )
+	dostrip -x "${rados_classes[@]#${D}}"
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/ceph/files/ceph-10.2.0-dont-use-virtualenvs.patch b/sys-cluster/ceph/files/ceph-10.2.0-dont-use-virtualenvs.patch
deleted file mode 100644
index f3627636aeb9..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.0-dont-use-virtualenvs.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 7734be2..ba33bda 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -79,7 +79,6 @@ clean-local:
- 	  cd src/gmock && $(MAKE) $(AM_MAKEFLAGS) clean; \
- 	fi
- 
--	@rm -rf src/test/virtualenv
- 	@rm -rf install-deps-*
- 
- 
-diff --git a/src/Makefile-env.am b/src/Makefile-env.am
-index df225d6..ca030cf 100644
---- a/src/Makefile-env.am
-+++ b/src/Makefile-env.am
-@@ -297,10 +297,6 @@ LIBCIVETWEB_DEPS =
- DENCODER_SOURCES =
- DENCODER_DEPS =
- 
--# put virtualenvs in this directory
--# otherwise it may overflow #! 80 kernel limit
--# beware that some build environments might not be able to write to /tmp
- export TMPDIR ?= /tmp
--export CEPH_BUILD_VIRTUALENV = $(TMPDIR)
- 
- radoslibdir = $(libdir)/rados-classes
-diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am
-index 8ddcb1e..52dd5d5 100644
---- a/src/ceph-detect-init/Makefile.am
-+++ b/src/ceph-detect-init/Makefile.am
-@@ -53,15 +53,10 @@ EXTRA_DIST += \
- 	ceph-detect-init/tests/test_all.py \
- 	ceph-detect-init/tox.ini
- 
--export CEPH_DETECT_INIT_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtualenv
--
--ceph-detect-init-all: ${CEPH_DETECT_INIT_VIRTUALENV}
--
--${CEPH_DETECT_INIT_VIRTUALENV}:
--	cd $(srcdir)/ceph-detect-init ; ../tools/setup-virtualenv.sh ${CEPH_DETECT_INIT_VIRTUALENV} ; test -d wheelhouse && export NO_INDEX=--no-index ; ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install $$NO_INDEX --use-wheel --find-links=file://$$(pwd)/wheelhouse -e .
-+ceph-detect-init-all:
- 
- ceph-detect-init-clean:
--	cd $(srcdir)/ceph-detect-init ; python setup.py clean ; rm -fr wheelhouse .tox build ${CEPH_DETECT_INIT_VIRTUALENV} .coverage *.egg-info
-+	cd $(srcdir)/ceph-detect-init
- 
- ceph-detect-init-install-data:
- 	cd $(srcdir)/ceph-detect-init ; \
-diff --git a/src/ceph-disk/Makefile.am b/src/ceph-disk/Makefile.am
-index 9006303..0b35b0f 100644
---- a/src/ceph-disk/Makefile.am
-+++ b/src/ceph-disk/Makefile.am
-@@ -29,15 +29,10 @@ EXTRA_DIST += \
- 	ceph-disk/tests/test_main.py \
- 	ceph-disk/tox.ini
- 
--export CEPH_DISK_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv
--
--ceph-disk-all: ${CEPH_DISK_VIRTUALENV}
--
--${CEPH_DISK_VIRTUALENV}:
--	cd $(srcdir)/ceph-disk ; ../tools/setup-virtualenv.sh ${CEPH_DISK_VIRTUALENV} ; test -d wheelhouse && export NO_INDEX=--no-index ; ${CEPH_DISK_VIRTUALENV}/bin/pip install $$NO_INDEX --use-wheel --find-links=file://$$(pwd)/wheelhouse -e .
-+ceph-disk-all:
- 
- ceph-disk-clean:
--	cd $(srcdir)/ceph-disk ; python setup.py clean ; rm -fr wheelhouse .tox build ${CEPH_DISK_VIRTUALENV} .coverage *.egg-info
-+	cd $(srcdir)/ceph-disk
- 
- ceph-disk-install-data:
- 	cd $(srcdir)/ceph-disk ; \
-diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
-index e730850..9569947 100644
---- a/src/tools/Makefile.am
-+++ b/src/tools/Makefile.am
-@@ -45,6 +45,3 @@ noinst_HEADERS += \
- 	tools/rados/PoolDump.h \
- 	tools/cephfs/DataScan.h \
- 	tools/cephfs/RoleSelector.h
--
--EXTRA_DIST += \
--	tools/setup-virtualenv.sh
-diff --git a/src/tools/setup-virtualenv.sh b/src/tools/setup-virtualenv.sh
-index 9ff2d26..b6fca0a 100755
---- a/src/tools/setup-virtualenv.sh
-+++ b/src/tools/setup-virtualenv.sh
-@@ -15,6 +15,8 @@
- # GNU Library Public License for more details.
- #
- 
-+exit 0
-+
- DIR=$1
- rm -fr $DIR
- mkdir -p $DIR
diff --git a/sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch b/sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch
deleted file mode 100644
index 34f8eb84beee..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ceph-10.2.1/configure.ac
-+++ ceph-10.2.1/configure.ac
-@@ -908,7 +908,7 @@
- 	    ,
- 	    [with_libzfs=no])
- AS_IF([test "x$with_libzfs" = xyes],
--	    [PKG_CHECK_MODULES([LIBZFS], [zfs], [], [true])])
-+	    [PKG_CHECK_MODULES([LIBZFS], [libzfs], [], [true])])
- AS_IF([test "x$with_libzfs" = xyes],
- 	    [AC_DEFINE([HAVE_LIBZFS], [1], [Defined if you have libzfs enabled])])
- AM_CONDITIONAL(WITH_LIBZFS, [ test "$with_libzfs" = "yes" ])
diff --git a/sys-cluster/ceph/files/ceph-10.2.1-unbundle-jerasure.patch b/sys-cluster/ceph/files/ceph-10.2.1-unbundle-jerasure.patch
deleted file mode 100644
index 8340b4d18bfd..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.1-unbundle-jerasure.patch
+++ /dev/null
@@ -1,355 +0,0 @@
-diff --git a/src/erasure-code/jerasure/Makefile.am b/src/erasure-code/jerasure/Makefile.am
-index adcb95d..8099208 100644
---- a/src/erasure-code/jerasure/Makefile.am
-+++ b/src/erasure-code/jerasure/Makefile.am
-@@ -1,52 +1,17 @@
- # jerasure plugin
- noinst_HEADERS += \
--  erasure-code/jerasure/gf-complete/include/gf_complete.h \
--  erasure-code/jerasure/gf-complete/include/gf_general.h \
--  erasure-code/jerasure/gf-complete/include/gf_int.h \
--  erasure-code/jerasure/gf-complete/include/gf_method.h \
--  erasure-code/jerasure/gf-complete/include/gf_rand.h \
--  erasure-code/jerasure/gf-complete/include/gf_w16.h \
--  erasure-code/jerasure/gf-complete/include/gf_w32.h \
--  erasure-code/jerasure/gf-complete/include/gf_w4.h \
--  erasure-code/jerasure/gf-complete/include/gf_w64.h \
--  erasure-code/jerasure/gf-complete/include/gf_w8.h \
--  erasure-code/jerasure/jerasure/include/cauchy.h \
--  erasure-code/jerasure/jerasure/include/galois.h \
--  erasure-code/jerasure/jerasure/include/jerasure.h \
--  erasure-code/jerasure/jerasure/include/liberation.h \
--  erasure-code/jerasure/jerasure/include/reed_sol.h \
-   erasure-code/jerasure/ErasureCodeJerasure.h
- 
- jerasure_sources = \
-   erasure-code/ErasureCode.cc \
--  erasure-code/jerasure/jerasure/src/cauchy.c \
--  erasure-code/jerasure/jerasure/src/galois.c \
--  erasure-code/jerasure/jerasure/src/jerasure.c \
--  erasure-code/jerasure/jerasure/src/liberation.c \
--  erasure-code/jerasure/jerasure/src/reed_sol.c \
--  erasure-code/jerasure/gf-complete/src/gf_wgen.c \
--  erasure-code/jerasure/gf-complete/src/gf_method.c \
--  erasure-code/jerasure/gf-complete/src/gf_w16.c \
--  erasure-code/jerasure/gf-complete/src/gf.c \
--  erasure-code/jerasure/gf-complete/src/gf_w32.c \
--  erasure-code/jerasure/gf-complete/src/gf_w64.c \
--  erasure-code/jerasure/gf-complete/src/gf_w128.c \
--  erasure-code/jerasure/gf-complete/src/gf_general.c \
--  erasure-code/jerasure/gf-complete/src/gf_w4.c \
--  erasure-code/jerasure/gf-complete/src/gf_rand.c \
--  erasure-code/jerasure/gf-complete/src/gf_w8.c \
-   erasure-code/jerasure/ErasureCodePluginJerasure.cc \
-   erasure-code/jerasure/ErasureCodeJerasure.cc
- 
- erasure-code/jerasure/ErasureCodePluginJerasure.cc: ./ceph_ver.h
- 
- libec_jerasure_generic_la_SOURCES = ${jerasure_sources}
--libec_jerasure_generic_la_CFLAGS = ${AM_CFLAGS}  \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include
--libec_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include
-+libec_jerasure_generic_la_CFLAGS = ${AM_CFLAGS}
-+libec_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS}
- libec_jerasure_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
- libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
-@@ -55,20 +20,11 @@ endif
- 
- erasure_codelib_LTLIBRARIES += libec_jerasure_generic.la
- 
--libec_jerasure_neon_la_SOURCES = ${jerasure_sources}                                       \
--                                  erasure-code/jerasure/gf-complete/src/neon/gf_w4_neon.c  \
--                                  erasure-code/jerasure/gf-complete/src/neon/gf_w8_neon.c  \
--                                  erasure-code/jerasure/gf-complete/src/neon/gf_w16_neon.c \
--                                  erasure-code/jerasure/gf-complete/src/neon/gf_w32_neon.c \
--                                  erasure-code/jerasure/gf-complete/src/neon/gf_w64_neon.c
-+libec_jerasure_neon_la_SOURCES = ${jerasure_sources}
- libec_jerasure_neon_la_CFLAGS = ${AM_CFLAGS}  \
--	${ARM_NEON_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include
-+	${ARM_NEON_FLAGS}
- libec_jerasure_neon_la_CXXFLAGS= ${AM_CXXFLAGS} \
--	${ARM_NEON_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include
-+	${ARM_NEON_FLAGS}
- libec_jerasure_neon_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
- libec_jerasure_neon_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
-@@ -84,16 +40,12 @@ libec_jerasure_sse3_la_CFLAGS = ${AM_CFLAGS}  \
- 	${INTEL_SSE_FLAGS} \
- 	${INTEL_SSE2_FLAGS} \
- 	${INTEL_SSE3_FLAGS} \
--	${INTEL_SSSE3_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include
-+	${INTEL_SSSE3_FLAGS}
- libec_jerasure_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \
- 	${INTEL_SSE_FLAGS} \
- 	${INTEL_SSE2_FLAGS} \
- 	${INTEL_SSE3_FLAGS} \
--	${INTEL_SSSE3_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include
-+	${INTEL_SSSE3_FLAGS}
- libec_jerasure_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
- libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
-@@ -111,18 +63,14 @@ libec_jerasure_sse4_la_CFLAGS = ${AM_CFLAGS}  \
- 	${INTEL_SSE3_FLAGS} \
- 	${INTEL_SSSE3_FLAGS} \
- 	${INTEL_SSE4_1_FLAGS} \
--	${INTEL_SSE4_2_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include
-+	${INTEL_SSE4_2_FLAGS}
- libec_jerasure_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \
- 	${INTEL_SSE_FLAGS} \
- 	${INTEL_SSE2_FLAGS} \
- 	${INTEL_SSE3_FLAGS} \
- 	${INTEL_SSSE3_FLAGS} \
- 	${INTEL_SSE4_1_FLAGS} \
--	${INTEL_SSE4_2_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include
-+	${INTEL_SSE4_2_FLAGS}
- libec_jerasure_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
- libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
-diff --git a/src/erasure-code/shec/ErasureCodePluginShec.cc b/src/erasure-code/shec/ErasureCodePluginShec.cc
-index d2b72f5..acbd172 100644
---- a/src/erasure-code/shec/ErasureCodePluginShec.cc
-+++ b/src/erasure-code/shec/ErasureCodePluginShec.cc
-@@ -71,7 +71,7 @@ public:
- };
- 
- extern "C" {
--#include "jerasure/include/galois.h"
-+#include "galois.h"
- 
- extern gf_t *gfp_array[];
- extern int  gfp_is_composite[];
-diff --git a/src/erasure-code/shec/ErasureCodeShec.cc b/src/erasure-code/shec/ErasureCodeShec.cc
-index 2180328..c84ffc7 100644
---- a/src/erasure-code/shec/ErasureCodeShec.cc
-+++ b/src/erasure-code/shec/ErasureCodeShec.cc
-@@ -28,8 +28,8 @@
- #include "crush/CrushWrapper.h"
- #include "osd/osd_types.h"
- extern "C" {
--#include "jerasure/include/jerasure.h"
--#include "jerasure/include/galois.h"
-+#include "jerasure.h"
-+#include "galois.h"
- 
- extern int calc_determinant(int *matrix, int dim);
- extern int* reed_sol_vandermonde_coding_matrix(int k, int m, int w);
-diff --git a/src/erasure-code/shec/Makefile.am b/src/erasure-code/shec/Makefile.am
-index 6b658d5..3281c60 100644
---- a/src/erasure-code/shec/Makefile.am
-+++ b/src/erasure-code/shec/Makefile.am
-@@ -4,49 +4,19 @@ shec_sources = \
- 	erasure-code/shec/ErasureCodePluginShec.cc \
- 	erasure-code/shec/ErasureCodeShec.cc \
- 	erasure-code/shec/ErasureCodeShecTableCache.cc \
--	erasure-code/shec/determinant.c \
--	erasure-code/jerasure/jerasure/src/cauchy.c \
--	erasure-code/jerasure/jerasure/src/galois.c \
--	erasure-code/jerasure/jerasure/src/jerasure.c \
--	erasure-code/jerasure/jerasure/src/liberation.c \
--	erasure-code/jerasure/jerasure/src/reed_sol.c \
--	erasure-code/jerasure/gf-complete/src/gf_wgen.c \
--	erasure-code/jerasure/gf-complete/src/gf_method.c \
--	erasure-code/jerasure/gf-complete/src/gf_w16.c \
--	erasure-code/jerasure/gf-complete/src/gf.c \
--	erasure-code/jerasure/gf-complete/src/gf_w32.c \
--	erasure-code/jerasure/gf-complete/src/gf_w64.c \
--	erasure-code/jerasure/gf-complete/src/gf_w128.c \
--	erasure-code/jerasure/gf-complete/src/gf_general.c \
--	erasure-code/jerasure/gf-complete/src/gf_w4.c \
--	erasure-code/jerasure/gf-complete/src/gf_rand.c \
--	erasure-code/jerasure/gf-complete/src/gf_w8.c
-+	erasure-code/shec/determinant.c
- 
- noinst_HEADERS += \
- 	erasure-code/shec/ErasureCodeShec.h \
--	erasure-code/shec/ErasureCodeShecTableCache.h \
--	erasure-code/jerasure/jerasure/include/cauchy.h \
--	erasure-code/jerasure/jerasure/include/galois.h \
--	erasure-code/jerasure/jerasure/include/jerasure.h \
--	erasure-code/jerasure/jerasure/include/liberation.h \
--	erasure-code/jerasure/jerasure/include/reed_sol.h \
--	erasure-code/jerasure/gf-complete/include/gf_int.h \
--	erasure-code/jerasure/gf-complete/include/gf_complete.h \
--	erasure-code/jerasure/gf-complete/include/gf_rand.h \
--	erasure-code/jerasure/gf-complete/include/gf_method.h \
--	erasure-code/jerasure/gf-complete/include/gf_general.h
-+	erasure-code/shec/ErasureCodeShecTableCache.h
- 
- erasure-code/shec/ErasureCodePluginShec.cc: ./ceph_ver.h
- 
- libec_shec_generic_la_SOURCES = ${shec_sources}
- libec_shec_generic_la_CFLAGS = ${AM_CFLAGS}  \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- libec_shec_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- libec_shec_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
-@@ -57,22 +27,13 @@ endif
- 
- erasure_codelib_LTLIBRARIES += libec_shec_generic.la
- 
--libec_shec_neon_la_SOURCES = ${shec_sources} \
--	erasure-code/jerasure/gf-complete/src/neon/gf_w4_neon.c \
--	erasure-code/jerasure/gf-complete/src/neon/gf_w8_neon.c \
--	erasure-code/jerasure/gf-complete/src/neon/gf_w16_neon.c \
--	erasure-code/jerasure/gf-complete/src/neon/gf_w32_neon.c \
--	erasure-code/jerasure/gf-complete/src/neon/gf_w64_neon.c
-+libec_shec_neon_la_SOURCES = ${shec_sources}
- libec_shec_neon_la_CFLAGS = ${AM_CFLAGS}  \
- 	${ARM_NEON_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- libec_shec_neon_la_CXXFLAGS= ${AM_CXXFLAGS} \
- 	${ARM_NEON_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- libec_shec_neon_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
-@@ -91,8 +52,6 @@ libec_shec_sse3_la_CFLAGS = ${AM_CFLAGS}  \
- 	${INTEL_SSE2_FLAGS} \
- 	${INTEL_SSE3_FLAGS} \
- 	${INTEL_SSSE3_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- libec_shec_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \
-@@ -100,8 +59,6 @@ libec_shec_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \
- 	${INTEL_SSE2_FLAGS} \
- 	${INTEL_SSE3_FLAGS} \
- 	${INTEL_SSSE3_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- libec_shec_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
-@@ -122,8 +79,6 @@ libec_shec_sse4_la_CFLAGS = ${AM_CFLAGS}  \
- 	${INTEL_SSSE3_FLAGS} \
- 	${INTEL_SSE4_1_FLAGS} \
- 	${INTEL_SSE4_2_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- libec_shec_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \
-@@ -133,8 +88,6 @@ libec_shec_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \
- 	${INTEL_SSSE3_FLAGS} \
- 	${INTEL_SSE4_1_FLAGS} \
- 	${INTEL_SSE4_2_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- libec_shec_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
-diff --git a/src/erasure-code/shec/determinant.c b/src/erasure-code/shec/determinant.c
-index 15b62c9..bf5d290 100755
---- a/src/erasure-code/shec/determinant.c
-+++ b/src/erasure-code/shec/determinant.c
-@@ -19,7 +19,7 @@
- #include <stdlib.h>
- #include <string.h>
- 
--#include "jerasure/include/galois.h"
-+#include "galois.h"
- 
- void print_matrix(int *mat, int dim)
- {
-diff --git a/src/test/erasure-code/Makefile.am b/src/test/erasure-code/Makefile.am
-index bdce080..11895ae 100644
---- a/src/test/erasure-code/Makefile.am
-+++ b/src/test/erasure-code/Makefile.am
-@@ -166,12 +166,8 @@ check_TESTPROGRAMS += unittest_erasure_code
- unittest_erasure_code_jerasure_SOURCES = \
- 	test/erasure-code/TestErasureCodeJerasure.cc \
- 	${jerasure_sources}
--unittest_erasure_code_jerasure_CFLAGS = $(AM_CFLAGS) \
--	-Ierasure-code/jerasure/gf-complete/include \
--	-Ierasure-code/jerasure/jerasure/include
--unittest_erasure_code_jerasure_CXXFLAGS = $(UNITTEST_CXXFLAGS) \
--	-Ierasure-code/jerasure/gf-complete/include \
--	-Ierasure-code/jerasure/jerasure/include
-+unittest_erasure_code_jerasure_CFLAGS = $(AM_CFLAGS)
-+unittest_erasure_code_jerasure_CXXFLAGS = $(UNITTEST_CXXFLAGS)
- unittest_erasure_code_jerasure_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
- if LINUX
- unittest_erasure_code_jerasure_LDADD += -ldl
-@@ -232,13 +228,9 @@ unittest_erasure_code_shec_SOURCES = \
- 	test/erasure-code/TestErasureCodeShec.cc \
- 	${shec_sources}
- unittest_erasure_code_shec_CFLAGS = ${libec_shec_la_CFLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
-@@ -251,13 +243,9 @@ unittest_erasure_code_shec_all_SOURCES = \
- 	test/erasure-code/TestErasureCodeShec_all.cc \
- 	${shec_sources}
- unittest_erasure_code_shec_all_CFLAGS = ${libec_shec_la_CFLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_all_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_all_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
-@@ -270,13 +258,9 @@ unittest_erasure_code_shec_thread_SOURCES = \
- 	test/erasure-code/TestErasureCodeShec_thread.cc \
- 	${shec_sources}
- unittest_erasure_code_shec_thread_CFLAGS = ${libec_shec_la_CFLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_thread_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_thread_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
-@@ -289,13 +273,9 @@ unittest_erasure_code_shec_arguments_SOURCES = \
- 	test/erasure-code/TestErasureCodeShec_arguments.cc \
- 	${shec_sources}
- unittest_erasure_code_shec_arguments_CFLAGS = ${libec_shec_la_CFLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_arguments_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_arguments_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
diff --git a/sys-cluster/ceph/files/ceph-10.2.3-CVE-2016-8626.patch b/sys-cluster/ceph/files/ceph-10.2.3-CVE-2016-8626.patch
deleted file mode 100644
index d767d8170dfa..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.3-CVE-2016-8626.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit dc2ffda7819d2ebeed3526d9e6da8f53221818de
-Author: Yehuda Sadeh <yehuda@redhat.com>
-Date:   Thu Oct 20 10:17:36 2016 -0700
-
-    rgw: handle empty POST condition
-    
-    Fixes: http://tracker.ceph.com/issues/17635
-    
-    Before accessing json entity, need to check that iterator is valid.
-    If there is no entry return appropriate error code.
-    
-    Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
-    (cherry picked from commit 23cb642243e09ca4a8e104f62a3bb7b2cbb6ea12)
-
-diff --git a/src/rgw/rgw_policy_s3.cc b/src/rgw/rgw_policy_s3.cc
-index 3843511..8af70a8 100644
---- a/src/rgw/rgw_policy_s3.cc
-+++ b/src/rgw/rgw_policy_s3.cc
-@@ -286,11 +286,13 @@ int RGWPolicy::from_json(bufferlist& bl, string& err_msg)
-       int r = add_condition(v[0], v[1], v[2], err_msg);
-       if (r < 0)
-         return r;
--    } else {
-+    } else if (!citer.end()) {
-       JSONObj *c = *citer;
-       dout(0) << "adding simple_check: " << c->get_name() << " : " << c->get_data() << dendl;
- 
-       add_simple_check(c->get_name(), c->get_data());
-+    } else {
-+      return -EINVAL;
-     }
-   }
-   return 0;
diff --git a/sys-cluster/ceph/files/ceph-10.2.3-build-without-openldap.patch b/sys-cluster/ceph/files/ceph-10.2.3-build-without-openldap.patch
deleted file mode 100644
index ffc164536048..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.3-build-without-openldap.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
-index c476129..cad54b8 100644
---- a/src/rgw/librgw.cc
-+++ b/src/rgw/librgw.cc
-@@ -470,7 +470,11 @@ namespace rgw {
-     const string& ldap_searchdn = store->ctx()->_conf->rgw_ldap_searchdn;
-     const string& ldap_dnattr =
-       store->ctx()->_conf->rgw_ldap_dnattr;
-+#ifdef HAVE_OPENLDAP
-     std::string ldap_bindpw = parse_rgw_ldap_bindpw(store->ctx());
-+#else
-+    std::string ldap_bindpw;
-+#endif /* HAVE_OPENLDAP */
- 
-     ldh = new rgw::LDAPHelper(ldap_uri, ldap_binddn, ldap_bindpw.c_str(),
- 			      ldap_searchdn, ldap_dnattr);
-diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
-index e9f24f3..7291e69 100644
---- a/src/rgw/rgw_rest_s3.cc
-+++ b/src/rgw/rgw_rest_s3.cc
-@@ -3091,7 +3091,11 @@ void RGW_Auth_S3::init_impl(RGWRados* store)
-   const string& ldap_searchdn = store->ctx()->_conf->rgw_ldap_searchdn;
-   const string& ldap_dnattr =
-     store->ctx()->_conf->rgw_ldap_dnattr;
-+#ifdef HAVE_OPENLDAP
-   std::string ldap_bindpw = parse_rgw_ldap_bindpw(store->ctx());
-+#else
-+  std::string ldap_bindpw;
-+#endif /* HAVE_OPENLDAP */
- 
-   ldh = new rgw::LDAPHelper(ldap_uri, ldap_binddn, ldap_bindpw,
- 			    ldap_searchdn, ldap_dnattr);
diff --git a/sys-cluster/ceph/files/ceph-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch b/sys-cluster/ceph/files/ceph-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch
deleted file mode 100644
index 08a7920035aa..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit e1dc386f93eb4613dc7e89cc76a031aeee5022ba
-Author: Oleh Prypin <oleh@pryp.in>
-Date:   Thu Jul 21 18:33:25 2016 +0300
-
-    pybind: Make CephFS bindings and tests compatible with Python 3
-    
-    Signed-off-by: Oleh Prypin <oleh@pryp.in>
-
-diff --git a/src/pybind/cephfs/cephfs.pyx b/src/pybind/cephfs/cephfs.pyx
-index ac17ada1a1..bd14de3b16 100644
---- a/src/pybind/cephfs/cephfs.pyx
-+++ b/src/pybind/cephfs/cephfs.pyx
-@@ -613,8 +613,7 @@ cdef class LibCephFS(object):
- 
-         if not isinstance(mode, int):
-             raise TypeError('mode must be an int')
--        if isinstance(flags, basestring):
--            flags = cstr(flags, 'flags')
-+        if isinstance(flags, str_type):
-             cephfs_flags = 0
-             if flags == '':
-                 cephfs_flags = os.O_RDONLY
diff --git a/sys-cluster/ceph/files/ceph-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch b/sys-cluster/ceph/files/ceph-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch
deleted file mode 100644
index a81aae6e7ce8..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit 773e01294da518c6ec18f0a8b72e05def85fef6c
-Author: Oleh Prypin <oleh@pryp.in>
-Date:   Fri Jun 24 15:48:57 2016 +0300
-
-    pybind: Make RBD Python bindings compatible with Python 3
-    
-    Signed-off-by: Oleh Prypin <oleh@pryp.in>
-
-diff --git a/src/pybind/rbd/rbd.pyx b/src/pybind/rbd/rbd.pyx
-index 52727bf39e..8f25dfbee0 100644
---- a/src/pybind/rbd/rbd.pyx
-+++ b/src/pybind/rbd/rbd.pyx
-@@ -745,7 +745,7 @@ class RBD(object):
-                     break
-                 elif ret != -errno.ERANGE:
-                     raise make_ex(ret, 'error listing images')
--            return [decode_cstr(name) for name in c_names[:ret].split('\0')
-+            return [decode_cstr(name) for name in c_names[:ret].split(b'\0')
-                     if name]
-         finally:
-             free(c_names)
-@@ -1885,8 +1885,8 @@ written." % (self.name, ret, length))
-                     raise make_ex(ret, 'error listing images')
-             if ret == 0:
-                 return []
--            pools = map(decode_cstr, c_pools[:pools_size - 1].split('\0'))
--            images = map(decode_cstr, c_images[:images_size - 1].split('\0'))
-+            pools = map(decode_cstr, c_pools[:pools_size - 1].split(b'\0'))
-+            images = map(decode_cstr, c_images[:images_size - 1].split(b'\0'))
-             return list(zip(pools, images))
-         finally:
-             free(c_pools)
-@@ -1933,9 +1933,9 @@ written." % (self.name, ret, length))
-                     raise make_ex(ret, 'error listing images')
-             if ret == 0:
-                 return []
--            clients = map(decode_cstr, c_clients[:clients_size - 1].split('\0'))
--            cookies = map(decode_cstr, c_cookies[:cookies_size - 1].split('\0'))
--            addrs = map(decode_cstr, c_addrs[:addrs_size - 1].split('\0'))
-+            clients = map(decode_cstr, c_clients[:clients_size - 1].split(b'\0'))
-+            cookies = map(decode_cstr, c_cookies[:cookies_size - 1].split(b'\0'))
-+            addrs = map(decode_cstr, c_addrs[:addrs_size - 1].split(b'\0'))
-             return {
-                 'tag'       : decode_cstr(c_tag),
-                 'exclusive' : exclusive == 1,
diff --git a/sys-cluster/ceph/files/ceph-10.2.7-fix-compilation-with-zstd.patch b/sys-cluster/ceph/files/ceph-10.2.7-fix-compilation-with-zstd.patch
deleted file mode 100644
index 4e76deabe65f..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.7-fix-compilation-with-zstd.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 5a11f31aac4fa6a5c5ebb4fa0964e1c07a420e8c Mon Sep 17 00:00:00 2001
-From: Zac Medico <zmedico@gentoo.org>
-Date: Wed, 12 Apr 2017 01:49:09 -0700
-Subject: [PATCH] configure: link against zstd if detected
-
-https://bugs.gentoo.org/show_bug.cgi?id=601610
----
- configure.ac        | 6 ++++--
- src/Makefile-env.am | 3 +++
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 51daf91..8914b71 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -851,12 +851,14 @@ AS_IF([test "x$with_librocksdb_static" = "xyes"],
- AM_CONDITIONAL(WITH_SLIBROCKSDB, [ test "x$with_librocksdb_static" = "xyes" ])
- AM_CONDITIONAL(WITH_LIBROCKSDB, [ test "x$with_librocksdb_static" = "xyes" -o "x$with_librocksdb" = "xyes" ])
- 
--# rocksdb detects bzlib and lz4 in its Makefile, which forces us to do the same.
-+# rocksdb detects headers in its Makefile, which forces us to do the same.
- AS_IF([test "x$with_librocksdb_static" = "xyes"], [
-   AC_CHECK_HEADER([bzlib.h], [have_bzlib=yes])
--  AC_CHECK_HEADER([lz4.h], [have_lz4=yes])])
-+  AC_CHECK_HEADER([lz4.h], [have_lz4=yes])]
-+  AC_CHECK_HEADER([zstd.h], [have_zstd=yes])])
- AM_CONDITIONAL(HAVE_BZLIB, [test "x$have_bzlib" = "xyes"])
- AM_CONDITIONAL(HAVE_LZ4, [test "x$have_lz4" = "xyes"])
-+AM_CONDITIONAL(HAVE_ZSTD, [test "x$have_zstd" = "xyes"])
- 
- # needs libcurl and libxml2
- if test "x$with_rest_bench" = xyes && test "x$with_system_libs3" = xno; then
-diff --git a/src/Makefile-env.am b/src/Makefile-env.am
-index 4771bad..0ee42f8 100644
---- a/src/Makefile-env.am
-+++ b/src/Makefile-env.am
-@@ -280,6 +280,9 @@ endif
- if HAVE_LZ4
- LIBKV += -llz4
- endif
-+if HAVE_ZSTD
-+LIBKV += -lzstd
-+endif
- endif # WITH_SLIBROCKSDB
- LIBKV += -lz -lleveldb -lsnappy
- LIBOS += $(LIBOS_TYPES) $(LIBKV) $(LIBFUSE_LIBS)
--- 
-2.10.2
-
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-cflags.patch b/sys-cluster/ceph/files/ceph-10.2.9-cflags.patch
deleted file mode 100644
index 31221ae2f994..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-cflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/Makefile-env.am b/src/Makefile-env.am
-index 4771bad02d..f92e20479b 100644
---- a/src/Makefile-env.am
-+++ b/src/Makefile-env.am
-@@ -53,10 +53,6 @@ endif
- ## automake environment
- 
- HARDENING_CFLAGS = \
--                   -O2 \
--                   -g \
--                   -pipe \
--                   -Wall \
-                    -Wp,-U_FORTIFY_SOURCE \
-                    -Wp,-D_FORTIFY_SOURCE=2 \
-                    -fexceptions \
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-dont-run-lsb_release.patch b/sys-cluster/ceph/files/ceph-10.2.9-dont-run-lsb_release.patch
deleted file mode 100644
index a6b5515cee28..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-dont-run-lsb_release.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am
-index 3926ac4bec..90e2eae50c 100644
---- a/src/ceph-detect-init/Makefile.am
-+++ b/src/ceph-detect-init/Makefile.am
-@@ -67,7 +67,7 @@ ceph-detect-init-clean:
- ceph-detect-init-install-data:
- 	cd $(srcdir)/ceph-detect-init ; \
- 	if test "$(DESTDIR)" ; then \
--		if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
-+		if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
- 			options=--install-layout=deb ; \
- 		else \
- 			options=--prefix=/usr ; \
-diff --git a/src/ceph-disk/Makefile.am b/src/ceph-disk/Makefile.am
-index a8532878c8..d908b1649a 100644
---- a/src/ceph-disk/Makefile.am
-+++ b/src/ceph-disk/Makefile.am
-@@ -43,7 +43,7 @@ ceph-disk-clean:
- ceph-disk-install-data:
- 	cd $(srcdir)/ceph-disk ; \
- 	if test "$(DESTDIR)" ; then \
--		if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
-+		if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
- 			options=--install-layout=deb ; \
- 		else \
- 			options=--prefix=/usr ; \
-diff --git a/src/pybind/cephfs/Makefile.am b/src/pybind/cephfs/Makefile.am
-index 698522daa4..c49c190986 100644
---- a/src/pybind/cephfs/Makefile.am
-+++ b/src/pybind/cephfs/Makefile.am
-@@ -15,7 +15,7 @@ cephfs-pybind-clean: ${srcdir}/ceph_ver.h
- 
- cephfs-pybind-install-exec: ${srcdir}/ceph_ver.h
- 	if test "$(DESTDIR)" ; then \
--		if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
-+		if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
- 			options=--install-layout=deb ; \
- 		else \
- 			options=--prefix=/usr ; \
-diff --git a/src/pybind/rados/Makefile.am b/src/pybind/rados/Makefile.am
-index a4145bf0f4..960395fee8 100644
---- a/src/pybind/rados/Makefile.am
-+++ b/src/pybind/rados/Makefile.am
-@@ -15,7 +15,7 @@ rados-pybind-clean: ${srcdir}/ceph_ver.h
- 
- rados-pybind-install-exec: ${srcdir}/ceph_ver.h
- 	if test "$(DESTDIR)" ; then \
--		if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
-+		if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
- 			options=--install-layout=deb ; \
- 		else \
- 			options=--prefix=/usr ; \
-diff --git a/src/pybind/rbd/Makefile.am b/src/pybind/rbd/Makefile.am
-index 7dd49333fa..fbb940d07d 100644
---- a/src/pybind/rbd/Makefile.am
-+++ b/src/pybind/rbd/Makefile.am
-@@ -15,7 +15,7 @@ rbd-pybind-clean: ${srcdir}/ceph_ver.h
- 
- rbd-pybind-install-exec: ${srcdir}/ceph_ver.h
- 	if test "$(DESTDIR)" ; then \
--		if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
-+		if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
- 			options=--install-layout=deb ; \
- 		else \
- 			options=--prefix=/usr ; \
diff --git a/sys-cluster/ceph/files/ceph-12.2.12-civetweb-openssl-1.1.1.patch b/sys-cluster/ceph/files/ceph-12.2.12-civetweb-openssl-1.1.1.patch
new file mode 100644
index 000000000000..a21bcc9325d8
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-12.2.12-civetweb-openssl-1.1.1.patch
@@ -0,0 +1,10 @@
+--- a/src/civetweb/src/civetweb.c	2017-11-02 10:58:06.000000000 -0700
++++ b/src/civetweb/src/civetweb.c	2019-04-11 17:23:30.736346783 -0700
+@@ -851,6 +851,7 @@
+ #include <openssl/crypto.h>
+ #include <openssl/x509.h>
+ #include <openssl/pem.h>
++#include <openssl/engine.h>
+ #else
+ /* SSL loaded dynamically from DLL.
+  * I put the prototypes here to be independent from OpenSSL source
diff --git a/sys-cluster/ceph/files/ceph-12.2.12-dont-use-bad-namespace.patch b/sys-cluster/ceph/files/ceph-12.2.12-dont-use-bad-namespace.patch
new file mode 100644
index 000000000000..9a23e1ee60a4
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-12.2.12-dont-use-bad-namespace.patch
@@ -0,0 +1,13 @@
+diff --git a/src/rgw/rgw_crypt.cc b/src/rgw/rgw_crypt.cc
+index cf4e38995e..7a4089fca9 100644
+--- a/src/rgw/rgw_crypt.cc
++++ b/src/rgw/rgw_crypt.cc
+@@ -31,7 +31,7 @@ using namespace CryptoPP;
+ #define dout_subsys ceph_subsys_rgw
+ 
+ using namespace rgw;
+-using ceph::crypto::PK11_ImportSymKey_FIPS;
++//using ceph::crypto::PK11_ImportSymKey_FIPS;
+ 
+ /**
+  * Encryption in CTR mode. offset is used as IV for each block.
diff --git a/sys-cluster/ceph/files/ceph-12.2.12-ncurses-tinfo.patch b/sys-cluster/ceph/files/ceph-12.2.12-ncurses-tinfo.patch
new file mode 100644
index 000000000000..1b72e5447dbe
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-12.2.12-ncurses-tinfo.patch
@@ -0,0 +1,20 @@
+diff --git a/src/tools/rbd/CMakeLists.txt b/src/tools/rbd/CMakeLists.txt
+index 7aa42e9efd..66186b159f 100644
+--- a/src/tools/rbd/CMakeLists.txt
++++ b/src/tools/rbd/CMakeLists.txt
+@@ -1,3 +1,6 @@
++set(CURSES_NEED_NCURSES TRUE)
++find_package(Curses REQUIRED)
++
+ set(rbd_srcs
+   rbd.cc
+   ArgumentTypes.cc
+@@ -46,7 +49,7 @@ target_link_libraries(rbd librbd librados
+   cls_journal_client cls_rbd_client
+   rbd_types
+   journal
+-  ceph-common global
++  ceph-common global ${CURSES_LIBRARIES}
+   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
+ if(WITH_KRBD)
+   target_link_libraries(rbd 
diff --git a/sys-cluster/ceph/files/ceph-12.2.12-qa-warning.patch b/sys-cluster/ceph/files/ceph-12.2.12-qa-warning.patch
new file mode 100644
index 000000000000..1b63d6e21ba5
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-12.2.12-qa-warning.patch
@@ -0,0 +1,13 @@
+diff --git a/src/common/blkdev.cc b/src/common/blkdev.cc
+index d95a397a84..d2cbf4b7b9 100644
+--- a/src/common/blkdev.cc
++++ b/src/common/blkdev.cc
+@@ -225,7 +225,7 @@ int get_device_by_uuid(uuid_d dev_uuid, const char* label, char* partition,
+     rc = get_block_device_base(partition, basename,
+       sizeof(basename));
+     if (rc >= 0) {
+-      strncpy(device, basename, sizeof(basename));
++      strncpy(device, basename, sizeof(device));
+       rc = 0;
+     } else {
+       rc = -ENODEV;
diff --git a/sys-cluster/ceph/files/ceph-14.2.1-ncurses-tinfo.patch b/sys-cluster/ceph/files/ceph-14.2.1-ncurses-tinfo.patch
new file mode 100644
index 000000000000..7f74a102d777
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.1-ncurses-tinfo.patch
@@ -0,0 +1,30 @@
+From b7bf406cff5e0f82fc87f19d5987cd4e719919e1 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 8 Apr 2019 16:34:53 +0200
+Subject: [PATCH] cmake: Fix build against ncurses with separate libtinfo
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/tools/rbd/CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/tools/rbd/CMakeLists.txt b/src/tools/rbd/CMakeLists.txt
+index 36b2408a8d28..0e38a033ff55 100644
+--- a/src/tools/rbd/CMakeLists.txt
++++ b/src/tools/rbd/CMakeLists.txt
+@@ -1,3 +1,6 @@
++set(CURSES_NEED_NCURSES TRUE)
++find_package(Curses REQUIRED)
++
+ set(rbd_srcs
+   rbd.cc
+   ArgumentTypes.cc
+@@ -52,7 +55,7 @@ target_link_libraries(rbd librbd librados
+   cls_journal_client cls_rbd_client
+   rbd_types
+   journal
+-  ceph-common global ncurses
++  ceph-common global ${CURSES_LIBRARIES}
+   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
+ if(WITH_KRBD)
+   target_link_libraries(rbd 
diff --git a/sys-cluster/ceph/files/ceph.confd-r1 b/sys-cluster/ceph/files/ceph.confd-r1
deleted file mode 100644
index 3bdb8b485ed8..000000000000
--- a/sys-cluster/ceph/files/ceph.confd-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-# Example
-
-# default ceph conf file
-#ceph_conf="/etc/ceph/ceph.conf"
diff --git a/sys-cluster/ceph/files/ceph.confd-r3 b/sys-cluster/ceph/files/ceph.confd-r3
deleted file mode 100644
index 281037c59982..000000000000
--- a/sys-cluster/ceph/files/ceph.confd-r3
+++ /dev/null
@@ -1,63 +0,0 @@
-# /etc/conf.d/ceph: startup configurations for ceph
-
-# default ceph conf file
-#ceph_conf="/etc/ceph/ceph.conf"
-
-# Set ulimits for Ceph services.
-#rc_ulimit="-n 131072 -u 257256"
-
-# the directory under /run to store runtime information in
-#rundir=/run/ceph
-
-# the user and group to run ceph as
-
-# settings for openrc supervisor for various ceph daemons
-#
-# defaults (can be overidden for each daemon)
-# stderr and stdout values get .${id}-std{out,err}.log appended to the provided value
-#
-#respawn_delay=20
-#respawn_max=5
-#respawn_period=1800
-#stdout="/dev/null"
-#stderr="/dev/null"
-
-# radosgw
-#radosgw_respawn_max
-#radosgw_respawn_delay=20
-#radosgw_respawn_period=1800
-#radosgw_stdout="/dev/null"
-#radosgw_stderr="/dev/null"
-
-# mon
-#mon_respawn_max=5
-#mon_respawn_delay=20
-#mon_respawn_period=1800
-#mon_stdout="/dev/null"
-#mon_stderr="/dev/null"
-
-# osd
-#osd_respawn_max=5
-#osd_respawn_delay=30
-#osd_respawn_period=1800
-#osd_stdout="/dev/null"
-#osd_stderr="/dev/null"
-
-# mds
-#mds_respawn_max=5
-#mds_respawn_delay=20
-#mds_respawn_period=1800
-#mds_stdout="/dev/null"
-#mds_stderr="/dev/null"
-
-# mgr
-#mgr_respawn_max=5
-#mgr_respawn_delay=20
-#mgr_respawn_period=1800
-#mgr_stdout="/dev/null"
-#mgr_stderr="/dev/null"
-
-# initd stop timeout.
-#CEPH_TERMTIMEOUT="TERM/120/KILL/5"
-#
-# vim:ft=gentoo-conf-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/ceph/files/ceph.initd-r2 b/sys-cluster/ceph/files/ceph.initd-r2
deleted file mode 100644
index 16267c58a139..000000000000
--- a/sys-cluster/ceph/files/ceph.initd-r2
+++ /dev/null
@@ -1,40 +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}"
-command="/usr/bin/ceph-${daemon_type}"
-pidfile="/run/ceph/${daemon_type}.${daemon_id}.pid"
-command_args="-i ${daemon_id} --pid-file ${pidfile} -c ${ceph_conf}"
-start_stop_daemon_args="--user ceph --group ceph"
-
-depend() {
-	after net ntpd ntp-client chronyd
-	before netmount
-}
-
-is_type_valid() {
-	case ${daemon_type} in
-		mon|mds|osd) return 0;;
-		*) return 1;;
-	esac
-}
-
-start_pre() {
-	checkpath -d -q -o ceph "$(dirname "${pidfile}")"
-	if ! is_type_valid ;then
-		eerror "Please give valid Ceph Server Type: mds, mon, osd"
-		return 1
-	fi
-}
-
-reload() {
-	ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
-	start-stop-daemon --signal 1 ${start_stop_daemon_args} --pidfile "${pidfile}"
-	eend $?
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/ceph/files/ceph.initd-r7 b/sys-cluster/ceph/files/ceph.initd-r7
deleted file mode 100644
index 110d7bd0b635..000000000000
--- a/sys-cluster/ceph/files/ceph.initd-r7
+++ /dev/null
@@ -1,87 +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
-			supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${arg_val}.${daemon_id}-${arg_name}.log"
-		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/metadata.xml b/sys-cluster/ceph/metadata.xml
index 03215bde3fda..bfbf70b7a303 100644
--- a/sys-cluster/ceph/metadata.xml
+++ b/sys-cluster/ceph/metadata.xml
@@ -18,13 +18,10 @@
   </longdescription>
   <use>
     <flag name="babeltrace">Add support for LTTng babeltrace</flag>
-    <flag name="cryptopp">Use <pkg>dev-libs/crypto++</pkg> for cryptography</flag>
     <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>
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index 2d5c7dee1c8b..61fa0ba44f09 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -13,9 +13,9 @@ DIST charm-6.8.2.tar.gz 24420478 BLAKE2B b5035d29f90ec766dc49b94e76d68a9ce3d16f4
 EBUILD charm-6.5.1-r1.ebuild 5248 BLAKE2B ed7c807ce8425c6371648696bde5d7d34ce3f864f5374d580837d129cd9904f5a372793015e90b3a30ad974305d6b310eb712abe1307334e09752f1cc0d88e91 SHA512 bca23f56b551d6fb40328f8bdd25130c34f84e6b1e11236749703a0fdedbdfe40b566f13f8e3cbe07c7668582ddd0bbe880242955516c1dfdc5075571be0a573
 EBUILD charm-6.5.1-r2.ebuild 5311 BLAKE2B 194e6a685d68a3240d21352e212a9aa062ec6c26029d84c5f3384646a2203471ecadea0da6ee2cdfc5e859e0575682dad294c82770899602bd0767ad3ea14785 SHA512 8cbea2a9aeab22ffbee26659991c8caed1b8545985df91e82375995b044a18be2dc3a14183260342eb7665c81bfce83e7d04f59346b718ef9aafd1f07d7c13ae
 EBUILD charm-6.5.1-r3.ebuild 5330 BLAKE2B 26314be92b5e5451476bd1611faddb7c194c1d53f5793aec9ef0272996596ad7f94767eec677de9f7391d8fe38b049414dd93a9332763e1bc540aea5ab76aed9 SHA512 d31c2c5eca23229b208ec9e043b5e8b23e86341cbc24ab2b588d84a094c9f543ff63c4b8fc24a11eb4c4d55db7ad66917dc620b275ce5dd137276a6cbcb649cb
-EBUILD charm-6.6.0-r1.ebuild 5578 BLAKE2B 843fd7c798641276977c7ff08574d0accc749465d47cb19d798c923327e837e933d2da53f4947c868cce694deddf6ecae6a4737c4609f18aaca6b31b63981a63 SHA512 f049285b990d1627f4bdd2dc5f0bc5ae64bed61769f8a81787a6137ad8ad50ab5c0e80038d77c00a25523085e9ba36f3582217894e3b215b1f031c3a8f081567
+EBUILD charm-6.6.0-r1.ebuild 5572 BLAKE2B 016d5d96033b1fd02a79b85af7ddaa236fc575740b5034d3d4c52de22e4388be4bf1bb101015a1c0257b0b71a4c185e4b4870e255243162dee8045b596ba978c SHA512 6947f911efc5d756537ff8c06754e0f9580f8f4b9e7ee33ea96be3144ad4537da21228ecfd1321f972d97979fcf556e4f3b2646b11de7717006b4491462fafa7
 EBUILD charm-6.6.0.ebuild 5572 BLAKE2B 016d5d96033b1fd02a79b85af7ddaa236fc575740b5034d3d4c52de22e4388be4bf1bb101015a1c0257b0b71a4c185e4b4870e255243162dee8045b596ba978c SHA512 6947f911efc5d756537ff8c06754e0f9580f8f4b9e7ee33ea96be3144ad4537da21228ecfd1321f972d97979fcf556e4f3b2646b11de7717006b4491462fafa7
-EBUILD charm-6.6.1.ebuild 5781 BLAKE2B 14d474c34b72731e5c139a3f5be4de882a1f99a0a8043b4220cfa4caa37116e6c1bbeb3ed5c4079a43b328dc4233090b0932db1038039c84d645bafd606c11e1 SHA512 1c278e8e52860772ebbae872d5f172c0e69932baf8555085572d278402782d913ba647f20ef6789d26265f78272d510d5a351047df419299e322f3b0e5217474
+EBUILD charm-6.6.1.ebuild 5775 BLAKE2B 94ae38b034519a903e5fc6a0d966c898cf24650208b558c0113aadf698d4632d0afe6f2a1c1e7c3b67029c1277986568e0feb1c159d649f2a99d4934113ada95 SHA512 f09f3ed8e5954b10dd28aa341ff08a09e73204808afb48e850001ddf900eaf939148b4defa1e0f245df6853176f6777ddc640b789a0524c523cd0093536616cd
 EBUILD charm-6.7.1.ebuild 5837 BLAKE2B 763e71d521c95ab06b7225f61cfb63b0f0c5fd9bf71ddec1f4653a6ad63f14dc1f9ea2382c713f0945faf20f435d1b3e07adf2b1f2e3714d0b2f103b9b968604 SHA512 9f51f10e66a46a85959042a3f3f9cf0f336b49a9ccdaf3c3cf0e7f2ca20b127123f1a5da185d79ea5ef2fa2ea0baf1de4ed43d691d3723e87b8b63938270ca7e
 EBUILD charm-6.8.2.ebuild 5892 BLAKE2B fa195ff36177c2e1fe4e024568c8c265d5c6ab73d115ba26a13797512698b20329d091caef9daf684d380279ef5b5af598014eb406c070b80203bf2e4d8392e1 SHA512 945ce5cd866f56d9433390f8cc506a320531c8f4eac4995fcab6ee41635b9e637a100af59424c94748d66635fd74d4ca91ce29c8a45a0218578274c49a4ec792
 MISC metadata.xml 1012 BLAKE2B ee284d471b4f13534787629319734afacbb998fa7ea115377281648614693fd32b7ff91775eddf292b61f267fbfb9be81397be4f37bf1b4582de8cf06bc9364a SHA512 e8fd7cfac25aa8428adbe77922140eee5621b18afa5f10d1ed0c7b14960affc3a1dc0896b7ea034001855ef3e1c1f12791cada0f959eb210ba78f1be44b89ffc
diff --git a/sys-cluster/charm/charm-6.6.0-r1.ebuild b/sys-cluster/charm/charm-6.6.0-r1.ebuild
index a8d9206fc52c..b6347d0be608 100644
--- a/sys-cluster/charm/charm-6.6.0-r1.ebuild
+++ b/sys-cluster/charm/charm-6.6.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 FORTRAN_STANDARD="90"
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit eutils flag-o-matic fortran-2 multilib multiprocessing python-any-r1 toolchain-funcs
 
diff --git a/sys-cluster/charm/charm-6.6.1.ebuild b/sys-cluster/charm/charm-6.6.1.ebuild
index fb6f4b9f8e25..b7c9dab265b5 100644
--- a/sys-cluster/charm/charm-6.6.1.ebuild
+++ b/sys-cluster/charm/charm-6.6.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 FORTRAN_STANDARD="90"
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit eutils flag-o-matic fortran-2 multilib multiprocessing python-any-r1 toolchain-funcs
 
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 6314fab566f7..a0a1280bcd6b 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,11 +1,13 @@
 AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c1d1f3a84b9f1c1e7c596361ec5d2aab650f1ebf3f0f053e313f2e15be64995d1309a6eafc8a69 SHA512 be3c2e6798b08527487cfd2b1cd66a03d891526a45f52c97a536b15a08d46a4162e3b036dcae86911c7dba25c5d7f02e73a089d4dd720526bf38ecd0f44c59b0
 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
-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-14.0.0.tar.gz 5498509 BLAKE2B adbd31dc953b467690a82be29e75467ec60a65064e402c1659948cb413154e9e9efd088ecc3b7accbe9b378e3a7f8bd5325d133e2d37b38d9ce091189857e293 SHA512 28940052eea307bcdce8ed9f7df09cb58b7250e561e128b3dd65123f8baffdacfadb6f6243a82d898fb8dc4ce11cf0fb0ad9905d5445cf61e2f603a580915562
 DIST cinder.conf.sample-13.0.4 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
+DIST cinder.conf.sample-14.0.0 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-2018.2.9999 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
-EBUILD cinder-13.0.3.ebuild 7809 BLAKE2B eac04abb8fede52a183b7908b4be44e7d5cb38b536c63c68eb50b4d41ad71607b94768b49dd159ff3f32599268c8f92dabee65427a0b1736150860924384f469 SHA512 83a0e6742a08a8e65a084f0f07025c35d8615ea0041e4e1edbc1b76df59c88e57e00e0b6c6eee33da53b0a2568588fa799ec831616b2993d3c69f6cd7c6ff0f4
-EBUILD cinder-13.0.4.ebuild 7811 BLAKE2B f903b27a6a07b69413fadabd0e94a368b4553438fe89404b9fdceefe4f77a80924bbabc84460393c6437583c34e6fb9d108d222e1e84a387c8864f7fe731390a SHA512 8ace1323dad4c04e7ef36042104552c870f560ab376b4b192a28923dafad60915ea9f0631fe239ec47a8ffa65b1d15daf66f4ad7a19b44497e234a7b953b27b4
-EBUILD cinder-2018.2.9999.ebuild 7814 BLAKE2B 6755862a53601c6f2afce2f3d07583e59b737cb8d3ff788099b4f9bccb8cc6a7084306fb999c55be18cf7281b62cae16625b4125b166dc68281d845e57fa0b3a SHA512 35ff4a9673ff4ba9af192853ee30997b86cf28866951a520d34149c02f8196365754bcaf8337834b4254581abd9e3067e09439840a1d97d8333bf2aa290c4270
+DIST cinder.conf.sample-2019.1.9999 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
+EBUILD cinder-13.0.4.ebuild 7807 BLAKE2B 4f8fcb254a66c4cdafbdc760d6640136b97e48c857aa868f08a379695d7529fa2f8fb05c20e6aeed33ec56b9ee66ec040bdd382ab1517231329d7084f94c758d SHA512 8b4f16da33f2c868dcee627275aed329cc9676f8509e5be763226b9453bff26ecf5dfbd85b3bc06198210e44ff8a07b56eb48b931b18517f2f7cd78ca89c3d54
+EBUILD cinder-14.0.0.ebuild 7818 BLAKE2B da3671b1b1b1153ad9bac111d63e2d408989107817e8efae04bbf9e77b8c1886e413786c2ca2185c0d78b935ab55afbc086443eec4265e6dbea305df85d214d9 SHA512 eb9c70b521aebc02f3d699b480f2a83e913143a67c5521c6b8a7c75e3ff1b59fc0bd499810da89ea048b939bda3b143ee9e1f40a7943a0a21d59cf331ac2825d
+EBUILD cinder-2018.2.9999.ebuild 7809 BLAKE2B 25e88e7eeeab5230ed34fde72301ca280da38b3c2a37e28fc2474d7e8252bfd0bfea6025a10ede5166f4335cd869e7baa8f2a95bf2138c8cc8c5b7a18b888924 SHA512 e662bb768f38ea5f972118a0bdafd963a89f04b96ee784475ec7002f4fd2f7b1434e13d5517d1250d481eba995d2b44f0ac4a1717b8b5885d3c57433f7187413
+EBUILD cinder-2019.1.9999.ebuild 7818 BLAKE2B da3671b1b1b1153ad9bac111d63e2d408989107817e8efae04bbf9e77b8c1886e413786c2ca2185c0d78b935ab55afbc086443eec4265e6dbea305df85d214d9 SHA512 eb9c70b521aebc02f3d699b480f2a83e913143a67c5521c6b8a7c75e3ff1b59fc0bd499810da89ea048b939bda3b143ee9e1f40a7943a0a21d59cf331ac2825d
 MISC metadata.xml 1244 BLAKE2B bac3f4931079ae89c48d66ed2fe689978fcf609638ade7b26d8f07ffbd6562d7c4a16b42dec4390654747c6d2dfcb92b73d27c90356f1928199469d42432ef69 SHA512 fda201e6974bb0af9c24c1384a3bb2dd0a0c630439d7f1955de336f53804070a68426919fd4dc6f864d502c7e9e99a80d1920c740b6dc179f7b46c7f7fb7aef9
diff --git a/sys-cluster/cinder/cinder-13.0.4.ebuild b/sys-cluster/cinder/cinder-13.0.4.ebuild
index f3ef098f76ee..b599d7a7b07b 100644
--- a/sys-cluster/cinder/cinder-13.0.4.ebuild
+++ b/sys-cluster/cinder/cinder-13.0.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1 eutils linux-info user
 
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	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"
diff --git a/sys-cluster/cinder/cinder-13.0.3.ebuild b/sys-cluster/cinder/cinder-14.0.0.ebuild
index a8e41663d73e..f5e2d68d7552 100644
--- a/sys-cluster/cinder/cinder-13.0.3.ebuild
+++ b/sys-cluster/cinder/cinder-14.0.0.ebuild
@@ -1,8 +1,8 @@
 # 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,6} )
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1 eutils linux-info user
 
@@ -13,11 +13,11 @@ if [[ ${PV} == *9999 ]];then
 	inherit git-r3
 	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/rocky"
+	EGIT_BRANCH="stable/stein"
 else
 	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"
@@ -33,8 +33,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 
 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')]
@@ -46,8 +44,8 @@ RDEPEND="
 	>=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.4.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.21.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}]
@@ -56,17 +54,18 @@ RDEPEND="
 	>=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-messaging-6.4.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-policy-1.44.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.32.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-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.34.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}]
@@ -77,18 +76,18 @@ RDEPEND="
 	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-2.1.0[${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-glanceclient-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.15.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/requests-2.20.0[${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/taskflow-3.2.0[${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? (
 		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
@@ -203,6 +202,8 @@ python_install_all() {
 	insinto /etc/sudoers.d/
 	insopts -m 0440 -o root -g root
 	newins "${FILESDIR}/cinder.sudoersd" cinder
+	# stupid python
+	rm -r "${ED}"/usr/etc
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/cinder/cinder-2018.2.9999.ebuild b/sys-cluster/cinder/cinder-2018.2.9999.ebuild
index 08199f011f46..dedea484546e 100644
--- a/sys-cluster/cinder/cinder-2018.2.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2018.2.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1 eutils linux-info user
 
diff --git a/sys-cluster/cinder/cinder-2019.1.9999.ebuild b/sys-cluster/cinder/cinder-2019.1.9999.ebuild
new file mode 100644
index 000000000000..f5e2d68d7552
--- /dev/null
+++ b/sys-cluster/cinder/cinder-2019.1.9999.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+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/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
+	EGIT_BRANCH="stable/stein"
+else
+	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"
+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/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/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.7.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.21.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.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}]
+	>=dev-python/oslo-messaging-6.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.44.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.32.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-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.34.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.5.2[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.15.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/requests-2.20.0[${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-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/rtslib-fb-2.1.65[${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-2.1[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${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
+	# only used for docs
+	sed -i '/^sphinx-feature-classification/d' 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}/cinder.conf.sample-${PV}" "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
+	# stupid python
+	rm -r "${ED}"/usr/etc
+}
+
+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/cluster-glue/Manifest b/sys-cluster/cluster-glue/Manifest
index 3d94e3c73119..1c00ae2e78bc 100644
--- a/sys-cluster/cluster-glue/Manifest
+++ b/sys-cluster/cluster-glue/Manifest
@@ -2,6 +2,6 @@ AUX heartbeat-logd.init 954 BLAKE2B b00280f93cb0a3f3f8f19d3170472e87d705f91113fc
 DIST glue-1.0.11.tar.bz2 466057 BLAKE2B 929c9f803814fb1162d4058e0fb78deb96b6be9b4064dae96ea5653521f5dfb862850ab2c9010530ac652264c5e8e379cb397fc173f720d126540405b264ca5b SHA512 35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413
 DIST glue-1.0.12.tar.bz2 451569 BLAKE2B c074507563e797f105318bfcfab3e73eb1b62eb3037689c2b68f1b98f02b4a2c1da2e0b2931cd28ccc194d9f3b486733f642c6ff071c4f7629062d40c8d39427 SHA512 d5d2f6c426d2bed0d39269338fedfffe840a90ff56b05dff395243d0d8b803593bf35bbce5f7dce376120cd7ddef78400914cb7515b5451c287a1e9e74233122
 EBUILD cluster-glue-1.0.11.ebuild 2191 BLAKE2B b5498424f8ea748d3e3b0e6a36091fccb181ef8a9f04e0173ac8172440a66101958f516f51df822a32f54a7148126d584790ac1ecda9f866c6704d36a9615034 SHA512 f8af50aa16f76e992bde0e57660e5f7de171b3a80de86827a5b70c6406e86e8b52c1ed89f4963e7f1e583a3845bc9fe4fab44224fcf050f22233064506ba4238
-EBUILD cluster-glue-1.0.12-r1.ebuild 2362 BLAKE2B ce64dedf7a8918914df5bd993702b319889ed58eff6d830ad1450ed62f22917ba97dde30a05c58339ea81e0a432b9ba7a9e951feca339f5c97b00b9a20d1ca2b SHA512 25626908d67a837d84cec46d1b9626e9425c38800886e9c7b90b109fabf9a046b29b33815e9077278c68abe4c503dfa6636c227f4cac2002d1b966b54422b386
+EBUILD cluster-glue-1.0.12-r1.ebuild 2382 BLAKE2B 782058032bede2ed0a86b20a713104b4519faf620e072a4eeabbe7d784f78d5012ec497286c93de43ea81063be28f9c19a16415565996ea8e0897edfc44e4d71 SHA512 c52b11db0b917f03fd77243cbfae3b4f5c45e6730250481f00028772626b2a2ebc0321512f6fca2ea896250079c36be46019e7d1c5687d654aa3861e12018806
 EBUILD cluster-glue-1.0.12.ebuild 2209 BLAKE2B acce4fe14e0bec15ab36318002404d9fca7c6eefe7214525409f29aab497cf6c9126dbea8f01c21148caa44c2dc7445ed2196229418e9142bb638a199b685e93 SHA512 ab138ae57b746200dbbf53744389d58c82fe43405fca01dd661a5d64f565e00ce35d3189a5557cec3b79580a9f1df19cbf8e25a78d001a6656a451e580020bc4
 MISC metadata.xml 582 BLAKE2B 5792be1499f85328ff85ec074189187e014c2eadf29b4ddaf4a64c71977ccf5ce91d86f251fe90f3540a7cfab8d52145cd5c085199c6e1099df5dbe801fc4291 SHA512 a2312279ff8e3e47db3d1a560699d76233dae3963cc094aefbbe965af053fe4299e95133d5f40aa69a565c91c21ce9d358020726d3c8c590255dcac72901d7e3
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
index 74f9306385af..ad5e78db7935 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.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
@@ -22,6 +22,7 @@ RDEPEND="
 	app-text/docbook-xml-dtd:4.4
 	dev-libs/glib:2
 	dev-libs/libaio
+	dev-libs/libltdl:=
 	dev-libs/libxml2
 	ipmilan? ( sys-libs/openipmi )
 	libnet? ( net-libs/libnet:1.1 )
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index ff67ab69d36b..3d69ae9aa660 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -4,6 +4,6 @@ AUX garb.cnf 612 BLAKE2B 6597e77fd29aacece48e89217004abc62ecaf7f6477b62d5a29ff1c
 AUX garb.sh 1029 BLAKE2B 452a4f3bf50b25f040784e03d428ba10a3580cee486a5cb283db90bee4bcefe951813fbfd4e38024fb05d1681adb74a697dfe48c4d0c47aaddf094204a818a95 SHA512 780eb8e7584d31ce24559e46724c7b981320f4706af0b9f0cd8d157247f853f51d3980178d0d234f64bcb097a4ee5493fe299d6800513403dbc7e0184c020902
 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.25.ebuild 1898 BLAKE2B 233d5916fa1859a43ac111ecc8ae5051851a30527a8e635880a0fefe2bec46a3415164b01faeb9808ee2b23909febf2750b8603de0b3c201e5b70393316f1868 SHA512 965e5874a357095dd6b410eb2aaa6d8bb20c11b636a40a1276dc2009a536a3cb6745a1ad6c76bbff19b2b6707f45743699716fe1104c8be471ca1e770807638f
+EBUILD galera-25.3.25.ebuild 1894 BLAKE2B 966c5c85e5b66b34223acf4e3c1a4451605259c19e0698068cb36ca80beff80d2b47d93bc111adb9061230cb1163b93248e09c72c33265da4ca464c3de814a66 SHA512 de45fd6c64e0329563d4e2e6b8aefda5c81d839359b37366c8f958613d5cb1c2723f8900848a7caa67492832394fb4cbb13c6e512b2ca3435cdee7093f2c826d
 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/galera-25.3.25.ebuild b/sys-cluster/galera/galera-25.3.25.ebuild
index 86678c81fd10..ea4bc722561c 100644
--- a/sys-cluster/galera/galera-25.3.25.ebuild
+++ b/sys-cluster/galera/galera-25.3.25.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 MY_P="${PN}-3-${PV}"
 
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 74e781e55781..f6a0ae8304b4 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,21 +1,16 @@
 AUX 50glusterfs-mode-gentoo.el 169 BLAKE2B 461afb9f17ef9dee79348279e861039193400d61a926e9d8499351b7e42377cc1bffce6dc2c2d7f3b50b1de016a336bad69c7a79bb800b973288eef542baed85 SHA512 f90b3f49f53c08db5596a6795df64a834b390602a79fb79b56f6cfb6191c7ca8ce2bedd2885d049575e26cc3b321f80e2786e99055c02682f4fbf454d5ed5804
 AUX glusterd-r3.initd 755 BLAKE2B 6b402725a6a53839ff718ae19f4917b61330f78ae6657480a218f06657d5d7db1c4b57efa275159be76bc84fd5b600a22bd4b374a8a6fbb56576799650ce89fe SHA512 d6f46374f48cf78c4114c786fbba4412764527cec020f43ab2a46000fcada98bdb6dfb67ba9db2be3e39a851cba1db97a7154e4cab6df7ce541c0157c781706c
 AUX glusterfs-3.12.2-poisoned-sysmacros.patch 431 BLAKE2B 4446b2ba5aad48dfe54c24e0cf802196d6ee4898a77f7a6950e2c1971550deddc7ff232dab021b4bfcb962f4544fa6bebba314b07942228298a5c38758c38442 SHA512 fb9f56254a90325bfc92d60af41075b51460d179eac7149cf1d0dc218d7cc7c9102eaf0591c2763df2fa68d2595f87dd3427d810bc182b61103bd5f9588c77db
-AUX glusterfs-3.12.2-silent_rules.patch 632 BLAKE2B f9aa9dfb128b7ba2bf212b3b59f1092dd94f24f43c91ec416af9e6c157a9a165581fad83f926e60557a236ca54ae7e2611fc927cd022bf0f931472d6ae1fba1d SHA512 81ec26ad0385b3c9e94c918a720ecea606cf5adf9f28aa57bfcd8de179e24b4feb344573820528716d6530079553bd3df7ac1cea39e3893b35573990fe3ffd1c
 AUX glusterfs-4.1.0-silent_rules.patch 500 BLAKE2B bd6812be1059f04bcb34e9408b6ef24f6bd0992cc432ff22da9f21970e11dd5394e1421a6967cae6c026207dcf1d7ae591afaa06e4a25a62c0e79f7f679cd22e SHA512 1cbdfd9f04a917387f0b3299f3ab04074c34e5a4911642ccf4274f1270a97acbf0e27f89c89ce6a1cd2e26238761f956cd1dfa3033d763ead32b0d0fd92a0798
-AUX glusterfs-TIRPC-config-summary.patch 1738 BLAKE2B 1155bd8e92c53c53f4e7e5467a798b1c0006064da367723cce609fc01e0383156ee2ec5884bc07c3bf26013f8704b11efa3bc3be3bda79c5d14548627080084e SHA512 86e2ecbb87a39bd31f1ddd9bfd07a6af9876912daa7feace7cca71db665ec00e86f39632ae33c557105a994d44bbe754d42db7aa860e2365055dc888e4f35994
 AUX glusterfs-r1.initd 3065 BLAKE2B 6bf49cfec1c6f685b4c72a79e956ca9823c742bca3d665f0bbffb59bbd2f81b314df62b8aab4eab5c4d23b9e88f43168160cb0faedece3307ddf2347f5282311 SHA512 28c5f401b2ff017d8faf7b290fa265cc5f1a9d60edf11dbae5801e943e7e0833fa8267880efa80c4fc07048d75afd446808c583d2b62a6c5a6bde25d317bde97
-AUX glusterfs-without-ipv6-default.patch 1337 BLAKE2B a270569af9d54142b4921497817355c032e6a028d292330508e97c916615113fdc8e2fcd0f9fc2954a114c49b1c15aa6413541e19cea7ef7d211a07c1af6ffab SHA512 a64fb5690c3241cd2ac87e8d1139de568d3c2ce232333d5d8d3e89c04b294eda233c39806b4ca7570c6c644caf8090bef97173d561d964ab4bd77dac4fb4fc9b
 AUX glusterfs.confd 129 BLAKE2B 17eeb707fe5ebeb335b0c64ce999268e5f5c6fb6d2ba48467f6f15e73f4c2e883b909da642e6144c637510302834c7c895ebf8b2558344c3bedc9cdc06a44766 SHA512 657c478dd3a60c144543821acd6a87f804d258d4679007aad5108790449e43eda7e0de8e8c0c8e13357a35afbb0d09065423101e5234285a9b96c9ac8b2e33b4
 AUX glusterfs.logrotate 611 BLAKE2B e79718d43b8123e8bcc63336977f972e58332536e0bccad84f3abb5e4afd87853d1c70ab689e2c454d94a8d74bb65122e7bf5a35150f60fb268c7757eea7b0d0 SHA512 568728fe77acecb686286b0be6c086fe3448d054d26da15c3846726a8f845ae963e6756c517b413a9eb4d6b646c61972887a35e89846d2d90d364b755e471791
 AUX glusterfs.vim 139 BLAKE2B 73fdcb49c0c252784718b461541d5483e118bf1b83f445a6ced3119600aa46c469291e19aa439e2c1e35ffc88c83a74977571d8ccfddf078f65c5c16a44ed3e0 SHA512 6ea3b56b71d7e206a57611dd68160b6b9242a19b5c927560f60881dc28d250f7958c50f788a7b9a41fb46010fdac2d67a8289b909ed1f05b793c900f37ccbfb7
-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
+DIST glusterfs-6.0.tar.gz 7495110 BLAKE2B 89fde01732dbbcecdf514d196e3bac683caaaaefb3658b4e92f1bbf73ca09defa4de9366066a00528564acfbe93c3f65cfabbeb0d830c00f29ee9c99ed7bf08a SHA512 fc4f4ee75b3936469b7c4be146545eb88d2cf3583d5f101bcacb2805c842aa95f69d1c023dee4dac32ebe01cdc9ede4814f9364482e8815e451e43660e6c74b9
 EBUILD glusterfs-4.1.5.ebuild 6772 BLAKE2B a13e90db6317fa727cb64f9f1cf244a9276e8a9b3f9fd0c4808e2572fe5802d12663b5b768ee223fd78f92ae781d8d3a6f31706ab7f5e83d3eaa3cf1fe98bd82 SHA512 5436e666878df02b3b4af43a3c448329e4b94a2255fd91d35d9f520184a91aea6d381428e423baebef7c233c4ecee6c0142cc8b5ba223341f5b34ae79945bf2f
-EBUILD glusterfs-4.1.8.ebuild 6775 BLAKE2B f6b805ea80edbde4b559de6fee78e5be3db4d9df7682b38840a5eebda1aba0a7f474c55ef4554bf03684c480684acbe1bc946def79ab452a5d6e696e224cbdbf SHA512 035637bfb1682268be7ec4cec1cb7e4f45cda45628c69ac55531424db89e18469495523c7f5bbd6e0f17ac4a2de7e73b1c68e57b1672e726da6d92b4a684ad66
+EBUILD glusterfs-4.1.8.ebuild 6773 BLAKE2B 25e24c4602585a38154822e9708c8617a906f6d713255b247040293760abe8d9ccaed3db33c981dacb19e3eca6194e2f1e5c302a7da09a32b6ce5a3d508bc99f SHA512 4daaa45126ad4e9e8861b0b3e2b052a544a690ba683874a770942f3169ce01af0df7487ec9e10ed7fe87b6b494ba957e6ec4f27967247bcc32e15cf0d42de34b
+EBUILD glusterfs-6.0.ebuild 6212 BLAKE2B 4d57942e086b22e4ca1f9426c6d2f9c9c521b0ead729c3d7db22d51d7185cda54c850233e2140c0b139666b76ed4d882532bc269b8693ceb038492b7e3a13190 SHA512 37c5ceee736e05db6b5a0a25e38b1d2d89c9518b374086e3aea8d0d3270689d189b85a1168e6406649e8a2dcb4d18e1c244f5409d7b2d96eea498e6ae0a5a95d
 EBUILD glusterfs-9999.ebuild 6779 BLAKE2B 0461134fcea8e8f237c6fcd4a7579426fa107e1d2c642ac009381e8a102623d37b15c33b696ecd5c127fe2db96e050dcccb2d100539fc16a506dd71a749401b4 SHA512 437fc1cda7440cf04a1c35c8d724542b20faf71fe70da2bf2f4a7048902c576fd5c4c4ee055585fa685933116e60eb161370faf1997bf35497faeb8c7fcad174
 MISC metadata.xml 1724 BLAKE2B 8d164da1feb4e49490543de9841ec60282199451f2dcd6920c6781bcff41cb1248fcea7895501db0501f01a1b87b27e91a068adacd87842630f17efebf4d8954 SHA512 5bc076910d574a03f1b29db15fe1933e1b9b6f0f2cde654a6934397f7fa6f10c5063dd0318248d522da508af1ce56d16f1a204bc4be8429430f189143baaf043
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.12.2-silent_rules.patch b/sys-cluster/glusterfs/files/glusterfs-3.12.2-silent_rules.patch
deleted file mode 100644
index d5e2727aa8df..000000000000
--- a/sys-cluster/glusterfs/files/glusterfs-3.12.2-silent_rules.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.ac	2017-08-30 13:46:34.075359703 +0100
-+++ b/configure.ac	2017-09-07 21:28:48.110879291 +0100
-@@ -19,19 +19,6 @@
- #but libglusterfs fails to build with contrib (Then are not set up that way?)
- #AM_INIT_AUTOMAKE([subdir-objects])
- 
--m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
--
--if make --help 2>&1 | grep -q no-print-directory; then
--   AM_MAKEFLAGS="$AM_MAKEFLAGS --no-print-directory";
--fi
--
--if make --help 2>&1 | grep -q quiet; then
--   AM_MAKEFLAGS="$AM_MAKEFLAGS --quiet"
--fi
--
--if libtool --help 2>&1 | grep -q quiet; then
--   AM_LIBTOOLFLAGS="--quiet";
--fi
- 
- AC_CONFIG_HEADERS([config.h site.h])
- 
diff --git a/sys-cluster/glusterfs/files/glusterfs-TIRPC-config-summary.patch b/sys-cluster/glusterfs/files/glusterfs-TIRPC-config-summary.patch
deleted file mode 100644
index c19ac7667b00..000000000000
--- a/sys-cluster/glusterfs/files/glusterfs-TIRPC-config-summary.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 1e1c3cc0761879e8a2e4d4a884dacc555bbe7fa0 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Fri, 9 Mar 2018 23:06:43 +0000
-Subject: [PATCH 2/2] build: Fix misleading TIRPC result in configure summary
-
-Requesting ipv6-default even if you explicitly disable libtirpc will
-then implicitly enable libtirpc because that is required. That is fine
-but the configure summary should not then show TIRPC as disabled when
-it is not.
-
-The result has also been made clearer by stating that TIRPC is
-"missing" when it has been tried but not found.
-
-BUG: 1553938
-Change-Id: I945bd6859aaf3defa682b0d05ee34a9827b9c45f
-Signed-off-by: James Le Cuirot <chewi@gentoo.org>
----
- configure.ac | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d42179182..9571dac76 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1097,16 +1097,15 @@ AC_SUBST(GF_DISTRIBUTION)
- GF_HOST_OS=""
- GF_LDFLAGS="-rdynamic"
- 
--DISABLE_LIBTIRPC=no
- dnl include tirpc for IPv6 builds
- if test "x$with_libtirpc" = "xyes" || test "x$with_ipv6_default" = "xyes" ; then
-     PKG_CHECK_MODULES([TIRPC], [libtirpc],
--       [GF_CFLAGS="$GF_CFLAGS $TIRPC_CFLAGS"; GF_LDFLAGS="$GF_LDFLAGS $TIRPC_LIBS";],
--       [DISABLE_LIBTIRPC=yes])
-+       [with_libtirpc=yes; GF_CFLAGS="$GF_CFLAGS $TIRPC_CFLAGS"; GF_LDFLAGS="$GF_LDFLAGS $TIRPC_LIBS";],
-+       [with_libtirpc=missing])
- fi
- 
--if test "x$DISABLE_LIBTIRPC" = "xyes" ; then
--    with_libtirpc=no; with_ipv6_default=no
-+if test "x$with_libtirpc" = "xmissing" ; then
-+    with_ipv6_default=no
-     AC_CHECK_HEADERS([rpc/rpc.h],[
-         AC_MSG_WARN([
-             ---------------------------------------------------------------------------------
--- 
-2.16.1
-
diff --git a/sys-cluster/glusterfs/files/glusterfs-without-ipv6-default.patch b/sys-cluster/glusterfs/files/glusterfs-without-ipv6-default.patch
deleted file mode 100644
index ed30a6a293f2..000000000000
--- a/sys-cluster/glusterfs/files/glusterfs-without-ipv6-default.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From c77b8f23af7d285fd82dbd3e4db3fa2c09899e58 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Fri, 9 Mar 2018 22:39:41 +0000
-Subject: [PATCH 1/2] build: Fix configure --without-ipv6-default behaviour
-
-The current behaviour disables ipv6-default when no switch is given at
-all but otherwise checks if libtirpc was requested, regardless of
-whether you have given --with-ipv6-default or --without-ipv6-default.
-
-I believe the intention was to enable when libtirpc is requested by
-default but otherwise respect the switch given.
-
-This is important because ipv6-default breaks Gluster for systems that
-have IPv6 disabled.
-
-BUG: 1553926
-Change-Id: I76b91ae2699574b2e5b777453732bb5cbd79bbca
-Signed-off-by: James Le Cuirot <chewi@gentoo.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 827ec0518..d42179182 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -315,7 +315,7 @@ AC_ARG_WITH([libtirpc],
- 
- AC_ARG_WITH([ipv6-default],
-         AC_HELP_STRING([--with-ipv6-default], [Set IPv6 as default.]),
--        [with_ipv6_default=$with_libtirpc], [with_ipv6_default=no])
-+        [], [with_ipv6_default=$with_libtirpc])
- 
- if test "x$ac_cv_file__etc_redhat_release" = "xyes"; then
-         if rpm -qa centos-release | grep centos; then
--- 
-2.16.1
-
diff --git a/sys-cluster/glusterfs/glusterfs-4.0.2.ebuild b/sys-cluster/glusterfs/glusterfs-4.0.2.ebuild
deleted file mode 100644
index fd1498eb3770..000000000000
--- a/sys-cluster/glusterfs/glusterfs-4.0.2.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools elisp-common python-single-r1 systemd user versionator
-
-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}/$(get_version_component_range '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 +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
-	dev-libs/openssl:=[-bindist]
-	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}-3.12.2-silent_rules.patch"
-	"${FILESDIR}/${PN}-TIRPC-config-summary.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() {
-	# --without-ipv6-default doesn't do what you think it does. Chewi
-	# has given up fighting with upstream about this.
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1553926
-
-	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_with 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_$(get_version_component_range '1-2')/"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/glusterfs/glusterfs-4.1.8.ebuild b/sys-cluster/glusterfs/glusterfs-4.1.8.ebuild
index b6b9a5597e93..6b3e8ff11b90 100644
--- a/sys-cluster/glusterfs/glusterfs-4.1.8.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-4.1.8.ebuild
@@ -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.0.0-r1.ebuild b/sys-cluster/glusterfs/glusterfs-6.0.ebuild
index b8c3d99fa8fd..e9acb97223c7 100644
--- a/sys-cluster/glusterfs/glusterfs-4.0.0-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-6.0.ebuild
@@ -1,18 +1,18 @@
-# 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=( python2_7 )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit autotools elisp-common python-single-r1 systemd user versionator
+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}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
@@ -20,31 +20,27 @@ HOMEPAGE="https://www.gluster.org/"
 
 LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0"
-IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband ipv6 +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml"
+IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test 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 )
+RDEPEND="!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
-	dev-libs/openssl:=[-bindist]
+	!libressl? ( dev-libs/openssl:=[-bindist] )
+	libressl? ( dev-libs/libressl:= )
 	dev-libs/userspace-rcu:=
 	net-libs/rpcsvc-proto
 	sys-apps/util-linux"
@@ -64,13 +60,6 @@ DEPEND="${RDEPEND}
 
 SITEFILE="50${PN}-mode-gentoo.el"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-3.12.2-poisoned-sysmacros.patch"
-	"${FILESDIR}/${PN}-3.12.2-silent_rules.patch"
-	"${FILESDIR}/${PN}-without-ipv6-default.patch"
-	"${FILESDIR}/${PN}-TIRPC-config-summary.patch"
-)
-
 DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
 
 # Maintainer notes:
@@ -79,7 +68,7 @@ DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
 #   glibc or if argp-standalone is installed.
 
 pkg_setup() {
-	python_setup "python2*"
+	python_setup "python3*"
 	python-single-r1_pkg_setup
 
 	# Needed for statedumps
@@ -107,21 +96,15 @@ src_configure() {
 		--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_with ipv6 ipv6-default) \
-		$(use_with libtirpc) \
+		$(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
@@ -188,9 +171,6 @@ src_install() {
 	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() {
@@ -217,7 +197,7 @@ pkg_postinst() {
 	ewarn "run GlusterFS."
 	echo
 	elog "If you are upgrading from a previous version of ${PN}, please read:"
-	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(get_version_component_range '1-2')/"
+	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
 
 	use emacs && elisp-site-regen
 }
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index 7449dd972de4..75aef8f45a14 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1,7 +1,15 @@
 AUX heat.initd 463 BLAKE2B c855fe1b4fe73fe93874add659c49133d1f83653acbb37e7ab9927641883196abb620f53e6b31f5cc39e7c59875d4af29b3d5b14eb2a1d67556e7fbf129c7705 SHA512 d6685d7751dfd6ece714c2b96c2d07419f13556f6f3d065a108943cb3bc90c4a51b66313b3e53db4f47f0577c411e859c89984d4764462857eb1ca1990ca847c
 DIST heat-11.0.0.tar.gz 2316538 BLAKE2B c7c56d273761af1846ef69d2a29563f96550afa97022ef749ac5fbd5c62117214bcfd0bd802a315168ea97d94cdf647c5e9c655803dc6f798ca7d64e0f1a9339 SHA512 bc38b062e273d4dfb11ba72c558b4c0ed7a9220a083cf1cc22b42583b864cc4bce8fb80acaa5a88f8f3e1658d585ee2950466d35ca5cb367390141a28aed1e6f
 DIST heat.conf.sample-11.0.0 89219 BLAKE2B 6db6b6476c90bedb8bccb88d6e792fd62d599bf4721153f9cd79fc22d6e99f5096dbbbb560d5ead9ee2388529a9ff0514e591444c462621e37ecdc0879ed6f78 SHA512 aedde1cea25ecbdff4de8fe410bcb13cf937a4479b9fa27aab8170f92956499c678c2546cc3f373f58c287f13576b1561613b5ff71e6fae5b60bb3d580a90f4f
+DIST heat.conf.sample-11.0.2 89219 BLAKE2B 6db6b6476c90bedb8bccb88d6e792fd62d599bf4721153f9cd79fc22d6e99f5096dbbbb560d5ead9ee2388529a9ff0514e591444c462621e37ecdc0879ed6f78 SHA512 aedde1cea25ecbdff4de8fe410bcb13cf937a4479b9fa27aab8170f92956499c678c2546cc3f373f58c287f13576b1561613b5ff71e6fae5b60bb3d580a90f4f
+DIST heat.conf.sample-12.0.0 74064 BLAKE2B 8ed905ab27d0478a8ff7f705cddb00e1331e52570f799d0d7dda91563fc3a8567a76d50110403ce9e4810efb8c61e9e07fe4871953d66f6bbdcfe90ce3bae772 SHA512 aa4f4d0a306cff8a56b043c3891c5aaa2ec3582ab253adc2c0d4ed51f79086fdbe0286faa22cf57f87029e0f6895f12cd56db6feb51308679d42fcb956ea7b8c
 DIST heat.conf.sample-2018.2.9999 89219 BLAKE2B 6db6b6476c90bedb8bccb88d6e792fd62d599bf4721153f9cd79fc22d6e99f5096dbbbb560d5ead9ee2388529a9ff0514e591444c462621e37ecdc0879ed6f78 SHA512 aedde1cea25ecbdff4de8fe410bcb13cf937a4479b9fa27aab8170f92956499c678c2546cc3f373f58c287f13576b1561613b5ff71e6fae5b60bb3d580a90f4f
-EBUILD heat-11.0.0.ebuild 6204 BLAKE2B b309e0aa1643aad43e7253471a57f28ba37bbc4d16a947861d11ac6b4ffd81148ed0059073a9838d3656d0cc372c3bd204f61906d9091eced61291fe912b6019 SHA512 c8e46729ae2527f904cb4d4e4d3cc8360b80ea01c55bd6a0a765097eb07fe9e64b41361ed7dddecf4e9d7efd45d89a38d22d7539866da9e6f9130e7d4b7d0997
-EBUILD heat-2018.2.9999.ebuild 6209 BLAKE2B ef231d0e1412d79bab18a809973bef1476be4821e77679981fca172908ed5d76957efd3b95bdcfca9396d1f32569603f7b2e441a733a32645694795e74cb06d1 SHA512 e10b1808e5f15cd6f3f28cce53b79b932b8ad8930b40ce14c49b9342c2248bad013b8b90f943450d0855174a2b2f866076bc096d3799d7b7a087405e98a47fac
+DIST heat.conf.sample-2019.1.9999 74064 BLAKE2B 8ed905ab27d0478a8ff7f705cddb00e1331e52570f799d0d7dda91563fc3a8567a76d50110403ce9e4810efb8c61e9e07fe4871953d66f6bbdcfe90ce3bae772 SHA512 aa4f4d0a306cff8a56b043c3891c5aaa2ec3582ab253adc2c0d4ed51f79086fdbe0286faa22cf57f87029e0f6895f12cd56db6feb51308679d42fcb956ea7b8c
+DIST openstack-heat-11.0.2.tar.gz 2320284 BLAKE2B 0bb16840cf0637dfd4783cf837f0b9eb8806275f9e292fcde54b18d14058004ce8382a17e433a785027c74653761412c3851a737c30b7a3e7100d6ef34a4f13e SHA512 fdc9dbdfd6c927c9df681a9d1213cd5ea8191d5efeb07c172f87baedad00a16687a074137f88d1d2dcce4081ca23f53cc7afbee8cb3c2a6add6fd01560684cdf
+DIST openstack-heat-12.0.0.tar.gz 2366052 BLAKE2B 53c44cb20be0383c1dc7df6edea35bfc3547cb9ca652645879b7156a87fa645b74f3317ac28ce15587cee281bb0ba219ddacc2f03cfc56e528156412a104ce5e SHA512 2fcc42de118e2abf380c1b8c2637812f0f3dcaaad0f9ddcf349bd372e9880d2b45bc09ab349faa5c2d2c9384aba73d7679f6e80ba6b143a52b669e13d56fe0e9
+EBUILD heat-11.0.0.ebuild 6202 BLAKE2B 273a60adddc11da0d8462137783011c4673329a5e78f6a656c2f91733707920f3a22222ced260130ad2a3eac3d2c9735670ad1ddde43aa30038131e99bb0a515 SHA512 84a0f83434478c47268b760c6363c2e428e1299ed3853553adae9fc85b39c740cf117ab6cf2fe960bcd275b8b2215ee7da002db63d3fffe473d008ba6a1de055
+EBUILD heat-11.0.2.ebuild 6244 BLAKE2B 565c676e669b95ee971763470285d0c5b0ab7b836aaa131369996b13e75fce7702f8325adbf2f35d68375390270f9f03e5d46b34cb00c5c0f6ded7f84880b08a SHA512 b7fd0ba308a99e2dc0d41c3b1c2f11677e728aab4e2dc3b33c3d046e1f965c49b9ef11ffc17585e5dbca918588f601cd9bbe0d40cb62907b5a5f2f0b9218e062
+EBUILD heat-12.0.0.ebuild 6325 BLAKE2B 3b5a1538092c48b5d34afc850d414ba0b3bcb93ab96469da0dcbfd00f6b89fb091a22d9be3c077666e306e3f0bafca7d3379b7f3419c124468b6449b7799565d SHA512 48fef835222e64ce87205c59343e77257d985b300628bc3b7dff336030edeaa15e52f41832431124f29f621db379939fdbd5260d70239a7d488b58b24b1d59bd
+EBUILD heat-2018.2.9999.ebuild 6234 BLAKE2B 01e13a18b911d25f906cea867f7888fc47f0446f4710f12ca999ff6cacc3eecfa89330048515d2d0a380608840ae74454d82cf38ab901b5082f5aaff4689a744 SHA512 6f5d83c7e48a12b9aecbdfba4edf556e58d8356b816d6e2063ccd476ba4cfbce3c8ebcf987f9d92c74174ce7ae9d9f01333d8c4955c500aaf7ab19c233f0cfd1
+EBUILD heat-2019.1.9999.ebuild 6325 BLAKE2B 3b5a1538092c48b5d34afc850d414ba0b3bcb93ab96469da0dcbfd00f6b89fb091a22d9be3c077666e306e3f0bafca7d3379b7f3419c124468b6449b7799565d SHA512 48fef835222e64ce87205c59343e77257d985b300628bc3b7dff336030edeaa15e52f41832431124f29f621db379939fdbd5260d70239a7d488b58b24b1d59bd
 MISC metadata.xml 631 BLAKE2B 566d35b5533177a6d8b0ef428c9bd1a320aace6b43e186139c4b53cde224c1bf488340be8b6bcac14bf6c7a51212952dc13940d34edc38e24d7d2fbea5ce0c68 SHA512 44e741975cc462454bfd08fce461b019c5ef141997f272796052f7f3aa7297646304cdc7d75a2ed01319bcba753475ba5861306c3ac74f3d97218bce60d42429
diff --git a/sys-cluster/heat/heat-11.0.0.ebuild b/sys-cluster/heat/heat-11.0.0.ebuild
index e68ea9fa1843..1e2a1e22363b 100644
--- a/sys-cluster/heat/heat-11.0.0.ebuild
+++ b/sys-cluster/heat/heat-11.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# 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,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1 eutils linux-info user
 
diff --git a/sys-cluster/heat/heat-11.0.2.ebuild b/sys-cluster/heat/heat-11.0.2.ebuild
new file mode 100644
index 000000000000..1af9685c9cfa
--- /dev/null
+++ b/sys-cluster/heat/heat-11.0.2.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{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.rocky -> heat.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/heat.git"
+	EGIT_BRANCH="stable/rocky"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.rocky -> heat.conf.sample-${PV}
+		https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+S="${WORKDIR}/openstack-${P}"
+
+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.2.1[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${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/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/neutron-lib-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.11.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.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-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.5.2[${PYTHON_USEDEP}]
+	>=dev-python/python-blazarclient-1.0.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.12.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.7.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-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-4.4.0[${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-12.0.0.ebuild b/sys-cluster/heat/heat-12.0.0.ebuild
new file mode 100644
index 000000000000..d776c23e9496
--- /dev/null
+++ b/sys-cluster/heat/heat-12.0.0.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+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.stein -> heat.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/heat.git"
+	EGIT_BRANCH="stable/stein"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.stein -> heat.conf.sample-${PV}
+		https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+S="${WORKDIR}/openstack-${P}"
+
+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.2.1[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${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/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/neutron-lib-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.11.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.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-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-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.37.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.5.2[${PYTHON_USEDEP}]
+	>=dev-python/python-blazarclient-1.0.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.12.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.7.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-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-4.4.0[${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
+	rm -r "${ED}"/usr/etc
+}
diff --git a/sys-cluster/heat/heat-2018.2.9999.ebuild b/sys-cluster/heat/heat-2018.2.9999.ebuild
index a0c7acdf6cf7..bf4626413563 100644
--- a/sys-cluster/heat/heat-2018.2.9999.ebuild
+++ b/sys-cluster/heat/heat-2018.2.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1 eutils linux-info user
 
@@ -19,6 +19,7 @@ else
 		https://tarballs.openstack.org/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
+S="${WORKDIR}/openstack-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/sys-cluster/heat/heat-2019.1.9999.ebuild b/sys-cluster/heat/heat-2019.1.9999.ebuild
new file mode 100644
index 000000000000..d776c23e9496
--- /dev/null
+++ b/sys-cluster/heat/heat-2019.1.9999.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+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.stein -> heat.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/heat.git"
+	EGIT_BRANCH="stable/stein"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.stein -> heat.conf.sample-${PV}
+		https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+S="${WORKDIR}/openstack-${P}"
+
+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.2.1[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${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/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/neutron-lib-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.11.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.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-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-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.37.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.5.2[${PYTHON_USEDEP}]
+	>=dev-python/python-blazarclient-1.0.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.12.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.7.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-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-4.4.0[${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
+	rm -r "${ED}"/usr/etc
+}
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index a20f4dd70875..ea3f271fca42 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -2,9 +2,9 @@ DIST hpx_0.9.99.tar.gz 3779841 BLAKE2B fae6b06a303964e3d52d68fcfd980f89625bfd2a7
 DIST hpx_1.0.0.tar.gz 3972403 BLAKE2B 737282f2b547c2ce7e6e0367df64beaf22760d73840f2f1b983e8b970baef074b376f264a97f8c67873eedc24255ec2515bbf2a5bbcb364f89284f48ac18b177 SHA512 42c155654f118bff34b48d929b1732fd56126b8fd3e7657b5bd2f84275288ddf538572ed1152883c4aed5e9683de53b9b1f1c3613e5092e7bd1a5e165bed606d
 DIST hpx_1.1.0.tar.gz 4374855 BLAKE2B 17caeb085e0167d51a1a89c73bce653938d9918776b9db07ae9171cb11570a440e2f88cea86d8b8066b7d102e9a24f1e8304b47b2ade161cbe4e27cce91e3b84 SHA512 09b69a5f14bdb4cbf629bc3a10a4e1dc4c0ab35efdb74386fc7f0135558db5f9557ae8de4edd0ade12cfb91a78e6cc2fac25efbdf9a21042abcb0f303eda1938
 DIST hpx_1.2.0.tar.gz 3918088 BLAKE2B 7c5eccef6a58f683f94e59e3773e949945652e1fc7c883d134da5b6d32f21bb9a2f526d073260561657da518687ac96487f058715e51236a334b97b27a414451 SHA512 e2dec9484490f5a5fa7d60f712989f70068bcddac643d8b730d2d52aa2a7e49260b28c3becd519925a8e96e9a703473f19955adce087061cf50b861f4fed8ab1
-EBUILD hpx-0.9.99.ebuild 1890 BLAKE2B 4dfb8ac3b1aab563e889b3ea89f9ed0fe8dbb09fe7da47293d03f829dd92fa7a429e55228546d6dbd03c5070a0c9356f56a44b5fc71640586aaf4d122336c76f SHA512 8300f95ef02cbad1e959f6958d680f1cbd46729adf813af54063652ad5e3413e67664be743fe8950ae743d9074cc58c3f0175d3dcbe014e1d734844f2bb50e21
-EBUILD hpx-1.0.0.ebuild 1946 BLAKE2B 948184f9c8be17b11a3b089e39c782bbc2abd858c5bcf1bdb115b8a7cff6a9d5044d872340acf07f1b08d4acf6898435149cc2319f22fe206a270bc3bd1c58f5 SHA512 adacf71dc11747e3d1535044929a3a8f379f46a63c3e95e70eec96f0766eb39f921914899033a8250804930e38796cccdfc5afee6b3b5e617e916ea416339658
-EBUILD hpx-1.1.0.ebuild 1943 BLAKE2B ccfea8c0fd8ef2f50655b82e950ea26a2f9c3a28c31525f6ffe9fee29b75f136fdd301c7d46c550065360a805f767ee8f42d2a4fd3bf17d29cec14ef902c5d3f SHA512 bb4406c69b03d8286ffe21ef322907903846aff77223cef3e1bd9c99b96c78135ca4634c24474a270b7d10f3e2dfb3d7cdebe2f8cca865b85aa1a5eebf5953b5
-EBUILD hpx-1.2.0.ebuild 1943 BLAKE2B ccfea8c0fd8ef2f50655b82e950ea26a2f9c3a28c31525f6ffe9fee29b75f136fdd301c7d46c550065360a805f767ee8f42d2a4fd3bf17d29cec14ef902c5d3f SHA512 bb4406c69b03d8286ffe21ef322907903846aff77223cef3e1bd9c99b96c78135ca4634c24474a270b7d10f3e2dfb3d7cdebe2f8cca865b85aa1a5eebf5953b5
-EBUILD hpx-9999.ebuild 1943 BLAKE2B ccfea8c0fd8ef2f50655b82e950ea26a2f9c3a28c31525f6ffe9fee29b75f136fdd301c7d46c550065360a805f767ee8f42d2a4fd3bf17d29cec14ef902c5d3f SHA512 bb4406c69b03d8286ffe21ef322907903846aff77223cef3e1bd9c99b96c78135ca4634c24474a270b7d10f3e2dfb3d7cdebe2f8cca865b85aa1a5eebf5953b5
+EBUILD hpx-0.9.99.ebuild 1884 BLAKE2B c38ecea42e0f981631bf5393cec7c24d9e52014ecacba06067d990a9d4a8325ddeb36cae9c6cd9b3e47fe5ee7ce4e28a8e1b8dde50c9e823cc0095ff34227c8e SHA512 72c17318f01794174ed83675b1e7a8a74eef4bf324511865963e6a77cd220bc79182980afae438d49b77090bdbcdf756088ed05b13410ee52ba796d0ab721a70
+EBUILD hpx-1.0.0.ebuild 1942 BLAKE2B cb09be80de38c0fa701d73562ddb66cdc90bc06d4244b91447a7f0b07173bad7f72e69ea21daa48c1f03191319e747c52e7d6bb5ede6492424aa2f047c713f77 SHA512 cc5f01a3c854ed94dc722c1b24219ca74dad390ad17fcf5f5e6f844c081d4fb661076ac1bfdcf7f46d46e5b4dd500d4e4b5793aa0c79797a886432abff3cfdc4
+EBUILD hpx-1.1.0.ebuild 1939 BLAKE2B 75751d10d4b3d88ddf478eb7a09ad71c861ca62ec78862300a9d99719dfa23ab147143fb5873004f77d100106a95e1ee6a5c5b01d1fd9b6f5f3549f3fe5d18f3 SHA512 350b39abf3e204601a31ad2175e6fb69330bae5dc212d0862f7c165770d9211935c5aaf1a775b9c0a7e6615692b018f71f28ba12f94e36fc852cad1609fb4659
+EBUILD hpx-1.2.0.ebuild 1939 BLAKE2B 75751d10d4b3d88ddf478eb7a09ad71c861ca62ec78862300a9d99719dfa23ab147143fb5873004f77d100106a95e1ee6a5c5b01d1fd9b6f5f3549f3fe5d18f3 SHA512 350b39abf3e204601a31ad2175e6fb69330bae5dc212d0862f7c165770d9211935c5aaf1a775b9c0a7e6615692b018f71f28ba12f94e36fc852cad1609fb4659
+EBUILD hpx-9999.ebuild 1939 BLAKE2B 75751d10d4b3d88ddf478eb7a09ad71c861ca62ec78862300a9d99719dfa23ab147143fb5873004f77d100106a95e1ee6a5c5b01d1fd9b6f5f3549f3fe5d18f3 SHA512 350b39abf3e204601a31ad2175e6fb69330bae5dc212d0862f7c165770d9211935c5aaf1a775b9c0a7e6615692b018f71f28ba12f94e36fc852cad1609fb4659
 MISC metadata.xml 1015 BLAKE2B 10711221bc93b52b674b0179b1d27ab762fc4f9de3a97e3af2e26296f7b42097aa75ab9acc0f6a5ed3faf053c31a575dd50dd2f1b7a69eb1ad4c7a745a547992 SHA512 a0215ad65388b911bb093d58903fb0b4948bfaaf32db26223c21ee2bd63bc7797f14f01d9a8e1203a27dea6bb6ea70c8f34bbeb22b53f49f70971d5e60ba8949
diff --git a/sys-cluster/hpx/hpx-0.9.99.ebuild b/sys-cluster/hpx/hpx-0.9.99.ebuild
index c7977e7361c5..871a7dee306b 100644
--- a/sys-cluster/hpx/hpx-0.9.99.ebuild
+++ b/sys-cluster/hpx/hpx-0.9.99.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python2_7 )
 
 if [ ${PV} == 9999 ] ; then
 	inherit git-r3
diff --git a/sys-cluster/hpx/hpx-1.0.0.ebuild b/sys-cluster/hpx/hpx-1.0.0.ebuild
index e7b63370d530..489183811659 100644
--- a/sys-cluster/hpx/hpx-1.0.0.ebuild
+++ b/sys-cluster/hpx/hpx-1.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 if [ ${PV} == 9999 ] ; then
 	inherit git-r3
diff --git a/sys-cluster/hpx/hpx-1.1.0.ebuild b/sys-cluster/hpx/hpx-1.1.0.ebuild
index 98afc4e22e11..9f8589d79686 100644
--- a/sys-cluster/hpx/hpx-1.1.0.ebuild
+++ b/sys-cluster/hpx/hpx-1.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 if [ ${PV} == 9999 ] ; then
 	inherit git-r3
diff --git a/sys-cluster/hpx/hpx-1.2.0.ebuild b/sys-cluster/hpx/hpx-1.2.0.ebuild
index 98afc4e22e11..9f8589d79686 100644
--- a/sys-cluster/hpx/hpx-1.2.0.ebuild
+++ b/sys-cluster/hpx/hpx-1.2.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 if [ ${PV} == 9999 ] ; then
 	inherit git-r3
diff --git a/sys-cluster/hpx/hpx-9999.ebuild b/sys-cluster/hpx/hpx-9999.ebuild
index 98afc4e22e11..9f8589d79686 100644
--- a/sys-cluster/hpx/hpx-9999.ebuild
+++ b/sys-cluster/hpx/hpx-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 if [ ${PV} == 9999 ] ; then
 	inherit git-r3
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index a08feefdb158..70ba468ba407 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -7,9 +7,11 @@ DIST keepalived-2.0.10.tar.gz 927631 BLAKE2B 0cb4c5c613ae2c58f993930c446cdcafdff
 DIST keepalived-2.0.11.tar.gz 961182 BLAKE2B 226bac3a544434a36b01ebdb43b166b3833fca3ec12014ba9a76e90f12663a5550271dff87155c74ba5eb908dd48fc9dd2cac810705e96ae3bd30df67a26e708 SHA512 ead982aeacdf329109089dfc58a42915ff44b0c4897006000c74642fa3747b2cac1a472faa438ce517f47b80d193d466875ab7130d2206400c8b2ad52f17c6d4
 DIST keepalived-2.0.12.tar.gz 947015 BLAKE2B c6c47bbc19bc8b31ae6c2d30616a5cfe90b1195c956b56731e702c909a1478e3793e22a7573f7b337d556c38d411d30f7aa5b4c0e45d14cfc18e17dfe46264d8 SHA512 345f7574cfe978194504691c0a7bcad76b1438bf8833911271647d445f0d1352972257554524e94be44e9d971299678d2f9a026e29088e844bbb3d2b25637076
 DIST keepalived-2.0.13.tar.gz 955953 BLAKE2B f6a8d23cdcf4b8484c37da9d48c12394617d36b1a2bba901c899d3397ed5a2ba048a73d98cf137df3c53359b4e83c382b9a958559303e8d1130316a6026a5d3b SHA512 5e33104d114794f9050958d06730d7ecb89e87157a043146509583df595d8e01439a8f1172abb7d2bca0e8e710a4ff6d364dbb0a89f5aafa632e7af2453f3966
-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
+DIST keepalived-2.0.15.tar.gz 972461 BLAKE2B 7c57d4ecdec7efe5dcb477e92daf4e6ee947ec66c3dc68a96fe0a7f07656a3c503751f10e9448f80e896b63d987fa9448bb264537106685cfac88ca87096721f SHA512 d426f2d917f72264944e8324409838287d4c535dfd5b5574a41c06828efc9095a2304f87a6435a067d4ad88ad5619108f7de97abb4a257a4c30e335929978dd1
+EBUILD keepalived-2.0.10-r1.ebuild 1797 BLAKE2B 1abc83adbdfae01b5ee03470164975fc2df917a54e8f72b9f77af28171cf7797524a7361600be6d61a7293d4546d544d105151e4027e387f209da5b637c89f40 SHA512 b1d9cb8a2471cd6a84892cc3a2bfd5d25212c509f9cd60dc32c0bc6e393a0d918ed277896848fa48a9ff04f4cd54f35804f9ec2537f884052fc9d683c6d3b0ea
+EBUILD keepalived-2.0.11.ebuild 1750 BLAKE2B 2b77dcce062c8096de1a16aa957fd5babcd2c91fe00e716258a4d0322e75a92dd5c662b0285daef77e8090edac2ea1229610f9014721e4e0ab3f8807b8f02c5e SHA512 a2702a070318a02fdd53404c65312c02af9e11a71c8eee54036510436ea81432ca993cf4b2959a77ad3828f3f3058299add16f56a561f55e87554948fdc6fe83
+EBUILD keepalived-2.0.12.ebuild 1750 BLAKE2B 2b77dcce062c8096de1a16aa957fd5babcd2c91fe00e716258a4d0322e75a92dd5c662b0285daef77e8090edac2ea1229610f9014721e4e0ab3f8807b8f02c5e SHA512 a2702a070318a02fdd53404c65312c02af9e11a71c8eee54036510436ea81432ca993cf4b2959a77ad3828f3f3058299add16f56a561f55e87554948fdc6fe83
+EBUILD keepalived-2.0.13-r1.ebuild 2238 BLAKE2B c1efbbe69af62c378bc3a3c39a7fec7dc884d98f71f29f8745655466f2a95ffd0f3b5e94c9a7a9183f7044d2dc8f6a1dd84853725f62057e952d2eba2ca0f88b SHA512 8d06181aea9b08f6a5eabf630310d233e2433f30bd8c60cefb34510dc07c20f25327ab8cbe31a79a1dc6709403c5b8dbb0f49ec5ae4b56dc5f6d8c5fcf7d0b09
+EBUILD keepalived-2.0.13.ebuild 1750 BLAKE2B 2b77dcce062c8096de1a16aa957fd5babcd2c91fe00e716258a4d0322e75a92dd5c662b0285daef77e8090edac2ea1229610f9014721e4e0ab3f8807b8f02c5e SHA512 a2702a070318a02fdd53404c65312c02af9e11a71c8eee54036510436ea81432ca993cf4b2959a77ad3828f3f3058299add16f56a561f55e87554948fdc6fe83
+EBUILD keepalived-2.0.15.ebuild 2254 BLAKE2B 4df1efab71cdffa310d8e3237384640e8c1ae518ca5cf9b6acd05720b5d81adef36e2d528842f22ca27ca7e54a18433f5d2c9a95ca3fc86aafe08c84afbbc7ae SHA512 6c611ffd1ad7749f373faa62450d93329baaa840e0419a9d8a464f255ff350ea8376ce2fabf199d95e3eb986eeb4d1a2cf84013dfa9f7d71aa9a029c79a6bebd
 MISC metadata.xml 640 BLAKE2B 5644b98bf487637c431299fe61e1185731d9fc22e9a19b9a3218855318a9c40500339c628671eb958c2bcee99d867a8e9c93903fdcdad25ad566659422dd2119 SHA512 6fd4981067e0a2e74511db7be79d656c62b39c1f43f860e0d981b6c9770cb2da6b4fd3e40af1ed23adc8bbbd01202e6c45e58b6f86480a807d193aae1a3f7ad3
diff --git a/sys-cluster/keepalived/keepalived-2.0.10-r1.ebuild b/sys-cluster/keepalived/keepalived-2.0.10-r1.ebuild
index 08bd54714b96..b0e4108824ad 100644
--- a/sys-cluster/keepalived/keepalived-2.0.10-r1.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.0.10-r1.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
@@ -6,8 +6,8 @@ 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"
+HOMEPAGE="https://www.keepalived.org/"
+SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-cluster/keepalived/keepalived-2.0.11.ebuild b/sys-cluster/keepalived/keepalived-2.0.11.ebuild
index 79fe86eb5c2b..e7e3f1f636d3 100644
--- a/sys-cluster/keepalived/keepalived-2.0.11.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.0.11.ebuild
@@ -6,8 +6,8 @@ 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"
+HOMEPAGE="https://www.keepalived.org/"
+SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-cluster/keepalived/keepalived-2.0.12.ebuild b/sys-cluster/keepalived/keepalived-2.0.12.ebuild
index 79fe86eb5c2b..e7e3f1f636d3 100644
--- a/sys-cluster/keepalived/keepalived-2.0.12.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.0.12.ebuild
@@ -6,8 +6,8 @@ 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"
+HOMEPAGE="https://www.keepalived.org/"
+SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-cluster/keepalived/keepalived-2.0.13-r1.ebuild b/sys-cluster/keepalived/keepalived-2.0.13-r1.ebuild
index 678e3d34ca81..fb23b0325af7 100644
--- a/sys-cluster/keepalived/keepalived-2.0.13-r1.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.0.13-r1.ebuild
@@ -6,8 +6,8 @@ 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"
+HOMEPAGE="https://www.keepalived.org/"
+SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-cluster/keepalived/keepalived-2.0.13.ebuild b/sys-cluster/keepalived/keepalived-2.0.13.ebuild
index 79fe86eb5c2b..e7e3f1f636d3 100644
--- a/sys-cluster/keepalived/keepalived-2.0.13.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.0.13.ebuild
@@ -6,8 +6,8 @@ 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"
+HOMEPAGE="https://www.keepalived.org/"
+SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-cluster/keepalived/keepalived-2.0.15.ebuild b/sys-cluster/keepalived/keepalived-2.0.15.ebuild
new file mode 100644
index 000000000000..a00ef1ac4008
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-2.0.15.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="https://www.keepalived.org/"
+SRC_URI="https://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 dev-libs/glib:2 )
+	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/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index d3728615f93a..8f72193360bc 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -2,8 +2,10 @@ AUX kubeadm-1.14-openrc.patch 3523 BLAKE2B bbcc45a82984afe2a8ab567ce1319b6c14c84
 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.14.1.tar.gz 28008273 BLAKE2B 28ef62504544f33581a64ccf4c54a9b93fff5b92169db869291ac00f199993373cbef51a9d2562d76f12a5f2ee073018113b23fdac5b875ddfb8a01dba7f422d SHA512 c2923b539103f9f5d414972ccddb99856df8161d5e734b30eb1156fd5ed4330fa25fabb2a9afcc21f07fd2e8c66b2b1b769efc38f32b19237e9b7bc3172af180
 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
+EBUILD kubeadm-1.14.1.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
 MISC metadata.xml 1128 BLAKE2B b5ad31ef126f2d95646a37c256b82d2ad5e008968f928fb56b05c39514d4a9e0a252ebcefbeac8679f5349acac170886859af44f095aafea97fc8bf00a34bc44 SHA512 b9246624712068cf304fc5329ae851c26d52204b684b5f547892b23e68948b04b4ed4654a49d7bb5fe7eea658b58fbdbbe51a7a9ba1f4a94c5d0499a033b7f5a
diff --git a/sys-cluster/kubeadm/kubeadm-1.14.1.ebuild b/sys-cluster/kubeadm/kubeadm-1.14.1.ebuild
new file mode 100644
index 000000000000..763c3838067b
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.14.1.ebuild
@@ -0,0 +1,50 @@
+# 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 Easily bootstrap a secure Kubernetes cluster"
+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.12
+	dev-go/go-bindata"
+
+RESTRICT="test"
+
+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() {
+	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/Manifest b/sys-cluster/kubectl/Manifest
index 2e999949b149..9eff109f0e13 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -3,11 +3,13 @@ DIST kubernetes-1.11.6.tar.gz 24827575 BLAKE2B 095adccef1b5618f7e5d3a46cbf835f10
 DIST kubernetes-1.12.6.tar.gz 28142622 BLAKE2B 7f3541356aebb3f60c27ba1ae1c9c50867bf77ae8cb585955b38addc1015ef0dbbf0bd21e454610ee2fe6c9811c0d32fe912de368f7bf5d95fe60cab7a538354 SHA512 bd4b28fb6ecb7212c9bd6fb24b3ba59466ed9d684a4ba4e403e0270fc96ac5d1bcdcf8ea0be0085353af29bbfe73ab6ff1cda5127ea123ad7660c3022cab4703
 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.14.1.tar.gz 28008273 BLAKE2B 28ef62504544f33581a64ccf4c54a9b93fff5b92169db869291ac00f199993373cbef51a9d2562d76f12a5f2ee073018113b23fdac5b875ddfb8a01dba7f422d SHA512 c2923b539103f9f5d414972ccddb99856df8161d5e734b30eb1156fd5ed4330fa25fabb2a9afcc21f07fd2e8c66b2b1b769efc38f32b19237e9b7bc3172af180
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
 EBUILD kubectl-1.10.12.ebuild 1218 BLAKE2B 07e3137d8a56d669cfa1fb05dedc4526b2376fdda9cdfc4c4d8a67f740687404cec372691f4e55a34d2fd1ddc8487ea0207f1699658910d010d22d19f9a0bc13 SHA512 747a24d27b67332c1c427825368a0e4f1feb3194fc9a7c6107d3463a049c998ff756b325eab950dab45b8b4a8236b0e202ea8bd302915d4f1feacc3335aa3b55
 EBUILD kubectl-1.11.6.ebuild 1218 BLAKE2B 07e3137d8a56d669cfa1fb05dedc4526b2376fdda9cdfc4c4d8a67f740687404cec372691f4e55a34d2fd1ddc8487ea0207f1699658910d010d22d19f9a0bc13 SHA512 747a24d27b67332c1c427825368a0e4f1feb3194fc9a7c6107d3463a049c998ff756b325eab950dab45b8b4a8236b0e202ea8bd302915d4f1feacc3335aa3b55
 EBUILD kubectl-1.12.6.ebuild 1218 BLAKE2B 07e3137d8a56d669cfa1fb05dedc4526b2376fdda9cdfc4c4d8a67f740687404cec372691f4e55a34d2fd1ddc8487ea0207f1699658910d010d22d19f9a0bc13 SHA512 747a24d27b67332c1c427825368a0e4f1feb3194fc9a7c6107d3463a049c998ff756b325eab950dab45b8b4a8236b0e202ea8bd302915d4f1feacc3335aa3b55
 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.14.1.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.14.1.ebuild b/sys-cluster/kubectl/kubectl-1.14.1.ebuild
new file mode 100644
index 000000000000..7a61b25dce90
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.14.1.ebuild
@@ -0,0 +1,47 @@
+# 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-lang/go-1.12
+	dev-go/go-bindata"
+
+RESTRICT="test"
+
+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
+	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/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 5a6020f7df11..82dda21c818f 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -10,6 +10,7 @@ DIST kubernetes-1.13.3.tar.gz 28781320 BLAKE2B 7ae1a6ddeff5b8d19bacc868ad5970cc8
 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.14.1.tar.gz 28008273 BLAKE2B 28ef62504544f33581a64ccf4c54a9b93fff5b92169db869291ac00f199993373cbef51a9d2562d76f12a5f2ee073018113b23fdac5b875ddfb8a01dba7f422d SHA512 c2923b539103f9f5d414972ccddb99856df8161d5e734b30eb1156fd5ed4330fa25fabb2a9afcc21f07fd2e8c66b2b1b769efc38f32b19237e9b7bc3172af180
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
 EBUILD kubelet-1.10.12.ebuild 1214 BLAKE2B a2b8a51455ab201eb5e3b39cefaaa9a120633340a240a0aa94b1c044d7bf83e3babc2b00f1f75f080d1cdaaa87736588f39890edb677e1dd2c59397d2eee0436 SHA512 772ba0ab7060ab606070ab6bba7ff512e2eaf15acbcc634fc40fc7a0834f750be757c9d7a24b1e59e5c52d60f828ae458f51b533da479cfcab65f0a6145adfbd
 EBUILD kubelet-1.11.6.ebuild 1214 BLAKE2B a2b8a51455ab201eb5e3b39cefaaa9a120633340a240a0aa94b1c044d7bf83e3babc2b00f1f75f080d1cdaaa87736588f39890edb677e1dd2c59397d2eee0436 SHA512 772ba0ab7060ab606070ab6bba7ff512e2eaf15acbcc634fc40fc7a0834f750be757c9d7a24b1e59e5c52d60f828ae458f51b533da479cfcab65f0a6145adfbd
@@ -18,5 +19,6 @@ EBUILD kubelet-1.13.3.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fd
 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.14.1.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.14.1.ebuild b/sys-cluster/kubelet/kubelet-1.14.1.ebuild
new file mode 100644
index 000000000000..f38ce59e625d
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.14.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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"
+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
+	>=dev-lang/go-1.11"
+
+RESTRICT="test"
+
+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() {
+	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}
+	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 83fe46503c22..b677785e5986 100644
--- a/sys-cluster/minikube/Manifest
+++ b/sys-cluster/minikube/Manifest
@@ -1,7 +1,7 @@
 DIST minikube-0.33.1.tar.gz 9434081 BLAKE2B a29c3293f67e33fa0f5ece632db1a852a3bbd6f2c522699e59148a41277bf819c20d5d27034c71f89df2a5d7895c2dbf3166c11661e98be38267fbd5b2c25ab5 SHA512 c4a266c2d68264155ebc6dcbd3788ed77678c86310be469e595cd6f1d89677082cd8445e9dd456ec7d7433922fd0e7d4315614c2a62640ce9efc7adceb0e7cb8
 DIST minikube-0.34.1.tar.gz 11048222 BLAKE2B 7451d310079f58c5a81383b3801faa153aeca9be6a93dd553d4220e203ce5ad06c2c5b1d0a7601bd76c9f05881c99ceabd959d1b290daa9c0ffce8b2f59c4e69 SHA512 004e403be9300b93a734eabe0fadf01fbfb7f13e04564df08924a6681109b1c155979728561aadce94265920ff3706785390d7ee9000a5072789127185d2a1d4
 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-0.33.1.ebuild 1618 BLAKE2B 5620e6b79ef6c614f2a95ec2ef865bd5ef9231c96dc65826a368beed1c394915127049eb469ec56173507f4bbeeaa592660d55f07e673953980feeb14708b11b SHA512 bc5fbdc8dea3180ca54d0d387faad6dfec924d7800651c13d78dcd292a95d4aef920531cf54a1ff59739ecedce82f45f9a1a87cacfe13165c7fd11972c162da3
+EBUILD minikube-0.34.1.ebuild 1618 BLAKE2B 5620e6b79ef6c614f2a95ec2ef865bd5ef9231c96dc65826a368beed1c394915127049eb469ec56173507f4bbeeaa592660d55f07e673953980feeb14708b11b SHA512 bc5fbdc8dea3180ca54d0d387faad6dfec924d7800651c13d78dcd292a95d4aef920531cf54a1ff59739ecedce82f45f9a1a87cacfe13165c7fd11972c162da3
 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.33.1.ebuild b/sys-cluster/minikube/minikube-0.33.1.ebuild
index dfa9435d5830..accf292d5ec8 100644
--- a/sys-cluster/minikube/minikube-0.33.1.ebuild
+++ b/sys-cluster/minikube/minikube-0.33.1.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
 
diff --git a/sys-cluster/minikube/minikube-0.34.1.ebuild b/sys-cluster/minikube/minikube-0.34.1.ebuild
index dfa9435d5830..accf292d5ec8 100644
--- a/sys-cluster/minikube/minikube-0.34.1.ebuild
+++ b/sys-cluster/minikube/minikube-0.34.1.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
 
diff --git a/sys-cluster/mpich/Manifest b/sys-cluster/mpich/Manifest
index 723b4945b3d4..c4261ad19f8e 100644
--- a/sys-cluster/mpich/Manifest
+++ b/sys-cluster/mpich/Manifest
@@ -1,5 +1,6 @@
+AUX mpich-3.3-add-external-libdir-parameter.patch 8605 BLAKE2B 56a6c60362da3004c8762f6fe62f0a9a010904a38ed7998f5617598362669e7d083b2893781e24d96100b9cefffe5f51ed1d3a921ff14b511dea12622e8a5e0e SHA512 2533f0a92f517118bf3c145d3d3a6e446b0596cc6c5c79d5eebb13e55ee1ab35ce2356fa75db4029f45a3337888ff151a78e0ec1e02ef6c7cde56f85c189eb00
 DIST mpich-3.0.4.tar.gz 10921075 BLAKE2B 341aaac23277aed05a4448ea03d9caf1ee14cfe327a770c95d620fc1ee1ea7bfa6df36860aa44aad162eb6d630d35fdfb30ae9a866d67680ab71c7b4326c109c SHA512 f9d8b2cf561fe5f85c12512ef4dd7b0cf5ec8b53ddb07bfa0d1db2e3c8ae0382c77e0661f46b82ec96b05d18ea2d25328bb84e9528ac06e5925f30ec8ef030d0
-DIST mpich-3.2.tar.gz 11862150 BLAKE2B 2e0414b2e11b08a59497fa255d464a2130c754ba8798b99a8b84f7232179906bb27906abbe58b9546833541c238f42ae06df90bfe1133d3ff2d85921d9736452 SHA512 083c51655b4355827bd7fa4fe528046e2bc77b7747d869ff87b79fa324c3cc2a9b5640ccb7271490ccc0dd627e354a33a449bbab448501bbfddcfe5f999ee717
+DIST mpich-3.3.tar.gz 27209008 BLAKE2B 3010f847456ed71a27e728b91887e04303a83b4abea883bf73d9794ff697052efe3bccd238933dc6e5fbc75e0be36004f1ae9fc7695a4e8887984552ae005917 SHA512 1ed6d8d30db4923fd1bd39b6e9622f0db939a45edf8d9f8bdbccfa619fde7fb920c5a0d3f2442f0dd63cf8fda823dbd2983ac5f7c16308bc79e04f61d8e119be
 EBUILD mpich-3.0.4.ebuild 2529 BLAKE2B d60c5eb9d4a9b7838de58dbc93c695ccf379136004a9ea670f9002c8b1173c5d8d7fb5107d29940025bf417dd5f2b3289ed44d062ba0de1f2ccfe77b14ee217b SHA512 c4588f2b52025fe4fca70b6b0b0c83b5595c4f2d281b744cede8f9ccfc73c0c880dea5f2271fb54a52f64a759488e194a14e5c55e017be63690a7aea9e9d2707
-EBUILD mpich-3.2-r1.ebuild 3113 BLAKE2B 9848838a9099f4b8a9dede5e396390cf32698aa0c219447445e5783cfd4c438acc22394530b7076095404c79d4abb6fd9bc0156a9e66e57e4e2a92927b476c72 SHA512 5e92a55e6303b9c352f3517affddf53e82427ce0f2ec1eb9edef84d97ef12dec69fea28b3aef280c63b7bbba8fc8a29c67cbbf9237f55dc2a8c1cecc8edd1e66
+EBUILD mpich-3.3.ebuild 3795 BLAKE2B f712a7c70d2e444c3aa8fa3d32a0751eae7cee897e845537d05e7c8f7cc400a30a2bef493f9a7d29e1499856d930798d535ac19ec3be9ce919abbe31cfa7a971 SHA512 8da57e216efb628c9a523b433b67de59b77e627bf5c6dfd37ea2a16a4acb6c812ec147eedfc45edaaeb17fdef1e002965b1f9ff7cb140cc2af3111798ac00769
 MISC metadata.xml 658 BLAKE2B 2fc81d1e02086392471d734b5837e8a7ddf9bc8f06ac24766f7bb2e2c7f735a92fd80ed5de47f693224058dcad1c8e89d764c81a2568c363f28a59c50f275112 SHA512 fb8427b6757ba0571f5f78ee71bfd80ebf9e0835a1016b3ef1f66d27a2022033118c7a1fbfe4011e591d321bae9df48c4e4554e3daaa1a3033bee74b5f4c08fe
diff --git a/sys-cluster/mpich/files/mpich-3.3-add-external-libdir-parameter.patch b/sys-cluster/mpich/files/mpich-3.3-add-external-libdir-parameter.patch
new file mode 100644
index 000000000000..64be728f5748
--- /dev/null
+++ b/sys-cluster/mpich/files/mpich-3.3-add-external-libdir-parameter.patch
@@ -0,0 +1,198 @@
+diff --git a/confdb/aclocal_libs.m4 b/confdb/aclocal_libs.m4
+index c417204..5d98053 100644
+--- a/confdb/aclocal_libs.m4
++++ b/confdb/aclocal_libs.m4
+@@ -27,6 +27,14 @@ AC_DEFUN([PAC_SET_HEADER_LIB_PATH],[
+                          [AC_MSG_WARN([--with[out]-$1-lib=PATH expects a valid PATH])
+                           with_$1_lib=""])],
+                 [])
++	AC_ARG_WITH([common-libdir],
++            [AS_HELP_STRING([[--with-common-libdir[=DIR]]], [use the $1
++                            library installed in DIR, rather than the
++                            one included in the distribution.  Pass
++                            "embedded" to force usage of the included
++                            $1 source.])],
++            [],
++            [with_common_libdir=lib64])
+ 
+     # The args have been sanitized into empty/non-empty values above.
+     # Now append -I/-L args to CPPFLAGS/LDFLAGS, with more specific options
+@@ -42,9 +50,7 @@ AC_DEFUN([PAC_SET_HEADER_LIB_PATH],[
+           [AS_IF([test -n "${with_$1}"],
+                  dnl is adding lib64 by default really the right thing to do?  What if
+                  dnl we are on a 32-bit host that happens to have both lib dirs available?
+-                 [PAC_APPEND_FLAG([-L${with_$1}/lib],[LDFLAGS])
+-                  AS_IF([test -d "${with_$1}/lib64"],
+-		        [PAC_APPEND_FLAG([-L${with_$1}/lib64],[LDFLAGS])])
++                 [PAC_APPEND_FLAG([-L${with_$1}/${with_common_libdir}],[LDFLAGS])
+                  ])
+           ])
+ ])
+@@ -79,6 +85,14 @@ AC_DEFUN([PAC_CHECK_HEADER_LIB_FATAL],[
+ 
+ dnl PAC_CHECK_PREFIX(with_option,prefixvar)
+ AC_DEFUN([PAC_CHECK_PREFIX],[
++	AC_ARG_WITH([prefix-libdir],
++            [AS_HELP_STRING([[--with-$1-prefix[=DIR]]], [use the $1
++                            library installed in DIR, rather than the
++                            one included in the distribution.  Pass
++                            "embedded" to force usage of the included
++                            $1 source.])],
++            [],
++            [with_prefix_libdir=lib64])
+ 	AC_ARG_WITH([$1-prefix],
+             [AS_HELP_STRING([[--with-$1-prefix[=DIR]]], [use the $1
+                             library installed in DIR, rather than the
+@@ -93,10 +107,7 @@ AC_DEFUN([PAC_CHECK_PREFIX],[
+                  :
+              else
+                  PAC_APPEND_FLAG([-I${with_$1_prefix}/include],[CPPFLAGS])
+-                 if test -d "${with_$1_prefix}/lib64" ; then
+-                     PAC_APPEND_FLAG([-L${with_$1_prefix}/lib64],[LDFLAGS])
+-                 fi
+-                 PAC_APPEND_FLAG([-L${with_$1_prefix}/lib],[LDFLAGS])
++                 PAC_APPEND_FLAG([-L${with_$1_prefix}/${with_prefix_libdir}],[LDFLAGS])
+              fi
+              ],
+             [with_$1_prefix="embedded"])
+diff --git a/configure.ac b/configure.ac
+index 765aa9e..ef9c2e5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1240,6 +1240,11 @@ OPA_fetch_and_incr_int(&i,5);
+ 
+ opasrcdir=""
+ AC_SUBST([opasrcdir])
++AC_ARG_WITH([opal-libdir],
++            [AS_HELP_STRING([[--with-opal-libdir[=DIR]]],
++                            [use the specified OPAL library path with DIR.])],
++            [],dnl action-if-given
++            [with_opal_libdir=lib64]) dnl action-if-not-given
+ opalibdir=""
+ AC_SUBST([opalibdir])
+ opalib=""
+@@ -1282,13 +1287,8 @@ else
+           [:],[AC_MSG_ERROR([the OpenPA installation in "${with_openpa_prefix}" appears broken])])
+     PAC_APPEND_FLAG([-I${with_openpa_prefix}/include],[CPPFLAGS])
+     PAC_PREPEND_FLAG([-l${OPALIBNAME}],[WRAPPER_LIBS])
+-    if test -d ${with_openpa_prefix}/lib64 ; then
+-        PAC_APPEND_FLAG([-L${with_openpa_prefix}/lib64],[WRAPPER_LDFLAGS])
+-        opalibdir="-L${with_openpa_prefix}/lib64"
+-    else
+-        opalibdir="-L${with_openpa_prefix}/lib"
+-    fi
+-    PAC_APPEND_FLAG([-L${with_openpa_prefix}/lib],[WRAPPER_LDFLAGS])
++    PAC_APPEND_FLAG([-L${with_openpa_prefix}/${with_opal_libdir}],[WRAPPER_LDFLAGS])
++    opallibdir="-L${with_openpa_prefix}/${with_opal_libdir}"
+ fi
+ 
+ # Izem
+@@ -1463,6 +1463,11 @@ AC_ARG_WITH([hwloc-prefix],
+             [with_hwloc_prefix=embedded]) dnl action-if-not-given
+ hwlocsrcdir=""
+ AC_SUBST([hwlocsrcdir])
++AC_ARG_WITH([hwloc-libdir],
++            [AS_HELP_STRING([[--with-hwloc-libdir[=DIR]]],
++                            [use the specified HWLOC library path with DIR.])],
++            [],dnl action-if-given
++            [with_hwloc_libdir=lib64]) dnl action-if-not-given
+ hwloclibdir=""
+ AC_SUBST([hwloclibdir])
+ hwloclib=""
+@@ -1502,12 +1507,8 @@ else
+ 
+    if test "$have_hwloc" = "yes" ; then
+       hwloclib="-lhwloc"
+-      if test -d ${with_hwloc_prefix}/lib64 ; then
+-         PAC_APPEND_FLAG([-L${with_hwloc_prefix}/lib64],[WRAPPER_LDFLAGS])
+-         hwloclibdir="-L${with_hwloc_prefix}/lib64"
+-      else
+-	 hwloclibdir="-L${with_hwloc_prefix}/lib"
+-      fi
++      PAC_APPEND_FLAG([-L${with_hwloc_prefix}/${with_hwloc_libdir}],[WRAPPER_LDFLAGS])
++      hwloclibdir="-L${with_hwloc_prefix}/${with_hwloc_libdir}"
+    fi
+ fi
+ 
+@@ -1526,7 +1527,11 @@ AC_ARG_WITH([netloc-prefix],
+             [AS_HELP_STRING([[--with-netloc-prefix[=DIR]]],
+                             [use the NETLOC library installed in DIR]) or system to use the system library], [],
+                             [with_netloc_prefix=no])
+-
++AC_ARG_WITH([netloc-libdir],
++            [AS_HELP_STRING([[--with-netloc-libdir[=DIR]]],
++                            [use the specified NETLOC library path with DIR.])],
++            [],dnl action-if-given
++            [with_netloc_libdir=lib64]) dnl action-if-not-given
+ netloclibdir=""
+ AC_SUBST([netloclibdir])
+ 
+@@ -1540,13 +1545,8 @@ if test "$have_hwloc" = "yes" ; then
+             PAC_APPEND_FLAG([-I${with_netloc_prefix}/include],[CPPFLAGS])
+             PAC_APPEND_FLAG([-I${with_netloc_prefix}/include],[CFLAGS])
+             PAC_PREPEND_FLAG([-lnetloc],[WRAPPER_LIBS])
+-            if test -d ${with_netloc_prefix}/lib64 ; then
+-                PAC_APPEND_FLAG([-L${with_netloc_prefix}/lib64],[WRAPPER_LDFLAGS])
+-                netloclibdir="-L${with_netloc_prefix}/lib64"
+-            else
+-                PAC_APPEND_FLAG([-L${with_netloc_prefix}/lib],[WRAPPER_LDFLAGS])
+-                netloclibdir="-L${with_netloc_prefix}/lib"
+-            fi
++            PAC_APPEND_FLAG([-L${with_netloc_prefix}/${with_netloc_libdir}],[WRAPPER_LDFLAGS])
++            netloclibdir="-L${with_netloc_prefix}/${with_netloc_libdir}"
+        else
+            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include "netloc.h"
+                                    ],
+diff --git a/src/izem/configure.ac b/src/izem/configure.ac
+index b5417fd..fe6cf4a 100644
+--- a/src/izem/configure.ac
++++ b/src/izem/configure.ac
+@@ -344,9 +344,14 @@ esac
+ 
+ AC_SUBST(ZM_QUEUE_CONF)
+ 
++AC_ARG_WITH([izem-libdir],
++            [AS_HELP_STRING([--with-hwloc-libdir], [Set specific path to hwloc.])],
++            [],
++            [with_izem_libdir=lib64])
++
+ AC_ARG_WITH([hwloc],
+             [AS_HELP_STRING([--with-hwloc], [Set path to hwloc. Default: auto detect.])],
+-            [LIBS="$LIBS -L$with_hwloc/lib"
++            [LIBS="$LIBS -L$with_hwloc/$with_izem_libdir"
+              CFLAGS="$CFLAGS -I$with_hwloc/include"],
+             [])
+ 
+diff --git a/src/mpid/ch4/netmod/ofi/libfabric/config/fi_provider.m4 b/src/mpid/ch4/netmod/ofi/libfabric/config/fi_provider.m4
+index 901de77..6778da7 100644
+--- a/src/mpid/ch4/netmod/ofi/libfabric/config/fi_provider.m4
++++ b/src/mpid/ch4/netmod/ofi/libfabric/config/fi_provider.m4
+@@ -189,16 +189,19 @@ AC_DEFUN([FI_CHECK_PREFIX_DIR],[
+ 	        AC_MSG_ERROR([Cannot continue])
+ 	       ])
+ 
++	AC_ARG_WITH([fiprovider-libdir],
++            [AS_HELP_STRING([[--with-fiprovider-libdir[=DIR]]],
++                            [use the specified FI PROVIDER library path with DIR.])],
++            [],dnl action-if-given
++            [with_fiprovider_libdir=lib64]) dnl action-if-not-given
++
+ 	# Check that base/lib or base/lib64 exists
+-	 AS_IF([test -d "$1/lib64"],
+-	       [$2_LIBDIR="$1/lib64"],
+-	       [AS_IF([test -d "$1/lib"],
+-		      [$2_LIBDIR="$1/lib"],
+-		      [AC_MSG_WARN([could not find "lib" or "lib64" subdirectories in supplied "$1" directory"])
+-		       AC_MSG_ERROR([Cannot continue])
+-		      ])
+-	       ])
+-	])
++     [AS_IF([test -d "$1/${with_fiprovider_libdir}"],
++        [$2_LIBDIR="$1/${with_fiprovider_libdir}"],
++        [AC_MSG_WARN([could not find "lib" or "lib64" subdirectories in supplied "$1" directory"])
++         AC_MSG_ERROR([Cannot continue])
++        ])
++     ]])
+ 
+ dnl ------------------------------------------------------------------------
+ 
diff --git a/sys-cluster/mpich/mpich-3.2-r1.ebuild b/sys-cluster/mpich/mpich-3.3.ebuild
index ed837625e33b..8eeb7b552f05 100644
--- a/sys-cluster/mpich/mpich-3.2-r1.ebuild
+++ b/sys-cluster/mpich/mpich-3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 FORTRAN_NEEDED=fortran
 FORTRAN_STANDARD="77 90"
 
-inherit fortran-2 multilib-minimal
+inherit fortran-2 multilib-minimal multilib autotools
 
 MY_PV=${PV/_/}
 DESCRIPTION="A high performance and portable MPI implementation"
@@ -15,12 +15,12 @@ SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="mpich2"
-KEYWORDS="amd64 ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+cxx doc fortran mpi-threads romio threads"
 
 COMMON_DEPEND="
 	>=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
-	<sys-apps/hwloc-2[${MULTILIB_USEDEP}]
+	>=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
 	romio? ( net-fs/nfs-utils )"
 
 DEPEND="${COMMON_DEPEND}
@@ -40,6 +40,10 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/opa_config.h
 )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3-add-external-libdir-parameter.patch
+)
+
 src_prepare() {
 	default
 
@@ -48,6 +52,20 @@ src_prepare() {
 		src/packaging/pkgconfig/mpich.pc.in \
 		src/env/*.in \
 		|| die
+
+	# Fix m4 files to satisfy lib dir with multilib.
+	touch -r src/pm/hydra/confdb/aclocal_libs.m4 \
+		confdb/aclocal_libs.m4 \
+		|| die
+	cp -fp confdb/aclocal_libs.m4 \
+		src/pm/hydra/confdb/aclocal_libs.m4 \
+		|| die
+	cp -fp confdb/aclocal_libs.m4 \
+		src/pm/hydra/mpl/confdb/aclocal_libs.m4 \
+		|| die
+	cd src/pm/hydra/mpl; eautoreconf; cd -
+	cd src/pm/hydra; eautoreconf; cd -
+	eautoreconf
 }
 
 multilib_src_configure() {
@@ -84,13 +102,18 @@ multilib_src_configure() {
 	ECONF_SOURCE=${S} econf \
 		--enable-shared \
 		--with-hwloc-prefix="${EPREFIX}/usr" \
+		--with-hwloc-libdir="$(get_libdir)" \
+		--with-common-libdir="$(get_libdir)" \
+		--with-prefix-libdir="$(get_libdir)" \
+		--with-izem-libdir="$(get_libdir)" \
+		--with-fiprovider-libdir="$(get_libdir)" \
 		${c} \
 		--with-pm=hydra \
 		--disable-fast \
 		--enable-versioning \
 		$(use_enable romio) \
 		$(use_enable cxx) \
-		$(multilib_native_use_enable fortran fortran all)
+		$(use_enable fortran fortran all)
 }
 
 multilib_src_test() {
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 9e20bd4c51e9..4acc3904a9c4 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -7,10 +7,21 @@ AUX neutron-server.confd 70 BLAKE2B 88309872ce864e4dfa9072c1472bd6f1e8116f71106f
 AUX neutron.initd 530 BLAKE2B 48900bdde5770a0b0db90490d6ae8541dafc96e3fa2aa1c8d75eab5f547be35fa5adb792db8960f71a98bbeb71d56b29e5f5166a47735ebe85804019aa4e1f11 SHA512 c9c7386ae8d97205859f02edb0c7d601059af78def3f232f87e676131c5e6fcdb6e880ccee5b1b15397b1dffe83446421145c90ed448f5e9d55994efd1629f92
 AUX neutron.sudoersd 117 BLAKE2B 30e903fd3d681b779ad7e4758b56bfd78df6165ae030f0a5017dccd1873570db450efd3e7b232f77d6d2e3fcb81cb64d9d44901802310ebe2d88f882d334acda SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366
 DIST neutron-13.0.2.tar.gz 10596419 BLAKE2B 5d18c5ada86c2676ecab1c0121834c04e5c12d2c81a42ddb9554d0bdc2b7d472b5941b7290dc701c22b21b69442d04a44768c9423ff5d317b51d8cd37aa076bf SHA512 4fb343039a6f6a6930d9770b02d58be732c57910e36739c8364bf8027a7ed55dafc40201ef8c349278310afc2ab6ee80fea562af94896e38891c35eaeb1faced
+DIST neutron-13.0.3.tar.gz 10599028 BLAKE2B 1eb3bcbf9986531d24d06de6dcf71707fb6599bf20d85814af42ce9feb24059a94592c2741fbcd71fad78ff829f93f811dbbe63aa2cdb3931b7499b5de2bcc2e SHA512 1c229256733bb1ea03ae3296607a7ee6c9004c03a6c57fdb9c13f006bbb337b39a57c4690e3a59a7d9e313d0f450c4b81f2100a64a14e5e5c81a188a8116e1e9
+DIST neutron-14.0.1.tar.gz 10711126 BLAKE2B 43bf5ffeb46249207b8ab55cc01812e12ac719b680a867cbd374fdad50df2443eb44df16e97fff9845467284ac3dbaa3e0e1886703a868c7f26087d8e4e27a1a SHA512 9181d1a63550e205114f33e5626ff66f306d424505fb42cf21bcc8673e80b8e36b8a0bf33d3f2ec90343868a7e2e1f6b221831df64d1bec8e84a1d956da69392
 DIST neutron-configs-13.0.2.tar.gz 26109 BLAKE2B 5de3b90dcb6f8c86ce659b3ab439a79dd920aaf57b66a1e1b29f1b0d0fd433b222335a634dca01ce2b0e07acc3011ff6bf25983071dc0ff00e78ac847ee3fdd6 SHA512 498f41ffec6c14597e9785da9a36c2d906138215b34017aa93f56d051078682279bcce05288d2534ff7ab8208b8251c9f721256488f6850173210e41bc6dd51c
+DIST neutron-configs-13.0.3.tar.gz 26109 BLAKE2B 5de3b90dcb6f8c86ce659b3ab439a79dd920aaf57b66a1e1b29f1b0d0fd433b222335a634dca01ce2b0e07acc3011ff6bf25983071dc0ff00e78ac847ee3fdd6 SHA512 498f41ffec6c14597e9785da9a36c2d906138215b34017aa93f56d051078682279bcce05288d2534ff7ab8208b8251c9f721256488f6850173210e41bc6dd51c
+DIST neutron-configs-14.0.1.tar.gz 22973 BLAKE2B f454ccc2569ec1e586d88b410d3acbe557f25894c5f4d06558aa242f3d14971b791eca0d827f22400ef02db9899fdb2a501b1b745a531c0f6577318a28c58278 SHA512 dce4a1fd8880d9ffbde9014dffdbb67f69a798a834f9cc6ac6ccd34d520c21b468b16093b3c54fbb472ded501305775b0b31da3c62a860cf19c4486a30c1da2b
 DIST neutron-configs-2018.2.9999.tar.gz 26109 BLAKE2B 5de3b90dcb6f8c86ce659b3ab439a79dd920aaf57b66a1e1b29f1b0d0fd433b222335a634dca01ce2b0e07acc3011ff6bf25983071dc0ff00e78ac847ee3fdd6 SHA512 498f41ffec6c14597e9785da9a36c2d906138215b34017aa93f56d051078682279bcce05288d2534ff7ab8208b8251c9f721256488f6850173210e41bc6dd51c
+DIST neutron-configs-2019.1.9999.tar.gz 22973 BLAKE2B f454ccc2569ec1e586d88b410d3acbe557f25894c5f4d06558aa242f3d14971b791eca0d827f22400ef02db9899fdb2a501b1b745a531c0f6577318a28c58278 SHA512 dce4a1fd8880d9ffbde9014dffdbb67f69a798a834f9cc6ac6ccd34d520c21b468b16093b3c54fbb472ded501305775b0b31da3c62a860cf19c4486a30c1da2b
 DIST neutron-ml2-plugins-13.0.2.tar.gz 7068 BLAKE2B fa27bd84c1d67bd36c7c7e47b6e8f98dd100e09c7a3bfa7aec615ed24e3dadf240f8ef44874c868ff92f79452afbf4a21fba46b1b9aec191bad53a62767b1861 SHA512 add4697c78c592dfe5ebadd3b0cf9b9c2a2c33bd05130a8e1422abf7456d8a0cc926a0d46f6b49ceee87017304d7c9c3486c975086e46f178e3bc142844f836f
+DIST neutron-ml2-plugins-13.0.3.tar.gz 7068 BLAKE2B fa27bd84c1d67bd36c7c7e47b6e8f98dd100e09c7a3bfa7aec615ed24e3dadf240f8ef44874c868ff92f79452afbf4a21fba46b1b9aec191bad53a62767b1861 SHA512 add4697c78c592dfe5ebadd3b0cf9b9c2a2c33bd05130a8e1422abf7456d8a0cc926a0d46f6b49ceee87017304d7c9c3486c975086e46f178e3bc142844f836f
+DIST neutron-ml2-plugins-14.0.1.tar.gz 8642 BLAKE2B 71d945504f3e2185bffddb94956f019fa38bdd4a8782e936de2b8753e2a934374b6f0ed11ea0cdc9d454a80544b2e225e70ff987acbb971d756ae940cf4d7d16 SHA512 399e3f0cd8daaaf18e36d47aa105cf71d70e3ed5f707093e2292e480e3a0868818ee0ee68ca7a8eeb8e28cec51721e2508ed75815f04a415eb42dfe56708fce2
 DIST neutron-ml2-plugins-2018.2.9999.tar.gz 7068 BLAKE2B fa27bd84c1d67bd36c7c7e47b6e8f98dd100e09c7a3bfa7aec615ed24e3dadf240f8ef44874c868ff92f79452afbf4a21fba46b1b9aec191bad53a62767b1861 SHA512 add4697c78c592dfe5ebadd3b0cf9b9c2a2c33bd05130a8e1422abf7456d8a0cc926a0d46f6b49ceee87017304d7c9c3486c975086e46f178e3bc142844f836f
+DIST neutron-ml2-plugins-2019.1.9999.tar.gz 8642 BLAKE2B 71d945504f3e2185bffddb94956f019fa38bdd4a8782e936de2b8753e2a934374b6f0ed11ea0cdc9d454a80544b2e225e70ff987acbb971d756ae940cf4d7d16 SHA512 399e3f0cd8daaaf18e36d47aa105cf71d70e3ed5f707093e2292e480e3a0868818ee0ee68ca7a8eeb8e28cec51721e2508ed75815f04a415eb42dfe56708fce2
 EBUILD neutron-13.0.2-r1.ebuild 8373 BLAKE2B 1cec37720970b276e892e7e826ecab17e5d063d0cb5703df568aeb4ad8d97881d52dbc088554eddcda03f83309d4615e83949813bc9aca866cd1768bda090167 SHA512 1788a996f6525d0a7b9d1e1a9a2c4e8b14938afc8ebf32e598828c5de6af0bd7d20eb28429328c86cd6cee13289eea84f6b5047a3c7d1b6419c3c47401cdf794
+EBUILD neutron-13.0.3.ebuild 8375 BLAKE2B a5d845ecaf73ef4a2d3c861a21be54ae454fbf3c5cae4fc66ebbcf694b083650369de0f1247120b363d9cabb14b2d3056fe65ba43dee9489b7a05f04862b53c4 SHA512 ff750f4164295bfaf82693a4f11416669b8da4c28e339497327be5b81485dc634025297dc5685fa0fc494f2c44c94d7a2b8b3117ae38ce173fe9df1383b9eb61
+EBUILD neutron-14.0.1.ebuild 8416 BLAKE2B ecda613ac4b1bb9a39e263bddf90b5a8f93b33bb141c3571c07a37c912fe33a53a9e24f53197b944964a086be7daf511c554d22676294c51ceb4af69b856287e SHA512 5a18c0566b6df54700b861fd7330a558c22069407c05bfa8a6947408729878c6682d0798abf0b4775c9c3b3c80db17ad4a64a264ec0a8e7347a728434780f0f8
 EBUILD neutron-2018.2.9999.ebuild 8375 BLAKE2B d88b9e1112d96c762185f2e376ae00e58457fdf22a1b869ca9610ba2d4bc4439aa58f571d7518653becda1e91eaa616cc6698c33802ea96da6e0955603d04979 SHA512 51bcb6827e7bcbb943de8978dd6ac8403b9f6ff9cadafee53ab641c1837df9c8dd051123e288366913a41de1c567aad7a6b8857df83cc54bd5036695d8083fde
+EBUILD neutron-2019.1.9999.ebuild 8416 BLAKE2B ecda613ac4b1bb9a39e263bddf90b5a8f93b33bb141c3571c07a37c912fe33a53a9e24f53197b944964a086be7daf511c554d22676294c51ceb4af69b856287e SHA512 5a18c0566b6df54700b861fd7330a558c22069407c05bfa8a6947408729878c6682d0798abf0b4775c9c3b3c80db17ad4a64a264ec0a8e7347a728434780f0f8
 MISC metadata.xml 1619 BLAKE2B 462b212e519778c98632ec3230e5f0d1a006a229edef034ed0d462559cb0c1763dafb997198241cca4f9c7cb056ebada214c82745dce35b269c2c27d554145a4 SHA512 8f9075719eeec3c3a939e8a1b05a5604bc1e801b227feb5775bfa9f2812e67c41165dc0b2b377685645d9fd9988523356ac77a8db8e73139ab3f035ae59b70ce
diff --git a/sys-cluster/neutron/neutron-13.0.3.ebuild b/sys-cluster/neutron/neutron-13.0.3.ebuild
new file mode 100644
index 000000000000..7b0f728c6c0a
--- /dev/null
+++ b/sys-cluster/neutron/neutron-13.0.3.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2019 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/rocky/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/rocky/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
+	EGIT_REPO_URI="https://github.com/openstack/neutron.git"
+	EGIT_BRANCH="stable/rocky"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/rocky/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/rocky/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/pecan-1.1.1[${PYTHON_USEDEP}]
+	!~dev-python/pecan-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/neutron-lib-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/ryu-4.24[${PYTHON_USEDEP}]
+	compute-only? (
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.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.9.1[${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-14.0.1.ebuild b/sys-cluster/neutron/neutron-14.0.1.ebuild
new file mode 100644
index 000000000000..b1729a1febbb
--- /dev/null
+++ b/sys-cluster/neutron/neutron-14.0.1.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,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"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/stein/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/stein/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
+	EGIT_REPO_URI="https://github.com/openstack/neutron.git"
+	EGIT_BRANCH="stable/stein"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/stein/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/stein/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-4.0.0[${PYTHON_USEDEP}]"
+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/pecan-1.3.2[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/neutron-lib-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	compute-only? (
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.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.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.37.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.32.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-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.35.1[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/ovsdbapp-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyroute2-0.5.3[${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-2019.1.9999.ebuild b/sys-cluster/neutron/neutron-2019.1.9999.ebuild
new file mode 100644
index 000000000000..b1729a1febbb
--- /dev/null
+++ b/sys-cluster/neutron/neutron-2019.1.9999.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,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"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/stein/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/stein/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
+	EGIT_REPO_URI="https://github.com/openstack/neutron.git"
+	EGIT_BRANCH="stable/stein"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/stein/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/stein/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-4.0.0[${PYTHON_USEDEP}]"
+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/pecan-1.3.2[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/neutron-lib-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	compute-only? (
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.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.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.37.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.32.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-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.35.1[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/ovsdbapp-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyroute2-0.5.3[${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 89696aef6169..6f9d8a869393 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -3,12 +3,14 @@ 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-18.1.0.tar.gz 11391992 BLAKE2B 5dd417661908cae6e12b4a0f3af5c620bd29d3a022661c6f852cd8954940a3a0a2e84d0cf72d43ff926a13836aeb8ed2ecfe0e9be39dc882d705ab0389297891 SHA512 d5112d2528a70338a9293423ede81b9a5dee10cf7872e3070c33d0e16d728d1a1612b8af45ba8424400fd67322238dec299bc85bb84c10989272496b684f8cbd
 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-19.0.0.tar.gz 11592449 BLAKE2B 8a4b1004e926790660ba8f3804a87cc8fe06047313618b78c3acbd09b75bdd80233c6ebb28e8eeb763d9646ad1a31ebab0d73e215ee2bb3513d780a8e14b21de SHA512 c9ea1f8433cd950dc40422fc6d22837572c251fb4888020342ba800cfaf2a5dd4569947ddf0ed619f3dfbdf1ec2ebcefb43df63d55e2978dab363a1c14e5b319
 DIST nova.conf.sample-18.2.0 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
+DIST nova.conf.sample-19.0.0 387769 BLAKE2B 2b4668e78765469c5ee518a8c340a09407a8f7e9bf3f87a6919b820db0ce2f38499827dbea58994490c8db3a648eef2c95521f7c62b3ae37606bb249492b4b12 SHA512 4facb96c111945f472654788e1ac3d52808b0c45e36c87b873cd1355d36b71922fa94b11d66ec5a8b250739072ecdec394dd4f852a8eb57dbd900c61c71ba770
 DIST nova.conf.sample-2018.2.9999 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
-EBUILD nova-18.1.0.ebuild 9502 BLAKE2B eda492089469f6fc053144f843ab32dc95119dc0c7ebb474707a8b58ad3632b58c6ce9b470c1fd89c9d8854025e701a70c8f538a548328ad5cd5918c72f6ad3a SHA512 3eef28b0debd8d230f40c95a393fd5527356ef31c80cd48a1860f38f116555f7bfc81f4be882026d05813a23d69263be60e5b69730a11b2fdf1e23028755d84b
-EBUILD nova-18.2.0.ebuild 9504 BLAKE2B 5d344dbd98a118e426c4f58507cf55d9fe3b0d19fa06632871c3a48550784e55ca054ffeec2ddb7e46cedf6f7cb6772451e11b42de02ecd4d72354687e41e627 SHA512 bdab5973c19d7e85fb5b055a7237b476107a262496613ab61fb7015cfdc3fe610ccc45e020528185b22cdcd3aa05a7658ed593e9fd41060dd14166624650ca35
-EBUILD nova-2018.2.9999.ebuild 9507 BLAKE2B 8090cacd3c743e7c924d2b6774e68597c1fcad3cc6daa7abaac674716ed61d50a9bb73ebfa79a9de9e2a2a5bd33b496dc1709767ca229728daf7c22e5ae838cc SHA512 0c0665f8948c2a6d1b8296a6477bc9c7c9df93c3f79e1c83e5fe88dd697b9ad2a3b61ab53fe7094e941be99aebe89b579c4008538b92676b020adf4ee36e57f5
+DIST nova.conf.sample-2019.1.9999 387769 BLAKE2B 2b4668e78765469c5ee518a8c340a09407a8f7e9bf3f87a6919b820db0ce2f38499827dbea58994490c8db3a648eef2c95521f7c62b3ae37606bb249492b4b12 SHA512 4facb96c111945f472654788e1ac3d52808b0c45e36c87b873cd1355d36b71922fa94b11d66ec5a8b250739072ecdec394dd4f852a8eb57dbd900c61c71ba770
+EBUILD nova-18.2.0.ebuild 9500 BLAKE2B c4fa7159a2fddcf8a3c5eaa598d6ce30074701f6f56c12f7e7f96717cb96748676f4e2f6b562d04abf89b4662a8b1c4fc6d6c93da3a61849ab1e39e4b3951d0e SHA512 bbb0b6b791c39681ad14dbfd63534d74ce40872b2cbb14181e151d93bbfd60f89daa4e702eacb7e7fdce25adb08aef70c525f3b41a2618cba9bb9f21128bb5d7
+EBUILD nova-19.0.0-r1.ebuild 9591 BLAKE2B ef89987b3a5e6e7b3a46bbb2e0b989d42a9b139d3e470fa58cada7e0e0f39ece56eb8541619f92aa9a6b4e0627db660bd9c44a69afe26c51c4c1347a87208583 SHA512 1ce0ebf7be9ba75c0cdee08ee92ee3c8b00b577d5d4540bfc76634f6b030719d9709d5b34b0328381b48cc82bddff2ea45a462ea66c74b9c833c98844cc9a98d
+EBUILD nova-2018.2.9999.ebuild 9502 BLAKE2B ee86d0af3adfd1ed8e2e1c502643b5ee96830b1a1a2ce03592787aa46b86f6a60a415b4aada1cb4bdfd990d8ef361ce538a80a655cc2d5c8ed13672a54bac581 SHA512 523de49d69edf7f69a3546aa23e5e35591d113b305f5617629c4fc8f325fa125ba2f8bd3e7da72191607e5904705d26aebeed771f8bd8730c957fc860b585311
+EBUILD nova-2019.1.9999.ebuild 9591 BLAKE2B ef89987b3a5e6e7b3a46bbb2e0b989d42a9b139d3e470fa58cada7e0e0f39ece56eb8541619f92aa9a6b4e0627db660bd9c44a69afe26c51c4c1347a87208583 SHA512 1ce0ebf7be9ba75c0cdee08ee92ee3c8b00b577d5d4540bfc76634f6b030719d9709d5b34b0328381b48cc82bddff2ea45a462ea66c74b9c833c98844cc9a98d
 MISC metadata.xml 1172 BLAKE2B aa85fe6bed1e40717884d721c2633c5f6d380914c69cb8a4a4c31b3e4c779db52b90fdaa5ee63b66ad9bc6694f666dd37dceeffb8de4676014ef3bb688476ef7 SHA512 bb506fa680b064c3d6a48710cac11efedc9e8a340603e234bf5c4c48aaab773e4527d7a8fc66ae36ec894230a1d02a5be995e521d222914f652e03b6f72642e4
diff --git a/sys-cluster/nova/nova-18.2.0.ebuild b/sys-cluster/nova/nova-18.2.0.ebuild
index 15e36f5f487c..123609323504 100644
--- a/sys-cluster/nova/nova-18.2.0.ebuild
+++ b/sys-cluster/nova/nova-18.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1 eutils linux-info multilib user
 
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	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"
diff --git a/sys-cluster/nova/nova-18.1.0.ebuild b/sys-cluster/nova/nova-19.0.0-r1.ebuild
index 340fa0b2ecb6..dc68e7e07ad9 100644
--- a/sys-cluster/nova/nova-18.1.0.ebuild
+++ b/sys-cluster/nova/nova-19.0.0-r1.ebuild
@@ -1,8 +1,8 @@
 # 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,6} )
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1 eutils linux-info multilib user
 
@@ -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/rocky/nova.conf.sample -> nova.conf.sample-${PV}"
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/stein/nova.conf.sample -> nova.conf.sample-${PV}"
 	EGIT_REPO_URI="https://github.com/openstack/nova.git"
-	EGIT_BRANCH="stable/rocky"
+	EGIT_BRANCH="stable/stein"
 else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/rocky/nova.conf.sample -> nova.conf.sample-${PV}
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/stein/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"
@@ -42,7 +42,7 @@ CDEPEND="
 	!~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"
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
 DEPEND="
 	${CDEPEND}
 	app-admin/sudo"
@@ -120,25 +120,25 @@ RDEPEND="
 	>=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-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.1[${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-utils-3.37.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-rootwrap-5.8.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-privsep-1.32.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-service-1.34.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.1.0[${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.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/oslo-versionedobjects-1.33.3[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/os-resource-classes-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.14.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.2.1[${PYTHON_USEDEP}]
@@ -151,9 +151,10 @@ RDEPEND="
 	>=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/futurist-1.8.0[$(python_gen_usedep 'python2_7')]
 	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	app-emulation/libvirt[iscsi?]
+	app-emulation/spice-html5
 	novncproxy? ( www-apps/novnc )
 	sys-apps/iproute2
 	openvswitch? ( net-misc/openvswitch )
@@ -237,6 +238,7 @@ python_install_all() {
 		insinto /etc/nova/
 		doins "${FILESDIR}/scsi-openscsi-link.sh"
 	fi
+	rm -r "${ED}/usr/etc"
 }
 
 python_install() {
diff --git a/sys-cluster/nova/nova-2018.2.9999.ebuild b/sys-cluster/nova/nova-2018.2.9999.ebuild
index 859632b7ea1b..3b424bce2c56 100644
--- a/sys-cluster/nova/nova-2018.2.9999.ebuild
+++ b/sys-cluster/nova/nova-2018.2.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1 eutils linux-info multilib user
 
diff --git a/sys-cluster/nova/nova-2019.1.9999.ebuild b/sys-cluster/nova/nova-2019.1.9999.ebuild
new file mode 100644
index 000000000000..dc68e7e07ad9
--- /dev/null
+++ b/sys-cluster/nova/nova-2019.1.9999.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+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/stein/nova.conf.sample -> nova.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/nova.git"
+	EGIT_BRANCH="stable/stein"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/stein/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-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}]
+	!~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[${PYTHON_USEDEP}]"
+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/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.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}]
+	<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.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.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}]
+	>=dev-python/oslo-serialization-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.37.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.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.32.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.34.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.33.3[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/os-resource-classes-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.14.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.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.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/futurist-1.8.0[$(python_gen_usedep 'python2_7')]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	app-emulation/libvirt[iscsi?]
+	app-emulation/spice-html5
+	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
+	rm -r "${ED}/usr/etc"
+}
+
+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"
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "iscsid needs to be running if you want cinder to connect"
+	fi
+}
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index ae183f1015d7..d1496636816b 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -13,6 +13,7 @@ DIST openmpi-2.0.4.tar.bz2 8272983 BLAKE2B 7d0a392fbc8c896cdccefb9bf0ff83fbd8db8
 DIST openmpi-2.1.6.tar.bz2 8324626 BLAKE2B 4aed4b397c0e0ead24ed5e9bbf45ee8f6719a7566d74405cccf119ddf535891ece91c04cbcad96be5a5d9805c620aa13a1b51c0edd67c049827357e7668008b9 SHA512 f552f47961e040476e7d2949cdd3e5a0b5ad74bea2b6532608117ec893473a160cd368251d1f439fd773f4846950857baf939e7b3586bac2a099495f7bc0e349
 DIST openmpi-3.0.3.tar.bz2 9316109 BLAKE2B e67e649917911eff3286c0f3d15e181b30e4ac6061891f6e13c75570368edb943fff55e4d41ffaa4a095b2060c84d24f8c32975758ad4632bae1813accd9f516 SHA512 12bbc5add4160e732ac10f302106c4bc2fa61ef2cde955e1fdd4a7aaad44b022d6babdd4bd529f687bb03fc5e5c3804ba6b1869e9609c9725bc291524c8304d7
 DIST openmpi-3.1.3.tar.bz2 9442937 BLAKE2B 40067e1694a106d96e5ba41884a6facec9e605b5afba03ab908e4cf124f35b0691f0ab626e5190cffebc9c28d05b11b5c6401a5aa39ac17ec04650ed29e0976e SHA512 700821df676de5f85ce2793298242dcaea73f585f89540e30999792a568f193545a9f9b2bcb3ea22effa3bf14744531c4eb5fc4c84a8d7bbe5e5fdd76ab3a04a
+DIST openmpi-4.0.1.tar.bz2 9838152 BLAKE2B 75657940e37c23fbe88032f116588960c6bcf34c4928d77b45e8fde6fb51e814f521adb6c5155cb588fff9d1b382c2470873d90979a68598ff13e1aa205fc811 SHA512 09f35dc2e44b4f84aab9c5af9d81f90bbdb030e4d90800a5d3ffae88cb32b7faecc9bea0abb113da53c21f73e9d19db68f961f997bc47bdd28d83a87beee0731
 EBUILD openmpi-1.10.7.ebuild 6381 BLAKE2B 7d07db3b67d2df22416e862f2e3493be1bebb27beddf2aa333c6f45518ece0397ca360c354266dc84c1cd73af7a700064579279398c483d39064b923f2507d7f SHA512 956982cfffd3f7971031f7861ce93343665be39641d03afd6e2e0be8af0fdbe943e8ad3456ccc3b8159857cd292ee2c5b6e7dffa882cf530210976d3b242ee01
 EBUILD openmpi-1.4.3.ebuild 2618 BLAKE2B a030b33a0fae59cf7e75cc8252af897ba703f95e259f938872182dfa97c86f587eb2259594f75114f939c7b0961490452ff3c11c2ed3a6b60ae3f2974d926446 SHA512 5c47bdf1192a6d2b95fa35c217a27ff6f69c0ca1bf5c5be3ff43f7785b354c214a371697006275efc08fc9ec3bf27d284db45a7f5d6cb1af9937c42340f79f83
 EBUILD openmpi-1.4.5.ebuild 2627 BLAKE2B 3aef1a37d78c175dcf3e3a47321a52f03d2fd61b1dde797ac811b2444d100b29e3eb4686d9961848573055af62ce41f114055eb729e2cec469e5edbc630ec4aa SHA512 4c31cc8ae2986222645c873f30ba0aa53f612524e4019428c3d803a83d0d947b08770317b440749a93ef7485e71c174a39436589b4a73786253a5289a8d7e2bb
@@ -26,4 +27,5 @@ EBUILD openmpi-2.0.4.ebuild 5995 BLAKE2B f0e8b0971b2e9cdae4a46b771bee622a4c35584
 EBUILD openmpi-2.1.6.ebuild 5606 BLAKE2B 2303401b7048a5e5a05552f79e964e45f1d0df2d315c993ebb05bac0f46fd156cd1cdb98ab47e1e730bbfb162343e6a457e69432c4901dcf236f88721dc3ad90 SHA512 e0ed1db674b40c82bbe85a22dbfcdd0271c95e76769799708be0ca2c652910ef378d7ea07c1a87d6b0bdd2557a6920b02cb75f4aaa702bef114a1ed505e7abc2
 EBUILD openmpi-3.0.3.ebuild 5495 BLAKE2B 92213e16ec144e427d50eeb3b2029989eccfed58f4eaad1dae0929bbb34e669cb3cbf83e36f9eb9117763ce425b0592a6ab82804985e5c9bab6742e3f9c84ad0 SHA512 ebba49ed4d305a4c73d3fe579837022a7d3e7e80d0968e1b63e9224d871bd36ad2f646011ec971cfb0b415a6b8fc89f94f9a86a3397787e076ef133ccf7a1d1d
 EBUILD openmpi-3.1.3.ebuild 5492 BLAKE2B 631d87e09e920e6d81f811070dba2f8fa811b1504576d291296f22e8c3f1d9eb2619896f5c5561c75f244e997a5c19cfd30c6956a07c08cc91f949a6a5fdfec8 SHA512 5dc6401c116c6ef93e71b56a3282396cbbed3c961fc006d4e065d9abc70758faa5f5b7397cf1bbbd6a26da69a4e22472786f29c0cb86a61c55620ecfb86a4723
+EBUILD openmpi-4.0.1.ebuild 5432 BLAKE2B 21fff5d4df3150c1b7e420ac01000f9f350ee65f948d96e177a7b0bf59fa8e9ddaea021dbe23bbb9ac85dd94f7dcc68af4b7eb1589dd6291bfd81800b460edd0 SHA512 aa5f710e1485729b0f39f9eb993bad586bd93a1fc32476478bb69313c8e4810b703889a47364b5af5a4ed1d8cf344ac570bafebbdd427cf834e79d86bb8f739d
 MISC metadata.xml 901 BLAKE2B 8cdef4e4438351cb99b59bafb932e4b2b960f08b4eaa9917ac2a5d97fd2423781b1ec27a16005ae6470b8f50509ae3c08c2d06f95e452bd2cf00505b7a79ac35 SHA512 6f30f50d2f2173a01e7ef0d4b808352be98b64945b6af1f05cfaa28024f6efccad28984fe0ad31094f8822c5e251c1270765d5905c7737e1b84302143fe4ac09
diff --git a/sys-cluster/openmpi/openmpi-4.0.1.ebuild b/sys-cluster/openmpi/openmpi-4.0.1.ebuild
new file mode 100644
index 000000000000..25592104fbbc
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-4.0.1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/-mpi}
+S=${WORKDIR}/${MY_P}
+
+IUSE_OPENMPI_FABRICS="
+	openmpi_fabrics_ofed
+	openmpi_fabrics_knem
+	openmpi_fabrics_psm"
+
+IUSE_OPENMPI_RM="
+	openmpi_rm_pbs
+	openmpi_rm_slurm"
+
+IUSE_OPENMPI_OFED_FEATURES="
+	openmpi_ofed_features_control-hdr-padding
+	openmpi_ofed_features_udcm
+	openmpi_ofed_features_rdmacm
+	openmpi_ofed_features_dynamic-sl"
+
+DESCRIPTION="A high-performance message passing library (MPI)"
+HOMEPAGE="http://www.open-mpi.org"
+SRC_URI="http://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java romio
+	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
+
+REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
+	openmpi_rm_pbs? ( !openmpi_rm_slurm )
+	openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
+
+CDEPEND="
+	!sys-cluster/mpich
+	!sys-cluster/mpich2
+	!sys-cluster/nullmpi
+	!sys-cluster/mpiexec
+	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
+	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	>=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
+	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
+	openmpi_fabrics_knem? ( sys-cluster/knem )
+	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
+	openmpi_rm_pbs? ( sys-cluster/torque )
+	openmpi_rm_slurm? ( sys-cluster/slurm )
+	openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* )"
+
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+DEPEND="${CDEPEND}
+	java? ( >=virtual/jdk-1.6 )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/mpi.h
+	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	java-pkg-opt-2_pkg_setup
+
+	elog
+	elog "OpenMPI has an overwhelming count of configuration options."
+	elog "Don't forget the EXTRA_ECONF environment variable can let you"
+	elog "specify configure options if you find them necessary."
+	elog
+}
+
+src_prepare() {
+	default
+
+	# Necessary for scalibility, see
+	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
+	echo 'oob_tcp_listen_mode = listen_thread' \
+		>> opal/etc/openmpi-mca-params.conf || die
+}
+
+multilib_src_configure() {
+	if use java; then
+		# We must always build with the right -source and -target
+		# flags. Passing flags to javac isn't explicitly supported here
+		# but we can cheat by overriding the configure test for javac.
+		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+	fi
+
+	ECONF_SOURCE=${S} econf \
+		--sysconfdir="${EPREFIX}/etc/${PN}" \
+		--enable-pretty-print-stacktrace \
+		--enable-orterun-prefix-by-default \
+		--with-hwloc="${EPREFIX}/usr" \
+		--with-hwloc-libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-libltdl="${EPREFIX}/usr" \
+		--with-libevent="${EPREFIX}/usr" \
+		--with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--enable-mpi-fortran=$(usex fortran all no) \
+		$(use_enable cxx mpi-cxx) \
+		$(use_with cma) \
+		$(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda) \
+		$(use_enable romio io-romio) \
+		$(use_enable heterogeneous) \
+		$(use_enable ipv6) \
+		$(multilib_native_use_enable java mpi-java) \
+		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
+		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
+		$(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
+		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
+		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
+		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
+		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
+		$(multilib_native_use_with openmpi_rm_pbs tm) \
+		$(multilib_native_use_with openmpi_rm_slurm slurm)
+}
+
+multilib_src_test() {
+	# Doesn't work with the default src_test as the dry run (-n) fails.
+	emake -j1 check
+}
+
+multilib_src_install() {
+	default
+
+	# fortran header cannot be wrapped (bug #540508), workaround part 1
+	if multilib_is_native_abi && use fortran; then
+		mkdir "${T}"/fortran || die
+		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
+	else
+		# some fortran files get installed unconditionally
+		rm \
+			"${ED}"/usr/include/mpif* \
+			"${ED}"/usr/bin/mpif* \
+			|| die
+	fi
+}
+
+multilib_src_install_all() {
+	# fortran header cannot be wrapped (bug #540508), workaround part 2
+	if use fortran; then
+		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
+	fi
+
+	# Remove la files, no static libs are installed and we have pkg-config
+	find "${ED}" -name '*.la' -delete || die
+
+	if use java; then
+		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
+		java-pkg_dojar "${mpi_jar}"
+		# We don't want to install the jar file twice
+		# so let's clean after ourselves.
+		rm "${mpi_jar}" || die
+	fi
+	einstalldocs
+}
diff --git a/sys-cluster/openstack-meta/Manifest b/sys-cluster/openstack-meta/Manifest
index 904ee19f188c..c7807154b983 100644
--- a/sys-cluster/openstack-meta/Manifest
+++ b/sys-cluster/openstack-meta/Manifest
@@ -1,2 +1,3 @@
 EBUILD openstack-meta-2018.2.9999.ebuild 604 BLAKE2B 4fbfae95d9d0086cbdaa27702cd6297ae1bcd1686c69fb03318a1ce74dce98f145b062bbaa8a7fde79924a33c85aaebdbde6d0517a327aab7df793f5aeac52ea SHA512 9b50a6cc30ed4cf7a6d55e2dca95531d05faeb2ba8ba114df340118e13ebfc816a10b06e81cae39bd9405e777c7fca12c0337827bc82f66444007445f890c4b6
-MISC metadata.xml 868 BLAKE2B d769c2b15440a48958819d31501f01020d65e667105bef5299bfc13d06d6f2ea19d2f461063e733ba9bff4426f803ef13062d1820f267437a458c972d363747f SHA512 20cad66e79a57fbe4e17bd8bd53a30b71746f5efa8ddaa9c6c7bebfa8db5fd64275dc213f927c433f1e6621d1b5d053efaef38c1144806cf736c44b56c5d967c
+EBUILD openstack-meta-2019.1.9999.ebuild 656 BLAKE2B 06798a7e12db582385e9d7fb15b24e6937d90516990ae5010a2bb67e70f2977a1c10a5289597e35bc8fae8308b0bbc7350f0c80f334cbed377b268772e1c5bcb SHA512 62531484de96b5ef0e70d2dde1c935a7c4aa3ea29c46b59bdb009543cf8dde94379f2e365a1bf28b6171695106ac05302d1a87b0b8beb7d51a48117dcec52e1b
+MISC metadata.xml 929 BLAKE2B 99830f4704b4bc21a5fadfb4b5cdb5370436ca42dfe2124d1b377e1ef5a5c3b056fb03436c26a330c47144601ee18481f27f02010dc958176e6d643eca4c1aeb SHA512 b33700296b6ae04bb7fd62feeb82bf20b2bc213cd87d7cccf02b788fa027e44cda59e60ce1ccc38f51181e43b0f7affe78f7dd1a90d4e3ed74ab303f6cebb77f
diff --git a/sys-cluster/openstack-meta/metadata.xml b/sys-cluster/openstack-meta/metadata.xml
index bc6326bac805..4db7aac5e123 100644
--- a/sys-cluster/openstack-meta/metadata.xml
+++ b/sys-cluster/openstack-meta/metadata.xml
@@ -16,6 +16,7 @@
     <flag name="neutron">Installs Openstack Neutron</flag>
     <flag name="nova">Installs Openstack Nova</flag>
     <flag name="heat">Installs Openstack Heat</flag>
+		<flag name="placement">Installs Openstack Placement</flag>
     <!-- <flag name="horizon">Installs Openstack Horizon</flag> -->
   </use>
 </pkgmetadata>
diff --git a/sys-cluster/openstack-meta/openstack-meta-2019.1.9999.ebuild b/sys-cluster/openstack-meta/openstack-meta-2019.1.9999.ebuild
new file mode 100644
index 000000000000..e2a3180efd85
--- /dev/null
+++ b/sys-cluster/openstack-meta/openstack-meta-2019.1.9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 placement 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} )
+	placement? ( ~sys-cluster/placement-${PV} )
+"
diff --git a/sys-cluster/placement/Manifest b/sys-cluster/placement/Manifest
new file mode 100644
index 000000000000..fd9b15e1d11e
--- /dev/null
+++ b/sys-cluster/placement/Manifest
@@ -0,0 +1,6 @@
+DIST openstack-placement-1.0.0.tar.gz 428179 BLAKE2B 342997d848f134de747e4fa7ac0c38c07c3ff0840b529a8664a0733aa9700592b00c9ef72ae27e3b0ce892c44a14eebc2c32edf078e1c1a77885be4655fc8bf4 SHA512 50c93d35868b0ee78a6f753e174b2c22742fed1287dfa5801db28692033fa92e21dbce8fe22d16eb8e3e1dbd798fb80e6c9631ac838455f8b91c3e4ba01e5fff
+DIST placement.conf.sample-1.0.0 19383 BLAKE2B 0088bffd3755ff589026856c977f241a1d98d151966ad7ece7b11e6fb382b1cc49fd606c66d857defba52db1927b6255f74144ce61d86e806e014baf97e6af1f SHA512 ea3c842145870fc51cf9d118734cab07498691fabc5313297e8956e2c8547eddfd0ef99b8529a8ad5e4d7b98e708276c3bed6549158b5ea774c39ef16777d1d3
+DIST placement.conf.sample-2019.1.9999 19383 BLAKE2B 0088bffd3755ff589026856c977f241a1d98d151966ad7ece7b11e6fb382b1cc49fd606c66d857defba52db1927b6255f74144ce61d86e806e014baf97e6af1f SHA512 ea3c842145870fc51cf9d118734cab07498691fabc5313297e8956e2c8547eddfd0ef99b8529a8ad5e4d7b98e708276c3bed6549158b5ea774c39ef16777d1d3
+EBUILD placement-1.0.0-r1.ebuild 4230 BLAKE2B 1e214d7aab53f15041f635d85f9338aec45baba58ff0ae65eb64cd5df38dcef1db33497d20728c6fcb2220841470ea7142ac66174b21a0c516bdd680aa99b7d9 SHA512 714a9960fe71dccebd2b2a166f0f387d908db83d40c5a8de2dadf5b9a82cf98c38bbd8ce378dac967b22cd6046ac377f379165badc7be5ca0377a04c449f8d26
+EBUILD placement-2019.1.9999.ebuild 4230 BLAKE2B 1e214d7aab53f15041f635d85f9338aec45baba58ff0ae65eb64cd5df38dcef1db33497d20728c6fcb2220841470ea7142ac66174b21a0c516bdd680aa99b7d9 SHA512 714a9960fe71dccebd2b2a166f0f387d908db83d40c5a8de2dadf5b9a82cf98c38bbd8ce378dac967b22cd6046ac377f379165badc7be5ca0377a04c449f8d26
+MISC metadata.xml 590 BLAKE2B 52aa7d1deb487225f34afa59f668939abe56f4d377626b3cd6dc20c2c94fc1b104f2cac7047d7ba461c62c90515cd39e75b8a94d17a341dd8c549d6bdca6bee3 SHA512 188176cc3f839d3a53dbcaf38f74fc71f1c223f7e938bcc9627e71b2509b14e535647513a7c1bb2eb2d250a317b9e6f0ef906cf464e465697d5a26b4bb013f78
diff --git a/sys-cluster/placement/metadata.xml b/sys-cluster/placement/metadata.xml
new file mode 100644
index 000000000000..f4e191f8fbe8
--- /dev/null
+++ b/sys-cluster/placement/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+    OpenStack Placement provides an HTTP service for managing, selecting, and claiming providers of classes of inventory representing available resources in a cloud.
+  </longdescription>
+</pkgmetadata>
diff --git a/sys-cluster/placement/placement-1.0.0-r1.ebuild b/sys-cluster/placement/placement-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..291dc9ebaad5
--- /dev/null
+++ b/sys-cluster/placement/placement-1.0.0-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 user
+
+DESCRIPTION="A HTTP service for managing, selecting, and claiming cloud resources."
+HOMEPAGE="https://github.com/openstack/placement"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/placement/stein/placement.conf.sample -> placement.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/placement.git"
+	EGIT_BRANCH="stable/stein"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/placement/stein/placement.conf.sample -> placement.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/openstack-${P}"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="mysql postgres sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND="
+	>=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}]
+	!~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[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	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/keystonemiddleware-4.18.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-6.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.37.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.40.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/os-resource-classes-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]"
+BDEPEND=""
+
+pkg_setup() {
+	enewgroup placement
+	enewuser placement -1 -1 /var/lib/placement placement
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	diropts -m 0750 -o placement -g placement
+	insinto /etc/placement
+	insopts -m 0640 -o placement -g placement
+	newins "${DISTDIR}/placement.conf.sample-${PV}" placement.conf.sample
+
+	dobin tools/mysql-migrate-db.sh
+	dobin tools/postgresql-migrate-db.sh
+}
diff --git a/sys-cluster/placement/placement-2019.1.9999.ebuild b/sys-cluster/placement/placement-2019.1.9999.ebuild
new file mode 100644
index 000000000000..291dc9ebaad5
--- /dev/null
+++ b/sys-cluster/placement/placement-2019.1.9999.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 user
+
+DESCRIPTION="A HTTP service for managing, selecting, and claiming cloud resources."
+HOMEPAGE="https://github.com/openstack/placement"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/placement/stein/placement.conf.sample -> placement.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/placement.git"
+	EGIT_BRANCH="stable/stein"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/placement/stein/placement.conf.sample -> placement.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/openstack-${P}"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="mysql postgres sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND="
+	>=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}]
+	!~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[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	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/keystonemiddleware-4.18.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-6.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.37.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.40.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/os-resource-classes-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]"
+BDEPEND=""
+
+pkg_setup() {
+	enewgroup placement
+	enewuser placement -1 -1 /var/lib/placement placement
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	diropts -m 0750 -o placement -g placement
+	insinto /etc/placement
+	insopts -m 0640 -o placement -g placement
+	newins "${DISTDIR}/placement.conf.sample-${PV}" placement.conf.sample
+
+	dobin tools/mysql-migrate-db.sh
+	dobin tools/postgresql-migrate-db.sh
+}
diff --git a/sys-cluster/sanlock/Manifest b/sys-cluster/sanlock/Manifest
index 0d70b3dd8718..a0d0da860762 100644
--- a/sys-cluster/sanlock/Manifest
+++ b/sys-cluster/sanlock/Manifest
@@ -2,6 +2,6 @@ AUX sanlock.initd 249 BLAKE2B 18bafba28ab4449c7f25ab2d14b4ac2d3cc89cf79bfb8f802f
 AUX wdmd.initd 261 BLAKE2B 65b393f2f084896d3c17aa0345f9930badeec7a3ee4cc7e47bd0a35e47c18ea2bcf5afdc386c0da98988bc9fae479a68b504c244b55ab389ac7f5304c34282ae SHA512 9c7e980817c1c76868caff229b42a3d70e912abfd8c974bf5b856067bef79fbd3a5942b30bcb7d02869e2eba85e6f6ba3c861e9780046b01b25df1b39661b6c0
 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 2082 BLAKE2B b178031818a4c7098b9f364f7e1a8ff9d4df019a7c34b92ba7b83adb64657bdde7a64340ce691841531daec057510bd0b255d2081ff871662f3c7e293fa8962b SHA512 3dc492b1b7babf2356d5c21003c2f027804774fbde40995ef66ca2119e795e79d25513616c4548cb5ef837882b00cdbbca13dd99762219fbf8242d693271f0a2
+EBUILD sanlock-3.4.0-r1.ebuild 2101 BLAKE2B d3ebdf34348baef440e9593dcf1aba3aede634d2651290dd5000dc5b36a9a5da21894dc8fa3c0d39ae24612e4ede6545d6a4cfc1917eb4c9050726a223cdaa6d SHA512 51452c62da78326f90eb5eefdd3349ad744477f7963e797b645be0e9979b8a8dd676980b7bafc0350002c0353881a46ac842d40784fe165c60187ed73add7fde
+EBUILD sanlock-3.6.0.ebuild 2076 BLAKE2B 27823e97ecb977dd25ca11308d380c0f9dbb46fbaa0b51a64cc6b3f302ff2616a9e9ed2cadaf4ca045b84a84baf740e81d658ec6162098e8b4f7bb5ffd643441 SHA512 afe77c486aa54ac2ea6c40f1e1f12f748e0f5b20fc68f14e847669bc42206587f08a6e3e60290736e90b28e6be627fa2b3cfaf02ef2fbf95c28fb89b83e271e1
 MISC metadata.xml 368 BLAKE2B a15a411ea20eb7649f299e38704b394344194d7526f9bc92b27c0a26760d7dba05b1e5d483ff5f9ce73a6d1cd527a18ac905344a614c8dc31a0c1180b2be07e7 SHA512 2cc3ec3c99cfff2e0c576ab6c7b0a39460af875ba826ce0cf3c5a1a4f0f3def6170753c8d42af2fc7a139ad7f2135e309c3165bde83b4e7574292768c96e8086
diff --git a/sys-cluster/sanlock/sanlock-3.4.0-r1.ebuild b/sys-cluster/sanlock/sanlock-3.4.0-r1.ebuild
index 9d6a69014f5f..341b2f72bc6b 100644
--- a/sys-cluster/sanlock/sanlock-3.4.0-r1.ebuild
+++ b/sys-cluster/sanlock/sanlock-3.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit linux-info python-r1 systemd user
 
 DESCRIPTION="shared storage lock manager"
diff --git a/sys-cluster/sanlock/sanlock-3.6.0.ebuild b/sys-cluster/sanlock/sanlock-3.6.0.ebuild
index 4edcd7da1466..4a32bb16ec06 100644
--- a/sys-cluster/sanlock/sanlock-3.6.0.ebuild
+++ b/sys-cluster/sanlock/sanlock-3.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit linux-info python-r1 systemd user
 
 DESCRIPTION="shared storage lock manager"
@@ -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/singularity/Manifest b/sys-cluster/singularity/Manifest
index 6f8dedf0dee4..6b86f6fe3758 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -2,7 +2,7 @@ AUX singularity-2.3.1-slurm.patch 1597 BLAKE2B d8e7a03909197e3743639edf8bd504223
 DIST singularity-2.3.1.tar.gz 643021 BLAKE2B 4c5648330005af22515435d5daf4a27e39b79cfa52de36bdc48b63877b703329f36c81f782c1e9d8394b6668e8503961ef682d5bd71f48f665b3691df8f70a93 SHA512 36c581e8dba57d133013c2fcfea26886b54a1a9a9165b011d2cebacb2a6249fe0f8e5aa91ed90f7a18855c658300682436c431a226629408f31422cc8a036600
 DIST singularity-2.4.2.tar.gz 691214 BLAKE2B c82f48d20d0a0b6e8086e275fa1621b0e3cae5ecd515719543d69f0ba286f3c09d9fc479e8be3b78921ef32014325dcb5482d2ce813e4388db683a408d27e3a7 SHA512 2c26af6cd092bc030113cdb2a79430d82d51b7438330a6cd0706e46438296feed4d86b08d57efff0b7df148ca0e08f706b8a214f03439bccd7d196714cd06dbc
 DIST singularity-2.4.tar.gz 689760 BLAKE2B 03ec88405bb1316ae3098c8ec9620f7e0dac8417b10c7d20cf0411983f0089e8e32e58a4e2ca5c4c40aeebaf044cc3d45261d5635146de6b043f33f92871a227 SHA512 b445e73d9794f344ab72ce17d8f802390d0c0c153791b837f416254eadabf19365f1abd29f0b498be5486b600f32cd7fe53e5dc131eee3465ab890c9d6b171f4
-EBUILD singularity-2.3.1.ebuild 952 BLAKE2B 13fb3009a33dfcd20eba0da765098db7446ba930effa41e54c2b4f4deb28ddde9a0f7ca1fa06b82d22e38567d1138913f38fa4b0180db59daf219d5dc3e2a142 SHA512 60ed34f1ab7543ae5f728b51595640dc671ebb514028dce2fb82c72f1d192ca896c761fe38b4c786641f1df678adfd45d855eac262b68ee00c2b1048072e6d2c
-EBUILD singularity-2.4.2.ebuild 859 BLAKE2B b7e4e8ddd3b55676d27b611be5e0e166e7f8540d0d6471428933d0382d1ba2681d4b4d8a9cf6d0d48f3a181b930f49a8a588c8d7555133bfa16b424c68083467 SHA512 08a662fc6a1fe33f5675b48f20028763ed64184b9c8873ffb317362d652a7ec8de4a1a23bf8358f1ef117b08ac78ada5318b41a4a1e9acd16d8ae221ea885f07
-EBUILD singularity-2.4.ebuild 859 BLAKE2B 2ea5361fc3c020c2ba8f89091e837bb4c39cbf924aba8cb820c49cb65d7ab7c7072da02c96be0dda4daa6d9fd608b9f7e6f9dbe7c5001095c0610732e31087c3 SHA512 e031db7fa7673b631096714279b4bcb8372386984b5606aa7c6811c240e4fb47c8860e4bf5e4bd2c66295c0004489f95b74135f66ce056567f179b5f34b11606
+EBUILD singularity-2.3.1.ebuild 947 BLAKE2B e41a73084575e5a35c8902dfdcedc4fdd697e695d176871d515a12fe2a488cad49bf3cf73d9bc4fb168280a984cf62e62d48ab5e05389526dbaa4482587790fe SHA512 1d3afad018ac04cf3df0c1c560ab5b39e66cc4df8c6d806e5b9287aa3e3f93ea1b5f3c79336b7b6026a40e181f1797502d4285314bfd49c445c7e5f7646b304e
+EBUILD singularity-2.4.2.ebuild 854 BLAKE2B f725d945d08eddaa80b6a2bda1b295c55f0c868b847c69d7d739a44a7fea1acb9ead187aeb73cd9743d4b292d3353d1581178ebf06cec8ef4f430dab6b173f5e SHA512 6724f4e7d06dfa686e2e006edfaac1cd4f38f5fc0cd797b3c4f66a1099c622622b62100f53d1a172ba6222c70ef2af3f663f79af8a674561d02dfff6c042436a
+EBUILD singularity-2.4.ebuild 854 BLAKE2B 28f0fec82454839a3b00865008d99149a0ff39180b5380d76d4436c9fac07f416b2e8f64071b0b5c66e4e0a4df86afb92a9daa2c07845a2df9b31dc18901453c SHA512 eebcad146c65ad444ca8ffd8ef69a9b22b3a718ed078e2e80946befe4380d5f405ba9ea813732640281c5cf3fcbfa7ee64ef990206818c2c16f9150b625d54f6
 MISC metadata.xml 440 BLAKE2B 2e25f2660dc2bb7db8b59f033737cad8486848a3f6e04301a782439cd6451d5b2915a1558a5d1d78cad15083d212f18a6872c779141957cd45866f97ab964b13 SHA512 d8363de6994afc68b776ee6330a56b6a5e6d3156f440633c01160a9e9967654e4a564e235fc126be9400f436ec099fb05bd7754739cf8221666913b244d3b559
diff --git a/sys-cluster/singularity/singularity-2.3.1.ebuild b/sys-cluster/singularity/singularity-2.3.1.ebuild
index 68fad22fedfe..c072830a2c10 100644
--- a/sys-cluster/singularity/singularity-2.3.1.ebuild
+++ b/sys-cluster/singularity/singularity-2.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 
 inherit autotools eutils python-single-r1
 
diff --git a/sys-cluster/singularity/singularity-2.4.2.ebuild b/sys-cluster/singularity/singularity-2.4.2.ebuild
index 458dfc186eb9..181c726fd2ca 100644
--- a/sys-cluster/singularity/singularity-2.4.2.ebuild
+++ b/sys-cluster/singularity/singularity-2.4.2.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=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 
 inherit autotools eutils python-single-r1
 
diff --git a/sys-cluster/singularity/singularity-2.4.ebuild b/sys-cluster/singularity/singularity-2.4.ebuild
index b897f939dd0f..9d664bc225ed 100644
--- a/sys-cluster/singularity/singularity-2.4.ebuild
+++ b/sys-cluster/singularity/singularity-2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 
 inherit autotools eutils python-single-r1
 
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 1a9fcba97588..12444507568b 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -5,7 +5,7 @@ AUX swift-proxy.initd 1379 BLAKE2B 56453a557c0abfd6b07f65778ef14d8920bedc4133e0e
 DIST swift-2.20.0.tar.gz 3012428 BLAKE2B 48cfb52bce8d89836ede3d82cde197e282b55cec7fa9366c18102a2259a2c96553c573c92b884e6471a3ff5a5fc88ff3eeadbb200c691db3c6b20b6881132576 SHA512 15f1082a94f16684001b1d6eaa635500d41dd2ed0b65b87d8fc2363f96179cbc4d40a6faee10e966ad954e45035ed77c31dc265daa2c7c9d17a0e81890e6bc79
 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-2.21.0-r1.ebuild 4018 BLAKE2B ded5587949b6bcb9db88032898134cf177990cc6248618cece257093e018253dd343887c8ec106025fa0d999a3f87ffac2e071706b9b968f4522ffe6a2e94557 SHA512 263739a2220d4933511bd3ca8f7d0525f3cfca78511924125d84a02ce7012bc63e7b6c284af31908e769dd0fbb5e2b69eb09b4a436470f17d873f27e92ad7093
+EBUILD swift-2.21.0-r1.ebuild 4016 BLAKE2B 2234265b662c37a0dcaf5eaab7662d4e8c756c254e25fd95ad02ead7dcb78039d6af7d61f53e17a19f1571e32a612a958e83797e05f568ad33a73adfe5ab0e09 SHA512 4e5a3fd19e2689652f14246401da49245f9d84716b92f1593de2444b5d003218054b957449354a3308bb8af62aa9e27d8b51e9117d6d264cb261c5205403a138
 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.21.0-r1.ebuild b/sys-cluster/swift/swift-2.21.0-r1.ebuild
index ec5ee0cd41ee..25a2b591ac5e 100644
--- a/sys-cluster/swift/swift-2.21.0-r1.ebuild
+++ b/sys-cluster/swift/swift-2.21.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	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"
diff --git a/sys-cluster/teleport/Manifest b/sys-cluster/teleport/Manifest
index c56b4171e0e4..525ab2bfb431 100644
--- a/sys-cluster/teleport/Manifest
+++ b/sys-cluster/teleport/Manifest
@@ -4,13 +4,11 @@ AUX teleport.init.d 940 BLAKE2B a3b5fd197e6d8e173903aac6e9db4a684a986ab7d52227d4
 AUX teleport.service 310 BLAKE2B 410a8ca2e1273a0b9ef1ad93f4ff21f71ecedc979e52eb4f7e1b807b5434fba2b88bd1e0a5544ac68489d6e0db641cda4d76e606bed9cc96527156088b9b088b SHA512 72a43cce5f16bbed63e3b25917d3a4d63641b735acf63975c13c3cd2624c7971f40dc697d1da0d9b94b54e675e051d0a4e863696f7ebcea14f1c4b86e9e1218b
 AUX teleport.service.conf 90 BLAKE2B 7f12f281d73ac6573c882a7910e400f901ff6392e0c576e4b7076972f4ced046f709c8898766aaf38cc38fbfcf450b526d3045ff859eed2a48e19dbd92ec3131 SHA512 d17faa0deaf3c864e5159d3567e542e36d09c6ea0ac91c663d3ae9729d1bccf7d2139f1f48fec132eccc473e023ffdaed0b8f2ee75db5dedc6ff36f637f68e1c
 AUX teleport.yaml 9564 BLAKE2B e797480ebddc081a5fdbc10b5b2490aac675412638dee2f8790b289cbb061506c890156fb1a4807e28f14303e661864e5fc7922d01557815399adb13f2682930 SHA512 427e219fa6b787d0bf3a4e72f1573b50e52863d75444ca1d1da76812acb427bda3a537590856a39aad40a03415237b2a1f4893ed11e11039b287f7f5b97d2fa2
-DIST teleport-2.6.7.tar.gz 16655508 BLAKE2B a020ab999b7503cb7aec54ed81532baf9d08b98000f2c659f63859d89f7f2b5fb311c41d6fcafb7d9bf72ea1c97eecfc6ac621b7c90d74f5afe2717edb8b0402 SHA512 45002dcf7b99108ca6fffae94d6608188eb9b0bea05cd14068618bfb11c496cad5546e261f349fee70f2acb574e7fc44093683dd991001e01406da6982c5c4c3
-DIST teleport-2.7.1.tar.gz 18222601 BLAKE2B 86852a1c7f0b083d8fc46bb2e51e287f0d54ca8bd1a6306e21ad325b6f1487682f853eb313a1f6f6fc4dc4d25d93e909ed65dad6d00eb37f878904d6df30f98c SHA512 703056eb99aa91062c8d9cfa7852e3573c8968ce9dea0ff5b076d5225caf8d67b965948a47785cdc7e4341993ef3ed005677859d37653f7d22c05cb2db51efd7
-DIST teleport-3.0.0.tar.gz 22365657 BLAKE2B a9cfec07ec73970b1050c51819ef4820be95fcd94dce0ffbb62deca38af28a944929c83a9ed2b443a93eb21f55d0cac024b66acf81c5d6939ba8e6b6ba40438a SHA512 8cba0b7471bebe9cdac07b44f17c99b7b323061f310ef0e61a3ebe1c4ea2ca2b1c853177528c4725a83366406e8b1a5aba23ecdd5fba7290bd6cab74ada3340d
-DIST teleport-3.0.1.tar.gz 22365638 BLAKE2B 200d7612a56520607f7c157a4e1ff095f8621c2495cef520ce4db7b75f61346e7e5588ca8c9a9b9aa30b87d692c05d488343c3c7b1d30a46e90cacef42ed4172 SHA512 9a477ad174f0d7b0179cb4063731ebf0bd7cf31af22fb6db350b12839bfcdc9c8b68847bc33639546bf6b9026ee62ceb3197176f81a36d67f6b070f2eb4d65e1
-EBUILD teleport-2.6.7.ebuild 1251 BLAKE2B e03ca3a59d482d100c78a22197c205515c59ebfb0acee6286b3e6612a7bf6a71ae598d37bf935abc99a9b369de15e77ee1929d762e101d1a1a446aece769165c SHA512 da7ed88a169950fea543619e277d75d4c0a5d44d63552f43d9290deb748cbbd7b8094afeb386a088b887173332863c6a4f47ba117320d758809b7562b30d4037
-EBUILD teleport-2.7.1.ebuild 1251 BLAKE2B e03ca3a59d482d100c78a22197c205515c59ebfb0acee6286b3e6612a7bf6a71ae598d37bf935abc99a9b369de15e77ee1929d762e101d1a1a446aece769165c SHA512 da7ed88a169950fea543619e277d75d4c0a5d44d63552f43d9290deb748cbbd7b8094afeb386a088b887173332863c6a4f47ba117320d758809b7562b30d4037
-EBUILD teleport-3.0.0.ebuild 1249 BLAKE2B 01c6f8a1581bc6fd38569b67721f4e5a24447cd9c6ccf625bba939605663f5bb643e343d6c46da1091bc872d64d049e639a4be55a5a375c20ddb59d609c9e119 SHA512 c921673cf7955253255dd41b7f53954acce2a9b53b55b88c7385bf65d087b084159152966d172151f5567a67c3794c50fc5756f871ffd1b0e5c3253553ac2cc8
-EBUILD teleport-3.0.1.ebuild 1249 BLAKE2B 01c6f8a1581bc6fd38569b67721f4e5a24447cd9c6ccf625bba939605663f5bb643e343d6c46da1091bc872d64d049e639a4be55a5a375c20ddb59d609c9e119 SHA512 c921673cf7955253255dd41b7f53954acce2a9b53b55b88c7385bf65d087b084159152966d172151f5567a67c3794c50fc5756f871ffd1b0e5c3253553ac2cc8
+DIST teleport-2.7.9.tar.gz 18221805 BLAKE2B c634f97008310c4cabf4020bc8a600de7eb92406e22082aee24b030a5cd8d6bff44b0e0e3ddf405013315064d3342544d0e6f43e120047991e7889e4b1a74f9c SHA512 b609f94f9432c8b205a4cda625c68318343a3472218cd883f003a30587a00963163258c53c25f3fe36a951fc0bd40fdf141fe955b6d36d49435cfd4eff106b59
+DIST teleport-3.1.8.tar.gz 22605752 BLAKE2B 2ddebb0b0c8c42d36d113e409ce04f194e5ed77a7d88dd3e0a5982e303b8db8e013b156693c5fcd038d9d81f2907d17fdb65f82b34bdc84379bb0c46498e53a5 SHA512 de834309f96c327b54470deec043a498da969c5f3a872777a44143fceb070bd1c9ee837f218f46dc5b82ee1b40fb869a422b8cf9c22d26618f07a069de165f6e
+DIST teleport-3.2.0.tar.gz 22613098 BLAKE2B 0ff9675a071f5fb660ad4a7b0e085b9bec01c3d0967bdd206ce29a51addae545c4b2621854cbffdc0f76d0cbc6e5ec8f39e082b80b26ba13d352b1add199c965 SHA512 a3fdb520a62361f78632ac1680f86f183a533e47696791586b3c5ff7d505eb167a881c438c6a3dd72395140c521c065c8d8e4b93b5b8c9cbf134688dd8c1f8da
+EBUILD teleport-2.7.9.ebuild 1251 BLAKE2B e03ca3a59d482d100c78a22197c205515c59ebfb0acee6286b3e6612a7bf6a71ae598d37bf935abc99a9b369de15e77ee1929d762e101d1a1a446aece769165c SHA512 da7ed88a169950fea543619e277d75d4c0a5d44d63552f43d9290deb748cbbd7b8094afeb386a088b887173332863c6a4f47ba117320d758809b7562b30d4037
+EBUILD teleport-3.1.8.ebuild 1249 BLAKE2B 01c6f8a1581bc6fd38569b67721f4e5a24447cd9c6ccf625bba939605663f5bb643e343d6c46da1091bc872d64d049e639a4be55a5a375c20ddb59d609c9e119 SHA512 c921673cf7955253255dd41b7f53954acce2a9b53b55b88c7385bf65d087b084159152966d172151f5567a67c3794c50fc5756f871ffd1b0e5c3253553ac2cc8
+EBUILD teleport-3.2.0.ebuild 1249 BLAKE2B 6083a99735180dac5420c1a31154dc7b0b43637703d27ff43fd2404259830c79478dde146cb2f0bee9124b0be0a67d2d87d6aea43a453631dde3d64d5ee9a1ec SHA512 6dc52348dad7492b24c3c1c55bc91750d0fb4098f0b6aec3269631f7c6615e926c30e9a8e2fcea314ee50be286d66317911042bc920c05994a1a615cb3590c57
 EBUILD teleport-9999.ebuild 1237 BLAKE2B 8b5f4312a98799074029bbb3ccc66105ba7534434b4a553905e467114fccfb2ae0636c71fe2d6556dff2c5fa2667fe9f8e36a36df74e7bf21fa4c3ff7da85a1e SHA512 e526b41dc228bbf1143ea15e879360e94e4ad6dd10764f4d31a07eb682605247ba4d653ed3d91f0e0dc076c015c796d9a24a2ff6bccbd91c73510385ca9d3030
 MISC metadata.xml 630 BLAKE2B ad22bb63ecf79ddd45b62fe0dcadd6d0d7fd475938b18ec868b56b0f4afe7ee5d3e0908eb0b13249a7c7b5031a3296bec406fea6fb487069a087c9e29dcf0ef2 SHA512 2aa911f2a91bfdea340b38715d69cbe59bcd460d34ac6d1d641f2badf2ba72f4e02cdd2f8a2ca387c9a9d19ea2c22e2be80ab4bb582d9395c1517b818f343c74
diff --git a/sys-cluster/teleport/teleport-2.7.1.ebuild b/sys-cluster/teleport/teleport-2.7.1.ebuild
deleted file mode 100644
index e7bfb7ce0408..000000000000
--- a/sys-cluster/teleport/teleport-2.7.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build systemd
-
-DESCRIPTION="Modern SSH server for teams managing distributed infrastructure"
-HOMEPAGE="https://gravitational.com/teleport"
-
-EGO_PN="github.com/gravitational/${PN}/..."
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 golang-vcs
-	EGIT_REPO_URI="https://github.com/gravitational/${PN}.git"
-else
-	inherit golang-vcs-snapshot
-	SRC_URI="https://github.com/gravitational/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-IUSE="pam"
-LICENSE="Apache-2.0"
-RESTRICT="test strip"
-SLOT="0"
-
-DEPEND="app-arch/zip"
-RDEPEND="pam? ( sys-libs/pam )"
-
-src_compile() {
-	BUILDFLAGS="" GOPATH="${S}" emake -j1 -C src/${EGO_PN%/*} full
-}
-
-src_install() {
-	keepdir /var/lib/${PN} /etc/${PN}
-	dobin src/${EGO_PN%/*}/build/{tsh,tctl,teleport}
-
-	insinto /etc/${PN}
-	newins "${FILESDIR}"/${PN}-2.yaml ${PN}.yaml
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-
-	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-	systemd_install_serviced "${FILESDIR}"/${PN}.service.conf ${PN}.service
-}
-
-src_test() {
-	BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*} test
-}
diff --git a/sys-cluster/teleport/teleport-2.6.7.ebuild b/sys-cluster/teleport/teleport-2.7.9.ebuild
index e7bfb7ce0408..e7bfb7ce0408 100644
--- a/sys-cluster/teleport/teleport-2.6.7.ebuild
+++ b/sys-cluster/teleport/teleport-2.7.9.ebuild
diff --git a/sys-cluster/teleport/teleport-3.0.0.ebuild b/sys-cluster/teleport/teleport-3.1.8.ebuild
index 4a7a27e42a48..4a7a27e42a48 100644
--- a/sys-cluster/teleport/teleport-3.0.0.ebuild
+++ b/sys-cluster/teleport/teleport-3.1.8.ebuild
diff --git a/sys-cluster/teleport/teleport-3.0.1.ebuild b/sys-cluster/teleport/teleport-3.2.0.ebuild
index 4a7a27e42a48..3fb8ff680c04 100644
--- a/sys-cluster/teleport/teleport-3.0.1.ebuild
+++ b/sys-cluster/teleport/teleport-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
deleted file mode 100644
index 1a5f19de0fe0..000000000000
--- a/sys-cluster/util-vserver/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-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 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/bash_completion b/sys-cluster/util-vserver/files/bash_completion
deleted file mode 100644
index 73a9fef89f85..000000000000
--- a/sys-cluster/util-vserver/files/bash_completion
+++ /dev/null
@@ -1,300 +0,0 @@
-# Completion for the vserver command. Source this file (or on some systems
-# add it to ~/.bash_completion and start a new shell) and bash's completion
-# mechanism will know all about vserver's options!
-#
-# Copyright (C) Thomas Champagne <lafeuil@gmail.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# The latest version of this software can be obtained here:
-#
-# http://linux-vserver.org/Vserver+Completion
-#
-# version 0.4.0
-
-have vserver-info && {
-: ${UTIL_VSERVER_VARS:=$(vserver-info - SYSINFO |grep prefix: | awk '{ print $2}')/lib/util-vserver/util-vserver-vars}
-
-test -e "$UTIL_VSERVER_VARS" && {
-
-. "$UTIL_VSERVER_VARS"
-. "$_LIB_FUNCTIONS"
-
-_vserver() {
-	local cur cmds cmdOpts cmdMethodOpts helpCmds names names_pipe func i j method
-
-	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
-
-	# find available vServers:
-	# call function getAllVservers in vserver library
-	getAllVservers names
-	names_pipe=`echo ${names[@]} | sed 's/ /|/g'`
-
-	# available commands
-	cmds='start stop restart condrestart suexec exec enter chkconfig \
-	running status unify pkg apt-get apt-config apt-cache \
-	rpm pkgmgmt delete'
-
-	# options (long and short name)
-	cmdOpts='--help --version --debug --defaulttty -s --sync -v \
-	--verbose --silent --'
-
-	cmdMethodOpts='-m -n --context --confdir --lockfile \
-	--hostname --netdev --netbcast --netmask \
-	--netprefix --interface --cpuset \
-	--cpusetcpus --cpusetmems --cpusetvirt \
-	--initstyle --flags --help --'
-
-	# if the previous option is a single option
-	helpCmds='--help|--version'
-	if [[ ${COMP_WORDS[1]} == @($helpCmds) ]] ; then
-		return 0
-	fi
-
-	# lookup the vServer name
-	for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do
-		if [[ ${COMP_WORDS[i]} == @($names_pipe) ]] ; then
-			# found it!
-			break
-		fi
-	done
-
-	#a vserver has been found
-	if (( $i < ${#COMP_WORDS[@]}-1 )) ; then
-		# Show the vserver command without build
-		case "${COMP_WORDS[i+1]}" in
-			start)
-				COMPREPLY=( $( compgen -W "--rescue --rescue-cmd" -- $cur ) )
-				;;
-			# No completion for apt-config
-			stop|restart|condrestart|enter|running|status|apt-config|delete)
-				;;
-			suexec)
-				# I don't know how to do
-				COMPREPLY=( $( compgen -W  -- $cur ) )
-				;;
-			exec)
-				#I don't know how to do
-				COMPREPLY=( $( compgen -W "" -- $cur ) )
-				;;
-			unify)
-				COMPREPLY=( $( compgen -W "-R" -- $cur ) )
-				;;
-			apt-get|apt-cache)
-				func=${COMP_WORDS[i+1]}
-				COMP_WORDS=( ${COMP_WORDS[@]:$((i+1))} )
-				COMP_CWORD=$((COMP_CWORD-i-1))
-				declare -f _${func//-/_} > /dev/null && _${func//-/_}
-				;;
-			*)
-				COMPREPLY=( $( compgen -W "$cmds" -- $cur ) )
-				;;
-		esac
-		return 0
-	else
-		#no vserver name found
-		prev=${COMP_WORDS[COMP_CWORD-1]}
-
-		#search the new name of vserver
-		for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )) ; do
-			if [[ ${COMP_WORDS[i]} == !(vserver|-*) ]] ; then
-				# found it!
-				break
-			fi
-		done
-
-		if (( $i < ${#COMP_WORDS[@]}-1 )) ; then
-			j=$i
-			i=${#COMP_WORDS[@]}
-			for (( ; j < ${#COMP_WORDS[@]}-1; j++ )) ; do
-				if [[ ${COMP_WORDS[j]} == "--" ]];  then
-					# method's parameter
-					case "$method" in
-						legacy|copy)
-							;;
-						apt-rpm)
-							COMPREPLY=( $( compgen -W "-d" -- $cur ) )
-							;;
-						yum)
-							COMPREPLY=( $( compgen -W "-d" -- $cur ) )
-							;;
-						rpm)
-							COMPREPLY=( $( compgen -W "-d --empty --force --nodeps" -- $cur ) )
-							;;
-						skeleton)
-							;;
-						debootstrap)
-							COMPREPLY=( $( compgen -W "-d -m -s --" -- $cur ) )
-							;;
-						*)
-							;;
-					esac
-					return 0
-					break
-				fi
-
-				if [[ ${COMP_WORDS[j]} == @(build|-m) ]];  then
-					i=$j
-					if (( $j+1 < ${#COMP_WORDS[@]}-1 )) ; then
-						method=${COMP_WORDS[j+1]}
-					fi
-				fi
-			done
-
-			if (( $i < ${#COMP_WORDS[@]}-1 )) ; then
-				case $prev in
-					--help)
-						;;
-					-n|--context|--confdir|--lockfile|--hostname|--netdev|--netbcast|--netmask|--netprefix|--interface|--cpuset|--cpusetcpus|--cpusetmems|--cpusetvirt|--initstyle|--flags)
-						COMPREPLY=( $( compgen -W "" -- $cur ) )
-						;;
-					-m)
-						COMPREPLY=( $( compgen -W "legacy copy apt-rpm yum rpm skeleton debootstrap" -- $cur ) )
-						;;
-					*)
-						COMPREPLY=( $( compgen -W "$cmdMethodOpts" -- $cur ) )
-						;;
-				esac
-			else
-				COMPREPLY=( $( compgen -W "build" -- $cur ) )
-			fi
-		else
-			COMPREPLY=( $( compgen -W "${names[@]} $cmdOpts" -- $cur ) )
-		fi
-
-		return 0
-	fi
-
-	return 0
-}
-
-complete -F _vserver vserver
-
-_vapt_rpm_yum()
-{
-	local cur cmds cmdOpts helpCmds names func i
-
-	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
-
-	# options (long and short name)
-	cmdOpts='--help --version --quiet -q --all'
-
-	# if the previous option is a single option
-	helpCmds='--help|--version'
-
-	if [[ "${COMP_WORDS[1]}" == "@($helpCmds)" ]] ; then
-		return 0
-	fi
-
-	# search --
-	for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )) ; do
-		if [[ ${COMP_WORDS[i]} = "--" ]] ; then
-			# found it!
-			break
-		fi
-	done
-
-	# find available vServers
-	# call function getAllVservers in vserver library
-	getAllVservers names
-	names_pipe=`echo ${names[@]}" --all" | sed 's/ /|/g'`
-
-	if (( $i < ${#COMP_WORDS[@]}-1 )) && (( $i < $COMP_CWORD )) ; then
-		func=${COMP_WORDS[0]:1}
-		COMP_WORDS=( $func ${COMP_WORDS[@]:$((i+1))} )
-		COMP_CWORD=$((COMP_CWORD-i))
-		declare -f _${func//-/_} > /dev/null && _${func//-/_}
-	else
-		# search vServer name
-		for (( i=0; i <  ${#COMP_WORDS[@]}-1; i++ )) ; do
-			if [[ ${COMP_WORDS[i]} == @($names_pipe) ]] ; then
-				# found it!
-				break
-			fi
-		done
-
-		if (( $i < ${#COMP_WORDS[@]}-1 )) ; then
-			if [[ "${COMP_WORDS[i]}" = "--all"  ]] ; then
-				cmdOpts='--'
-				COMPREPLY=( $( compgen -W "$cmdOpts" -- $cur ) )
-			else
-				cmdOpts='--'
-				COMPREPLY=( $( compgen -W "${names[@]} $cmdOpts" -- $cur ) )
-			fi
-		else
-			COMPREPLY=( $( compgen -W "${names[@]} $cmdOpts" -- $cur ) )
-		fi
-	fi
-
-	return 0
-}
-
-_vserver_copy()
-{
-	local cur prev cmdOpts helpCmds confCmds names names_pipe i
-
-	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
-
-	# find available vServers
-	# call function getAllVservers in vserver library
-	getAllVservers names
-	names_pipe=`echo ${names[@]} | sed 's/ /|/g'`
-
-	# options (long and short name)
-	cmdOpts='--help -h --version -V --verbose -v --quiet -q \
-		 --vsroot -r --rsh -R --stopstart -s \
-		 --domain -d --ip -i'
-
-	# if the previous option is a single option
-	helpCmds='--help|-h|--version|-V'
-
-	if [[ ${COMP_WORDS[1]} == @($helpCmds) ]] ; then
-		return 0
-	fi
-
-	confCmds='--ip|-i|--domain|-d'
-	prev=${COMP_WORDS[COMP_CWORD-1]}
-
-	if [[ $prev == @($confCmds) ]] ; then
-		return 0
-	fi
-
-	# search a vServer name
-	for (( i=0; i <  ${#COMP_WORDS[@]}-1; i++ )); do
-		if [[ ${COMP_WORDS[i]} == @($names_pipe) ]] ; then
-			# found it!
-			break
-		fi
-	done
-
-	if (( $i < ${#COMP_WORDS[@]}-1 )) ; then
-		return 0
-	else
-		COMPREPLY=( $( compgen -W "${names[@]} $cmdOpts" -- $cur ) )
-	fi
-
-	return 0
-}
-
-complete -F _vapt_rpm_yum vapt-get
-complete -F _vapt_rpm_yum vrpm
-complete -F _vapt_rpm_yum vyum
-complete -F _vserver_copy vserver-copy
-
-}
-}
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
deleted file mode 100644
index cde8ccc500a6..000000000000
--- a/sys-cluster/util-vserver/files/util-vserver-0.30.216_pre3120-dietlibc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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/files/util-vserver-0.30.216_pre3120-vserver-init-functions.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.216_pre3120-vserver-init-functions.patch
deleted file mode 100644
index 9026ba07c967..000000000000
--- a/sys-cluster/util-vserver/files/util-vserver-0.30.216_pre3120-vserver-init-functions.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/scripts/vserver-init.functions	2019-02-20 07:54:16.747585681 +0000
-+++ b/scripts/vserver-init.functions	2019-02-20 07:54:31.457661349 +0000
-@@ -80,7 +80,7 @@
- 
- function create_dirs()
- {
--    $_MKDIR -p "$__RUNDIR" && $_MKDIR -p "$__VSHELPERSTATEDIR" && $_MKDIR -p `$_READLINK "$__PKGSTATEREVDIR"`
-+    $_MKDIR -p "$__RUNDIR" && $_MKDIR -p "$__VSHELPERSTATEDIR" && $_MKDIR -p "$__PKGCACHEDIR" && $_MKDIR -p `$_READLINK "$__PKGSTATEREVDIR"`
- }
- 
- function mount_cgroup()
diff --git a/sys-cluster/util-vserver/metadata.xml b/sys-cluster/util-vserver/metadata.xml
deleted file mode 100644
index 39c113a225e0..000000000000
--- a/sys-cluster/util-vserver/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>monsieurp@gentoo.org</email>
-		<name>Patrice Clement</name>
-	</maintainer>
-	<longdescription>
-		util-vserver is a Linux virtual server utility framework,
-		allowing an administrator to set up multiple, isolated
-		virtual servers. It can be used to run various services
-		securely separated, without requiring special configuration.
-		Virtual servers are unable to interact with each other, or
-		the main server.
-	</longdescription>
-</pkgmetadata>
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
deleted file mode 100644
index b64a51e52729..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils bash-completion-r1
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Linux-VServer admin utilities"
-HOMEPAGE="http://www.nongnu.org/util-vserver/"
-SRC_URI="http://people.linux-vserver.org/~dhozac/t/uv-testing/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-
-CDEPEND="
-	net-misc/vconfig
-	dev-libs/beecrypt
-	sys-apps/iproute2
-	net-firewall/iptables"
-
-DEPEND="
-	${CDEPEND}
-	>dev-libs/dietlibc-0.33"
-
-RDEPEND="
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-vserver-init-functions.patch"
-	"${FILESDIR}/${P}-dietlibc.patch"
-)
-
-DOCS=( README ChangeLog NEWS AUTHORS THANKS util-vserver.spec )
-
-pkg_setup() {
-	if [[ -z "${VDIRBASE}" ]]; then
-		einfo
-		einfo "You can change the default vserver base directory (/vservers)"
-		einfo "by setting the VDIRBASE environment variable."
-	fi
-
-	: ${VDIRBASE:=/vservers}
-
-	einfo
-	einfo "Using \"${VDIRBASE}\" as vserver base directory"
-	einfo
-}
-
-src_test() {
-	# do not use $D from portage by accident (#297982)
-	sed -i -e 's/^\$D //' "${S}"/src/testsuite/vunify-test.sh || die
-
-	default
-}
-
-src_configure() {
-	local myeconf=(
-		--with-vrootdir="${VDIRBASE}"
-		--with-initscripts=gentoo
-		--localstatedir=/var
-	)
-
-	econf "${myeconf[@]}"
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	make DESTDIR="${D}" install install-distribution || die
-
-	# remove runtime paths
-	rm -r "${D}"/var/run || die
-	rm -r "${D}"/var/cache || die
-
-	# keep dirs
-	keepdir "${VDIRBASE}"
-	keepdir "${VDIRBASE}"/.pkg
-
-	# bash-completion
-	newbashcomp "${FILESDIR}"/bash_completion ${PN}
-}
-
-pkg_postinst() {
-	# Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also
-	# present when merging.
-	mkdir -p "${VDIRBASE}" || die
-	if ! setattr --barrier "${VDIRBASE}"; then
-		ewarn "Filesystem on ${VDIRBASE} does not support chroot barriers."
-		ewarn "Chroot barrier is additional security measure that is used"
-		ewarn "when two vservers or the host system share the same filesystem."
-		ewarn "If you intend to use separate filesystem for every vserver"
-		ewarn "you can safely ignore this warning."
-		ewarn "To manually apply a barrier use: setattr --barrier ${VDIRBASE}"
-		ewarn "For details see: http://linux-vserver.org/Secure_chroot_Barrier"
-	fi
-
-	rm /etc/vservers/.defaults/vdirbase || die
-	ln -sf "${VDIRBASE}" /etc/vservers/.defaults/vdirbase || die
-
-	elog
-	elog "You have to run the vprocunhide command after every reboot"
-	elog "in order to setup /proc permissions correctly for vserver"
-	elog "use. An init script has been installed by this package."
-	elog "To use it you should add it to a runlevel:"
-	elog
-	elog " rc-update add vprocunhide default"
-	elog
-}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild
deleted file mode 100644
index f78cde235aa5..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils bash-completion-r1
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Linux-VServer admin utilities"
-HOMEPAGE="http://www.nongnu.org/util-vserver/"
-SRC_URI="http://people.linux-vserver.org/~dhozac/t/uv-testing/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 x86"
-
-CDEPEND="
-	dev-libs/beecrypt
-	net-firewall/iptables
-	net-misc/vconfig
-	sys-apps/iproute2"
-
-DEPEND="
-	${CDEPEND}
-	>dev-libs/dietlibc-0.33"
-
-RDEPEND="
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if [[ -z "${VDIRBASE}" ]]; then
-		einfo
-		einfo "You can change the default vserver base directory (/vservers)"
-		einfo "by setting the VDIRBASE environment variable."
-	fi
-
-	: ${VDIRBASE:=/vservers}
-
-	einfo
-	einfo "Using \"${VDIRBASE}\" as vserver base directory"
-	einfo
-}
-
-src_test() {
-	# do not use $D from portage by accident (#297982)
-	sed -i -e 's/^\$D //' "${S}"/src/testsuite/vunify-test.sh || die
-
-	default
-}
-
-src_configure() {
-	local myeconf=(
-		--with-vrootdir="${VDIRBASE}"
-		--with-initscripts=gentoo
-		--localstatedir=/var
-	)
-
-	econf "${myeconf[@]}"
-}
-
-src_compile() {
-	emake -j1 || die "emake failed!"
-}
-
-src_install() {
-	make DESTDIR="${D}" install install-distribution \
-		|| die "make install failed!"
-
-	# keep dirs
-	keepdir /var/cache/vservers
-	keepdir "${VDIRBASE}"
-	keepdir "${VDIRBASE}"/.pkg
-
-	# bash-completion
-	newbashcomp "${FILESDIR}"/bash_completion ${PN}
-
-	dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec
-}
-
-pkg_postinst() {
-	# Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also
-	# present when merging.
-
-	mkdir -p "${VDIRBASE}" || die
-	if ! setattr --barrier "${VDIRBASE}"; then
-		ewarn "Filesystem on ${VDIRBASE} does not support chroot barriers."
-		ewarn "Chroot barrier is additional security measure that is used"
-		ewarn "when two vservers or the host system share the same filesystem."
-		ewarn "If you intend to use separate filesystem for every vserver"
-		ewarn "you can safely ignore this warning."
-		ewarn "To manually apply a barrier use: setattr --barrier ${VDIRBASE}"
-		ewarn "For details see: http://linux-vserver.org/Secure_chroot_Barrier"
-	fi
-
-	rm /etc/vservers/.defaults/vdirbase || die
-	ln -sf "${VDIRBASE}" /etc/vservers/.defaults/vdirbase || die
-
-	elog
-	elog "You have to run the vprocunhide command after every reboot"
-	elog "in order to setup /proc permissions correctly for vserver"
-	elog "use. An init script has been installed by this package."
-	elog "To use it you should add it to a runlevel:"
-	elog
-	elog " rc-update add vprocunhide default"
-	elog
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
commit	b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree	e318514216845acb8f2e49fff7a5cba4027e9d91 /sys-cluster
parent	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)