Merge branch 'edge' into next

21 files changed, 160 insertions, 2400 deletions

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: