gentoo resync : 25.04.2020

50 files changed, 989 insertions, 2650 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 8b6a8a6a9288..33ecb57b5588 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index ab97ff0b15e2..209813541b1d 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -11,25 +11,14 @@ AUX ceph-12.2.12-qa-warning.patch 494 BLAKE2B eeee0d451264390f8b6c712b08592b5dca
 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
-AUX ceph-12.2.5-boost-sonames.patch 5546 BLAKE2B 8062f550dd36371b1f89981ed2c63e5d8ff4273a6843f8cb8227c38fcfe29c1ce42c07578c3491a9b04e548d0c76a27481a7cb9ae2afad2870191090697c6f4b SHA512 0f48e5107be166306c832bc998c4375759e783ce0159250b3440f22ed7ef3b16fefc9e2258b53829145361d2e2e6bae97e09dde6ed81149a137f3ce84fe4ee47
 AUX ceph-12.2.5-no-werror.patch 2214 BLAKE2B b8878f8dd9e971f0f11f0954ba81fdf2df270e0ac3588220f629255737119a05def4012caa202b2e13f693b3962322126d7b6fb91ca18e844b0a1aed3de37586 SHA512 db945087453b83a87c963bf87b35ab77946a53f3b86e24dafd4b947e098d9780ff41aa6df979adcd306fa9e740d1dbba8cf7c391feb5b934ea83c55621b350cd
-AUX ceph-13.2.0-boost-sonames.patch 6598 BLAKE2B 906530f288518b26b005140645241da4deda6ab38a1780fdd92e9a7602547cc8f6ef65da66a2fe689d047339aa1237a32ea524419649109309634b8516ce687b SHA512 4d62c4babfcd20fadbe25572d3aebb4b01360a22fa5554e73454d59d9a46ed011b59ab0538e0ddd182c006889c160394d8eda171171aeb55c131ce7237c54343
 AUX ceph-13.2.0-cflags.patch 1011 BLAKE2B a7d911ed0ded1a1eb5426bae3a7b1cc169774668cdefd120ce8a5bb2f2082d792dfa0d2e14bac558bf27343763b66d42b9d84046acfa5a1cb1d61fc1219955b3 SHA512 8ec0d668fefee12d2c7f5b5297dd81fc6a559f5823d069e6395d9b4240110eb8f95049d3054697a459948c1f3784b4450539849cf9d7f3b1aa1c7fbd96c475df
-AUX ceph-13.2.0-mgr-python-version.patch 675 BLAKE2B 2458bd067f9947189b65c439df501f1c31eaf6a9ca7d46164e84a37aec7e99ac12456bd299604d18b2f0ac70898de90427a80390644a8e3d455c5e3caf297854 SHA512 aa0f3dab73573c1ac91513bca378a8441ace5f58a0e469f4f01d7ab22869b41e5d4a1e44c3fe8e2bc23ab5249fd1a52a4b72000d458521b6ee291512e51d474c
-AUX ceph-13.2.0-no-virtualenvs.patch 4466 BLAKE2B 9f5176b7d3ee3b3602341864af8eb2494cfcc2268492d7ecf9f43576963de913c9be52259dd16c2a3ad6440eeb33604ce609fc11e7e36236a37c02b84ad81890 SHA512 7b9ab0a7e22784f66253f873dd76bb3e76cfff4781632ed51d39beefacdd1a7f4d90441aff9fd93987837fadaa847906bba32eb18c86f8a8fe31205246cbfd8d
 AUX ceph-13.2.2-dont-install-sysvinit-script.patch 471 BLAKE2B 85ef94f49408496360fa24a433e9d6f3568749a6dfb415cbd17bfb950b9500f182c5141eab402686001f95e1611e60accdac7111ceca14f03b1ff8b4345c087f SHA512 ea069b75b786c22166c609b127b512802cc5c6e9512d792d7b7b34d276f5b86d57c8c35cfc7b5c855a59c0ba87ba1aabe2ca26da72b26bff46b6ba8410ddb27e
-AUX ceph-13.2.5-no-automagic-deps.patch 1056 BLAKE2B dbae76e4be1ca690ff59c0b905ef63b9fbcddcb25d181af2a514113f4bfd5028a8b5bce98c965d195ae69f8532731b2e9d9002f01bb91ccfcde5a29eb43b8f41 SHA512 60616eaaadbf4431769bc2e192718ee28842efc818ee561af1c2c7a5269e393efeb455260c36582d3265730d482a92fb911b4c501e486a3a6387ab4a10d1589d
-AUX ceph-13.2.6-dpdk-alignment.patch 612 BLAKE2B 7f75b53383979d5790862c91ff67b41c16d94e6572c9c387ae511401d22562493bddb296f47bef60ebf586683df36b5b62744ac30d43b1c4eede053d6ae4438a SHA512 058bf0a564a158356e5a87099ea8d1372123eeee8bfdb3c25870911dccc351f33e00793456c5c04f670946559cd49bc6a8cab5553dc99bebb570910b4a787d58
-AUX ceph-13.2.6-no-virtualenvs.patch 4137 BLAKE2B 9cef3ed31ec0ab2d13091b0b76071532ffd021a5627fa91808bb7eff382a4b29945eaa6bc529e8ee3176056caf9f62af0fb4b4210d2549bbc05f018fd4ecd75c SHA512 051c80c70a951135e2a00f6688ff03f604f89c65be47c4e00e2f72ee1a071be067cc8a7a60fd4ef78587a6b79b2b26d52d5dc3efbdcf0e11d4e3e1156483b03e
 AUX ceph-14.2.0-cflags.patch 545 BLAKE2B 0f5c4e509b2252de7a4b914b99fb4abe13010a1c21b2b701530f6a29dcd41924e3b81841cb65b7b949af42b168ce9fe756b0551c31babf9c9498d394b2ea6aa8 SHA512 9e6bb46d5bbdc5d93f4f026b2a8d6bdb692d9ea6e7018c1bb0188d95ea8574c76238d968b340fd67ddaa3d8183b310e393e3549dc3a63a795fde696413b0ca94
 AUX ceph-14.2.0-cython-0.29.patch 946 BLAKE2B c251b6a171e5e0bab3f8716b79eb3138a177c1f39e7cf433ba52d03d73de4b45abc2db6742237c8044519337297025cf577d210ace81457ff05325073aa5bb43 SHA512 82c1608928ee669ef60b8930ce82c443152c446e669e7bde9ce32f78571afb19a9620c3818b69ac8cb3ea33e7d7ac40f77c89162c71b19b157336d907fa23e3d
 AUX ceph-14.2.0-dpdk-cflags.patch 1171 BLAKE2B a6815317d3828cee8d2476d6cc77b60d089db5b5ab0b30fd24c0ac10270ce930ce3049f1b22af71e5b39a6e323c672245fb78753e7ed901055afac8371cbcb9f SHA512 ece01fcaf0b82c441618eea1f37fc2658aa356de1128121d368769fdbf6316b226ea15a781353b115c0a81921c8872bb3d003ecbb1e8f1b456bb8cf6db8f091e
 AUX ceph-14.2.0-link-crc32-statically.patch 428 BLAKE2B d324855dab736eeecf5835e79c4f2fad9ea4d10aa29b2b03ab6274efa2f54a5cfdad710552662a49d5f61466e1cd9d6c2fc8a42373961e3334f39b806e647feb SHA512 3efe70f826ebc207f1ce8744483c9a82ebbf8f3cfa81c9cbb3152b40f5b540cc9cc21e6bd3370197bee9a27a01c3e3725754d044069bb760c3dbfbc97fe4276d
 AUX ceph-14.2.0-mgr-python-version.patch 685 BLAKE2B fbd36e0f5fe45be7cc58cf11b2b83613c2f7f7fdfd64d4f04729c36e5ebc110341aa4c5521d9be590bfb7a7812525130e773a346827461df0a108fbde359b161 SHA512 af0851913cf8b42bad71ece4e41017f71e91db19aeeebb5ea0306055d6d6d9e7eb9ba34224bb2583ca437d44827de8852727e8a9dd809d942d4c277ec3da3214
-AUX ceph-14.2.0-no-virtualenvs.patch 2349 BLAKE2B a012ab044f92c2a22c8f04661d2210585dbacb531ece528cc3d8d026ba692f46d1306b920826d02b93317de24c325542ac222a4e2b42684aa44f5c12019e2a29 SHA512 623eacb30565725768b80e56e876cef6f52c07b63d8a0f0cc9b16d82677014636f1fdffbf7ca77b21d6465fc84b7fa429153b5c51e6202c85b1fdd6c5ae96a38
-AUX ceph-14.2.3-boost-1.6-python-sonames.patch 987 BLAKE2B c70ee9689cbe2f7b3ad437285d9ab58a029ef35ea1a9f4a34891a32f3ac21068d28e0bbedcdefeee7f1748566e2133ce8c2c79eaf2a74b416a53c9cee4f3a7b9 SHA512 f8596e0c22270e771ae24498ea959e4d0079433198950fba05e172bdb6caa6ece75515f2fefc8aebc93cfd1b0a8ac087bf917bd99f6dd486fe855ba81a448c53
-AUX ceph-14.2.3-boost-1.70.patch 3591 BLAKE2B 12a947de968155cc9b73299757acb04f1588e988658f40b5bb6ef781d273a280543fd78a37cd5565599fe1bc7c187f7beaaa63a103d4b9ba1e7f3981e1027c87 SHA512 1bff4165c44a26950de22b01221e791b6cffe32653eceab0e9f03d3ae893b0b1fdab5659d5742335aa1fb519e34d2d841984ed8c844e8b8f1db8bc78bbed2472
-AUX ceph-14.2.3-boost-sonames.patch 13701 BLAKE2B 7d8fa01f56922770190d7cada4cd5404e1584cf8afc2a84aae9d0031e66d778af6e9b2072e405982ca652229b86169f5cdefcd7fe321a1626f9bec5ca014c54e SHA512 c6e7497a427c0ca10b4aa006020467e9ae6c2fb167f500d72d92adc953490a1f7062bbc2dcdeee61a6ab251fa3a27ddd6c64b190bb88e7993df1fd4084d39882
 AUX ceph-14.2.3-dpdk-compile-fix-1.patch 4729 BLAKE2B 96e709b592a7ea9324f54acf75ac3f78334a0d2b155f6d4b5360df8b13e2c9c8e5f6d6b19da5ddb7760c56d9307e056db9aeecec1926dddec88b6b685eb55374 SHA512 d0849fa120b3d7c26106e75bd830874854ee4214ac867b577f4486e4a033b2f555fa6745910f90d26f7fa5280bff01f5880eda9a2bc6edc856400a5756a8346b
 AUX ceph-14.2.4-python-executable.patch 922 BLAKE2B a5c9e8c70de62a974ea0bea4159874447d725a566d75a026ca125a7db0f24a8d92212d067c8dd91b75ec1e2aab12e46da464f320c7e696cc916e29a4e0d28f93 SHA512 b263de28897f05fc3a201622b90a222bb2c6605d4e6d8921d3c8101247a41a44e1f9da4242f208e1ef4d10ae028917510f4390cc69595b77b723545f0f72eeb2
 AUX ceph-14.2.4-undefined-behaviour.patch 1990 BLAKE2B 4f9839bc05c95d40c870f346ebb1856f2846adb26fcbbed67e260f47def9b7167bac4a15917262e8c9dbb99cb83892da2aa315b6d9ee8cd60eb222876dc56482 SHA512 15e4df7cadb02e65144dffea3c287e853e27a04c18281c13282409f1bc28184f31b80d505123a3a29e5394fa0b5e3e3f1246bb70353f142e52e19939149a341e
@@ -37,18 +26,14 @@ AUX ceph-14.2.5-boost-1.6-python-sonames.patch 987 BLAKE2B 526a863091ce68d2b7624
 AUX ceph-14.2.5-boost-1.70.patch 3601 BLAKE2B af39a65d9303d8516d1147afd7287d22725b23e722d5b38e708881b916d674a92f15f50a70047cd04050ab518518a0aca6a964f631b98ac9c98a599a1d891a99 SHA512 cb8d37d5d83a9e1e6e37f3a72719c0e892b09bb064f3cbd30b213e9be32662ebc1d3d1afbb2a84c7a8aa701d5cfd398ec4ef0c958de98b3eaffeeadc66004e11
 AUX ceph-14.2.5-boost-sonames.patch 19634 BLAKE2B 7f8225c9ae87ece13056f83b352983184ef473db53aa5da14125a002c14f355dfe8571e1fa4ea5d8241df3bebfc125c65295d4e8a9e2acbcd5070f9e05535a1c SHA512 a01e5a741cf91148d7154733233e04c6dbf8f6d672c498a5446385624c0c29c256f6031a357e899f9029335799707ee117c05468594333d05405b5acfb319b46
 AUX ceph-14.2.5-no-virtualenvs.patch 2144 BLAKE2B 1ade0666aa6dcaee8bf9da5d6e0d4f9c433afe2e59f7403d37409923f23c5de5de4451cf7193d57198c6b7617333f0ac7acdb2299411550f9bda833a9feb1e51 SHA512 e40fdef0c5b55393863cd662f52354f33f175519d746ee0ac37803616f02f9c207aeca0a1af8ecdc93742a3a63b97869a2032078a419c5746582c96fc7ecd012
-AUX ceph-14.2.8-boost-sonames.patch 22485 BLAKE2B 7447cfdb51b6e4dd306bbccfd769fc3652424748688726019642e07e9ec98d838464b0cb1a6bfca1523c285070c6e30b02934bc570ab06d2d83a0253e7170c18 SHA512 f033a41e967c05ac1eab69e6aead60751a5519eb8d2d98c72606be8a366a855cbb32dc5c4abb744947f18a395e48a68126b74b3dc2e10d38f0883c85fe1ae16b
 AUX ceph-15.2.0-no-virtualenvs.patch 3197 BLAKE2B 356a5d465e449b9de1ec2e0f1f1b38950954844bc3d47a2ba22118aba5376b050fbd56b366fe2913f87fa1ef7822ad4a6fff93511d02c67e3718bab0a1962b7a SHA512 181d56a168875ede97b1945976481061c5632ae79232f9d35a00adb4e5d1cf0acc9bd2e4ac7a62638574b149bcac639522c9914a08636603504385e0cbdd1292
 AUX ceph-15.2.0-rocksdb-cmake.patch 703 BLAKE2B 1c99a1a89be22cedf39326cbf7d6e381c76598ceb8efd4dc6e9f97033c8e654314b8a59c147a7d5daf0305aaedbb4ceb14b9c14e79f61e8fa789e74c0205b1f4 SHA512 20256de5c3227caa149f8285bcc90fcbd67be8cefa568fb72ad0d43688f1f62db7c7fc231dfd4ecf2dd11be68bf1ccc284ebbc691a82a26f3968200f12c82097
 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-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-r12 3088 BLAKE2B 371ee28604bef04766b3b13687feb56e076cf4ef23797bdf469db8b85454624ab005304c798c0945bcd4c5c0478ad7d724ccd33074afef39ab939464969e32b1 SHA512 4eeb1d589cd010b39405d1664f077a79d6a8bb8d9693b32390546e14a240f98ba6e4d6281940f482f57e8364339c68b1b02219c0f837f65a738686b00ac9498c
-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
 AUX envd-tcmalloc 48 BLAKE2B 4a0799ac6bbedfe5e701eead67600312d86f06143dbfd11d2c594c03d09bf13dfa645e5a0bde1189211ad20036dc4fcfce6758d3a5829d943eb337cc65783af9 SHA512 d180b1a888ec6d870ff523a3b10fd00eca479ee2586a236458af5ffaba21c84e7b8098da6d4bc08fb86c82c61a861dd3c3596a01063d734c329a92808682fc8c
@@ -57,11 +42,10 @@ AUX rbdmap.initd 2373 BLAKE2B b88d79efc722e2de3d1f0269664a976ed45fbb0a1c9d46fcfd
 AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8aa98ae97349b42b56c65a531b207c5f970f873a79c41789941cdd10b279e38f1616f84d SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a
 DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7881cd9c2e185eca12096efb79d21578659d248eb5bae678924983d57452d370e23ab7e78663764d7bea834a461 SHA512 e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc
 DIST ceph-14.2.7.tar.gz 116647114 BLAKE2B f6971324b0467cfdb863db553b6feacaf3607b14fb9adae2808bd6e5514fc5ce218482c412b80902c22a74b883ed697f2c126bc687c8733a83de5b970593efa2 SHA512 59f475e56053ba5e7e3a482a3a91b4d44272e6ec8051b92783de76c09c0d967a7ef76676db998968a709e48f08e90828dd8f86bd96a7c3fd111d48bfb7fd93b1
-DIST ceph-14.2.8.tar.gz 128415417 BLAKE2B bb3644938106aaefe17d29fd6adc8568a35e6aef799da048add5ecebb6fb0128a8575eba1f5ecc2f33f33caf2130619e5b6979a6291566e0971976d8da0e8387 SHA512 38b0c6df58579377528c8f8e06d0cbc40f471f6eb2fb4a05b395f6fddbd3f2117674545b2147d8730973b01967ddcd4322a769ba03f9c625417ed35cc39f195a
-DIST ceph-15.2.0.tar.gz 147445869 BLAKE2B 266bcffd702b46482316f59a9a071bdb9e1f9fc01a87f2f603995fe85d124722a8652aa3086bf3642d395a7f19652a0ce48496ee044a9b8f7e1f59643b48198e SHA512 07a3ff2ccf1a3abac652ff8c5f1611e7c628fcedcb280adc6cd49792b46fa50c7c29437dc57c2c4a6af708a6833abf8c1a386ef2142d30bd5e1f214ba7aec4f2
-EBUILD ceph-12.2.12-r2.ebuild 8446 BLAKE2B aed1bab233d20c77e385b49bc0f8fa7cbdd9a806f0e5e856e1000cccb09557bfc394ef2e97fbeb8fa5b995dd119dcd4b3e79751c6b5da00798b1267af392412e SHA512 50e031732540249f824e9b14a8286c600bff8a361e5047ad0b67c87ec940c1feaf0a2f7d5f40ab529dbfa91b15915b4adf372a6d3257025d6457c64cc152d1d1
-EBUILD ceph-14.2.7-r1.ebuild 10460 BLAKE2B 2b39e9b8547e37bea987737c7a0be15f0e4aeb586b509d9403398b72b67568892e9d8755967f70e161091389ede0fc6206ca6f21c071840747f3a08d3dd88297 SHA512 aebd7fc16527519c68912cdf73c07201bb9b05a307a57b6fb98261af668ccc7908a912bba4ab40ed11690b3e4678e7d9c5334428989f30c26ce01291966351e7
-EBUILD ceph-14.2.7.ebuild 10267 BLAKE2B e64a6096a7e021d3a6f1ae0e8564132d76d38f3ef195510a2b0606602792929d2b62c31e16ae12b8c35b0b2dca793d40dc0d4a4e3dc517fa8edb21bf9ff88b42 SHA512 2cc3f8116ca7b57914f0b3b2cde51fbf0df5f90ca9c649db50ed370d6cda8f840cdb1d67f38454d765f1fcc2d96bab0ed5a7766601556a7931b8c8c3a8d988f2
-EBUILD ceph-14.2.8.ebuild 10151 BLAKE2B e74002c4c7276e1f7c65a6ce8c5c17054b07d82b720c73fa27e1fbe5621aa32863ed0a92cb39475bf820bff137bd5fa02f35a2ce536f853875b458d7d334c0d9 SHA512 05d3da655dbfb09c3d80eee9fd149fd4c15e2bab33da072e64085cafc7ad9dd69731759978610f3e651a7b67453d4dca19b0b29428481e01c1f2eda7c5e09c2c
-EBUILD ceph-15.2.0-r1.ebuild 10597 BLAKE2B 46005034a3595a5a152cf5a5227ead905b0dcc8e0ac084ca1737548409d0f3e8db5b92720be052b0457225aab8dcecea2dc4c881d912629faf68af1fed8043aa SHA512 eb9e33697d026bda841e5971245a2ac784bf7ca063adae957293ff85d2e20ba3e8af838e9bbf2d6678a6d8e02ff8f9bafca196435e9057bc9b651c3ae310f574
+DIST ceph-14.2.9.tar.gz 128419205 BLAKE2B bace7469d9066a3da7320a0eb894013fae5b7139c15679dddae7df28c593a1029956234a1ba0d3bbdf1639e3a975aa776c695efefb915113a16099c80d563675 SHA512 0a26372d0037c32fe1d24be880e272fcce5089b02adfb0e791e0406155f6e66c913fa43762028f49c1fa3f30c6c8d819c521dd11702a37cc7040dfd3097c068e
+DIST ceph-15.2.1.tar.gz 147551715 BLAKE2B fcb5683493431ffc75aced3be7faf5a0486052df695d3133572bb9728fd4863fb88117bd9b13e4bf89c7e4afeea2888bbb252df48b0f52c33ce6202a6f4f7f87 SHA512 01589875078466321aaaeead8d7e21baf670e68c3d1f3168de188f3ad93eada745affb9da30217c8cb4938cbfdbe6bdf6bfd074fe8eb01863e1e8448f06a2304
+EBUILD ceph-12.2.12-r3.ebuild 8084 BLAKE2B 10c1bb21651ca274643565a22794b4c6d8c61c9baa19fca9ffa396d6cbbf22b72b5601457b01ba62c1cdd6400ca965c6a8bdc638a959df315c57f0d272e36b5a SHA512 2cfdd77569da5c05354036e3d3864abab69e889e1cee142ed10782fb989353a8c9d7c491ef8e3fd6a872700b6a341413a591e0a341aa1a1ffca988be5b6a9af0
+EBUILD ceph-14.2.7-r1.ebuild 9766 BLAKE2B 311b4050caa476ea8198e90fa633d1f06a632127abe073831844aee81a56d1f0b15c340516c1bd44273b0a2bd50e8c37b5fb0710ddb4c5ebf439228203842729 SHA512 504eb96009c8c0d33d06540f50adc48455a2b81f11c00eb626c2b8008b604833181832bc265d4fbcb4169809aafeadcd5aede8bf97c768ef3caa6a75f53b0fcf
+EBUILD ceph-14.2.9-r1.ebuild 9631 BLAKE2B 2f486712c825e24b7708e581fe2c9c9d7c1e6321ee32174f8b5b5c14e643ec2369639340452a79608061f573069fc5e7940e43b555d51a1ddd8e155d208d6cc9 SHA512 8847c34ad72f931d464aafdbe62c37e80f5f16fa8be419a736c8f25109e03e73540bc83fec6a4a690cc6ad61342113b136a16faae7bc3666aef041f4cca23fbb
+EBUILD ceph-15.2.1-r1.ebuild 10074 BLAKE2B c91fde40bfceda6b4ee9abb85a28a27d70473ab6b71554bcecafd433787d0636f34d4766c2c01d57af936bd528cefa21c0808c8144983b2bb4a7479f8390241b SHA512 c76fa1fd17efc95f75d4dd8720953d3d7e15596be3230f037f8879d7b52bdb84c3b5fb72202340f7bd6350baa6d66f57441dffe66090acdfa1d4662bedc02983
 MISC metadata.xml 2018 BLAKE2B aa5f1b8431436f63e186cd845bfb85ad2cf25c3074a9e9e4a4f3899ab2910ac179eb778d7a248e12ccd460c48b27e7608e86fe3e8f59b21742dd2ceeee4e2acd SHA512 575499433ee2b2381269850ec2378345250031689f0f08d9362d04e30cbf78b799fdbfc2bb28f74748c28f0500400aa77d1a90c4604fb0ac3d6391bca1bfc1c2
diff --git a/sys-cluster/ceph/ceph-12.2.12-r2.ebuild b/sys-cluster/ceph/ceph-12.2.12-r3.ebuild
index 5ce8a64ecb1d..029b309f0095 100644
--- a/sys-cluster/ceph/ceph-12.2.12-r2.ebuild
+++ b/sys-cluster/ceph/ceph-12.2.12-r3.ebuild
@@ -27,7 +27,7 @@ SLOT="0"
 CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
 
 IUSE="babeltrace cephfs fuse jemalloc ldap lttng +mgr nss +radosgw +ssl"
-IUSE+=" static-libs +system-boost systemd +tcmalloc test xfs zfs"
+IUSE+=" +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
@@ -37,36 +37,36 @@ COMMON_DEPEND="
 	acct-group/ceph
 	acct-user/ceph
 	virtual/libudev:=
-	app-arch/bzip2:=[static-libs?]
-	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs(-)?]
-	app-arch/zstd:=[static-libs?]
-	app-misc/jq:=[static-libs?]
-	<dev-libs/crypto++-7.0:=[static-libs?]
-	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
-	dev-libs/libaio:=[static-libs?]
-	dev-libs/libxml2:=[static-libs?]
-	sys-apps/keyutils:=[static-libs?]
-	sys-apps/util-linux:=[static-libs?]
-	sys-libs/zlib:=[static-libs?]
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	app-arch/snappy:=
+	app-arch/zstd:=
+	app-misc/jq:=
+	<dev-libs/crypto++-7.0:=
+	dev-libs/leveldb:=[snappy,tcmalloc?]
+	dev-libs/libaio:=
+	dev-libs/libxml2:=
+	sys-apps/keyutils:=
+	sys-apps/util-linux:=
+	sys-libs/zlib:=
 	babeltrace? ( dev-util/babeltrace )
-	ldap? ( net-nds/openldap:=[static-libs?] )
+	ldap? ( net-nds/openldap:= )
 	lttng? ( dev-util/lttng-ust:= )
 	nss? ( dev-libs/nss:= )
-	fuse? ( sys-fs/fuse:0=[static-libs?] )
-	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
-	zfs? ( sys-fs/zfs:=[static-libs?] )
-	ssl? ( dev-libs/openssl:0=[static-libs?] )
+	fuse? ( sys-fs/fuse:0= )
+	xfs? ( sys-fs/xfsprogs:= )
+	zfs? ( sys-fs/zfs:= )
+	ssl? ( dev-libs/openssl:0= )
 	radosgw? (
-		dev-libs/expat:=[static-libs?]
-		<dev-libs/openssl-1.1:=[static-libs?]
-		net-misc/curl:=[curl_ssl_openssl,static-libs?]
+		dev-libs/expat:=
+		<dev-libs/openssl-1.1:=
+		net-misc/curl:=[curl_ssl_openssl]
 	)
 	system-boost? (
-		=dev-libs/boost-1.66*:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
+		=dev-libs/boost-1.66*:=[threads,context,python,${PYTHON_USEDEP}]
 	)
-	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
-	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
+	jemalloc? ( dev-libs/jemalloc:= )
+	!jemalloc? ( >=dev-util/google-perftools-2.4:= )
 	${PYTHON_DEPS}
 	"
 DEPEND="${COMMON_DEPEND}
@@ -201,7 +201,7 @@ ceph_src_configure() {
 		-DWITH_TESTS=$(usex test)
 		-DWITH_XFS=$(usex xfs)
 		-DWITH_ZFS=$(usex zfs)
-		-DENABLE_SHARED=$(usex static-libs '' 'yes' 'no')
+		-DENABLE_SHARED="yes"
 		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
 		-DWITH_SYSTEM_BOOST=$(usex system-boost)
 		-DBOOST_J=$(makeopts_jobs)
diff --git a/sys-cluster/ceph/ceph-14.2.7-r1.ebuild b/sys-cluster/ceph/ceph-14.2.7-r1.ebuild
index bbd99feb1f92..f05b0b4f65b9 100644
--- a/sys-cluster/ceph/ceph-14.2.7-r1.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.7-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
 fi
 
 DESCRIPTION="Ceph distributed filesystem"
@@ -28,8 +28,8 @@ SLOT="0"
 
 CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
 
-IUSE="babeltrace +cephfs dpdk fuse grafana jemalloc kerberos ldap libressl"
-IUSE+=" lttng +mgr numa rabbitmq +radosgw +ssl spdk static-libs system-boost"
+IUSE="babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl"
+IUSE+=" lttng +mgr numa rabbitmq +radosgw +ssl spdk system-boost"
 IUSE+=" systemd +tcmalloc test xfs zfs"
 IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
 
@@ -37,71 +37,79 @@ COMMON_DEPEND="
 	acct-group/ceph
 	acct-user/ceph
 	virtual/libudev:=
-	app-arch/bzip2:=[static-libs?]
-	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs(-)?]
-	app-arch/zstd:=[static-libs?]
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	app-arch/snappy:=
+	app-arch/zstd:=
 	app-shells/bash:0
-	app-misc/jq:=[static-libs?]
-	dev-libs/crypto++:=[static-libs?]
-	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc(-)?]
-	dev-libs/libaio:=[static-libs?]
-	dev-libs/libnl:3=[static-libs?]
-	dev-libs/libxml2:=[static-libs?]
+	app-misc/jq:=
+	dev-libs/crypto++:=
+	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
+	dev-libs/libaio:=
+	dev-libs/libnl:3=
+	dev-libs/libxml2:=
 	dev-libs/nss:=
 	sys-auth/oath-toolkit:=
 	sys-apps/coreutils
 	sys-apps/grep
-	sys-apps/keyutils:=[static-libs?]
-	sys-apps/util-linux:=[static-libs?]
+	sys-apps/keyutils:=
+	sys-apps/util-linux:=
 	sys-apps/sed
 	sys-apps/util-linux
-	sys-libs/libcap-ng:=[static-libs?]
-	sys-libs/ncurses:0=[static-libs?]
-	sys-libs/zlib:=[static-libs?]
+	sys-libs/libcap-ng:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
 	babeltrace? ( dev-util/babeltrace )
-	ldap? ( net-nds/openldap:=[static-libs?] )
+	ldap? ( net-nds/openldap:= )
 	lttng? ( dev-util/lttng-ust:= )
-	fuse? ( sys-fs/fuse:0=[static-libs?] )
+	fuse? ( sys-fs/fuse:0= )
 	kerberos? ( virtual/krb5 )
-	rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] )
+	rabbitmq? ( net-libs/rabbitmq-c:= )
 	ssl? (
-		!libressl? ( dev-libs/openssl:=[static-libs?] )
-		libressl? ( dev-libs/libressl:=[static-libs?] )
+		!libressl? ( dev-libs/openssl:= )
+		libressl? ( dev-libs/libressl:= )
 	)
-	xfs? ( sys-fs/xfsprogs:=[static-libs(+)?] )
-	zfs? ( sys-fs/zfs:=[static-libs?] )
+	xfs? ( sys-fs/xfsprogs:= )
+	zfs? ( sys-fs/zfs:= )
 	radosgw? (
-		dev-libs/expat:=[static-libs?]
+		dev-libs/expat:=
 		!libressl? (
-			dev-libs/openssl:=[static-libs?]
-			net-misc/curl:=[curl_ssl_openssl,static-libs?]
+			dev-libs/openssl:=
+			net-misc/curl:=[curl_ssl_openssl]
 		)
 		libressl? (
-			dev-libs/libressl:=[static-libs?]
-			net-misc/curl:=[curl_ssl_libressl,static-libs?]
+			dev-libs/libressl:=
+			net-misc/curl:=[curl_ssl_libressl]
 		)
 	)
 	system-boost? (
 		|| (
-			=dev-libs/boost-1.71*[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-			=dev-libs/boost-1.70*[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-			=dev-libs/boost-1.67*[threads,context,python,static-libs?,${PYTHON_USEDEP}]
+			=dev-libs/boost-1.71*[threads,context,python,${PYTHON_USEDEP}]
+			=dev-libs/boost-1.70*[threads,context,python,${PYTHON_USEDEP}]
+			=dev-libs/boost-1.67*[threads,context,python,${PYTHON_USEDEP}]
 		)
-		dev-libs/boost:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
+		dev-libs/boost:=[threads,context,python,${PYTHON_USEDEP}]
 	)
-	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
-	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
+	jemalloc? ( dev-libs/jemalloc:= )
+	!jemalloc? ( >=dev-util/google-perftools-2.4:= )
 	${PYTHON_DEPS}
 "
-BDEPEND="
+DEPEND="${COMMON_DEPEND}
 	amd64? ( dev-lang/yasm )
 	x86? ( dev-lang/yasm )
-	app-arch/cpio
-	>=dev-util/cmake-3.5.0
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/sphinx
 	dev-util/cunit
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		sys-apps/grep[pcre]
+		sys-fs/btrfs-progs
+	)
+"
+BDEPEND="
+	app-arch/cpio
+	>=dev-util/cmake-3.5.0
 	dev-util/gperf
 	dev-util/valgrind
 	sys-apps/coreutils
@@ -112,13 +120,6 @@ BDEPEND="
 	sys-devel/bc
 	sys-devel/patch
 	virtual/pkgconfig
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		sys-apps/grep[pcre]
-		sys-fs/btrfs-progs
-	)
 "
 RDEPEND="${COMMON_DEPEND}
 	net-misc/socat
@@ -137,17 +138,10 @@ RDEPEND="${COMMON_DEPEND}
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/werkzeug[${PYTHON_USEDEP}]
-	mgr? (
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/pyjwt[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/routes[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
 "
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	mgr? ( cephfs )
+	|| ( $(python_gen_useflags 'python3*') )
 	?? ( jemalloc tcmalloc )
 	rabbitmq? ( radosgw )
 "
@@ -247,7 +241,7 @@ ceph_src_configure() {
 		-DWITH_TESTS=$(usex test)
 		-DWITH_XFS=$(usex xfs)
 		-DWITH_ZFS=$(usex zfs)
-		-DENABLE_SHARED=$(usex static-libs '' 'ON' 'OFF')
+		-DENABLE_SHARED="ON"
 		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
 		-DWITH_SYSTEM_BOOST=$(usex system-boost)
 		-DBOOST_J=$(makeopts_jobs)
diff --git a/sys-cluster/ceph/ceph-14.2.7.ebuild b/sys-cluster/ceph/ceph-14.2.7.ebuild
deleted file mode 100644
index 971298be9bf5..000000000000
--- a/sys-cluster/ceph/ceph-14.2.7.ebuild
+++ /dev/null
@@ -1,370 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-CMAKE_MAKEFILE_GENERATOR=emake
-
-DISTUTILS_OPTIONAL=1
-
-inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \
-		multiprocessing python-r1 udev readme.gentoo-r1 toolchain-funcs \
-		systemd
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain"
-SLOT="0"
-
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl"
-IUSE+=" lttng +mgr numa rabbitmq +radosgw +ssl spdk static-libs system-boost"
-IUSE+=" systemd +tcmalloc test xfs zfs"
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-COMMON_DEPEND="
-	acct-group/ceph
-	acct-user/ceph
-	virtual/libudev:=
-	app-arch/bzip2:=[static-libs?]
-	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs(-)?]
-	app-arch/zstd:=[static-libs?]
-	app-shells/bash:0
-	app-misc/jq:=[static-libs?]
-	dev-libs/crypto++:=[static-libs?]
-	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc(-)?]
-	dev-libs/libaio:=[static-libs?]
-	dev-libs/libnl:3=[static-libs?]
-	dev-libs/libxml2:=[static-libs?]
-	dev-libs/nss:=
-	sys-auth/oath-toolkit:=
-	sys-apps/coreutils
-	sys-apps/grep
-	sys-apps/keyutils:=[static-libs?]
-	sys-apps/util-linux:=[static-libs?]
-	sys-apps/sed
-	sys-apps/util-linux
-	sys-libs/libcap-ng:=[static-libs?]
-	sys-libs/ncurses:0=[static-libs?]
-	sys-libs/zlib:=[static-libs?]
-	babeltrace? ( dev-util/babeltrace )
-	ldap? ( net-nds/openldap:=[static-libs?] )
-	lttng? ( dev-util/lttng-ust:= )
-	fuse? ( sys-fs/fuse:0=[static-libs?] )
-	kerberos? ( virtual/krb5 )
-	rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] )
-	ssl? (
-		!libressl? ( dev-libs/openssl:=[static-libs?] )
-		libressl? ( dev-libs/libressl:=[static-libs?] )
-	)
-	xfs? ( sys-fs/xfsprogs:=[static-libs(+)?] )
-	zfs? ( sys-fs/zfs:=[static-libs?] )
-	radosgw? (
-		dev-libs/expat:=[static-libs?]
-		!libressl? (
-			dev-libs/openssl:=[static-libs?]
-			net-misc/curl:=[curl_ssl_openssl,static-libs?]
-		)
-		libressl? (
-			dev-libs/libressl:=[static-libs?]
-			net-misc/curl:=[curl_ssl_libressl,static-libs?]
-		)
-	)
-	system-boost? (
-		|| (
-			=dev-libs/boost-1.71*[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-			=dev-libs/boost-1.70*[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-			=dev-libs/boost-1.67*[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-		)
-		dev-libs/boost:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-	)
-	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
-	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
-	${PYTHON_DEPS}
-"
-DEPEND="${COMMON_DEPEND}
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	dev-util/cunit
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		sys-apps/grep[pcre]
-		sys-fs/btrfs-progs
-	)
-"
-BDEPEND="
-	app-arch/cpio
-	>=dev-util/cmake-3.5.0
-	dev-util/gperf
-	dev-util/valgrind
-	sys-apps/coreutils
-	sys-apps/findutils
-	sys-apps/grep
-	sys-apps/sed
-	sys-apps/which
-	sys-devel/bc
-	sys-devel/patch
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/socat
-	sys-apps/gptfdisk
-	sys-block/parted
-	sys-fs/cryptsetup
-	sys-fs/lvm2[-device-mapper-only(-)]
-	sys-fs/lsscsi
-	virtual/awk
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pecan[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( $(python_gen_useflags 'python3*') )
-	?? ( jemalloc tcmalloc )
-	rabbitmq? ( radosgw )
-"
-
-# the tests need root access
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-# false positives unless all USE flags are on
-CMAKE_WARN_UNUSED_CLI="no"
-
-PATCHES=(
-	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
-	"${FILESDIR}/ceph-14.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
-	"${FILESDIR}/ceph-13.2.0-cflags.patch"
-	"${FILESDIR}/ceph-14.2.0-mgr-python-version.patch"
-	"${FILESDIR}/ceph-14.2.5-no-virtualenvs.patch"
-	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
-	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
-	"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
-	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
-	"${FILESDIR}/ceph-14.2.5-boost-1.70.patch"
-	"${FILESDIR}/ceph-14.2.3-dpdk-compile-fix-1.patch"
-	"${FILESDIR}/ceph-14.2.4-python-executable.patch"
-	"${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch"
-)
-
-check-reqs_export_vars() {
-	if use amd64; then
-		CHECKREQS_DISK_BUILD="12G"
-		CHECKREQS_DISK_USR="460M"
-	else
-		CHECKREQS_DISK_BUILD="1400M"
-		CHECKREQS_DISK_USR="450M"
-	fi
-
-	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup 'python3*'
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use system-boost; then
-		eapply "${FILESDIR}/ceph-14.2.5-boost-sonames.patch"
-
-		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
-			| xargs --null sed -e 's|Boost::|Boost_|g' -i || die
-
-		has_version '>=dev-libs/boost-1.70.0' || \
-			eapply "${FILESDIR}/ceph-14.2.5-boost-1.6-python-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
-}
-
-ceph_src_configure() {
-	local flag
-	local mycmakeargs=(
-		-DWITH_BABELTRACE=$(usex babeltrace)
-		-DWITH_CEPHFS=$(usex cephfs)
-		-DWITH_CEPHFS_SHELL=$(if python_is_python3; then usex cephfs; else echo OFF; fi)
-		-DWITH_DPDK=$(usex dpdk)
-		-DWITH_DPDK=$(usex spdk)
-		-DWITH_FUSE=$(usex fuse)
-		-DWITH_LTTNG=$(usex lttng)
-		-DWITH_GSSAPI=$(usex kerberos)
-		-DWITH_GRAFANA=$(usex grafana)
-		-DWITH_MGR=$(usex mgr)
-		-DWITH_MGR_DASHBOARD_FRONTEND=NO
-		-DWITH_NUMA=$(usex numa)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi)
-		-DWITH_PYTHON3=$(if python_is_python3; then echo "ON"; else echo "OFF"; fi)
-		-DWITH_PYTHON2=$(if python_is_python3; then echo "OFF"; else echo "ON"; fi)
-		-DWITH_RADOSGW=$(usex radosgw)
-		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
-		-DWITH_SSL=$(usex ssl)
-		-DWITH_SYSTEMD=$(usex systemd)
-		-DWITH_TESTS=$(usex test)
-		-DWITH_XFS=$(usex xfs)
-		-DWITH_ZFS=$(usex zfs)
-		-DENABLE_SHARED=$(usex static-libs '' 'ON' 'OFF')
-		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
-		-DWITH_SYSTEM_BOOST=$(usex system-boost)
-		-DBOOST_J=$(makeopts_jobs)
-		-DWITH_RDMA=no
-		-DWITH_TBB=no
-		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
-		-DEPYTHON_VERSION="${EPYTHON#python}"
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		#-Wno-dev
-	)
-	if use amd64 || use x86; then
-		for flag in ${CPU_FLAGS_X86[@]}; do
-			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
-		done
-	fi
-
-	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
-		|| die "failed to remove cmake cache"
-
-	cmake-utils_src_configure
-
-	# bug #630232
-	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${S}}"/include/acconfig.h \
-		|| die "sed failed"
-}
-
-src_configure() {
-	ceph_src_configure
-}
-
-python_compile() {
-	local CMAKE_USE_DIR="${S}"
-	ceph_src_configure
-
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	emake VERBOSE=1 clean
-	emake VERBOSE=1 all
-
-	# python modules are only compiled with "make install" so we need to do this to
-	# prevent doing a bunch of compilation in src_install
-	DESTDIR="${T}" emake VERBOSE=1 install
-	popd >/dev/null || die
-}
-
-src_compile() {
-	cmake-utils_src_make VERBOSE=1 all
-
-	# we have to do this here to prevent from building everything multiple times
-	python_copy_sources
-	python_foreach_impl python_compile
-}
-
-src_test() {
-	make check || die "make check failed"
-}
-
-python_install() {
-	local CMAKE_USE_DIR="${S}"
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	DESTDIR="${ED}" emake VERBOSE=1 install
-	popd >/dev/null || die
-
-	python_optimize
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_foreach_impl python_install
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
-
-	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
-	fowners -R ceph:ceph /var/log/ceph
-
-	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
-	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
-	# units aren't installed by the build system unless systemd is enabled
-	# so no point installing these with the USE flag disabled
-	if use systemd; then
-		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
-			"ceph-mds@.service"
-
-		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
-			"ceph-osd@.service"
-	fi
-
-	udev_dorules udev/*.rules
-
-	readme.gentoo_create_doc
-
-	python_setup 'python3*'
-
-	# bug #630232
-	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
-		|| die "sed failed"
-
-	python_fix_shebang "${ED}"/usr/{,s}bin/
-
-	# python_fix_shebang apparently is not idempotent
-	local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
-	grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
-		| xargs --null --no-run-if-empty -- sed -i -r  "s:${shebang_regex}:\1:" || die
-
-	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
-	dostrip -x "${rados_classes[@]#${ED}}"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/ceph-14.2.8.ebuild b/sys-cluster/ceph/ceph-14.2.9-r1.ebuild
index 95abd364b0f5..8fbefa08d5f3 100644
--- a/sys-cluster/ceph/ceph-14.2.8.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.9-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="amd64 ~ppc64"
 fi
 
 DESCRIPTION="Ceph distributed filesystem"
@@ -29,7 +29,7 @@ SLOT="0"
 CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
 
 IUSE="babeltrace +cephfs custom-cflags dpdk fuse grafana jemalloc kerberos ldap"
-IUSE+=" libressl lttng +mgr numa rabbitmq +radosgw +ssl spdk static-libs"
+IUSE+=" libressl lttng +mgr numa rabbitmq +radosgw +ssl spdk"
 IUSE+=" system-boost systemd +tcmalloc test xfs zfs"
 IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
 
@@ -37,54 +37,54 @@ COMMON_DEPEND="
 	acct-group/ceph
 	acct-user/ceph
 	virtual/libudev:=
-	app-arch/bzip2:=[static-libs?]
-	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs(-)?]
-	app-arch/zstd:=[static-libs?]
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	app-arch/snappy:=
+	app-arch/zstd:=
 	app-shells/bash:0
-	app-misc/jq:=[static-libs?]
-	dev-libs/crypto++:=[static-libs?]
-	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc(-)?]
-	dev-libs/libaio:=[static-libs?]
-	dev-libs/libnl:3=[static-libs?]
-	dev-libs/libxml2:=[static-libs?]
+	app-misc/jq:=
+	dev-libs/crypto++:=
+	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
+	dev-libs/libaio:=
+	dev-libs/libnl:3=
+	dev-libs/libxml2:=
 	dev-libs/nss:=
 	sys-auth/oath-toolkit:=
 	sys-apps/coreutils
 	sys-apps/grep
-	sys-apps/keyutils:=[static-libs?]
-	sys-apps/util-linux:=[static-libs?]
+	sys-apps/keyutils:=
+	sys-apps/util-linux:=
 	sys-apps/sed
 	sys-apps/util-linux
-	sys-libs/libcap-ng:=[static-libs?]
-	sys-libs/ncurses:0=[static-libs?]
-	sys-libs/zlib:=[static-libs?]
+	sys-libs/libcap-ng:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
 	babeltrace? ( dev-util/babeltrace )
-	ldap? ( net-nds/openldap:=[static-libs?] )
+	ldap? ( net-nds/openldap:= )
 	lttng? ( dev-util/lttng-ust:= )
-	fuse? ( sys-fs/fuse:0=[static-libs?] )
+	fuse? ( sys-fs/fuse:0= )
 	kerberos? ( virtual/krb5 )
-	rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] )
+	rabbitmq? ( net-libs/rabbitmq-c:= )
 	ssl? (
-		!libressl? ( dev-libs/openssl:=[static-libs?] )
-		libressl? ( dev-libs/libressl:=[static-libs?] )
+		!libressl? ( dev-libs/openssl:= )
+		libressl? ( dev-libs/libressl:= )
 	)
-	xfs? ( sys-fs/xfsprogs:=[static-libs(+)?] )
-	zfs? ( sys-fs/zfs:=[static-libs?] )
+	xfs? ( sys-fs/xfsprogs:= )
+	zfs? ( sys-fs/zfs:= )
 	radosgw? (
-		dev-libs/expat:=[static-libs?]
+		dev-libs/expat:=
 		!libressl? (
-			dev-libs/openssl:=[static-libs?]
-			net-misc/curl:=[curl_ssl_openssl,static-libs?]
+			dev-libs/openssl:=
+			net-misc/curl:=[curl_ssl_openssl]
 		)
 		libressl? (
-			dev-libs/libressl:=[static-libs?]
-			net-misc/curl:=[curl_ssl_libressl,static-libs?]
+			dev-libs/libressl:=
+			net-misc/curl:=[curl_ssl_libressl]
 		)
 	)
-	system-boost? ( =dev-libs/boost-1.72*[threads,context,python,static-libs?,${PYTHON_USEDEP}] )
-	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
-	!jemalloc? ( >=dev-util/google-perftools-2.6.1:=[static-libs?] )
+	system-boost? ( =dev-libs/boost-1.72*[threads,context,python,${PYTHON_USEDEP}] )
+	jemalloc? ( dev-libs/jemalloc:= )
+	!jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
 	${PYTHON_DEPS}
 "
 BDEPEND="
@@ -197,12 +197,10 @@ src_prepare() {
 	cmake-utils_src_prepare
 
 	if use system-boost; then
-		eapply "${FILESDIR}/ceph-14.2.8-boost-sonames.patch"
-
 		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
 			| xargs --null sed \
-			-e 's|Boost::|Boost_|g' \
-			-e 's|Boost_boost|boost_system|g' -i || die
+			-e 's|Boost::|boost_|g' \
+			-e 's|boost_boost|boost_system|g' -i || die
 	fi
 
 	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
@@ -238,7 +236,7 @@ ceph_src_configure() {
 		-DWITH_TESTS=$(usex test)
 		-DWITH_XFS=$(usex xfs)
 		-DWITH_ZFS=$(usex zfs)
-		-DENABLE_SHARED=$(usex static-libs '' 'ON' 'OFF')
+		-DENABLE_SHARED="ON"
 		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
 		-DWITH_SYSTEM_BOOST=$(usex system-boost)
 		-DBOOST_J=$(makeopts_jobs)
diff --git a/sys-cluster/ceph/ceph-15.2.0-r1.ebuild b/sys-cluster/ceph/ceph-15.2.1-r1.ebuild
index e59cae91a6c1..68a4aafed5ce 100644
--- a/sys-cluster/ceph/ceph-15.2.0-r1.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.1-r1.ebuild
@@ -29,7 +29,7 @@ SLOT="0"
 CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
 
 IUSE="babeltrace +cephfs custom-cflags dpdk fuse grafana jemalloc kafka kerberos ldap
-	libressl lttng +mgr numa +openssl pmdk rabbitmq +radosgw rbd-rwl +ssl spdk static-libs
+	libressl lttng +mgr numa +openssl pmdk rabbitmq +radosgw rbd-rwl +ssl spdk
 	system-boost systemd +tcmalloc test uring xfs zfs"
 IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
 
@@ -37,65 +37,65 @@ COMMON_DEPEND="
 	acct-group/ceph
 	acct-user/ceph
 	virtual/libudev:=
-	app-arch/bzip2:=[static-libs?]
-	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs(-)?]
-	app-arch/zstd:=[static-libs?]
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	app-arch/snappy:=
+	app-arch/zstd:=
 	app-shells/bash:0
-	app-misc/jq:=[static-libs?]
-	dev-libs/crypto++:=[static-libs?]
-	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc(-)?]
-	dev-libs/libaio:=[static-libs?]
+	app-misc/jq:=
+	dev-libs/crypto++:=
+	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
+	dev-libs/libaio:=
 	dev-libs/libfmt:=
-	dev-libs/libnl:3=[static-libs?]
-	dev-libs/libxml2:=[static-libs?]
-	dev-libs/xmlsec:=[!openssl?,!libressl?,static-libs?]
+	dev-libs/libnl:3=
+	dev-libs/libxml2:=
+	dev-libs/xmlsec:=[!openssl?,!libressl?]
 	dev-cpp/yaml-cpp:=
 	dev-libs/nss:=
-	dev-libs/protobuf:=[static-libs?]
-	net-dns/c-ares:=[static-libs?]
-	net-libs/gnutls:=[static-libs?]
+	dev-libs/protobuf:=
+	net-dns/c-ares:=
+	net-libs/gnutls:=
 	sys-auth/oath-toolkit:=
 	sys-apps/coreutils
 	sys-apps/grep
-	sys-apps/hwloc:=[static-libs?]
-	sys-apps/keyutils:=[static-libs?]
-	sys-apps/util-linux:=[static-libs?]
+	sys-apps/hwloc:=
+	sys-apps/keyutils:=
+	sys-apps/util-linux:=
 	sys-apps/sed
 	sys-apps/util-linux
-	sys-libs/libcap-ng:=[static-libs?]
-	sys-libs/ncurses:0=[static-libs?]
-	sys-libs/zlib:=[static-libs?]
-	sys-process/numactl:=[static-libs?]
-	x11-libs/libpciaccess:=[static-libs?]
+	sys-libs/libcap-ng:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
+	sys-process/numactl:=
+	x11-libs/libpciaccess:=
 	babeltrace? ( dev-util/babeltrace )
-	fuse? ( sys-fs/fuse:0=[static-libs?] )
-	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
-	!jemalloc? ( >=dev-util/google-perftools-2.6.1:=[static-libs?] )
-	kafka? ( dev-libs/librdkafka:=[static-libs?] )
+	fuse? ( sys-fs/fuse:0= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	!jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
+	kafka? ( dev-libs/librdkafka:= )
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:=[static-libs?] )
+	ldap? ( net-nds/openldap:= )
 	lttng? ( dev-util/lttng-ust:= )
-	rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] )
+	rabbitmq? ( net-libs/rabbitmq-c:= )
 	radosgw? (
-		dev-libs/expat:=[static-libs?]
+		dev-libs/expat:=
 		openssl? (
-			dev-libs/openssl:=[static-libs?]
-			net-misc/curl:=[curl_ssl_openssl,static-libs?]
+			dev-libs/openssl:=
+			net-misc/curl:=[curl_ssl_openssl]
 		)
 		libressl? (
-			dev-libs/libressl:=[static-libs?]
-			net-misc/curl:=[curl_ssl_libressl,static-libs?]
+			dev-libs/libressl:=
+			net-misc/curl:=[curl_ssl_libressl]
 		)
 	)
 	ssl? (
-		openssl? ( dev-libs/openssl:=[static-libs?] )
-		libressl? ( dev-libs/libressl:=[static-libs?] )
+		openssl? ( dev-libs/openssl:= )
+		libressl? ( dev-libs/libressl:= )
 	)
-	system-boost? ( =dev-libs/boost-1.72*[threads,context,python,static-libs?,${PYTHON_USEDEP}] )
-	uring? ( sys-libs/liburing:=[static-libs?] )
-	xfs? ( sys-fs/xfsprogs:=[static-libs(+)?] )
-	zfs? ( sys-fs/zfs:=[static-libs?] )
+	system-boost? ( =dev-libs/boost-1.72*[threads,context,python,${PYTHON_USEDEP}] )
+	uring? ( sys-libs/liburing:= )
+	xfs? ( sys-fs/xfsprogs:= )
+	zfs? ( sys-fs/zfs:= )
 	${PYTHON_DEPS}
 "
 BDEPEND="
@@ -126,12 +126,15 @@ BDEPEND="
 	)
 "
 RDEPEND="${COMMON_DEPEND}
+	app-admin/sudo
 	net-misc/socat
 	sys-apps/gptfdisk
+	sys-apps/nvme-cli
+	>=sys-apps/smartmontools-7.0
 	sys-block/parted
 	sys-fs/cryptsetup
-	sys-fs/lvm2[-device-mapper-only(-)]
 	sys-fs/lsscsi
+	sys-fs/lvm2[-device-mapper-only(-)]
 	virtual/awk
 	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/cherrypy[${PYTHON_USEDEP}]
@@ -257,7 +260,7 @@ ceph_src_configure() {
 		-DWITH_LIBURING=$(usex uring)
 		-DWITH_XFS=$(usex xfs)
 		-DWITH_ZFS=$(usex zfs)
-		-DENABLE_SHARED=$(usex static-libs '' 'ON' 'OFF')
+		-DENABLE_SHARED="ON"
 		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
 		-DWITH_SYSTEM_BOOST=$(usex system-boost)
 		-DBOOST_J=$(makeopts_jobs)
diff --git a/sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch b/sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch
deleted file mode 100644
index 57482b3f27c4..000000000000
--- a/sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index aa90ba65da..ea65dd4209 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -567,7 +567,7 @@ set(BOOST_COMPONENTS
- set(BOOST_HEADER_COMPONENTS container)
- 
- if(WITH_MGR)
--	list(APPEND BOOST_COMPONENTS python)
-+	list(APPEND BOOST_COMPONENTS python-${EPYTHON_VERSION})
- endif()
- if(WITH_BOOST_CONTEXT)
-   list(APPEND BOOST_COMPONENTS context coroutine)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7aa8a4392e..111f669f2e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -622,13 +622,13 @@ set(ceph_common_objs
-   $<TARGET_OBJECTS:crush_objs>)
- set(ceph_common_deps
-   json_spirit erasure_code rt ${LIB_RESOLV}
--  Boost::thread
--  Boost::system
--  Boost::regex
--  Boost::random
--  Boost::program_options
--  Boost::date_time
--  Boost::iostreams
-+  boost_thread
-+  boost_system
-+  boost_regex
-+  boost_random
-+  boost_program_options
-+  boost_date_time
-+  boost_iostreams
-   ${BLKID_LIBRARIES}
-   ${Backtrace_LIBRARIES}
-   ${BLKIN_LIBRARIES}
-@@ -712,7 +712,7 @@ if (WITH_MGR)
-                  $<TARGET_OBJECTS:heap_profiler_objs>)
-   target_include_directories(ceph-mgr PRIVATE "${PYTHON_INCLUDE_DIRS}")
-   target_link_libraries(ceph-mgr osdc client global-static common
--      Boost::python ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
-+	  boost_python-${EPYTHON_VERSION} ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
-   install(TARGETS ceph-mgr DESTINATION bin)
- endif (WITH_MGR)
- 
-@@ -885,7 +885,7 @@ set(ceph_mds_srcs
-   ceph_mds.cc)
- add_executable(ceph-mds ${ceph_mds_srcs})
- target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static common
--  Boost::thread)
-+  boost_thread)
- install(TARGETS ceph-mds DESTINATION bin)
- 
- add_subdirectory(erasure-code)
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index f3999e3b01..0ce7fca1ba 100644
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -148,7 +148,7 @@ add_executable(ceph_omapbench
-   )
- target_link_libraries(ceph_omapbench
-   librados
--  Boost::program_options
-+  boost_program_options
-   global
-   ${BLKID_LIBRARIES}
-   ${CMAKE_DL_LIBS}
-@@ -202,7 +202,7 @@ if(${WITH_RADOSGW})
-     cls_rgw_client
-     cls_user_client
-     cls_lock_client
--    Boost::regex
-+    boost_regex
-     ${BLKID_LIBRARIES}
-     ${CURL_LIBRARIES}
-     ${EXPAT_LIBRARIES}
-@@ -232,7 +232,7 @@ if(${WITH_RADOSGW})
-     cls_rgw_client
-     cls_user_client
-     cls_lock_client
--    Boost::regex
-+    boost_regex
-     ${BLKID_LIBRARIES}
-     ${CURL_LIBRARIES}
-     ${EXPAT_LIBRARIES}
-diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt
-index 9fba701e05..da3cbcfe96 100644
---- a/src/test/bench/CMakeLists.txt
-+++ b/src/test/bench/CMakeLists.txt
-@@ -8,7 +8,7 @@ set(smalliobench_srcs
- add_executable(ceph_smalliobench
-   ${smalliobench_srcs}
-   )
--target_link_libraries(ceph_smalliobench librados Boost::program_options global
-+target_link_libraries(ceph_smalliobench librados boost_program_options global
-   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
- 
- # ceph_smalliobenchrbd
-@@ -27,7 +27,7 @@ if(WITH_RBD)
-     librados
-     os
-     global
--    Boost::program_options
-+    boost_program_options
-     ${BLKID_LIBRARIES}
-     ${CMAKE_DL_LIBS}
-     )
-@@ -50,7 +50,7 @@ set(ceph_smalliobenchfs_srcs
- add_executable(ceph_smalliobenchfs
-   ${ceph_smalliobenchfs_srcs}
-   )
--target_link_libraries(ceph_smalliobenchfs librados Boost::program_options os global
-+target_link_libraries(ceph_smalliobenchfs librados boost_program_options os global
-   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
- 
- # ceph_smalliobenchdumb
-@@ -63,7 +63,7 @@ set(smalliobenchdumb_srcs
- add_executable(ceph_smalliobenchdumb
-   ${smalliobenchdumb_srcs}
-   )
--target_link_libraries(ceph_smalliobenchdumb librados Boost::program_options os global
-+target_link_libraries(ceph_smalliobenchdumb librados boost_program_options os global
-   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
- 
- # ceph_tpbench
-@@ -73,7 +73,7 @@ set(tpbench_srcs
- add_executable(ceph_tpbench
-   ${tpbench_srcs}
-   )
--target_link_libraries(ceph_tpbench librados Boost::program_options global
-+target_link_libraries(ceph_tpbench librados boost_program_options global
-   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
- 
- install(TARGETS
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index 9f72fa3b48..665c977606 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -24,13 +24,13 @@ target_link_libraries(ceph_radosacl librados global)
- install(TARGETS ceph_radosacl DESTINATION bin)
- 
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options)
- install(TARGETS ceph-osdomap-tool DESTINATION bin)
- 
- add_executable(ceph-monstore-tool
-   ceph_monstore_tool.cc
-   ../mgr/mgr_commands.cc)
--target_link_libraries(ceph-monstore-tool os global Boost::program_options)
-+target_link_libraries(ceph-monstore-tool os global boost_program_options)
- install(TARGETS ceph-monstore-tool DESTINATION bin)
- install(PROGRAMS
-   ceph-monstore-update-crush.sh
-@@ -41,7 +41,7 @@ add_executable(ceph-objectstore-tool
-   ceph_objectstore_tool.cc
-   rebuild_mondb.cc
-   RadosDump.cc)
--target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
- if(WITH_FUSE)
-   target_link_libraries(ceph-objectstore-tool fuse)
- endif(WITH_FUSE)
diff --git a/sys-cluster/ceph/files/ceph-13.2.0-boost-sonames.patch b/sys-cluster/ceph/files/ceph-13.2.0-boost-sonames.patch
deleted file mode 100644
index 8de09b91d8ae..000000000000
--- a/sys-cluster/ceph/files/ceph-13.2.0-boost-sonames.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2f997d03f8..748cb190e6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -591,7 +591,7 @@ set(BOOST_COMPONENTS
- set(BOOST_HEADER_COMPONENTS container)
- 
- if(WITH_MGR)
--	list(APPEND BOOST_COMPONENTS python)
-+	list(APPEND BOOST_COMPONENTS python-${EPYTHON_VERSION})
- endif()
- if(WITH_BOOST_CONTEXT)
-   list(APPEND BOOST_COMPONENTS context coroutine)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3d3b4c0919..94ab42ef9f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -630,12 +630,12 @@ set(ceph_common_objs
-   $<TARGET_OBJECTS:crush_objs>)
- set(ceph_common_deps
-   json_spirit erasure_code ${LIB_RESOLV}
--  Boost::thread
--  Boost::system
--  Boost::random
--  Boost::program_options
--  Boost::date_time
--  Boost::iostreams
-+  boost_thread
-+  boost_system
-+  boost_random
-+  boost_program_options
-+  boost_date_time
-+  boost_iostreams
-   ${BLKID_LIBRARIES}
-   ${Backtrace_LIBRARIES}
-   ${BLKIN_LIBRARIES}
-@@ -759,7 +759,7 @@ if (WITH_MGR)
-                  $<TARGET_OBJECTS:heap_profiler_objs>)
-   target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
-   target_link_libraries(ceph-mgr osdc client global-static ceph-common
--      Boost::python ${MGR_PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
-+      boost_python-${EPYTHON_VERSION} ${MGR_PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
-   install(TARGETS ceph-mgr DESTINATION bin)
- endif (WITH_MGR)
- 
-@@ -888,7 +888,7 @@ set(ceph_mds_srcs
-   ceph_mds.cc)
- add_executable(ceph-mds ${ceph_mds_srcs})
- target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common
--  Boost::thread)
-+  boost_thread)
- install(TARGETS ceph-mds DESTINATION bin)
- 
- add_subdirectory(erasure-code)
-diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt
-index e9d3804c5f..5c6eb58de1 100644
---- a/src/rbd_replay/CMakeLists.txt
-+++ b/src/rbd_replay/CMakeLists.txt
-@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE)
-     global
-     babeltrace
-     babeltrace-ctf
--    Boost::date_time
-+    boost_date_time
-     )
-   install(TARGETS rbd-replay-prep DESTINATION bin)
- endif(HAVE_BABELTRACE)
-diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
-index c1edd3b882..000c8daaf8 100644
---- a/src/rgw/CMakeLists.txt
-+++ b/src/rgw/CMakeLists.txt
-@@ -162,7 +162,7 @@ target_link_libraries(rgw_a librados cls_otp_client cls_lock_client cls_rgw_clie
- 
- if (WITH_RADOSGW_BEAST_FRONTEND)
-   target_compile_definitions(rgw_a PUBLIC BOOST_COROUTINES_NO_DEPRECATION_WARNING)
--  target_link_libraries(rgw_a Boost::coroutine Boost::context)
-+  target_link_libraries(rgw_a boost_coroutine boost_context)
- endif()
- 
- if (WITH_CURL_OPENSSL OR (WITH_RADOSGW_BEAST_FRONTEND AND WITH_RADOSGW_BEAST_OPENSSL))
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index a43335e825..a0d056faaa 100644
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -147,7 +147,7 @@ add_executable(ceph_omapbench
-   )
- target_link_libraries(ceph_omapbench
-   librados
--  Boost::program_options
-+  boost_program_options
-   global
-   ${BLKID_LIBRARIES}
-   ${CMAKE_DL_LIBS}
-diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
-index 4ba31ab2a8..ab66208b57 100644
---- a/src/test/erasure-code/CMakeLists.txt
-+++ b/src/test/erasure-code/CMakeLists.txt
-@@ -2,15 +2,15 @@
- add_executable(ceph_erasure_code_benchmark 
-   ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc
-   ceph_erasure_code_benchmark.cc)
--target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code_benchmark
-   DESTINATION bin)
- 
- add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc)
--target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- 
- add_executable(ceph_erasure_code ceph_erasure_code.cc)
--target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code
-   DESTINATION bin)
- 
-diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt
-index 1c909ee1ce..7c1ef32df1 100644
---- a/src/test/librados/CMakeLists.txt
-+++ b/src/test/librados/CMakeLists.txt
-@@ -61,7 +61,7 @@ set_target_properties(ceph_test_rados_api_asio PROPERTIES COMPILE_FLAGS
- target_link_libraries(ceph_test_rados_api_asio global
-   librados ${UNITTEST_LIBS})
- if(WITH_BOOST_CONTEXT)
--  target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context)
-+  target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context)
- endif()
- 
- # ceph_test_rados_api_list
-@@ -147,7 +147,7 @@ add_executable(ceph_test_rados_api_tier
- set_target_properties(ceph_test_rados_api_tier PROPERTIES COMPILE_FLAGS
-   ${UNITTEST_CXX_FLAGS})
- target_link_libraries(ceph_test_rados_api_tier
--  librados global ${UNITTEST_LIBS} Boost::system radostest)
-+  librados global ${UNITTEST_LIBS} boost_system radostest)
- 
- # ceph_test_rados_api_snapshots
- add_executable(ceph_test_rados_api_snapshots
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index e0844ec0c7..886839302c 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -29,20 +29,20 @@ install(PROGRAMS
- endif(WITH_TESTS)
- 
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options)
- install(TARGETS ceph-osdomap-tool DESTINATION bin)
- 
- add_executable(ceph-monstore-tool
-   ceph_monstore_tool.cc
-   ../mgr/mgr_commands.cc)
--target_link_libraries(ceph-monstore-tool os global Boost::program_options)
-+target_link_libraries(ceph-monstore-tool os global boost_program_options)
- install(TARGETS ceph-monstore-tool DESTINATION bin)
- 
- add_executable(ceph-objectstore-tool
-   ceph_objectstore_tool.cc
-   rebuild_mondb.cc
-   RadosDump.cc)
--target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
- if(WITH_FUSE)
-   target_link_libraries(ceph-objectstore-tool fuse)
- endif(WITH_FUSE)
diff --git a/sys-cluster/ceph/files/ceph-13.2.0-mgr-python-version.patch b/sys-cluster/ceph/files/ceph-13.2.0-mgr-python-version.patch
deleted file mode 100644
index 0dc90ebeaef3..000000000000
--- a/sys-cluster/ceph/files/ceph-13.2.0-mgr-python-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/pybind/CMakeLists.txt b/src/pybind/CMakeLists.txt
-index c996cd9402..f99765702b 100644
---- a/src/pybind/CMakeLists.txt
-+++ b/src/pybind/CMakeLists.txt
-@@ -62,11 +62,6 @@ foreach(python_version ${py_vers})
- endforeach()
- 
- if(WITH_MGR)
--  if(NOT WITH_PYTHON2 AND MGR_PYTHON_VERSION_MAJOR EQUAL 2)
--    message(FATAL_ERROR "mgr plugins require python2 binding")
--  elseif(NOT WITH_PYTHON3 AND MGR_PYTHON_VERSION_MAJOR EQUAL 3)
--    message(FATAL_ERROR "mgr plugins require python3 binding")
--  endif()
-   # Location needs to match default setting for mgr_module_path, currently:
-   # OPTION(mgr_module_path, OPT_STR, CEPH_PKGLIBDIR "/mgr")
-   install(DIRECTORY
diff --git a/sys-cluster/ceph/files/ceph-13.2.0-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-13.2.0-no-virtualenvs.patch
deleted file mode 100644
index 470dbaeb3c0b..000000000000
--- a/sys-cluster/ceph/files/ceph-13.2.0-no-virtualenvs.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/src/ceph-detect-init/CMakeLists.txt b/src/ceph-detect-init/CMakeLists.txt
-index 6e5946b784..233cccfc9b 100644
---- a/src/ceph-detect-init/CMakeLists.txt
-+++ b/src/ceph-detect-init/CMakeLists.txt
-@@ -2,8 +2,8 @@ set(CEPH_DETECT_INIT_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtua
- 
- add_custom_target(ceph-detect-init
-   COMMAND
--  ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} &&
--  ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e .
-+  #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} &&
-+  #${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e .
-   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-detect-init
-   COMMENT "ceph-detect-init is being created")
- add_dependencies(tests ceph-detect-init)
-diff --git a/src/ceph-disk/CMakeLists.txt b/src/ceph-disk/CMakeLists.txt
-index 00aaec4a80..b0700c488f 100644
---- a/src/ceph-disk/CMakeLists.txt
-+++ b/src/ceph-disk/CMakeLists.txt
-@@ -2,8 +2,8 @@ set(CEPH_DISK_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv)
- 
- add_custom_target(ceph-disk
-   COMMAND
--  ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} &&
--  ${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e .
-+  #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} &&
-+  #${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e .
-   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-disk
-   COMMENT "ceph-disk is being created")
- add_dependencies(tests ceph-disk)
-diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
-index 2b050f6c6e..e9fb87f76b 100644
---- a/src/pybind/mgr/dashboard/CMakeLists.txt
-+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
-@@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv)
- 
- add_custom_target(mgr-dashboard-test-venv
-   COMMAND
--  ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
-+  #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
-   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard
-   COMMENT "dashboard tests virtualenv is being created")
- add_dependencies(tests mgr-dashboard-test-venv)
-@@ -13,9 +13,9 @@ set(mgr-dashboard-nodeenv ${CMAKE_CURRENT_BINARY_DIR}/node-env)
- 
- add_custom_command(
-   OUTPUT "${mgr-dashboard-nodeenv}/bin/npm"
--  COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv}
--  COMMAND ${mgr-dashboard-nodeenv}/bin/pip install nodeenv
--  COMMAND ${mgr-dashboard-nodeenv}/bin/nodeenv -p -n 8.10.0
-+  #COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv}
-+  #COMMAND ${mgr-dashboard-nodeenv}/bin/pip install nodeenv
-+  #COMMAND ${mgr-dashboard-nodeenv}/bin/nodeenv -p -n 8.10.0
-   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-   COMMENT "dashboard nodeenv is being installed"
- )
-@@ -27,7 +27,7 @@ add_custom_target(mgr-dashboard-nodeenv
- 
- add_custom_command(
-   OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules"
--  COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && npm install && deactivate
-+  #COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && npm install && deactivate
-   DEPENDS frontend/package.json
-   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
-   COMMENT "dashboard frontend dependencies are being installed"
-@@ -62,9 +62,11 @@ else()
-   set(npm_command npm run build)
- endif()
- 
-+LIST(APPEND CMAKE_PROGRAM_PATH ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules/.bin)
-+
- add_custom_command(
-   OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/dist"
--  COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && ${npm_command} && deactivate
-+  COMMAND PREFIX="${CMAKE_SOURCE_DIR}" ${npm_command}
-   DEPENDS ${frontend_src} frontend/node_modules
-   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
-   COMMENT "dashboard frontend is being created"
diff --git a/sys-cluster/ceph/files/ceph-13.2.5-no-automagic-deps.patch b/sys-cluster/ceph/files/ceph-13.2.5-no-automagic-deps.patch
deleted file mode 100644
index 1eb42b3e5ad6..000000000000
--- a/sys-cluster/ceph/files/ceph-13.2.5-no-automagic-deps.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- ceph-13.2.5.orig/src/rocksdb/CMakeLists.txt	2019-03-20 11:39:25.065954652 -0700
-+++ ceph-13.2.5/src/rocksdb/CMakeLists.txt	2019-03-20 13:18:01.548085828 -0700
-@@ -286,18 +286,24 @@
-   endif()
- endif()
- 
--find_package(NUMA)
--if(NUMA_FOUND)
--  add_definitions(-DNUMA)
--  include_directories(${NUMA_INCLUDE_DIR})
--  list(APPEND THIRDPARTY_LIBS ${NUMA_LIBRARIES})
-+option(WITH_NUMA "build with UBSAN" OFF)
-+if(WITH_NUMA)
-+  find_package(NUMA)
-+  if(NUMA_FOUND)
-+    add_definitions(-DNUMA)
-+    include_directories(${NUMA_INCLUDE_DIR})
-+    list(APPEND THIRDPARTY_LIBS ${NUMA_LIBRARIES})
-+  endif()
- endif()
- 
--find_package(TBB)
--if(TBB_FOUND)
--  add_definitions(-DTBB)
--  include_directories(${TBB_INCLUDE_DIR})
--  list(APPEND THIRDPARTY_LIBS ${TBB_LIBRARIES})
-+option(WITH_TBB "build with UBSAN" OFF)
-+if(WITH_TBB)
-+  find_package(TBB)
-+  if(TBB_FOUND)
-+    add_definitions(-DTBB)
-+    include_directories(${TBB_INCLUDE_DIR})
-+    list(APPEND THIRDPARTY_LIBS ${TBB_LIBRARIES})
-+  endif()
- endif()
- 
- # Used to run CI build and tests so we can run faster
diff --git a/sys-cluster/ceph/files/ceph-13.2.6-dpdk-alignment.patch b/sys-cluster/ceph/files/ceph-13.2.6-dpdk-alignment.patch
deleted file mode 100644
index c5d048eb7a2e..000000000000
--- a/sys-cluster/ceph/files/ceph-13.2.6-dpdk-alignment.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/spdk/dpdk/lib/librte_net/rte_ether.h b/src/spdk/dpdk/lib/librte_net/rte_ether.h
-index 3a87ff184..8090b7c01 100644
---- a/src/spdk/dpdk/lib/librte_net/rte_ether.h
-+++ b/src/spdk/dpdk/lib/librte_net/rte_ether.h
-@@ -55,7 +55,8 @@ extern "C" {
-  * See http://standards.ieee.org/regauth/groupmac/tutorial.html
-  */
- struct ether_addr {
--	uint8_t addr_bytes[ETHER_ADDR_LEN]; /**< Addr bytes in tx order */
-+	/** Addr bytes in tx order */
-+	uint8_t addr_bytes[ETHER_ADDR_LEN] __rte_aligned(2);
- } __attribute__((__packed__));
-
- #define ETHER_LOCAL_ADMIN_ADDR 0x02 /**< Locally assigned Eth. address. */
diff --git a/sys-cluster/ceph/files/ceph-13.2.6-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-13.2.6-no-virtualenvs.patch
deleted file mode 100644
index ad38799b6901..000000000000
--- a/sys-cluster/ceph/files/ceph-13.2.6-no-virtualenvs.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/src/ceph-detect-init/CMakeLists.txt b/src/ceph-detect-init/CMakeLists.txt
-index 6e5946b784..233cccfc9b 100644
---- a/src/ceph-detect-init/CMakeLists.txt
-+++ b/src/ceph-detect-init/CMakeLists.txt
-@@ -2,8 +2,8 @@ set(CEPH_DETECT_INIT_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtua
- 
- add_custom_target(ceph-detect-init
-   COMMAND
--  ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} &&
--  ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e .
-+  #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} &&
-+  #${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e .
-   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-detect-init
-   COMMENT "ceph-detect-init is being created")
- add_dependencies(tests ceph-detect-init)
-diff --git a/src/ceph-disk/CMakeLists.txt b/src/ceph-disk/CMakeLists.txt
-index 00aaec4a80..b0700c488f 100644
---- a/src/ceph-disk/CMakeLists.txt
-+++ b/src/ceph-disk/CMakeLists.txt
-@@ -2,8 +2,8 @@ set(CEPH_DISK_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv)
- 
- add_custom_target(ceph-disk
-   COMMAND
--  ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} &&
--  ${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e .
-+  #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} &&
-+  #${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e .
-   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-disk
-   COMMENT "ceph-disk is being created")
- add_dependencies(tests ceph-disk)
-diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
-index 88ca8a60bb..77c716cdb1 100644
---- a/src/pybind/mgr/dashboard/CMakeLists.txt
-+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
-@@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv)
- 
- add_custom_target(mgr-dashboard-test-venv
-   COMMAND
--  ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
-+  #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
-   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard
-   COMMENT "dashboard tests virtualenv is being created")
- add_dependencies(tests mgr-dashboard-test-venv)
-@@ -13,9 +13,6 @@ set(mgr-dashboard-nodeenv ${CMAKE_CURRENT_BINARY_DIR}/node-env)
- 
- add_custom_command(
-   OUTPUT "${mgr-dashboard-nodeenv}/bin/npm"
--  COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv}
--  COMMAND ${mgr-dashboard-nodeenv}/bin/pip install nodeenv
--  COMMAND ${mgr-dashboard-nodeenv}/bin/nodeenv -p -n 10.13.0
-   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-   COMMENT "dashboard nodeenv is being installed"
- )
-@@ -27,7 +24,6 @@ add_custom_target(mgr-dashboard-nodeenv
- 
- add_custom_command(
-   OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules"
--  COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && npm ci && deactivate
-   DEPENDS frontend/package.json
-   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
-   COMMENT "dashboard frontend dependencies are being installed"
-@@ -62,9 +58,11 @@ else()
-   set(npm_command npm run build)
- endif()
- 
-+LIST(APPEND CMAKE_PROGRAM_PATH ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules/.bin)
-+
- add_custom_command(
-   OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/dist"
--  COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && ${npm_command} && deactivate
-+  COMMAND PREFIX="${CMAKE_SOURCE_DIR}" ${npm_command}
-   DEPENDS ${frontend_src} frontend/node_modules
-   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
-   COMMENT "dashboard frontend is being created"
diff --git a/sys-cluster/ceph/files/ceph-14.2.0-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-14.2.0-no-virtualenvs.patch
deleted file mode 100644
index 5647ac51674d..000000000000
--- a/sys-cluster/ceph/files/ceph-14.2.0-no-virtualenvs.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/.gitignore b/.gitignore
-index 2c2afc282e..80c05ee2f0 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -13,10 +13,8 @@
- *.swp
- *.swo
- *.tmp
--*.orig
- *.patch
- !debian/patches/*.patch
--*.rej
- *.rpm
- *.pyc
- ceph.spec
-diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
-index 24a2efc9e2..b11d4d0303 100644
---- a/src/pybind/mgr/dashboard/CMakeLists.txt
-+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
-@@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv)
- 
- add_custom_target(mgr-dashboard-test-venv
-   COMMAND
--  ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
-+  #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
-   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard
-   COMMENT "dashboard tests virtualenv is being created")
- add_dependencies(tests mgr-dashboard-test-venv)
-@@ -14,9 +14,9 @@ function(add_npm_command)
-   set(multi_kw COMMAND DEPENDS)
-   cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN})
-   string(REPLACE ";" " " command "${NC_COMMAND}")
--  if(NC_NODEENV)
--    string(REGEX REPLACE "^(npm .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
--  endif()
-+  #if(NC_NODEENV)
-+  #  string(REGEX REPLACE "^(npm .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
-+  #endif()
-   string(REPLACE " " ";" command "${command}")
-   add_custom_command(
-     OUTPUT "${NC_OUTPUT}"
-@@ -41,9 +41,9 @@ else()
- 
-   add_custom_command(
-     OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm"
--    COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
--    COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
--    COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=10.13.0
-+	#COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
-+	#COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
-+	#COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=10.13.0
-     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-     COMMENT "dashboard nodeenv is being installed"
-   )
diff --git a/sys-cluster/ceph/files/ceph-14.2.3-boost-1.6-python-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.3-boost-1.6-python-sonames.patch
deleted file mode 100644
index 860bd9624e89..000000000000
--- a/sys-cluster/ceph/files/ceph-14.2.3-boost-1.6-python-sonames.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 05d1e61270..8b939b8af6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -640,7 +640,7 @@ set(BOOST_HEADER_COMPONENTS container)
- 
- if(WITH_MGR)
-   list(APPEND BOOST_COMPONENTS
--    python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR})
-+    python-${MGR_PYTHON_VERSION_MAJOR}.${MGR_PYTHON_VERSION_MINOR})
- endif()
- if(WITH_BOOST_CONTEXT)
-   list(APPEND BOOST_COMPONENTS context coroutine)
-diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
-index f46cc0d485..3cc6340b2c 100644
---- a/cmake/modules/BuildBoost.cmake
-+++ b/cmake/modules/BuildBoost.cmake
-@@ -205,7 +205,7 @@ macro(build_boost version)
-     endif()
-     add_dependencies(Boost::${c} Boost)
-     if(c MATCHES "^python")
--      set(c "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
-+      set(c "python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
-     endif()
-     if(Boost_USE_STATIC_LIBS)
-       set(Boost_${upper_c}_LIBRARY
diff --git a/sys-cluster/ceph/files/ceph-14.2.3-boost-1.70.patch b/sys-cluster/ceph/files/ceph-14.2.3-boost-1.70.patch
deleted file mode 100644
index 26cea1e394bc..000000000000
--- a/sys-cluster/ceph/files/ceph-14.2.3-boost-1.70.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc
-index e4be074ec7..4af3695dc1 100644
---- a/src/rgw/rgw_asio_frontend.cc
-+++ b/src/rgw/rgw_asio_frontend.cc
-@@ -81,7 +81,8 @@ class StreamIO : public rgw::asio::ClientIO {
- using SharedMutex = ceph::async::SharedMutex<boost::asio::io_context::executor_type>;
-
- template <typename Stream>
--void handle_connection(RGWProcessEnv& env, Stream& stream,
-+void handle_connection(boost::asio::io_context& context,
-+                       RGWProcessEnv& env, Stream& stream,
-                        boost::beast::flat_buffer& buffer, bool is_ssl,
-                        SharedMutex& pause_mutex,
-                        rgw::dmclock::Scheduler *scheduler,
-@@ -152,7 +153,7 @@ void handle_connection(RGWProcessEnv& env, Stream& stream,
-                                   rgw::io::add_conlen_controlling(
-                                     &real_client))));
-       RGWRestfulIO client(cct, &real_client_io);
--      auto y = optional_yield{socket.get_io_context(), yield};
-+      auto y = optional_yield{context, yield};
-       process_request(env.store, env.rest, &req, env.uri_prefix,
-                       *env.auth_registry, &client, env.olog, y, scheduler);
-     }
-@@ -560,7 +561,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec)
-           return;
-         }
-         buffer.consume(bytes);
--        handle_connection(env, stream, buffer, true, pause_mutex,
-+        handle_connection(context, env, stream, buffer, true, pause_mutex,
-                           scheduler.get(), ec, yield);
-         if (!ec) {
-           // ssl shutdown (ignoring errors)
-@@ -578,7 +579,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec)
-         auto c = connections.add(conn);
-         boost::beast::flat_buffer buffer;
-         boost::system::error_code ec;
--        handle_connection(env, s, buffer, false, pause_mutex,
-+        handle_connection(context, env, s, buffer, false, pause_mutex,
-                           scheduler.get(), ec, yield);
-         s.shutdown(tcp::socket::shutdown_both, ec);
-       });
-diff --git a/src/rgw/rgw_dmclock_async_scheduler.h b/src/rgw/rgw_dmclock_async_scheduler.h
-index 70487a5253..1d454acd2e 100644
---- a/src/rgw/rgw_dmclock_async_scheduler.h
-+++ b/src/rgw/rgw_dmclock_async_scheduler.h
-@@ -82,7 +82,12 @@ class AsyncScheduler : public md_config_obs_t, public Scheduler {
-   using Completion = async::Completion<Signature, async::AsBase<Request>>;
-
-   using Clock = ceph::coarse_real_clock;
-+#if BOOST_VERSION < 107000
-   using Timer = boost::asio::basic_waitable_timer<Clock>;
-+#else
-+  using Timer = boost::asio::basic_waitable_timer<Clock,
-+        boost::asio::wait_traits<Clock>, executor_type>;
-+#endif
-   Timer timer; //< timer for the next scheduled request
-
-   CephContext *const cct;
-diff --git a/src/rgw/rgw_reshard.h b/src/rgw/rgw_reshard.h
-index d99a6ff68d..213fc238d2 100644
---- a/src/rgw/rgw_reshard.h
-+++ b/src/rgw/rgw_reshard.h
-@@ -183,7 +183,14 @@ class RGWReshardWait {
-   ceph::condition_variable cond;
-
-   struct Waiter : boost::intrusive::list_base_hook<> {
--    boost::asio::basic_waitable_timer<Clock> timer;
-+#if BOOST_VERSION < 107000
-+    using Timer = boost::asio::basic_waitable_timer<Clock>;
-+#else
-+    using Executor = boost::asio::io_context::executor_type;
-+    using Timer = boost::asio::basic_waitable_timer<Clock,
-+          boost::asio::wait_traits<Clock>, Executor>;
-+#endif
-+    Timer timer;
-     explicit Waiter(boost::asio::io_context& ioc) : timer(ioc) {}
-   };
-   boost::intrusive::list<Waiter> waiters;
diff --git a/sys-cluster/ceph/files/ceph-14.2.3-boost-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.3-boost-sonames.patch
deleted file mode 100644
index 92ca32f5c8e0..000000000000
--- a/sys-cluster/ceph/files/ceph-14.2.3-boost-sonames.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake
-index dd08ba5e45..19d3b8ad37 100644
---- a/cmake/modules/FindBoost.cmake
-+++ b/cmake/modules/FindBoost.cmake
-@@ -1235,10 +1235,10 @@ endif()
- # on all platforms to keep end user code free from platform dependent
- # code.  Also provide convenience targets to disable autolinking and
- # enable dynamic linking.
--if(NOT TARGET Boost::diagnostic_definitions)
--  add_library(Boost::diagnostic_definitions INTERFACE IMPORTED)
--  add_library(Boost::disable_autolinking INTERFACE IMPORTED)
--  add_library(Boost::dynamic_linking INTERFACE IMPORTED)
-+if(NOT TARGET boost_diagnostic_definitions)
-+  add_library(boost_diagnostic_definitions INTERFACE IMPORTED)
-+  add_library(boost_disable_autolinking INTERFACE IMPORTED)
-+  add_library(boost_dynamic_linking INTERFACE IMPORTED)
- endif()
- if(WIN32)
-   # In windows, automatic linking is performed, so you do not have
-@@ -1259,11 +1259,11 @@ if(WIN32)
-   # code to emit a #pragma message each time a library is selected
-   # for linking.
-   set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC")
--  set_target_properties(Boost::diagnostic_definitions PROPERTIES
-+  set_target_properties(boost_diagnostic_definitions PROPERTIES
-     INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC")
--  set_target_properties(Boost::disable_autolinking PROPERTIES
-+  set_target_properties(boost_disable_autolinking PROPERTIES
-     INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB")
--  set_target_properties(Boost::dynamic_linking PROPERTIES
-+  set_target_properties(boost_dynamic_linking PROPERTIES
-     INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK")
- endif()
- 
-@@ -2088,52 +2088,52 @@ if(Boost_FOUND)
-   endif()
- 
-   foreach(COMPONENT ${Boost_FIND_COMPONENTS})
--    if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost::${COMPONENT})
-+    if(_Boost_IMPORTED_TARGETS AND NOT TARGET boost_${COMPONENT})
-       string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-       if(Boost_${UPPERCOMPONENT}_FOUND)
-         if(Boost_USE_STATIC_LIBS)
--          add_library(Boost::${COMPONENT} STATIC IMPORTED)
-+          add_library(boost_${COMPONENT} STATIC IMPORTED)
-         else()
-           # Even if Boost_USE_STATIC_LIBS is OFF, we might have static
-           # libraries as a result.
--          add_library(Boost::${COMPONENT} UNKNOWN IMPORTED)
-+          add_library(boost_${COMPONENT} UNKNOWN IMPORTED)
-         endif()
-         if(Boost_INCLUDE_DIRS)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
-         endif()
-         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY}")
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-             IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}")
-         endif()
-         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
--          set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
-+          set_property(TARGET boost_${COMPONENT} APPEND PROPERTY
-             IMPORTED_CONFIGURATIONS RELEASE)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
-             IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
-         endif()
-         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
--          set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
-+          set_property(TARGET boost_${COMPONENT} APPEND PROPERTY
-             IMPORTED_CONFIGURATIONS DEBUG)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
-             IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
-         endif()
-         if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES)
-           unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES)
-           foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES})
--            list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost::${dep})
-+            list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES boost_${dep})
-           endforeach()
-           if(COMPONENT STREQUAL "thread")
-             list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Threads::Threads)
-           endif()
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             INTERFACE_LINK_LIBRARIES "${_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES}")
-         endif()
-         if(_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             INTERFACE_COMPILE_FEATURES "${_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES}")
-         endif()
-       endif()
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 4895e84df6..55814e3b96 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -356,12 +356,12 @@ set(ceph_common_objs
- set(ceph_common_deps
-   json_spirit erasure_code arch crc32
-   ${LIB_RESOLV}
--  Boost::thread
--  Boost::system
--  Boost::random
--  Boost::program_options
--  Boost::date_time
--  Boost::iostreams
-+  boost_thread
-+  boost_system
-+  boost_random
-+  boost_program_options
-+  boost_date_time
-+  boost_iostreams
-   ${BLKID_LIBRARIES}
-   ${Backtrace_LIBRARIES}
-   ${BLKIN_LIBRARIES}
-@@ -522,7 +522,7 @@ if (WITH_CEPHFS)
-     ceph_mds.cc)
-   add_executable(ceph-mds ${ceph_mds_srcs})
-   target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common
--    Boost::thread)
-+    boost_thread)
-   install(TARGETS ceph-mds DESTINATION bin)
- endif()
- 
-diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt
-index d7b58521d4..e1533af33f 100644
---- a/src/crimson/CMakeLists.txt
-+++ b/src/crimson/CMakeLists.txt
-@@ -106,8 +106,8 @@ target_link_libraries(crimson-common
-   PRIVATE
-     crc32
-     crimson::cflags
--    Boost::iostreams
--    Boost::random
-+    boost_iostreams
-+    boost_random
-     ${NSS_LIBRARIES} ${NSPR_LIBRARIES} OpenSSL::Crypto)
- 
- set(crimson_auth_srcs
-diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
-index 252fb3e5e3..213482da16 100644
---- a/src/mgr/CMakeLists.txt
-+++ b/src/mgr/CMakeLists.txt
-@@ -26,7 +26,7 @@ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
- target_link_libraries(ceph-mgr
-   osdc client heap_profiler
-   global-static ceph-common
--  Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
-+  boost_python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
-   ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
- set_target_properties(ceph-mgr PROPERTIES
-   POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE})
-diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt
-index e9d3804c5f..5c6eb58de1 100644
---- a/src/rbd_replay/CMakeLists.txt
-+++ b/src/rbd_replay/CMakeLists.txt
-@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE)
-     global
-     babeltrace
-     babeltrace-ctf
--    Boost::date_time
-+    boost_date_time
-     )
-   install(TARGETS rbd-replay-prep DESTINATION bin)
- endif(HAVE_BABELTRACE)
-diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
-index 8d5b0638a0..a147c55bc3 100644
---- a/src/rgw/CMakeLists.txt
-+++ b/src/rgw/CMakeLists.txt
-@@ -196,7 +196,7 @@ if(WITH_CURL_OPENSSL)
- endif()
- 
- if(WITH_BOOST_CONTEXT)
--  target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context)
-+  target_link_libraries(rgw_a PRIVATE boost_coroutine boost_context)
- endif()
- 
- set(rgw_libs rgw_a)
-@@ -347,7 +347,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT)
-   target_link_libraries(rgw_admin_user PRIVATE RabbitMQ::RabbitMQ)
- endif()
- if(WITH_BOOST_CONTEXT)
--  target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context)
-+  target_link_libraries(rgw_admin_user PRIVATE boost_coroutine boost_context)
- endif()
- 
- if(WITH_TESTS)
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index 5dcee1694d..60743be698 100644
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -159,7 +159,7 @@ add_executable(ceph_omapbench
-   )
- target_link_libraries(ceph_omapbench
-   librados
--  Boost::program_options
-+  boost_program_options
-   global
-   ${BLKID_LIBRARIES}
-   ${CMAKE_DL_LIBS}
-diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt
-index 71fb77cda9..aff8fb6565 100644
---- a/src/test/common/CMakeLists.txt
-+++ b/src/test/common/CMakeLists.txt
-@@ -315,8 +315,8 @@ add_ceph_unittest(unittest_hobject)
- 
- add_executable(unittest_async_completion test_async_completion.cc)
- add_ceph_unittest(unittest_async_completion)
--target_link_libraries(unittest_async_completion Boost::system)
-+target_link_libraries(unittest_async_completion boost_system)
- 
- add_executable(unittest_async_shared_mutex test_async_shared_mutex.cc)
- add_ceph_unittest(unittest_async_shared_mutex)
--target_link_libraries(unittest_async_shared_mutex ceph-common Boost::system)
-+target_link_libraries(unittest_async_shared_mutex ceph-common boost_system)
-diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
-index 721f6c3675..1cd9635c77 100644
---- a/src/test/erasure-code/CMakeLists.txt
-+++ b/src/test/erasure-code/CMakeLists.txt
-@@ -2,15 +2,15 @@
- add_executable(ceph_erasure_code_benchmark 
-   ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc
-   ceph_erasure_code_benchmark.cc)
--target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code_benchmark
-   DESTINATION bin)
- 
- add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc)
--target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- 
- add_executable(ceph_erasure_code ceph_erasure_code.cc)
--target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code
-   DESTINATION bin)
- 
-diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt
-index 4fc53d2406..e6304394f8 100644
---- a/src/test/librados/CMakeLists.txt
-+++ b/src/test/librados/CMakeLists.txt
-@@ -62,7 +62,7 @@ add_executable(ceph_test_rados_api_asio asio.cc)
- target_link_libraries(ceph_test_rados_api_asio global
-   librados ${UNITTEST_LIBS})
- if(WITH_BOOST_CONTEXT)
--  target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context)
-+  target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context)
- endif()
- 
- add_executable(ceph_test_rados_api_list
-@@ -132,7 +132,7 @@ add_executable(ceph_test_rados_api_tier_pp
-   tier_cxx.cc
-   $<TARGET_OBJECTS:unit-main>)
- target_link_libraries(ceph_test_rados_api_tier_pp
--  librados global ${UNITTEST_LIBS} Boost::system radostest-cxx)
-+  librados global ${UNITTEST_LIBS} boost_system radostest-cxx)
- 
- add_executable(ceph_test_rados_api_snapshots
-   snapshots.cc)
-diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
-index 3988e94bd3..b2a720b8a0 100644
---- a/src/test/librbd/CMakeLists.txt
-+++ b/src/test/librbd/CMakeLists.txt
-@@ -27,7 +27,7 @@ target_link_libraries(rbd_test PRIVATE
-   radostest
-   radostest-cxx
-   librados
--  Boost::thread
-+  boost_thread
-   GMock::GMock
-   GTest::GTest)
- 
-diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt
-index 36df883a66..43d3456089 100644
---- a/src/test/rgw/CMakeLists.txt
-+++ b/src/test/rgw/CMakeLists.txt
-@@ -144,7 +144,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler)
- target_link_libraries(unittest_rgw_dmclock_scheduler radosgw_a dmclock)
- if(WITH_BOOST_CONTEXT)
-   target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING)
--  target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context)
-+  target_link_libraries(unittest_rgw_dmclock_scheduler boost_coroutine boost_context)
- endif()
- 
- if(WITH_RADOSGW_AMQP_ENDPOINT)
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index d31f3d2408..6945018b11 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -35,20 +35,20 @@ install(PROGRAMS
- endif(WITH_TESTS)
- 
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options)
- install(TARGETS ceph-osdomap-tool DESTINATION bin)
- 
- add_executable(ceph-monstore-tool
-   ceph_monstore_tool.cc
-   ../mgr/mgr_commands.cc)
--target_link_libraries(ceph-monstore-tool os global Boost::program_options)
-+target_link_libraries(ceph-monstore-tool os global boost_program_options)
- install(TARGETS ceph-monstore-tool DESTINATION bin)
- 
- add_executable(ceph-objectstore-tool
-   ceph_objectstore_tool.cc
-   rebuild_mondb.cc
-   RadosDump.cc)
--target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
- if(WITH_FUSE)
-   target_link_libraries(ceph-objectstore-tool ${FUSE_LIBRARIES})
- endif(WITH_FUSE)
diff --git a/sys-cluster/ceph/files/ceph-14.2.8-boost-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.8-boost-sonames.patch
deleted file mode 100644
index 07def706d78b..000000000000
--- a/sys-cluster/ceph/files/ceph-14.2.8-boost-sonames.patch
+++ /dev/null
@@ -1,538 +0,0 @@
-diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
-index f99d74a0bc..d1a47bc5d1 100644
---- a/cmake/modules/BuildBoost.cmake
-+++ b/cmake/modules/BuildBoost.cmake
-@@ -199,13 +199,13 @@ macro(build_boost version)
-   foreach(c ${Boost_BUILD_COMPONENTS})
-     string(TOUPPER ${c} upper_c)
-     if(Boost_USE_STATIC_LIBS)
--      add_library(Boost::${c} STATIC IMPORTED)
-+      add_library(Boost_${c} STATIC IMPORTED)
-     else()
--      add_library(Boost::${c} SHARED IMPORTED)
-+      add_library(Boost_${c} SHARED IMPORTED)
-     endif()
--    add_dependencies(Boost::${c} Boost)
-+    add_dependencies(Boost_${c} Boost)
-     if(c MATCHES "^python")
--      set(c "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
-+      set(c "python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
-     endif()
-     if(Boost_USE_STATIC_LIBS)
-       set(Boost_${upper_c}_LIBRARY
-@@ -215,7 +215,7 @@ macro(build_boost version)
-         ${install_dir}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}boost_${c}${CMAKE_SHARED_LIBRARY_SUFFIX})
-     endif()
-     unset(buildid)
--    set_target_properties(Boost::${c} PROPERTIES
-+    set_target_properties(Boost_${c} PROPERTIES
-       INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}"
-       IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-       IMPORTED_LOCATION "${Boost_${upper_c}_LIBRARY}")
-@@ -224,19 +224,19 @@ macro(build_boost version)
-   foreach(c ${Boost_BUILD_COMPONENTS})
-     if(Boost_${c}_DEPENDENCIES)
-       foreach(dep ${Boost_${c}_DEPENDENCIES})
--        list(APPEND dependencies Boost::${dep})
-+        list(APPEND dependencies Boost_${dep})
-       endforeach()
--      set_target_properties(Boost::${c} PROPERTIES
-+      set_target_properties(Boost_${c} PROPERTIES
-         INTERFACE_LINK_LIBRARIES "${dependencies}")
-       unset(dependencies)
-     endif()
-   endforeach()
- 
-   # for header-only libraries
--  add_library(Boost::boost INTERFACE IMPORTED)
--  set_target_properties(Boost::boost PROPERTIES
-+  add_library(boost INTERFACE IMPORTED)
-+  set_target_properties(boost PROPERTIES
-     INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
--  add_dependencies(Boost::boost Boost)
-+  add_dependencies(boost Boost)
-   find_package_handle_standard_args(Boost DEFAULT_MSG
-     Boost_INCLUDE_DIRS Boost_LIBRARIES)
-   mark_as_advanced(Boost_LIBRARIES BOOST_INCLUDE_DIRS)
-@@ -253,7 +253,7 @@ function(maybe_add_boost_dep target)
-     get_filename_component(ext ${src} EXT)
-     # assuming all cxx source files include boost header(s)
-     if(ext MATCHES ".cc|.cpp|.cxx")
--      add_dependencies(${target} Boost::boost)
-+      add_dependencies(${target} boost)
-       return()
-     endif()
-   endforeach()
-diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake
-index bc61995b03..4419632fa4 100644
---- a/cmake/modules/FindBoost.cmake
-+++ b/cmake/modules/FindBoost.cmake
-@@ -293,9 +293,9 @@ function(_boost_get_canonical_target_name component target_var)
-   string(TOLOWER "${component}" component)
-   if(component MATCHES "^([a-z_]*)(python|numpy)([1-9])\\.?([0-9])?$")
-     # handle pythonXY and numpyXY versioned components and also python X.Y, mpi_python etc.
--    set(${target_var} "Boost::${CMAKE_MATCH_1}${CMAKE_MATCH_2}" PARENT_SCOPE)
-+    set(${target_var} "boost_${CMAKE_MATCH_1}${CMAKE_MATCH_2}" PARENT_SCOPE)
-   else()
--    set(${target_var} "Boost::${component}" PARENT_SCOPE)
-+    set(${target_var} "boost_${component}" PARENT_SCOPE)
-   endif()
- endfunction()
- 
-@@ -403,19 +403,19 @@ function(_boost_set_legacy_variables_from_config)
-   if(WIN32)
-     _boost_set_if_unset(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC")
-   endif()
--  if(NOT TARGET Boost::headers)
--    add_library(Boost::headers INTERFACE IMPORTED)
--    target_include_directories(Boost::headers INTERFACE ${Boost_INCLUDE_DIRS})
-+  if(NOT TARGET boost_headers)
-+    add_library(boost_headers INTERFACE IMPORTED)
-+    target_include_directories(boost_headers INTERFACE ${Boost_INCLUDE_DIRS})
-   endif()
-   # Legacy targets w/o functionality as all handled by defined targets
-   foreach(lib diagnostic_definitions disable_autolinking dynamic_linking)
--    if(NOT TARGET Boost::${lib})
--      add_library(Boost::${lib} INTERFACE IMPORTED)
-+    if(NOT TARGET boost_${lib})
-+      add_library(boost_${lib} INTERFACE IMPORTED)
-     endif()
-   endforeach()
--  if(NOT TARGET Boost::boost)
--    add_library(Boost::boost INTERFACE IMPORTED)
--    target_link_libraries(Boost::boost INTERFACE Boost::headers)
-+  if(NOT TARGET boost_boost)
-+    add_library(boost_boost INTERFACE IMPORTED)
-+    target_link_libraries(boost_boost INTERFACE boost_headers)
-   endif()
- endfunction()
- 
-@@ -580,10 +580,6 @@ macro(_Boost_ADJUST_LIB_VARS basename)
- 
-     if(Boost_${basename}_LIBRARY AND Boost_${basename}_HEADER)
-       set(Boost_${basename}_FOUND ON)
--      if("x${basename}" STREQUAL "xTHREAD" AND NOT TARGET Threads::Threads)
--        string(APPEND Boost_ERROR_REASON_THREAD " (missing dependency: Threads)")
--        set(Boost_THREAD_FOUND OFF)
--      endif()
-     endif()
- 
-   endif()
-@@ -1170,7 +1166,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
-   if (NOT _boost_DEPS_STRING)
-     set(_boost_DEPS_STRING "(none)")
-   endif()
--  # message(STATUS "Dependencies for Boost::${component}: ${_boost_DEPS_STRING}")
-+  # message(STATUS "Dependencies for Boost_${component}: ${_boost_DEPS_STRING}")
- endfunction()
- 
- #
-@@ -1254,7 +1250,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs)
-   if (NOT _boost_HDRS_STRING)
-     set(_boost_HDRS_STRING "(none)")
-   endif()
--  # message(STATUS "Headers for Boost::${component}: ${_boost_HDRS_STRING}")
-+  # message(STATUS "Headers for Boost_${component}: ${_boost_HDRS_STRING}")
- endfunction()
- 
- #
-@@ -1302,7 +1298,7 @@ endfunction()
- 
- #
- # Some boost libraries may require particular set of compler features.
--# The very first one was `boost::fiber` introduced in Boost 1.62.
-+# The very first one was `boost_fiber` introduced in Boost 1.62.
- # One can check required compiler features of it in
- # - `${Boost_ROOT}/libs/fiber/build/Jamfile.v2`;
- # - `${Boost_ROOT}/libs/context/build/Jamfile.v2`.
-@@ -1472,11 +1468,11 @@ _Boost_DEBUG_PRINT_VAR("${CMAKE_CURRENT_LIST_FILE}" "${CMAKE_CURRENT_LIST_LINE}"
- # on all platforms to keep end user code free from platform dependent
- # code.  Also provide convenience targets to disable autolinking and
- # enable dynamic linking.
--if(NOT TARGET Boost::diagnostic_definitions)
--  add_library(Boost::diagnostic_definitions INTERFACE IMPORTED)
--  add_library(Boost::disable_autolinking INTERFACE IMPORTED)
--  add_library(Boost::dynamic_linking INTERFACE IMPORTED)
--  set_target_properties(Boost::dynamic_linking PROPERTIES
-+if(NOT TARGET boost_diagnostic_definitions)
-+  add_library(boost_diagnostic_definitions INTERFACE IMPORTED)
-+  add_library(boost_disable_autolinking INTERFACE IMPORTED)
-+  add_library(boost_dynamic_linking INTERFACE IMPORTED)
-+  set_target_properties(boost_dynamic_linking PROPERTIES
-     INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK")
- endif()
- if(WIN32)
-@@ -1498,9 +1494,9 @@ if(WIN32)
-   # code to emit a #pragma message each time a library is selected
-   # for linking.
-   set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC")
--  set_target_properties(Boost::diagnostic_definitions PROPERTIES
-+  set_target_properties(boost_diagnostic_definitions PROPERTIES
-     INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC")
--  set_target_properties(Boost::disable_autolinking PROPERTIES
-+  set_target_properties(boost_disable_autolinking PROPERTIES
-     INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB")
- endif()
- 
-@@ -1933,7 +1929,7 @@ if("thread" IN_LIST Boost_FIND_COMPONENTS)
-   else()
-     set(_Boost_find_quiet "")
-   endif()
--  find_package(Threads ${_Boost_find_quiet})
-+  find_package(boost_thread ${_Boost_find_quiet})
-   unset(_Boost_find_quiet)
- endif()
- 
-@@ -2234,69 +2230,69 @@ endif()
- if(Boost_FOUND)
-   # The builtin CMake package in Boost 1.70+ introduces a new name
-   # for the header-only lib, let's provide the same UI in module mode
--  if(NOT TARGET Boost::headers)
--    add_library(Boost::headers INTERFACE IMPORTED)
-+  if(NOT TARGET boost_headers)
-+    add_library(boost_headers INTERFACE IMPORTED)
-     if(Boost_INCLUDE_DIRS)
--      set_target_properties(Boost::headers PROPERTIES
-+      set_target_properties(boost_headers PROPERTIES
-         INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
-     endif()
-   endif()
- 
-   # Define the old target name for header-only libraries for backwards
-   # compat.
--  if(NOT TARGET Boost::boost)
--    add_library(Boost::boost INTERFACE IMPORTED)
--    set_target_properties(Boost::boost
--      PROPERTIES INTERFACE_LINK_LIBRARIES Boost::headers)
-+  if(NOT TARGET boost_boost)
-+    add_library(boost_boost INTERFACE IMPORTED)
-+    set_target_properties(boost_boost
-+      PROPERTIES INTERFACE_LINK_LIBRARIES boost_headers)
-   endif()
- 
-   foreach(COMPONENT ${Boost_FIND_COMPONENTS})
--    if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost::${COMPONENT})
-+    if(_Boost_IMPORTED_TARGETS AND NOT TARGET boost_${COMPONENT})
-       string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-       if(Boost_${UPPERCOMPONENT}_FOUND)
-         if(Boost_USE_STATIC_LIBS)
--          add_library(Boost::${COMPONENT} STATIC IMPORTED)
-+          add_library(boost_${COMPONENT} STATIC IMPORTED)
-         else()
-           # Even if Boost_USE_STATIC_LIBS is OFF, we might have static
-           # libraries as a result.
--          add_library(Boost::${COMPONENT} UNKNOWN IMPORTED)
-+          add_library(boost_${COMPONENT} UNKNOWN IMPORTED)
-         endif()
-         if(Boost_INCLUDE_DIRS)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
-         endif()
-         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY}")
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-             IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}")
-         endif()
-         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
--          set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
-+          set_property(TARGET boost_${COMPONENT} APPEND PROPERTY
-             IMPORTED_CONFIGURATIONS RELEASE)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
-             IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
-         endif()
-         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
--          set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
-+          set_property(TARGET boost_${COMPONENT} APPEND PROPERTY
-             IMPORTED_CONFIGURATIONS DEBUG)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
-             IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
-         endif()
-         if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES)
-           unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES)
-           foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES})
--            list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost::${dep})
-+            list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES boost_${dep})
-           endforeach()
-           if(COMPONENT STREQUAL "thread")
-             list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Threads::Threads)
-           endif()
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             INTERFACE_LINK_LIBRARIES "${_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES}")
-         endif()
-         if(_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             CXX_STANDARD 17)
-         endif()
-       endif()
-diff --git a/cmake/modules/Finddpdk.cmake b/cmake/modules/Finddpdk.cmake
-index 964ae5dfb0..92bf07c14e 100644
---- a/cmake/modules/Finddpdk.cmake
-+++ b/cmake/modules/Finddpdk.cmake
-@@ -102,9 +102,9 @@ if(dpdk_FOUND)
- 
-   if(NOT TARGET dpdk::dpdk)
-     add_library(dpdk::dpdk INTERFACE IMPORTED)
--    find_package(Threads QUIET)
-+    find_package(boost_thread QUIET)
-     list(APPEND dpdk_LIBRARIES
--      Threads::Threads
-+      boost_thread
-       dpdk::cflags)
-     set_target_properties(dpdk::dpdk PROPERTIES
-       INTERFACE_LINK_LIBRARIES "${dpdk_LIBRARIES}"
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 28ec9835f8..31a1efa19f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -356,12 +356,12 @@ set(ceph_common_objs
- set(ceph_common_deps
-   json_spirit erasure_code arch crc32
-   ${LIB_RESOLV}
--  Boost::thread
--  Boost::system
--  Boost::random
--  Boost::program_options
--  Boost::date_time
--  Boost::iostreams
-+  boost_thread
-+  boost_system
-+  boost_random
-+  boost_program_options
-+  boost_date_time
-+  boost_iostreams
-   ${BLKID_LIBRARIES}
-   ${Backtrace_LIBRARIES}
-   ${BLKIN_LIBRARIES}
-@@ -522,7 +522,7 @@ if (WITH_CEPHFS)
-     ceph_mds.cc)
-   add_executable(ceph-mds ${ceph_mds_srcs})
-   target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common
--    Boost::thread)
-+    boost_thread)
-   install(TARGETS ceph-mds DESTINATION bin)
- endif()
- 
-diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt
-index d7b58521d4..e1533af33f 100644
---- a/src/crimson/CMakeLists.txt
-+++ b/src/crimson/CMakeLists.txt
-@@ -106,8 +106,8 @@ target_link_libraries(crimson-common
-   PRIVATE
-     crc32
-     crimson::cflags
--    Boost::iostreams
--    Boost::random
-+    boost_iostreams
-+    boost_random
-     ${NSS_LIBRARIES} ${NSPR_LIBRARIES} OpenSSL::Crypto)
- 
- set(crimson_auth_srcs
-diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
-index 180e39bc1c..8323aa29a5 100644
---- a/src/mgr/CMakeLists.txt
-+++ b/src/mgr/CMakeLists.txt
-@@ -30,7 +30,7 @@ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
- target_link_libraries(ceph-mgr
-   osdc client heap_profiler
-   global-static ceph-common
--  Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
-+  boost_python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
-   ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
- set_target_properties(ceph-mgr PROPERTIES
-   POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE})
-diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt
-index e9d3804c5f..5c6eb58de1 100644
---- a/src/rbd_replay/CMakeLists.txt
-+++ b/src/rbd_replay/CMakeLists.txt
-@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE)
-     global
-     babeltrace
-     babeltrace-ctf
--    Boost::date_time
-+    boost_date_time
-     )
-   install(TARGETS rbd-replay-prep DESTINATION bin)
- endif(HAVE_BABELTRACE)
-diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
-index d184c783de..00740331e3 100644
---- a/src/rgw/CMakeLists.txt
-+++ b/src/rgw/CMakeLists.txt
-@@ -203,7 +203,7 @@ if(WITH_CURL_OPENSSL)
- endif()
- 
- if(WITH_BOOST_CONTEXT)
--  target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context)
-+  target_link_libraries(rgw_a PRIVATE boost_coroutine boost_context)
- endif()
- 
- set(rgw_libs rgw_a)
-@@ -354,7 +354,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT)
-   target_link_libraries(rgw_admin_user PRIVATE RabbitMQ::RabbitMQ)
- endif()
- if(WITH_BOOST_CONTEXT)
--  target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context)
-+  target_link_libraries(rgw_admin_user PRIVATE boost_coroutine boost_context)
- endif()
- 
- if(WITH_TESTS)
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index 5dcee1694d..60743be698 100644
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -159,7 +159,7 @@ add_executable(ceph_omapbench
-   )
- target_link_libraries(ceph_omapbench
-   librados
--  Boost::program_options
-+  boost_program_options
-   global
-   ${BLKID_LIBRARIES}
-   ${CMAKE_DL_LIBS}
-diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt
-index 71fb77cda9..aff8fb6565 100644
---- a/src/test/common/CMakeLists.txt
-+++ b/src/test/common/CMakeLists.txt
-@@ -315,8 +315,8 @@ add_ceph_unittest(unittest_hobject)
- 
- add_executable(unittest_async_completion test_async_completion.cc)
- add_ceph_unittest(unittest_async_completion)
--target_link_libraries(unittest_async_completion Boost::system)
-+target_link_libraries(unittest_async_completion boost_system)
- 
- add_executable(unittest_async_shared_mutex test_async_shared_mutex.cc)
- add_ceph_unittest(unittest_async_shared_mutex)
--target_link_libraries(unittest_async_shared_mutex ceph-common Boost::system)
-+target_link_libraries(unittest_async_shared_mutex ceph-common boost_system)
-diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
-index 721f6c3675..1cd9635c77 100644
---- a/src/test/erasure-code/CMakeLists.txt
-+++ b/src/test/erasure-code/CMakeLists.txt
-@@ -2,15 +2,15 @@
- add_executable(ceph_erasure_code_benchmark 
-   ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc
-   ceph_erasure_code_benchmark.cc)
--target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code_benchmark
-   DESTINATION bin)
- 
- add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc)
--target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- 
- add_executable(ceph_erasure_code ceph_erasure_code.cc)
--target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code
-   DESTINATION bin)
- 
-diff --git a/src/test/lazy-omap-stats/CMakeLists.txt b/src/test/lazy-omap-stats/CMakeLists.txt
-index fad71f135c..06a3d2d929 100644
---- a/src/test/lazy-omap-stats/CMakeLists.txt
-+++ b/src/test/lazy-omap-stats/CMakeLists.txt
-@@ -4,7 +4,7 @@ add_executable(ceph_test_lazy_omap_stats
-   main.cc
-   lazy_omap_stats_test.cc)
- target_link_libraries(ceph_test_lazy_omap_stats
--  librados ${UNITTEST_LIBS} Boost::system)
-+  librados ${UNITTEST_LIBS} boost_system)
- install(TARGETS
-   ceph_test_lazy_omap_stats
-   DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt
-index 4fc53d2406..e6304394f8 100644
---- a/src/test/librados/CMakeLists.txt
-+++ b/src/test/librados/CMakeLists.txt
-@@ -62,7 +62,7 @@ add_executable(ceph_test_rados_api_asio asio.cc)
- target_link_libraries(ceph_test_rados_api_asio global
-   librados ${UNITTEST_LIBS})
- if(WITH_BOOST_CONTEXT)
--  target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context)
-+  target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context)
- endif()
- 
- add_executable(ceph_test_rados_api_list
-@@ -132,7 +132,7 @@ add_executable(ceph_test_rados_api_tier_pp
-   tier_cxx.cc
-   $<TARGET_OBJECTS:unit-main>)
- target_link_libraries(ceph_test_rados_api_tier_pp
--  librados global ${UNITTEST_LIBS} Boost::system radostest-cxx)
-+  librados global ${UNITTEST_LIBS} boost_system radostest-cxx)
- 
- add_executable(ceph_test_rados_api_snapshots
-   snapshots.cc)
-diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
-index 3c3e9db6c1..2c208c1a4f 100644
---- a/src/test/librbd/CMakeLists.txt
-+++ b/src/test/librbd/CMakeLists.txt
-@@ -27,7 +27,7 @@ target_link_libraries(rbd_test PRIVATE
-   radostest
-   radostest-cxx
-   librados
--  Boost::thread
-+  boost_thread
-   GMock::GMock
-   GTest::GTest)
- 
-diff --git a/src/test/mon/CMakeLists.txt b/src/test/mon/CMakeLists.txt
-index b712e95be7..6225ff3320 100644
---- a/src/test/mon/CMakeLists.txt
-+++ b/src/test/mon/CMakeLists.txt
-@@ -44,7 +44,7 @@ target_link_libraries(unittest_mon_montypes mon global)
- add_executable(ceph_test_mon_memory_target
-   test_mon_memory_target.cc
-   )
--target_link_libraries(ceph_test_mon_memory_target ${UNITTEST_LIBS} Boost::system)
-+target_link_libraries(ceph_test_mon_memory_target ${UNITTEST_LIBS} boost_system)
- install(TARGETS ceph_test_mon_memory_target
-   DESTINATION ${CMAKE_INSTALL_BINDIR})
- 
-diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt
-index cde6348d57..e6ce738834 100644
---- a/src/test/rgw/CMakeLists.txt
-+++ b/src/test/rgw/CMakeLists.txt
-@@ -144,7 +144,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler)
- target_link_libraries(unittest_rgw_dmclock_scheduler radosgw_a dmclock)
- if(WITH_BOOST_CONTEXT)
-   target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING)
--  target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context)
-+  target_link_libraries(unittest_rgw_dmclock_scheduler boost_coroutine boost_context)
- endif()
- 
- if(WITH_RADOSGW_AMQP_ENDPOINT)
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index d31f3d2408..6945018b11 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -35,20 +35,20 @@ install(PROGRAMS
- endif(WITH_TESTS)
- 
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options)
- install(TARGETS ceph-osdomap-tool DESTINATION bin)
- 
- add_executable(ceph-monstore-tool
-   ceph_monstore_tool.cc
-   ../mgr/mgr_commands.cc)
--target_link_libraries(ceph-monstore-tool os global Boost::program_options)
-+target_link_libraries(ceph-monstore-tool os global boost_program_options)
- install(TARGETS ceph-monstore-tool DESTINATION bin)
- 
- add_executable(ceph-objectstore-tool
-   ceph_objectstore_tool.cc
-   rebuild_mondb.cc
-   RadosDump.cc)
--target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
- if(WITH_FUSE)
-   target_link_libraries(ceph-objectstore-tool ${FUSE_LIBRARIES})
- endif(WITH_FUSE)
diff --git a/sys-cluster/ceph/files/ceph.confd-r4 b/sys-cluster/ceph/files/ceph.confd-r4
deleted file mode 100644
index b8a0c930a495..000000000000
--- a/sys-cluster/ceph/files/ceph.confd-r4
+++ /dev/null
@@ -1,70 +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 1048576 -u 1048576"
-
-# the directory under /run to store runtime information in
-#rundir=/run/ceph
-
-# the user and group to run ceph as
-#user="ceph"
-#group="ceph"
-
-# tell openrc to use control groups to make sure everything gets killed
-# properly on stop. Highly reccommended to leave this enabled.
-rc_cgroup_cleanup=1
-
-# 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-r11 b/sys-cluster/ceph/files/ceph.initd-r11
deleted file mode 100644
index 23827e1a562c..000000000000
--- a/sys-cluster/ceph/files/ceph.initd-r11
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/sbin/openrc-run
-
-# make sure /etc/conf.d/ceph gets loaded for ceph-mon etc
-_CONFD_FILE="${RC_SERVICE%/*}/../conf.d/${RC_SVCNAME%-*}"
-if [ -r "${_CONFD_FILE}" ]; then
-	. "${_CONFD_FILE}" || exit 1
-fi
-
-: "${ceph_conf:=/etc/ceph/ceph.conf}"
-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}"
-extra_commands="reload"
-command_args_foreground="--foreground"
-
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
-start_stop_daemon_args="--user ${user} --group ${group}"
-supervise_daemon_args="--user ${user} --group ${group}"
-
-: "${supervisor:=supervise-daemon}"
-: "${stdout:=/var/log/ceph/ceph}"
-: "${stderr:=/var/log/ceph/ceph}"
-: "${respawn_delay:=10}"
-: "${respawn_max:=5}"
-: "${respawn_period:=1800}"
-
-: "${osd_respawn_delay:=15}"
-: "{osd_respawn_max:=10}"
-
-: "{radosgw_respawn_max:=5}"
-: "${radosgw_respawn_period:=30}"
-
-depend() {
-	use dns logger
-	after net ntpd ntp-client chronyd
-	before netmount
-}
-
-is_type_valid() {
-	case ${daemon_type} in
-		mon|mds|osd|mgr|radosgw) return 0;;
-		*) return 1;;
-	esac
-}
-
-start_pre() {
-	local log_dir
-	export CEPH_CONF="${ceph_conf}"
-
-	checkpath -d -q -o "${user}:${group}" "${rundir}"
-
-	if ! is_type_valid ;then
-		eerror "Please give valid Ceph Server Type: mds, mon, osd"
-		return 1
-
-	elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
-		eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
-		return 1
-	fi
-
-	if [ -n "${bluestore_osd_fsid}" ]; then
-		einfo "Mounting Bluestore"
-		ceph-volume lvm activate "${daemon_id}" "${bluestore_osd_fsid}" --no-systemd
-	fi
-
-	if [ "${daemon_type}" = radosgw ] && [ "${RADOSGW_WANT_NAME_PARAM}" = y ]; then
-		command_args="${command_args} --name client.${daemon_id}"
-	fi
-
-	local arg_name arg_val repl_arg_name
-	for arg_name in stdout stderr respawn_delay respawn_max respawn_period; do
-		eval arg_val="\${${daemon_type}_${arg_name}}"
-
-		if [ -z "${arg_val}" ]; then
-			eval arg_val="\${${arg_name}}"
-		else
-			eval "${arg_name}=\"${arg_val}\""
-		fi
-
-		if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
-			local log_file log_postfix
-			log_postfix=".${daemon_id}-${arg_name}.log"
-			log_file="${arg_val}"
-
-			if [ "${log_file}" != /dev/null ]; then
-				log_file="${log_file}${log_postfix}"
-
-				log_dir="$(dirname "${log_file}")"
-				checkpath -m 0755 -o "${user}:${group}" -d "${log_dir}"
-			fi
-
-			repl_arg_name="$(printf -- "%s\n" "${arg_name}" | tr _ -)"
-			supervise_daemon_args="${supervise_daemon_args} --${repl_arg_name}=${log_file}"
-		fi
-	done
-}
-
-reload() {
-	ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
-	start-stop-daemon --signal 1 "${start_stop_daemon_args}"
-	eend ${?}
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/ceph/files/ceph.initd-r9 b/sys-cluster/ceph/files/ceph.initd-r9
deleted file mode 100644
index cfbd58e4b571..000000000000
--- a/sys-cluster/ceph/files/ceph.initd-r9
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-: ${rundir:=/run/ceph}
-: ${user:=ceph}
-: ${group:=ceph}
-: ${rc_ulimit:=-n 1048576 -u 1048576}
-
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
-
-command="/usr/bin/${RC_SVCNAME%%.*}"
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
-command_args_foreground="--foreground"
-
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
-start_stop_daemon_args="--user ${user} --group ${group}"
-supervise_daemon_args="--user ${user} --group ${group}"
-
-: ${supervisor:=supervise-daemon}
-: ${stdout:=/var/log/ceph/ceph}
-: ${stderr:=/var/log/ceph/ceph}
-: ${respawn_delay:=10}
-: ${respawn_max:=5}
-: ${respawn_period:=1800}
-
-: ${osd_respawn_delay:=15}
-: ${osd_respawn_max:=10}
-
-: ${radosgw_respawn_max:=5}
-: ${radosgw_respawn_period:=30}
-
-depend() {
-	use dns logger
-	after net ntpd ntp-client chronyd
-	before netmount
-}
-
-is_type_valid() {
-	case ${daemon_type} in
-		mon|mds|osd|mgr|radosgw) return 0;;
-		*) return 1;;
-	esac
-}
-
-start_pre() {
-	export CEPH_CONF="${ceph_conf}"
-
-	checkpath -d -q -o "${user}:${group}" "${rundir}"
-
-	if ! is_type_valid ;then
-		eerror "Please give valid Ceph Server Type: mds, mon, osd"
-		return 1
-
-	elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
-		eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
-		return 1
-	fi
-
-	local arg_name arg_val
-	for arg_name in std{out,err} respawn_{delay,max,period}; do
-		eval arg_val="\${${daemon_type}_${arg_name}}"
-
-		if [ -z "${arg_val}" ]; then
-			eval arg_val="\${${arg_name}}"
-		else
-			eval "${arg_name}=\"${arg_val}\""
-		fi
-
-		if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
-			local log_file log_postfix
-			log_postfix=".${daemon_id}-${arg_name}.log"
-			log_file="${arg_val}"
-
-			if [ "${log_file}" != /dev/null ]; then
-				log_file="${log_file}${log_postfix}"
-			fi
-
-			checkpath -m 0755 -o "${user}:${group}" -d $(dirname "${log_file}")
-
-			supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${log_file}"
-		fi
-	done
-}
-
-reload() {
-	ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
-	start-stop-daemon --signal 1 "${start_stop_daemon_args}"
-	eend ${?}
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index 472c6d9547ce..9d76bb595fb9 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -2,10 +2,12 @@ AUX charliecloud-0.10-fix-hardcoded-gcc.patch 1944 BLAKE2B 920697592b47f532a335c
 AUX charliecloud-0.9.10-fix-flags.patch 1471 BLAKE2B 637d7fc18126a5842006233468da626a9e26c9e66c1efbf5112c0c391795a27885a28f90035894d6d529ad58926c59a9fb4ee50d8759a5d259b2e59ffef749f1 SHA512 6dae473e0583f3a167f88d1dc7006dfa0120d6f2a3508ca63e499dbbb9e1e2ef78041093144efa350d6a9653ac2de1d5b36f71b071af7577f467933d590a0379
 AUX charliecloud-0.9.10-fix-hardcoded-gcc.patch 708 BLAKE2B 78b73bf527f7d9be0aa9de06eb023557bd9934708dda8ff5d948fc8240484b5cb2a0404fd2184da2759c2c08e6dd4842e5dd60b6d9af92f12a4734557df49f13 SHA512 5dfab73c4242bad9620dca71737d69215f43c8b109d25bcd2156166d2bd83d328011c6d448ee87d5f54908ea7946283ba200a865c61500912da95b7acf6c13ad
 DIST charliecloud-0.10.tar.gz 301083 BLAKE2B be0c650bebc12fd047b1afc61588b4b9cfc0d0addfddb808765d8e125c70329d6c06a86144b4167e5abaf64392ad1891319aabd2ba8fb528de2d9789d040fc0c SHA512 681e2f30f730b42b55b4097dba78e41924b17990354b866e04e09e6d2e4bb584211c130f9a04619dcdd38f2a3eaaad7615ee5ec20a266ee2332b0a512492331f
+DIST charliecloud-0.15.tar.gz 346718 BLAKE2B a3710814864904c5db282d092f64faf9a11aeea016c788ee4be62f11257b5b5200d0c1887150b93f18446034d7919df933d3badcf33907a81c0b33e65a5e9f78 SHA512 70f6c9a18f613d05396eda5d41044ec699cf6366ae1bf43839275e62ac317231bb1c3278469040faa03af007260d84e2d718c0fb3fb45e6ace8fb733c6275a84
 DIST charliecloud-0.9.10.tar.gz 275687 BLAKE2B e03c3358dd4e5eb88f9c5a3002366c79563e15d5d7792dd55f2800a001b847c13443fce0689a850aa7e6a0aa510c3f6b53d93a88a6f79326eac27acc9cbe2c57 SHA512 93a6f0c6bcceb54fabbc179b960a0d03f1b3547786ce8d502552ddc571475ea2110d6aa290ce5c245be6e2c7cdc47d3f23ff7e74558f684b4a27358aa0971a61
 DIST charliecloud-0.9.6.tar.gz 205380 BLAKE2B 2e95f5486ea6d2306512378290cd29114bc688717741436ae9cc8c1dd2679c22ab21059574d62222cd14063bacecc6a7005b216cd9e2ed01fe1593a3b69871b0 SHA512 55af3e57ef6c2b81ae10bd50d149872af50d508392b271bdaa75cf3b655659ec7da5016a9deeea15aaa20e265e8066d1ed982c122cb5e62ee6d47f25d367410f
 EBUILD charliecloud-0.10-r1.ebuild 1559 BLAKE2B e33fd6a6dcd8bf6823e9d79a005050c56ff40f4d86a63805997f15c0b2620fea00b726a9734f7c2d6ccc97132b3f83990a6cb5a3d5e16090f51ac8c4e7ba4a35 SHA512 c04634bbaa51798f5d969657608f11008af026781d6eddd1350bd98415dc38d5dadb4aff252fdfdbc3073b72a29e46209c2792675414749649ce8befd2ead13d
+EBUILD charliecloud-0.15.ebuild 1979 BLAKE2B dc1016a9437a8ce7219b5ee62eec43cc28c35dc514c7d51ef693140abe2a3626b3ce17b2d182ab705e067af3de0c60b2c991bf3b1c72da96b2828f7611943874 SHA512 919c24c2c48bdc7b2d46415dcc69c478f77502a0b4748a3d6f520376adbdaed5eda1d120496ecb89fb29cb81d7a2315763f4cf73b7a4d8093163264308bcd21b
 EBUILD charliecloud-0.9.10.ebuild 1554 BLAKE2B a5255254ef542ed3ac8d2233af32dffb2be2cf75578891ca66ecac4283657bb453d7fbbd50914f93399d996cafe6694f4efab855bf5a151f5db0225cded66e7d SHA512 a44da8749ee859b459a211d92838d8e5886eeb58e8927d44c9014d0c15a24d20d2531c0a994ecf9513ef509cafb1d8086e5ab556f8549c46731534d4bd28d674
 EBUILD charliecloud-0.9.6.ebuild 1502 BLAKE2B b7dee3131b106eaa6ef4ec023339efcf33b24d9e684e0f3b0b9e246676f4868394e6a4a7e23cb66296c355de32cee0cc2425c8ca7241a3743787849bfdf80f4b SHA512 ad33df1b66ffab1b882b5799c89df2f03a3458c0bfc5e172eed3da9f37490db535c447ba9e4b177bdb747b43e3b042b9f88fac5021d7a1356bd70f32d1d18344
-EBUILD charliecloud-9999.ebuild 1426 BLAKE2B 15d6b088b608f19fea30aec3ae1e81f6c26a7da0e36c2dba234754fcfc8c51a19b90d6e33c27b249984f2217a965ed9699816b2c5356ea8341ce805eedd20835 SHA512 ffddb1be0a052eddc178cf50c587c1f966e18ff88d78089702f5e7f996e481e482f3612517cf0c4f8fc15116f20b73e4cdb72f2e47e8b1804f5cba1f57fe3d48
-MISC metadata.xml 782 BLAKE2B 8eb3cbbd39486b78ffaf3b932804536d900cbbded17dc41437bece7f47f6edbe8fe76d99b695f220c7477356e93ffad16a137a902a026ded8ab5098b7a44ade6 SHA512 775f7de9e4f296a5d13bf66df50b935866d4ca87b2d13678ba03ee5ee72f2740d17c9c2ba69e221efef7ca4038129d7704f1e13c738227e87cd7b869cd7d63db
+EBUILD charliecloud-9999.ebuild 1979 BLAKE2B dc1016a9437a8ce7219b5ee62eec43cc28c35dc514c7d51ef693140abe2a3626b3ce17b2d182ab705e067af3de0c60b2c991bf3b1c72da96b2828f7611943874 SHA512 919c24c2c48bdc7b2d46415dcc69c478f77502a0b4748a3d6f520376adbdaed5eda1d120496ecb89fb29cb81d7a2315763f4cf73b7a4d8093163264308bcd21b
+MISC metadata.xml 937 BLAKE2B e57547bd213b476c45d79c716af07e58d5097637fe86f3a65215eea57348dd94b93176239b4275660c5a50d370937cd9cfb340205b0ad556163f8ec7c5896a51 SHA512 69b8c1bec13e3ab80a277c7e24070a707b72dc0cb82de2bd2f75236e06185489692da07bfd5504f61a2b096b77bf9ca10ee8b66252031e3587855559919ccd7d
diff --git a/sys-cluster/charliecloud/charliecloud-0.15.ebuild b/sys-cluster/charliecloud/charliecloud-0.15.ebuild
new file mode 100644
index 000000000000..54113d039cd4
--- /dev/null
+++ b/sys-cluster/charliecloud/charliecloud-0.15.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit autotools eutils python-single-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
+	S="${WORKDIR}/${P}"
+else
+	SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~x86-linux"
+fi
+
+DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
+HOMEPAGE="https://hpc.github.io/charliecloud/"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+IUSE="ch-grow doc examples +pv +squashfs squashfuse"
+
+# Extensive test suite exists, but downloads container images
+# directly and via Docker and installs packages inside using apt/yum.
+# Additionally, clashes with portage namespacing and sandbox.
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	pv? ( sys-apps/pv )
+	squashfs? ( sys-fs/squashfs-tools )
+	squashfuse? ( sys-fs/squashfuse )"
+DEPEND="
+	ch-grow? (
+		$(python_gen_cond_dep '
+			dev-python/lark-parser[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
+		')
+		net-misc/rsync
+	)"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local econf_args=()
+	econf_args+=(
+		$(use_enable doc html)
+		$(use_enable ch-grow)
+		# Libdir is used as a libexec-style destination.
+		--libdir="${EPREFIX}"/usr/lib
+		# Attempts to call python-exec directly otherwise.
+		--with-sphinx-python=${PYTHON}
+	)
+	econf "${econf_args[@]}"
+}
+
+pkg_postinst() {
+	elog "Various builders are supported, as alternative "
+	elog "to the internal ch-grow. The following packages "
+	elog "can be installed to get the corresponding support."
+
+	optfeature "Building with Buildah" app-emulation/buildah
+	optfeature "Building with Docker" app-emulation/docker
+}
diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
index c838d73e90e9..54113d039cd4 100644
--- a/sys-cluster/charliecloud/charliecloud-9999.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
 
-inherit python-single-r1
+inherit autotools eutils python-single-r1
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	S="${WORKDIR}/${P}"
 else
 	SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86 ~x86-linux"
 fi
 
 DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
@@ -21,7 +21,7 @@ HOMEPAGE="https://hpc.github.io/charliecloud/"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-IUSE="doc examples +pv squashfuse"
+IUSE="ch-grow doc examples +pv +squashfs squashfuse"
 
 # Extensive test suite exists, but downloads container images
 # directly and via Docker and installs packages inside using apt/yum.
@@ -32,9 +32,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	pv? ( sys-apps/pv )
-	squashfuse? ( sys-fs/squashfuse )
-"
+	squashfs? ( sys-fs/squashfs-tools )
+	squashfuse? ( sys-fs/squashfuse )"
 DEPEND="
+	ch-grow? (
+		$(python_gen_cond_dep '
+			dev-python/lark-parser[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	doc? (
 		$(python_gen_cond_dep '
 			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
@@ -43,16 +49,29 @@ DEPEND="
 		net-misc/rsync
 	)"
 
-src_compile() {
-	emake
-	use doc && emake -C doc-src
+src_prepare() {
+	default
+	eautoreconf
 }
 
-src_install() {
-	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" LIBEXEC_DIR="libexec/${PF}"
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	einstalldocs
+src_configure() {
+	local econf_args=()
+	econf_args+=(
+		$(use_enable doc html)
+		$(use_enable ch-grow)
+		# Libdir is used as a libexec-style destination.
+		--libdir="${EPREFIX}"/usr/lib
+		# Attempts to call python-exec directly otherwise.
+		--with-sphinx-python=${PYTHON}
+	)
+	econf "${econf_args[@]}"
+}
+
+pkg_postinst() {
+	elog "Various builders are supported, as alternative "
+	elog "to the internal ch-grow. The following packages "
+	elog "can be installed to get the corresponding support."
+
+	optfeature "Building with Buildah" app-emulation/buildah
+	optfeature "Building with Docker" app-emulation/docker
 }
diff --git a/sys-cluster/charliecloud/metadata.xml b/sys-cluster/charliecloud/metadata.xml
index 584c30766905..61291d6ce81d 100644
--- a/sys-cluster/charliecloud/metadata.xml
+++ b/sys-cluster/charliecloud/metadata.xml
@@ -17,7 +17,9 @@
     <remote-id type="github">hpc/charliecloud</remote-id>
   </upstream>
   <use>
+    <flag name='ch-grow'>Build the internal builder ch-grow</flag>
     <flag name='pv'>Use sys-apps/pv to enable progress bar functionality</flag>
+    <flag name='squashfs'>Use sys-fs/squashfs-tools for creating SquashFS images</flag>
     <flag name='squashfuse'>Use sys-fs/squashfuse for the SquashFS workflow</flag>
   </use>
 </pkgmetadata>
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index ef3e6f447ebb..c31b83ba54f3 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,11 +1,8 @@
 AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c1d1f3a84b9f1c1e7c596361ec5d2aab650f1ebf3f0f053e313f2e15be64995d1309a6eafc8a69 SHA512 be3c2e6798b08527487cfd2b1cd66a03d891526a45f52c97a536b15a08d46a4162e3b036dcae86911c7dba25c5d7f02e73a089d4dd720526bf38ecd0f44c59b0
 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
-DIST cinder-15.0.1.tar.gz 5516811 BLAKE2B 081b3a6175303c783ff23122d409814812fdab2a7955174cd90b57ea62c055c1e39936d8e8a38e21fc2820e7069e0afc91fa46a490f539f518f33302067b4acd SHA512 7a63f25bcd6beedc60bb4a6b976d8b1f862b445a6d858e2fbbf53f4ff425d8bee094af354883a46c6226349d7557d45a649cd745e79a445e32b759b24294116f
 DIST cinder-15.1.0.tar.gz 5504663 BLAKE2B 19097821729c99f0a13f0c30c9fa2c8647fe4c6ae01790b59b264fad282f1051e5e3f3275720114b1575afcbef517baab89a34ce75b7ef54d6515c204907f28a SHA512 1c6c88854994d440c3818d26533ea075adfcfc4b8642b2796d1ac90a5feec5e3c8d64d06f433840afcf2d9d4f5a50ba256808b74495e0e735a3f0a19bdc838e3
-DIST cinder.conf.sample-15.0.1 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a
 DIST cinder.conf.sample-15.1.0 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a
 DIST cinder.conf.sample-2019.2.9999 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a
-EBUILD cinder-15.0.1.ebuild 7734 BLAKE2B 4ff524caf8e8ccc741b307ab21e3597a495712a11c8dc59d127e274a87bf52c14e65c38fa78b0c1db60f11652d36f249fdc79efba9de30cae28a47387d4cbf02 SHA512 2db77c8f068716112617ecb0bbd5e49e95d7e8bc2d8c93b4de4d57f3fe372214fdb16648592e166c2effcaeb83a9ff7c5c64447fa6e798e0fa236f9cd73bb511
-EBUILD cinder-15.1.0.ebuild 7687 BLAKE2B f436f56df12ccb7b2a9c7994ce702021dd0386de702efa4bfc99b6ed9410230a3c0872fa9b08c501dba9cd9223464da3ea235a45b8a85ca5905c33f78e992596 SHA512 fd298c23064fe56047a04e38699552b26e7e44aa35de93b81e5cb7ffc553b36a604d0b81f751014475031517075d97c387984ab1cf68cbe429d52f22966a2cd3
-EBUILD cinder-2019.2.9999.ebuild 7687 BLAKE2B f436f56df12ccb7b2a9c7994ce702021dd0386de702efa4bfc99b6ed9410230a3c0872fa9b08c501dba9cd9223464da3ea235a45b8a85ca5905c33f78e992596 SHA512 fd298c23064fe56047a04e38699552b26e7e44aa35de93b81e5cb7ffc553b36a604d0b81f751014475031517075d97c387984ab1cf68cbe429d52f22966a2cd3
+EBUILD cinder-15.1.0-r1.ebuild 7725 BLAKE2B 9030f02232344ed4766bc083de914f28b05411f6548c96d77cfb8bf6a3f2235666af44a06804f515df8a70e1512595c904e6ef2396e4d220b549eded07822bb9 SHA512 634c3cce3444ef915af124dcabf83c2f5ceeaba535cfab56b700a146ef3365891b273e046c5feaa308805dfc023ebe4cf669c1c0a7c875ffe372e2bfd536a300
+EBUILD cinder-2019.2.9999.ebuild 7727 BLAKE2B 6db8b0067861be958f16707937bb7c2345cbba8d49357610dd358d485b6bb3930629adc469b5f50de3360dbdf9acb8ae30baf08995bda0dd14ff0e1d61c0cc65 SHA512 d8b5041ed0fed6addbc626d1faaf6adce7e1fc47ff3845f2db25658b691bc58044b7f2b56b7442f2fc0651d0da4b7315e003a513b100e097af44971b677d8a89
 MISC metadata.xml 1244 BLAKE2B bac3f4931079ae89c48d66ed2fe689978fcf609638ade7b26d8f07ffbd6562d7c4a16b42dec4390654747c6d2dfcb92b73d27c90356f1928199469d42432ef69 SHA512 fda201e6974bb0af9c24c1384a3bb2dd0a0c630439d7f1955de336f53804070a68426919fd4dc6f864d502c7e9e99a80d1920c740b6dc179f7b46c7f7fb7aef9
diff --git a/sys-cluster/cinder/cinder-15.0.1.ebuild b/sys-cluster/cinder/cinder-15.0.1.ebuild
deleted file mode 100644
index 8c8f4a9cfe8c..000000000000
--- a/sys-cluster/cinder/cinder-15.0.1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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/train/cinder.conf.sample -> cinder.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
-	EGIT_BRANCH="stable/train"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/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"
-RESTRICT="!test? ( test )"
-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/eventlet-0.22.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/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/cinder/cinder-15.1.0.ebuild b/sys-cluster/cinder/cinder-15.1.0-r1.ebuild
index dd0bb4f9d5bc..7e28298f02b3 100644
--- a/sys-cluster/cinder/cinder-15.1.0.ebuild
+++ b/sys-cluster/cinder/cinder-15.1.0-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/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"
@@ -32,6 +32,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	${CDEPEND}
 	app-admin/sudo"
 
+#	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]  # do not include, upstream depricated
 RDEPEND="
 	${CDEPEND}
 	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
@@ -47,7 +48,6 @@ RDEPEND="
 	>=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}]
diff --git a/sys-cluster/cinder/cinder-2019.2.9999.ebuild b/sys-cluster/cinder/cinder-2019.2.9999.ebuild
index dd0bb4f9d5bc..a4f149da4e04 100644
--- a/sys-cluster/cinder/cinder-2019.2.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2019.2.9999.ebuild
@@ -32,6 +32,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	${CDEPEND}
 	app-admin/sudo"
 
+#	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]  # do not include, upstream depricated
 RDEPEND="
 	${CDEPEND}
 	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
@@ -47,7 +48,6 @@ RDEPEND="
 	>=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}]
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index a3d45e1a5b2a..d24c116b0891 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -13,5 +13,5 @@ EBUILD galera-25.3.26.ebuild 1932 BLAKE2B 7b8ba8da617cb4c0ef8d74d72f15769eaaa674
 EBUILD galera-25.3.28-r1.ebuild 1786 BLAKE2B a064ec5c6e173f43e54535ee88c7732b1459b68a3e3dcf47dc3034e1988b3bbbe3d568dfb1dfd01026ba98e42341bb0ff9bf785a2adad8428840669ca2bd9353 SHA512 132d907d22de6a25cfcd84a12371cb8c79748dba5ee17335b18c89aeb6a481029209eab6ecf00d8a7952d6b4a64d602a5f8bdb7911fadddea0c7684b5716b568
 EBUILD galera-25.3.28.ebuild 1932 BLAKE2B 429c0365de384c20d4004f555f3b18230c9272631cbd77e964cd07666362806b5faed1a5e26cabcc4627893f1a6daa2910a8f150fa2fcd9fe8987325a2dae11d SHA512 7509ef4e83f1e2f5c39366d66583082c83bcccc2f0218f94e4f6745e9080193850d82ca60882727f694196eade5370ef827db0c20e387a3890c0c649748a3fe4
 EBUILD galera-26.4.2.ebuild 1886 BLAKE2B 0a118cbbc699ae1023eb65283ac6c7c76c954c465c67fe49d0069e1362571639ef2c6c5de524627fa6a17d0d2bbc8967abd27cec5a4d6bc62c323ee0dfe2b73e SHA512 9b3ef59bce28519e85c505c65899064eeba3cc0f7ef8bb00f5c4062487fe907278c32805169ef53088d0b777f3c287d2cd2fa5a5c540272f784483fe2768eb61
-EBUILD galera-26.4.3.ebuild 1790 BLAKE2B 455e88d86919e56823b52eb750072b45919efa1a7e274db4313d162e2ff9c54265268c002317d7f23eb0a937559cb100a0b2776a99a685eea5fcee76414eddba SHA512 82751b9c0c2270bbd2557efe9be0924ac3dcde05ccc32d1645e5f8430effa36bb8754309d51a1cead442d0f08ba911b9933c87747f2e57d6ee0d7b58c668c686
+EBUILD galera-26.4.3.ebuild 1789 BLAKE2B aa0a22cbf898c72be74fdcceb34acfcfe4abe4c7817a65957c9958df38439c76fd9c9665ab8de97f65d97e0fcd205047e76f2500178a77966b0f00f4b75d1db5 SHA512 023fe1d4f81061de6ed895f937df0b55f3ff6058c4f70d1836be3d4f9e95907a4b8718f6d79efca0a9af39581a3e74e38121dc309b761681796b48b630cddfd0
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/galera-26.4.3.ebuild b/sys-cluster/galera/galera-26.4.3.ebuild
index 403fe64247e4..26b904c8bf26 100644
--- a/sys-cluster/galera/galera-26.4.3.ebuild
+++ b/sys-cluster/galera/galera-26.4.3.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2 BSD"
 
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="cpu_flags_x86_sse4_2 garbd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-cluster/kubernetes/Manifest b/sys-cluster/kubernetes/Manifest
index 2d89ca47e994..17286433976a 100644
--- a/sys-cluster/kubernetes/Manifest
+++ b/sys-cluster/kubernetes/Manifest
@@ -16,11 +16,17 @@ AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a005854898
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
 DIST kubernetes-1.16.8.tar.gz 31731459 BLAKE2B 1d53c16586b5a7a41fc42d0fb3444b694531d3f04fb9e168a70d4b98f966f322bc82d39234612e38c71da052002c5bcc452c747d9f948dacbdd91ea40a9f5417 SHA512 04c8e9a9227ac9a98074cd52cbe90758134fedb10164fa69accbc19716a2f18dc133a4f880d0e35a3728c377faea431363f00ae9fe2ff5ca9e509444da9106c5
+DIST kubernetes-1.16.9.tar.gz 31752857 BLAKE2B 34c0ff54e60276bf41ce971a8a50d57256f696ac95b551a90a6d2ccf1540279010953119def539c0824217fbbfc287d24b6f080e1fefce8864c1eade72d0777f SHA512 08fffe855a433ad0cc7586afd12815adb3bcafcac86712181625198fedbfe170bc36ae31aca9783d30dd790c415d447f073234f621416a76a7e4e0de2eeb008d
 DIST kubernetes-1.17.4.tar.gz 31777775 BLAKE2B cd04e429d3f524f5dce7948db9b22230df8abdeb7570001ab985ffdb5b85709a8d1698490b9df13455d8f3968741db9571ee1ab3bc2a6fdd06a8c0fe274476e2 SHA512 fd1944d26c840bc1d2f585fccbabf48091fe8820ea089b3ea5c18652fd1edb3c8157a70ea19111b8b62aef16e0284a1607b583c3c1af79dd0dd266b99e20c549
+DIST kubernetes-1.17.5.tar.gz 31788321 BLAKE2B b7531b9ba07a20aba6829e3351b3b66a64251970be3a07d44f8b20ef2d44fa7d80f2528c1c0a6c3dcf3373cbb21e500d26c0a53c4ed4b66bb334860c5f8ce3b9 SHA512 2f7fd071a11a4f9d53cf0b23e381d0e864a6dc19e1dab88c2b5bcdade514328714f651bc0caa9c302e74fab7d2823a0d724fe0f5444e13afcf89b792377af283
 DIST kubernetes-1.18.0.tar.gz 32554015 BLAKE2B 24079970cc1887c6dad7b55d9f2fd80cd9f46f1b6c1240cf28abf2eb33b3809bcd858293bb800255533a13e24145fab580b0bd2eb0e06c15ca4e0feeedcf6ff2 SHA512 3298ec63a2fbcd396b415f27a581f4286317ae206c30b35457aed780baae4115059df20e40028df394984caccc8bb4ef6c879ae3c064771c8a5c045dee7998e8
 DIST kubernetes-1.18.1.tar.gz 32581783 BLAKE2B ffacdba21dd6d326ddf9733c49ed3a16ad679fbd25b4ddda44b047a402a163474033d6b2328a816e83ede505aae07e205b68938165c546202fa6df2d03609ead SHA512 c002153e16494cd74e6f0609847602d6dcf166c8bab020341f8302b7cad5d7452ed1c2e66b3b230731d13401493d2d02f0500abcd526dbff44ae3aeabd210577
+DIST kubernetes-1.18.2.tar.gz 32585912 BLAKE2B 1f8dbd6e7a8ba4257abaf2926ada656ec42eb7e0f502f2b4fc75b2a6cacd9a6e91624a717772f605a24b42421933580bc399aca4480aa1c88009016160485a77 SHA512 9786312b06aea5cbd4e786e4b6d639ec4750fa6c8ba469d860702b317103ec464f038015ef038ba21841a0d627d58902769eb73a5d2fdf4da2f0ae4c0ec14e85
 EBUILD kubernetes-1.16.8.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
+EBUILD kubernetes-1.16.9.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
 EBUILD kubernetes-1.17.4.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
+EBUILD kubernetes-1.17.5.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
 EBUILD kubernetes-1.18.0.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
 EBUILD kubernetes-1.18.1.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
+EBUILD kubernetes-1.18.2.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
 MISC metadata.xml 719 BLAKE2B 4f7918cba4809becbff0cb1f6c6e9ce00e778c1a474955e64fccef68942a2e7fb337d5dbe8b01074b992497da913fbfbebe5705635245e8ce02f6daca4df7936 SHA512 9d4662622f1fa57b753018db9839b4399f3bb589a1e061821941738ea86a6d65cd0dbec31ffef658aeb14ac7d5c3840948694627b1fb32bc138b0f7dbf40a011
diff --git a/sys-cluster/kubernetes/kubernetes-1.16.9.ebuild b/sys-cluster/kubernetes/kubernetes-1.16.9.ebuild
new file mode 100644
index 000000000000..c333bbabb3b4
--- /dev/null
+++ b/sys-cluster/kubernetes/kubernetes-1.16.9.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="production-grade container orchestration"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+AGENT="kubelet"
+CLI="kubeadm kubectl"
+SERVICES="kube-apiserver kube-controller-manager kube-proxy kube-scheduler"
+IUSE="hardened"
+for x in ${AGENT} ${CLI} ${SERVICES}; do
+	IUSE+=" +${x}"
+done
+
+BDEPEND=">=dev-lang/go-1.13"
+COMMON_DEPEND="
+	kube-apiserver? (
+		acct-group/kube-apiserver
+		acct-user/kube-apiserver
+	)
+	kube-controller-manager? (
+		acct-group/kube-controller-manager
+		acct-user/kube-controller-manager
+	)
+	kube-scheduler? (
+		acct-group/kube-scheduler
+		acct-user/kube-scheduler
+	)"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	kube-proxy? ( net-firewall/conntrack-tools )
+	!sys-cluster/kubeadm
+	!sys-cluster/kubectl
+	!sys-cluster/kubelet
+	!sys-cluster/kube-apiserver
+	!sys-cluster/kube-controller-manager
+	!sys-cluster/kube-proxy
+	!sys-cluster/kube-scheduler"
+
+RESTRICT+=" test"
+
+src_compile() {
+	local x
+	for x in ${AGENT} ${CLI} ${SERVICES}; do
+		use $x || continue
+		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+			emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${x}
+	done
+}
+
+src_install() {
+	local x
+	for x in ${AGENT} ${CLI} ${SERVICES}; do
+		use $x || continue
+		dobin _output/bin/${x}
+		if has ${x} ${CLI}; then
+		_output/bin/${x} completion bash > ${x}.bash || die
+		_output/bin/${x} completion zsh > ${x}.zsh || die
+			newbashcomp ${x}.bash ${x}
+			insinto /usr/share/zsh/site-functions
+			newins ${x}.zsh _${x}
+			continue
+		fi
+		newinitd "${FILESDIR}"/${x}.initd ${x}
+		newconfd "${FILESDIR}"/${x}.confd ${x}
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/${x}.logrotated ${x}
+		keepdir /var/log/${x}
+		if [[ "$x" =~ kubelet ]]; then
+			systemd_dounit "${FILESDIR}"/${x}.service
+			insinto /etc/kubernetes
+			newins "${FILESDIR}"/${x}.env ${x}.env
+			keepdir /etc/kubernetes/manifests
+		fi
+		if [[ $x =~ kubelet|kube-proxy ]]; then
+			keepdir /var/lib/${x}
+		fi
+		if [[ $x =~ .*apiserver|.*controller-manager|.*scheduler ]]; then
+			fowners ${x}:${x} /var/log/${x}
+		fi
+	done
+}
diff --git a/sys-cluster/kubernetes/kubernetes-1.17.5.ebuild b/sys-cluster/kubernetes/kubernetes-1.17.5.ebuild
new file mode 100644
index 000000000000..c333bbabb3b4
--- /dev/null
+++ b/sys-cluster/kubernetes/kubernetes-1.17.5.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="production-grade container orchestration"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+AGENT="kubelet"
+CLI="kubeadm kubectl"
+SERVICES="kube-apiserver kube-controller-manager kube-proxy kube-scheduler"
+IUSE="hardened"
+for x in ${AGENT} ${CLI} ${SERVICES}; do
+	IUSE+=" +${x}"
+done
+
+BDEPEND=">=dev-lang/go-1.13"
+COMMON_DEPEND="
+	kube-apiserver? (
+		acct-group/kube-apiserver
+		acct-user/kube-apiserver
+	)
+	kube-controller-manager? (
+		acct-group/kube-controller-manager
+		acct-user/kube-controller-manager
+	)
+	kube-scheduler? (
+		acct-group/kube-scheduler
+		acct-user/kube-scheduler
+	)"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	kube-proxy? ( net-firewall/conntrack-tools )
+	!sys-cluster/kubeadm
+	!sys-cluster/kubectl
+	!sys-cluster/kubelet
+	!sys-cluster/kube-apiserver
+	!sys-cluster/kube-controller-manager
+	!sys-cluster/kube-proxy
+	!sys-cluster/kube-scheduler"
+
+RESTRICT+=" test"
+
+src_compile() {
+	local x
+	for x in ${AGENT} ${CLI} ${SERVICES}; do
+		use $x || continue
+		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+			emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${x}
+	done
+}
+
+src_install() {
+	local x
+	for x in ${AGENT} ${CLI} ${SERVICES}; do
+		use $x || continue
+		dobin _output/bin/${x}
+		if has ${x} ${CLI}; then
+		_output/bin/${x} completion bash > ${x}.bash || die
+		_output/bin/${x} completion zsh > ${x}.zsh || die
+			newbashcomp ${x}.bash ${x}
+			insinto /usr/share/zsh/site-functions
+			newins ${x}.zsh _${x}
+			continue
+		fi
+		newinitd "${FILESDIR}"/${x}.initd ${x}
+		newconfd "${FILESDIR}"/${x}.confd ${x}
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/${x}.logrotated ${x}
+		keepdir /var/log/${x}
+		if [[ "$x" =~ kubelet ]]; then
+			systemd_dounit "${FILESDIR}"/${x}.service
+			insinto /etc/kubernetes
+			newins "${FILESDIR}"/${x}.env ${x}.env
+			keepdir /etc/kubernetes/manifests
+		fi
+		if [[ $x =~ kubelet|kube-proxy ]]; then
+			keepdir /var/lib/${x}
+		fi
+		if [[ $x =~ .*apiserver|.*controller-manager|.*scheduler ]]; then
+			fowners ${x}:${x} /var/log/${x}
+		fi
+	done
+}
diff --git a/sys-cluster/kubernetes/kubernetes-1.18.2.ebuild b/sys-cluster/kubernetes/kubernetes-1.18.2.ebuild
new file mode 100644
index 000000000000..c333bbabb3b4
--- /dev/null
+++ b/sys-cluster/kubernetes/kubernetes-1.18.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="production-grade container orchestration"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+AGENT="kubelet"
+CLI="kubeadm kubectl"
+SERVICES="kube-apiserver kube-controller-manager kube-proxy kube-scheduler"
+IUSE="hardened"
+for x in ${AGENT} ${CLI} ${SERVICES}; do
+	IUSE+=" +${x}"
+done
+
+BDEPEND=">=dev-lang/go-1.13"
+COMMON_DEPEND="
+	kube-apiserver? (
+		acct-group/kube-apiserver
+		acct-user/kube-apiserver
+	)
+	kube-controller-manager? (
+		acct-group/kube-controller-manager
+		acct-user/kube-controller-manager
+	)
+	kube-scheduler? (
+		acct-group/kube-scheduler
+		acct-user/kube-scheduler
+	)"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	kube-proxy? ( net-firewall/conntrack-tools )
+	!sys-cluster/kubeadm
+	!sys-cluster/kubectl
+	!sys-cluster/kubelet
+	!sys-cluster/kube-apiserver
+	!sys-cluster/kube-controller-manager
+	!sys-cluster/kube-proxy
+	!sys-cluster/kube-scheduler"
+
+RESTRICT+=" test"
+
+src_compile() {
+	local x
+	for x in ${AGENT} ${CLI} ${SERVICES}; do
+		use $x || continue
+		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+			emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${x}
+	done
+}
+
+src_install() {
+	local x
+	for x in ${AGENT} ${CLI} ${SERVICES}; do
+		use $x || continue
+		dobin _output/bin/${x}
+		if has ${x} ${CLI}; then
+		_output/bin/${x} completion bash > ${x}.bash || die
+		_output/bin/${x} completion zsh > ${x}.zsh || die
+			newbashcomp ${x}.bash ${x}
+			insinto /usr/share/zsh/site-functions
+			newins ${x}.zsh _${x}
+			continue
+		fi
+		newinitd "${FILESDIR}"/${x}.initd ${x}
+		newconfd "${FILESDIR}"/${x}.confd ${x}
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/${x}.logrotated ${x}
+		keepdir /var/log/${x}
+		if [[ "$x" =~ kubelet ]]; then
+			systemd_dounit "${FILESDIR}"/${x}.service
+			insinto /etc/kubernetes
+			newins "${FILESDIR}"/${x}.env ${x}.env
+			keepdir /etc/kubernetes/manifests
+		fi
+		if [[ $x =~ kubelet|kube-proxy ]]; then
+			keepdir /var/lib/${x}
+		fi
+		if [[ $x =~ .*apiserver|.*controller-manager|.*scheduler ]]; then
+			fowners ${x}:${x} /var/log/${x}
+		fi
+	done
+}
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 1d9c6f414108..cfefa259fcb0 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -3,9 +3,9 @@ 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-20.1.1.tar.gz 11604365 BLAKE2B cafc47be451d12f84918c5ad7500ab548be8978cf2f28af6dbac1dba2233e6a3d43be96b9496976d2027894883780241a67950135c920136666f60e310ebd925 SHA512 90e9359ce96e9c7a55583a0c02a3b5b0635f20ab474c9b7ceee3255ddc6571925f4db41b950811b9bc2e3fc8c2fbb78683b1979b3d1f287449725cd70f5ad7b0
-DIST nova.conf.sample-20.1.1 220110 BLAKE2B af98687c895ee091cc2e8d668eb50b52cc94618081f8a50b544faebed29b2b3a5dfa38309da70dcc6d0083792605b810081b50c15a6c960947e0c782f25717ab SHA512 cc6cce95943b06d60dfc1f85b87d527662eeb57388dca4a6037078b517302b86fd7f752c6e9e43c59c10be83ac5955f21c08284bbc946ffe2171f5bfa6edff38
+DIST nova-20.2.0.tar.gz 11625085 BLAKE2B 5ae0be3831ed03722947041efa6ce1dc3662273517ca652fb0c135f90f0323deed1f0af7751916343e3c8e065be4cc8eb7b00adf043ddaa798bf5faa88aa7bc9 SHA512 3db1fc8bda5ae95394518af1a856b6876104b852ffd758bda90a7fbdb8b389bc246e406d55eae614e65b559556ea9511c0c1281e2858d6157dd462767ae5127f
+DIST nova.conf.sample-20.2.0 220110 BLAKE2B af98687c895ee091cc2e8d668eb50b52cc94618081f8a50b544faebed29b2b3a5dfa38309da70dcc6d0083792605b810081b50c15a6c960947e0c782f25717ab SHA512 cc6cce95943b06d60dfc1f85b87d527662eeb57388dca4a6037078b517302b86fd7f752c6e9e43c59c10be83ac5955f21c08284bbc946ffe2171f5bfa6edff38
 DIST nova.conf.sample-2019.2.9999 220110 BLAKE2B af98687c895ee091cc2e8d668eb50b52cc94618081f8a50b544faebed29b2b3a5dfa38309da70dcc6d0083792605b810081b50c15a6c960947e0c782f25717ab SHA512 cc6cce95943b06d60dfc1f85b87d527662eeb57388dca4a6037078b517302b86fd7f752c6e9e43c59c10be83ac5955f21c08284bbc946ffe2171f5bfa6edff38
-EBUILD nova-20.1.1.ebuild 7724 BLAKE2B 746858811dcdc2e5951d3fdbeb3e113136e6b32e62d18d2ba39f59988c57050607ddc4b1805dce6485597160103a21d8492c1b157635e7daa9292e06e335507b SHA512 a39fa8fd98f10e9933596565bfe1827b6e0e5505559a31e9c3c70a93acdd2898e9b02ab321cfb8f7bc18455d9260af0531de98a11b2020272000040bdb22d0a5
+EBUILD nova-20.2.0.ebuild 7724 BLAKE2B 746858811dcdc2e5951d3fdbeb3e113136e6b32e62d18d2ba39f59988c57050607ddc4b1805dce6485597160103a21d8492c1b157635e7daa9292e06e335507b SHA512 a39fa8fd98f10e9933596565bfe1827b6e0e5505559a31e9c3c70a93acdd2898e9b02ab321cfb8f7bc18455d9260af0531de98a11b2020272000040bdb22d0a5
 EBUILD nova-2019.2.9999.ebuild 7726 BLAKE2B 54ac624037ad5f471d987cae53bee5e88feeb9eb56ca06e362993156a3ebe069cb878e4975b20ee09318a45768841e2bf0fa045db05abafb26d4d4fcde06fdff SHA512 ed74e7d855e703cd30b427fc3e75d090493932ef511b0a62309fa23dfe20809ecb695cbd39a2892ae9745d3753951c8d052056cb4a8d9a6cdc5e919ce09fdf3b
 MISC metadata.xml 1172 BLAKE2B aa85fe6bed1e40717884d721c2633c5f6d380914c69cb8a4a4c31b3e4c779db52b90fdaa5ee63b66ad9bc6694f666dd37dceeffb8de4676014ef3bb688476ef7 SHA512 bb506fa680b064c3d6a48710cac11efedc9e8a340603e234bf5c4c48aaab773e4527d7a8fc66ae36ec894230a1d02a5be995e521d222914f652e03b6f72642e4
diff --git a/sys-cluster/nova/nova-20.1.1.ebuild b/sys-cluster/nova/nova-20.2.0.ebuild
index c68161259e22..c68161259e22 100644
--- a/sys-cluster/nova/nova-20.1.1.ebuild
+++ b/sys-cluster/nova/nova-20.2.0.ebuild
diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest
index a3b882e4ccd7..845fd114ff58 100644
--- a/sys-cluster/rdma-core/Manifest
+++ b/sys-cluster/rdma-core/Manifest
@@ -6,9 +6,11 @@ DIST rdma-core-26.0.tar.gz 1444585 BLAKE2B 148b25f6108199b3845446e9f45a59d089e7f
 DIST rdma-core-26.1.tar.gz 1601313 BLAKE2B 459baa80d5cb74386e567880ec7fd2de9e4aaea177e7022603db5dd70f633152d86618bbab637ca337a9314c0c19b5c0f6a51f281802fa0b8bedb8fad149f26c SHA512 98f0e3f3e951f3b2287711526a2a6c62cb4e0f5eb693894c7f44783c5eb6d4213c9eedc39b2370563e8bca17e133497e475392004ace0203d2a39de371254742
 DIST rdma-core-27.0.tar.gz 1445552 BLAKE2B a038653865f8d37b6599a54ca7fef97b2ac131b3a11ce8696b5c1ec558e85332e950f8d5104f250b23a186224735b2a338fc03f875979bff342ad26ebb5b74b2 SHA512 8a299f4d3fe6ea98d8fc8d8135295e55c8bbf5d0d5f2e5fd362a5eb96d86f5aa84263736ab80a3c0eb104c7fc5fb5d43a2077cc6a1fed3d346af89597a4ddee2
 DIST rdma-core-28.0.tar.gz 1455729 BLAKE2B cee2030bda14d3833fa6e851e85d92ec7f91363a09e11bb7ce939ae144e4edbe32653a759a573d94a735ba6766911cb491e7871722bad81e45c3744dc3b8683e SHA512 aec8b8a0d67bcfe42d9d4a53f93bf03ead14fc6f8887fc9f05b2f1ccfd1aae1214c49ecbc01f16b585f71369e3c7a7e2c8d2adc42aa9b31436939b3f3038fde8
+DIST rdma-core-29.0.tar.gz 1467415 BLAKE2B ecea77fcd4b4033f81aef9cd9b483cc97b1f4af7c73030c2f94e8242be178c53c5d62aef4d3db7de60e2b7a9cf068bbf851915385912c8ef795c406c4e45a4f9 SHA512 4b12cd0fdf01a827831081cbe9bbb927173cb600edc51e2befe5e6c3cd88c90069d2872d839ef98e87c59eee777da6429dbf5e8621b6e872e0cf99857fe6d78b
 EBUILD rdma-core-26.0-r1.ebuild 2513 BLAKE2B 519c57cb9eb2e8ddbd666668c50e186b106eeff016f8be36ee3f15afadcc7851f65f16684355d4deee14ec66ef0770391fcd3f202423b6a6dc926c26c40afbcc SHA512 f81a43e2b04de7479b61fb626a1dc701ae21bf6c14af586574950965195d8541c09e663a678b5a28a3db658c57da2dc010e7071dcae2e32b465b140a18b3a7fb
 EBUILD rdma-core-26.1.ebuild 2514 BLAKE2B d63803233031ebe7765c685e24a28751f1e83433b49ad7dd6a167d97c007d4076fa3ba01015404ac24897997ce21ada5e634aad920911e9e3e0ee8f74c8517e6 SHA512 3b31ab7ec3630268d4f072046404ab129c3b5539054343d29361d56bdd493b01a04f05701f4bb7f6362787e6144f0dfbf43a6105426ab10b02aa3ed944922801
 EBUILD rdma-core-27.0-r1.ebuild 2545 BLAKE2B 3527d23b09d389391992ab23b3c54f328fd1ca6439ec45da9ddb90aa594a7aa917ffe29103713e9d2c761044e71fdcbcef55a0730d4a8e74cc4381813a1c61b1 SHA512 91230439a73aff381201d3b34076e1481e21fef3ff6d8760b90894bfa4512397c4d1d7a198e1a9430cd702c90e1e3379fd2e98c07946e9e3a62930b31106adb4
 EBUILD rdma-core-28.0.ebuild 2552 BLAKE2B 864eba031ea08c1bd5603e368ecbc93c3a3f2689e74624ba04509c35fe6369692aedbfa29c8a3429aa96a816531aca9e8f7e8b81dd44d1e06fdf5e771a51d966 SHA512 c1023e7c6368f19056802107e7e605aa8d74cbb55ac326882c28d1bda5c8ff7a8d5b16e805f632cefc19dcc1e98c3d39b3de008cb00006cbd32677782e464eeb
+EBUILD rdma-core-29.0.ebuild 2552 BLAKE2B 864eba031ea08c1bd5603e368ecbc93c3a3f2689e74624ba04509c35fe6369692aedbfa29c8a3429aa96a816531aca9e8f7e8b81dd44d1e06fdf5e771a51d966 SHA512 c1023e7c6368f19056802107e7e605aa8d74cbb55ac326882c28d1bda5c8ff7a8d5b16e805f632cefc19dcc1e98c3d39b3de008cb00006cbd32677782e464eeb
 EBUILD rdma-core-9999.ebuild 2472 BLAKE2B d1883898cc9fe6f89ce89377ec7f4141c60b7c945d7152c2c59548e396a5f771a4a2b75028886fc2131d51288005ca07de08e347c235d5bb4b75398f9b9b7d92 SHA512 2768d543d83416c519c7305af1ad66c9c7370d090a249fd5d9a5c79cb3245bd5c1824279f1cf8c7ecb26fabaf618adf96d1bcac1a243fb9c3c788d618fa2a8e7
 MISC metadata.xml 559 BLAKE2B 1526777511ab5118d4de73361959107221858659ebbc60f52eb09b45d0798d969f847e4f157501ed6e8c85c2cee1c93d0b26989b357141bba45af946e2e5b0a1 SHA512 5d69acf3d0a323c0d2ee66971fd058c6c0ebf59e4fac0d4777b15bfcc7db8f515b67e6059d204346404ce3b26cdd77c2bea21e1132f418498fe1523eb16dccbb
diff --git a/sys-cluster/rdma-core/rdma-core-29.0.ebuild b/sys-cluster/rdma-core/rdma-core-29.0.ebuild
new file mode 100644
index 000000000000..b5518fdad7d5
--- /dev/null
+++ b/sys-cluster/rdma-core/rdma-core-29.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit cmake-utils python-single-r1 udev systemd
+
+DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem"
+HOMEPAGE="https://github.com/linux-rdma/rdma-core"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
+else
+	SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
+SLOT="0"
+IUSE="neigh python static-libs systemd valgrind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	virtual/libudev:=
+	neigh? ( dev-libs/libnl:3 )
+	systemd? ( sys-apps/systemd:= )
+	valgrind? ( dev-util/valgrind )
+	python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${COMMON_DEPEND}
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-fabric/infiniband-diags
+	!sys-fabric/libibverbs
+	!sys-fabric/librdmacm
+	!sys-fabric/libibumad
+	!sys-fabric/ibacm
+	!sys-fabric/libibmad
+	!sys-fabric/srptools
+	!sys-fabric/infinipath-psm
+	!sys-fabric/libcxgb3
+	!sys-fabric/libcxgb4
+	!sys-fabric/libmthca
+	!sys-fabric/libmlx4
+	!sys-fabric/libmlx5
+	!sys-fabric/libocrdma
+	!sys-fabric/libnes"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/optional_pandoc.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_FULL_RUNDIR=/run
+		-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib
+		-DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d
+		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_pandoc=yes
+		$(ver_test -ge 25 && echo -DCMAKE_DISABLE_FIND_PACKAGE_rst2man=yes)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex systemd no yes)"
+		-DENABLE_VALGRIND="$(usex valgrind)"
+		-DENABLE_RESOLVE_NEIGH="$(usex neigh)"
+		-DENABLE_STATIC="$(usex static-libs)"
+	)
+
+	if use python; then
+		mycmakeargs+=( -DNO_PYVERBS=OFF )
+	else
+		mycmakeargs+=( -DNO_PYVERBS=ON )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	udev_dorules "${D}"/etc/udev/rules.d/70-persistent-ipoib.rules
+	rm -r "${D}"/etc/{udev,init.d} || die
+
+	newinitd "${FILESDIR}"/ibacm.init ibacm
+	newinitd "${FILESDIR}"/iwpmd.init iwpmd
+	newinitd "${FILESDIR}"/srpd.init srpd
+
+	use python && python_optimize
+}
diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index c8691976971b..a4852649b675 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,3 +1,5 @@
 DIST singularity-2.6.1.tar.gz 835029 BLAKE2B 4a581e1bc5df9d664d68f17e275f01081c850aa53f8a9bfcceaf5eb2b8f16e3a018f88669674c7427c60ab00ec0f21b4ec5e6ecaab261c16f70a998cb54ff855 SHA512 063327c67dae2629d1decebc060c474a72e6741f6dc9b6373734e429ccf11d53ee55c1578c28e74e8f8bcda87f3e0b735a3a0e982c9ea894f03a31eaaadf617c
+DIST singularity-3.5.3.tar.gz 7885009 BLAKE2B 8afa2223906e7abf5f3d796efe7cf243dd9d91e61c8ca143a755ad772618ed01d20b7f4a030e82767cf9bf2a7431848d8344e30bde38f413ecd2eef0a9bab53e SHA512 b8bb44539e78eaf74c1b97e5bae8fae1f390412456d76b573fffe2a90240b182db1aec60aee80715547c3edfbaa0607506e2727a575bc951223f9a7c3be0a97e
 EBUILD singularity-2.6.1.ebuild 887 BLAKE2B 19268b434a825c6d03c7a53741553aefd9d14796abfbda8e954436829456026003a705c86df8bb83b6f802289b54cde226000cbe0c0768d43816484f6fa17873 SHA512 ade0b12d26dc2991824fa6b90fc91adcb3a1d6d798f6484b5f124197493ecc9d88bfeeebb1493182c684dab234c2c8b9cc3e5a9c4ffb0d1fbf413853d3b5e14a
-MISC metadata.xml 336 BLAKE2B 8da1deed407d4f546b3765bd240bda546a0dd7756d70468490547f38f4e1ca7ac6be41d74c881359cefb28c7ff87eb94012f15d0411be9843603b7cdd35a3999 SHA512 02684993daeb7128cb6e4a4561144b90eee37318e8581821a870e072e39f04f61723a09c430f9fd92e38804de901421b3a1f3cab12ccf37d2d403eb688d5170f
+EBUILD singularity-3.5.3-r1.ebuild 1808 BLAKE2B 423f260e996e91b4666e03c27ed038af1b587dfb787054a62d7c1903b0b514acdaba6b7feec7c1230568881191596f98a6ab7653e06ed7f6c30e8c70654e7aa0 SHA512 b2532538e7102ef908cb61b1aa8b4271da412ed80e5a2ed50d83a5e1c25a7f7a4908fd94581231eca8224b5e22321b9895d66ed34b4a620e9d4bbd8afb991915
+MISC metadata.xml 451 BLAKE2B d68571ca2f95ec8c3212a64b8fd77056ee933ddb4c4789899bacb590e6c52d4fee2b2a53cb7dbd8a109c616ae5464d97b37fc4dbb094b68cdf4abbba8def7c70 SHA512 88105dac9813ba9f7126adae945898ad15e79b7abcea6eda8b6231de72bc48392fd8029b9d6bcb2ec9b0f4dfb0b2d14d90096ac0080f2da200b9802a77ccf38a
diff --git a/sys-cluster/singularity/metadata.xml b/sys-cluster/singularity/metadata.xml
index f47500258195..e7f7edb94ed6 100644
--- a/sys-cluster/singularity/metadata.xml
+++ b/sys-cluster/singularity/metadata.xml
@@ -5,7 +5,11 @@
 		<email>jlec@gentoo.org</email>
 		<name>Justin Lecher</name>
 	</maintainer>
+	<use>
+		<flag name="network">Install network plug-ins</flag>
+		<flag name="suid">Install SUID helper binary</flag>
+	</use>
 	<upstream>
-		<remote-id type="github">singularityware/singularity</remote-id>
+		<remote-id type="github">sylabs/singularity</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/singularity/singularity-3.5.3-r1.ebuild b/sys-cluster/singularity/singularity-3.5.3-r1.ebuild
new file mode 100644
index 000000000000..16834ae083a3
--- /dev/null
+++ b/sys-cluster/singularity/singularity-3.5.3-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info
+
+DESCRIPTION="Application containers for Linux"
+HOMEPAGE="https://sylabs.io"
+SRC_URI="https://github.com/sylabs/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples +network +suid"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+COMMON="sys-libs/libseccomp"
+BDEPEND="virtual/pkgconfig"
+DEPEND="${COMMON}
+	>=dev-lang/go-1.13.0
+	app-crypt/gpgme
+	dev-libs/openssl
+	sys-apps/util-linux
+	sys-fs/cryptsetup"
+RDEPEND="${COMMON}
+	sys-fs/squashfs-tools"
+
+CONFIG_CHECK="~SQUASHFS"
+
+S=${WORKDIR}/${PN}
+
+src_configure() {
+	local myconfargs=(
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--runstatedir=/run \
+		--localstatedir=/var \
+		$(usex network "" "--without-network") \
+		$(usex suid "" "--without-suid")
+	)
+	./mconfig -v ${myconfargs[@]} || die "Error invoking mconfig"
+}
+
+src_compile() {
+	emake -C builddir
+}
+
+src_install() {
+	emake DESTDIR="${ED}" -C builddir install
+	keepdir /var/singularity/mnt/session
+
+	# As of version 3.5.3 this seems to be very much broken, affecting
+	# commands which have got nothing to do with singularity (example:
+	# completion on 'udisks mount -b /dev/' rejects all files from that
+	# directory other than 'autofs'). Moreover, this should go into
+	# $(get_bashcompdir) (from bash-completion-r1.eclass) rather than /etc.
+	# Hopefully temporary, which is why we delete this at install time
+	# instead of patching build scripts not to generate bash-completion
+	# data in the first place.
+	rm -rf "${ED}"/etc/bash_completion.d || die
+
+	dodoc README.md CONTRIBUTORS.md CONTRIBUTING.md
+	if use examples; then
+		dodoc -r examples
+	fi
+}
diff --git a/sys-cluster/spark-bin/Manifest b/sys-cluster/spark-bin/Manifest
index d2ed875787bf..15a470932c7d 100644
--- a/sys-cluster/spark-bin/Manifest
+++ b/sys-cluster/spark-bin/Manifest
@@ -1,6 +1,6 @@
 AUX 99spark 26 BLAKE2B c25fe3d379a16c8a51764ea5b4c27d8f34869687c882141f0428d102d921eb65fea8ac253e407fe07fd4cce1232dd513728b1340bc0bcd21bd19ce0aed0c2420 SHA512 6d64d751f1504bea332b16078804abcaf21c8ea9c69f94fef3a8929b6d6cb1107ec899a5dc49770997243cbfda61edbcfa4d505da29220a71f5be38c1008f4f0
 DIST spark-bin-2.3.1.tgz 225883783 BLAKE2B d89e83a54aaabd39c5fa0d9c51a1bb5635f60ded4869672a387d13d87fffbb48385d4fbf67b55a96e709f27348f73a089624a0563c98eaba31f93d74bf4548ee SHA512 dc3a97f3d99791d363e4f70a622b84d6e313bd852f6fdbc777d31eab44cbc112ceeaa20f7bf835492fb654f48ae57e9969f93d3b0e6ec92076d1c5e1b40b4696
-DIST spark-bin-2.4.4.tgz 230091034 BLAKE2B 66f7e7bae6fe6959f233adc085560cf1b80a641b4018eb334d77f390eb88f5ab898e1ea59c1c17ca15a122f4f98eea4670ea7152bc2c83f6cb76cd11d3f586ec SHA512 2e3a5c853b9f28c7d4525c0adcb0d971b73ad47d5cce138c85335b9f53a6519540d3923cb0b5cee41e386e49ae8a409a51ab7194ba11a254e037a848d0c4a9e5
+DIST spark-bin-2.4.5.tgz 232530699 BLAKE2B e67d728af9e40417afb09e342d515021146bebef9a27df12cab2b64f1eb3ed134bbb8eecd731b2e30c9c4c6042f6fb9d076da5ac5c654c9066d2f9c3ecd0c24c SHA512 2426a20c548bdfc07df288cd1d18d1da6b3189d0b78dee76fa034c52a4e02895f0ad460720c526f163ba63a17efae4764c46a1cd8f9b04c60f9937a554db85d2
 EBUILD spark-bin-2.3.1-r1.ebuild 1345 BLAKE2B 8e981f59a0cf2b62f38115b866aab1b31cc280accd02cc2e2c24342b3531302b3a38185a66894231589e0303afa11374919bae72c7ff9e357785b1e9b3566920 SHA512 36dcac657747a7b05f2048b7fe298d78425782d15c3d443cc5caec61785f2cb4eaf3aef82e1c5aa270b1ed6b7e283626b6e8180b2d99ccf8a3a34e8a1c0af04d
-EBUILD spark-bin-2.4.4-r1.ebuild 1345 BLAKE2B ce90de6e0fb044c4ab8a240156497456ce8076617df5cab3a486f5f05a06741d7fc6b561d3c029852ef085e6336315a4ff33fb098d2c1edab2eca1d436d54d2b SHA512 88290cc874a8734426fecccbdb971d97cf72ccb0a60b8d37e4c527b68f39c9ee2488ed427b8c5f5ea464c93bcd6bcd29ec1e4eb2ee774c19c97e1b741331c961
+EBUILD spark-bin-2.4.5.ebuild 1345 BLAKE2B add185c93644dab828fa9a9a63f2773eafe1a4f571f4ebbd0cb1246038d08e186fbc5ce4a47f0c73da4741c2a6f4d33124c650c095d00a20d6df8e6e8168a34a SHA512 ef52fd7edd4246e56cea4a69b014c0991026b64a2a012c3d3b34a14d2a0deda034dfa0f616a360cc0c0689a5387cd7f35585d1633fedf304bc5ff85d174f7abf
 MISC metadata.xml 499 BLAKE2B 7116e88708f7dafb75197e46237ea5d405bc703feadece0bb65766537f64bd2f7ea2b34cf4a4c94d4f25d74f040b6cf5eb0b0072a20600a9d206087b38f63831 SHA512 273279c1235d9888e5b30073044687584699f7f26fd696f019c5b11545f32095319b6bfe52196ed6846cf74c8ffaa2c7f6c9f3a29749fa3315f18adba917094c
diff --git a/sys-cluster/spark-bin/spark-bin-2.4.4-r1.ebuild b/sys-cluster/spark-bin/spark-bin-2.4.5.ebuild
index 63bb7e0eeb47..c178519a3a77 100644
--- a/sys-cluster/spark-bin/spark-bin-2.4.4-r1.ebuild
+++ b/sys-cluster/spark-bin/spark-bin-2.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 959213b1cdfa..bc4344eaf1fe 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -4,7 +4,10 @@ AUX swift-object.initd 862 BLAKE2B 2a062873ab613e7d98d78758ccae793d8d952cb66922d
 AUX swift-proxy.initd 1379 BLAKE2B 56453a557c0abfd6b07f65778ef14d8920bedc4133e0efa1aa4a5466a72103e9b57b361f481e0b5cb816471161196755de7794bd3ea3d6f5120cc1f159489c22 SHA512 dd32e4249686b51d2ed6add8e2e91eb9e520c662ebdf068f68b4e52faf4d508d3c87e996c6c2f7ba2a7d1f5fdf639d08e1e6878cd4c9918408e007ccbd7c84ec
 DIST swift-2.23.1.tar.gz 3044545 BLAKE2B b3b06aefa7c58b718f7d9c1c1b9bc92f442b83202b8d5c2dbbb777650088f2d939f5e9d0fbe83cea38fd6635d072cd8bb3894d64ed9767dde203064c1b81cfdb SHA512 48aa82b178f5e3901363c2b9eeeedeea12a58b1ba86cc46937dd9ec074ecc005b04a6ce732d4e9fce2497c6c62b659038da40ed43550256584bb371df4e596fb
 DIST swift-2.24.0.tar.gz 3177018 BLAKE2B f465f0e8f58cc097b5b1fdbe5c9736ee3e2247d13d8ae1beeb7e736dd1246e7d8820cb7241afb67e651ad85c269a48d9dbeda3479dadd773bfc1fe3278731afe SHA512 f8e3b0fec06776e095067b2c12f782a9a787c814cea8039ec32930c562be5c74b4b2bf4cb9dad3481953e5163bd051fe32f3074be7776fd1af0be94982d113b6
+DIST swift-2.25.0.tar.gz 3183764 BLAKE2B 865cfcc832edb1f30a4529b0ff550c987a7413c841b9f1ef0d0a145f5be55762963b32ea332aa6f51690a871124e84dc7fb036309f38d4120a1e095e60bfaa34 SHA512 60cbc4bae61bb287e93d9a6a4e9a58a9c97f407d07927dde99c923d1ee7ab4ef79350c7c0cdcaab8aa0944aee09c27da549f3ebf86eb9bb92766b2b301d593a2
 EBUILD swift-2.23.1-r2.ebuild 3785 BLAKE2B 1d270fdd6d8184a967f41b5c6cd27b8fe7a2bf9cb0938b95b9ec7e44e84857c893214aefac59429b3cd624310579eaa15ff149789a9549c13067ee111cc2624b SHA512 48b18dee61c17bf0d70b2818d8c0ed6430341b10c4930414090f00413d3b0b2ec21ed319b1b5b09d8b3142f96b86ab400b6084bcc602180e4306f34c22c090c5
 EBUILD swift-2.24.0-r1.ebuild 3785 BLAKE2B 1d270fdd6d8184a967f41b5c6cd27b8fe7a2bf9cb0938b95b9ec7e44e84857c893214aefac59429b3cd624310579eaa15ff149789a9549c13067ee111cc2624b SHA512 48b18dee61c17bf0d70b2818d8c0ed6430341b10c4930414090f00413d3b0b2ec21ed319b1b5b09d8b3142f96b86ab400b6084bcc602180e4306f34c22c090c5
+EBUILD swift-2.25.0.ebuild 3788 BLAKE2B 608b4ff858d880e54991a147481007e96e069c33a252690adc42927c279765bf5ef92f1d27ce6a2136fb63f757943de9d4021b2ca3802138cee88635da896974 SHA512 78e29f66db0a114142af2e8fcabd12a25ec797ccd80a2be58de05afff4939b402385523f28717b16197d6156b563f9cd17bd09c52fa2afdfe4a90644be4490ea
 EBUILD swift-2019.2.9999.ebuild 3768 BLAKE2B 10f16a798b087da87a17262da8c21a470c78bd801496c2a1fd3f58c43a815eacb11a975935099e29b0148945488d8cdca80538973fea2b91f3e123cb9c6f53dd SHA512 0e99713271b137db2a4760a875167ae3c8b39a8b336e7d3d0a91c45dd08a7a1a71c7fd16f890918a87a7d2b12397b414896391baa5fd8fe3f72b11031ae3e140
+EBUILD swift-2020.1.9999.ebuild 3788 BLAKE2B 608b4ff858d880e54991a147481007e96e069c33a252690adc42927c279765bf5ef92f1d27ce6a2136fb63f757943de9d4021b2ca3802138cee88635da896974 SHA512 78e29f66db0a114142af2e8fcabd12a25ec797ccd80a2be58de05afff4939b402385523f28717b16197d6156b563f9cd17bd09c52fa2afdfe4a90644be4490ea
 MISC metadata.xml 758 BLAKE2B 8b1f494e6c40f469c01b494154d32702dc9b848939ea67005d8065c39661fcb97b5ca9cdee524ca66f0e74af5f9c522ca236b628a9b0289eef4f808e5f32461e SHA512 94a6af6b29a7f968d1e23a70decb908b9de10f792f1bd0711b95ea18abf59595d42017da6f278ed4991695ebbe0941d8907c160412e20758697597179fc3bb19
diff --git a/sys-cluster/swift/swift-2.25.0.ebuild b/sys-cluster/swift/swift-2.25.0.ebuild
new file mode 100644
index 000000000000..94ae1015614d
--- /dev/null
+++ b/sys-cluster/swift/swift-2.25.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 )
+
+inherit distutils-r1 eutils linux-info
+
+DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
+HOMEPAGE="https://launchpad.net/swift"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/swift.git"
+	EGIT_BRANCH="stable/ussuri"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="account container doc +memcached +object proxy"
+REQUIRED_USE="|| ( proxy account container object )"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.8[${PYTHON_USEDEP}]
+	!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
+	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	dev-python/pyxattr[${PYTHON_USEDEP}]
+	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.0.2[${PYTHON_USEDEP}]
+	memcached? ( net-misc/memcached )
+	net-misc/rsync[xattr]
+	acct-user/swift
+	acct-group/swift"
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
+	~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
+	~ZFS"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
+		done
+	fi
+}
+
+src_prepare() {
+	sed -i 's/xattr/pyxattr/g' requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	# https://bugs.launchpad.net/swift/+bug/1249727
+	find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
+	SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	keepdir /etc/swift
+	insinto /etc/swift
+
+	newins "etc/swift.conf-sample" "swift.conf"
+	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
+	newins "etc/mime.types-sample" "mime.types-sample"
+	newins "etc/memcache.conf-sample" "memcache.conf-sample"
+	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
+	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
+
+	if use proxy; then
+		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
+		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
+		if use memcached; then
+			sed -i '/depend/a\    need memcached' "${D}/etc/init.d/swift-proxy"
+		fi
+	fi
+	if use account; then
+		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
+		newins "etc/account-server.conf-sample" "account-server.conf"
+	fi
+	if use container; then
+		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
+		newins "etc/container-server.conf-sample" "container-server.conf"
+	fi
+	if use object; then
+		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
+		newins "etc/object-server.conf-sample" "object-server.conf"
+		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
+	fi
+
+	if use doc; then
+		doman doc/manpages/*
+		dodoc -r doc/{s3api,saio,source}
+	fi
+
+	fowners root:swift "/etc/swift"
+	fperms 0750 /etc/swift
+}
+
+pkg_postinst() {
+	elog "Openstack swift will default to using insecure http unless a"
+	elog "certificate is created in /etc/swift/cert.crt and the associated key"
+	elog "in /etc/swift/cert.key.  These can be created with the following:"
+	elog "  * cd /etc/swift"
+	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
+}
diff --git a/sys-cluster/swift/swift-2020.1.9999.ebuild b/sys-cluster/swift/swift-2020.1.9999.ebuild
new file mode 100644
index 000000000000..94ae1015614d
--- /dev/null
+++ b/sys-cluster/swift/swift-2020.1.9999.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 )
+
+inherit distutils-r1 eutils linux-info
+
+DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
+HOMEPAGE="https://launchpad.net/swift"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/swift.git"
+	EGIT_BRANCH="stable/ussuri"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="account container doc +memcached +object proxy"
+REQUIRED_USE="|| ( proxy account container object )"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.8[${PYTHON_USEDEP}]
+	!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
+	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	dev-python/pyxattr[${PYTHON_USEDEP}]
+	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.0.2[${PYTHON_USEDEP}]
+	memcached? ( net-misc/memcached )
+	net-misc/rsync[xattr]
+	acct-user/swift
+	acct-group/swift"
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
+	~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
+	~ZFS"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
+		done
+	fi
+}
+
+src_prepare() {
+	sed -i 's/xattr/pyxattr/g' requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	# https://bugs.launchpad.net/swift/+bug/1249727
+	find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
+	SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	keepdir /etc/swift
+	insinto /etc/swift
+
+	newins "etc/swift.conf-sample" "swift.conf"
+	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
+	newins "etc/mime.types-sample" "mime.types-sample"
+	newins "etc/memcache.conf-sample" "memcache.conf-sample"
+	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
+	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
+
+	if use proxy; then
+		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
+		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
+		if use memcached; then
+			sed -i '/depend/a\    need memcached' "${D}/etc/init.d/swift-proxy"
+		fi
+	fi
+	if use account; then
+		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
+		newins "etc/account-server.conf-sample" "account-server.conf"
+	fi
+	if use container; then
+		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
+		newins "etc/container-server.conf-sample" "container-server.conf"
+	fi
+	if use object; then
+		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
+		newins "etc/object-server.conf-sample" "object-server.conf"
+		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
+	fi
+
+	if use doc; then
+		doman doc/manpages/*
+		dodoc -r doc/{s3api,saio,source}
+	fi
+
+	fowners root:swift "/etc/swift"
+	fperms 0750 /etc/swift
+}
+
+pkg_postinst() {
+	elog "Openstack swift will default to using insecure http unless a"
+	elog "certificate is created in /etc/swift/cert.crt and the associated key"
+	elog "in /etc/swift/cert.key.  These can be created with the following:"
+	elog "  * cd /etc/swift"
+	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
+}
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 240ab54ce4d9..9122d2357e9c 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -19,7 +19,7 @@ AUX trqauthd-init.d 477 BLAKE2B fe62bfae07d1d9fe08352ba4d99ab5d46185a74b10497f32
 DIST torque-4.1.7.tar.gz 6218108 BLAKE2B 6c1ad0f1bb3f364603ad7f498999bd910491910fa5632b9f6b82e08b3afb8c54e8775c38bc8e5c959aa99d0647c54c7c348cd07bcbe11add8bfab5f3f06a4c80 SHA512 5a085c0a7b205fed075bff4599db90ca5c4bb5f22d87d76fd56539d5cc1935bb8eeffcd4d18ba84401bd4ca128718070b69c8b91ab6814a4638622ba351654e6
 DIST torque-4.2.10-gh-20150517.tar.gz 5836286 BLAKE2B 7108f1adcb6f674526b7db97df4ebcee04ae5c818d4f35ed1230a4e72e52ec0bc3b44e17334a143b21bcd3acccefc3927eca4f98d54d37745c8bb46a75e07045 SHA512 600bb5389b6a4161732b7aa82627f1ebeae238d7091aa2e223d9a14c44bf4668662f664b976f62ba3f1d8a366f90fb6058a8c904e20c26432dccd6abcd9c57fa
 DIST torque-6.0.4-gh-20170829.tar.gz 6182495 BLAKE2B f9156ae4ffe388a7f3fa0df142e5f2d48c16fd7b8c148a3a80cd1c977eb0c1ef4a455da275f993100867be043422526ed05c53734e707851083d6d23ee1a2cc4 SHA512 8f1101adb89e06617de501f7956e126633b78b495baeb7980d3c534d34537cc604a3cf0a7c23c48eb2554b26cc13672b0e00c75d0f722d63ac4d42d57388ed94
-EBUILD torque-4.1.7-r1.ebuild 7490 BLAKE2B fe42f00dd776d8d8b1b505cda4773d7fdc51abc17ba01fc2be538f36c9287ab18e490a580090489897d2a47fce88edbb644353cb3638e5e3bec240e0cef89d23 SHA512 2779644eb339119b62a18b159e89ff818e3501b526ecb12c2eb3a560957dd2f8b2f5ae95c19a32db4179142a1e631942b4bc4945776ed4dc5cc391f6aac92f96
+EBUILD torque-4.1.7-r1.ebuild 7455 BLAKE2B d05ed3f1431a21b1328b7ba83a46cac5b70345d90f53d5008e3287d4b00ef4032dbf644fb51e7f510ddda9b1de1d8ee7a04453c0277679362c7e637530f67808 SHA512 92e19691180517e59e4b5220c3f25819c0111193b609adea1bd1af90312f25279a417130f1a198af1de261bec876b77b63b7987efafb53c84fd7a9184f137dc0
 EBUILD torque-4.2.10-r1.ebuild 6086 BLAKE2B c685ce4e6b5b7f58c040f0b16779bb59540aa0c80fe9a55b76d603e336e63a5186d543d664caa0f6184c3145c9608b31fed379b2e827bdcd62e6e53f8334b5cc SHA512 2c64f7dfaa26e1648e32283c1dcc31df0dba8bf3c4177fdafbe713d408d931ca83c2386d3548b47e1d6d90552e4c5ceeadf96c50089f2d17eb56d79312dc70f8
 EBUILD torque-6.0.4-r1.ebuild 5448 BLAKE2B e71a78dc2e1b51c81d4513134bcbabb29c01b3caa0eb48fffc8ba2a17154b41b30535d3c9550d7d992a61a66b920ea8fa5bcda3cf83ac81d7c633387ffa0b7d9 SHA512 e08a5b7decad36d11561e4d4f8aae597e865106eba3d8e148c8db10c4bc6be1c6d36ba6f0dbb0f344b6137330578f5847cad40a4b099ed6b4c20cca39eba7754
 MISC metadata.xml 988 BLAKE2B 257e838c8bde7ceea876a84631c248fce2e3a347794459bbfd4ae23210c779f69e606e120438351783ebf1cdeab7bd5e5df196ee9af31306bebd6130a08bb46f SHA512 46f2eb41303c17e84aacf5b8548b645772ab923bf9a4847892260cc5c6aaf354acc0bb0128186acf312ed77a24d9429c97f18914d759c7c5c97c19ad62489a43
diff --git a/sys-cluster/torque/torque-4.1.7-r1.ebuild b/sys-cluster/torque/torque-4.1.7-r1.ebuild
index 6e27735c3372..12099f7e7c5e 100644
--- a/sys-cluster/torque/torque-4.1.7-r1.ebuild
+++ b/sys-cluster/torque/torque-4.1.7-r1.ebuild
@@ -174,7 +174,7 @@ pkg_postinst() {
 	echo ""
 	elog "    For a basic setup, you may use emerge --config ${PN}"
 	echo ""
-	if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 4 ]]; then
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		elog "Important 4.0+ updates"
 		elog "  - The on-wire protocol version has been changed."
 		elog "    Versions of Torque before 4.0.0 are no longer able to communicate."