gentoo resync : 28.04.2021

12 files changed, 243 insertions, 30 deletions

diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 5635a87f884e..2edf833b6789 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -21,6 +21,12 @@ AUX ceph-15.2.3-spdk-compile.patch 376 BLAKE2B 073cee321c1a99f9a161fbec8f9e33bb1
 AUX ceph-15.2.4-system-uring.patch 2170 BLAKE2B aabfb8c5085de8d69c9afedd20cb99161fd556148f1e6c88c35ed1bdb83dafe28ddbe75ac1e579e23d0728856bb2c650895ab4c0791b0f8e6acf2652822b14f1 SHA512 8258661e56b5360f4260fdd29b07bac4d415068a112b61ca8c55c529fb1593d8d61a0d59a4eec8f1567b97167c058082198d008f55f8ee701cb46489df5f7823
 AUX ceph-15.2.5-missing-includes.patch 435 BLAKE2B 66c4b30629203694bd0d5c82f5977a0576c67b3cb14d678e6ab60bc7a933e65306b122e253856bae7862637564e14a93b9cd2c48c9b510e01cc316fc7be9f218 SHA512 84de66f64ea96cd59b40dfb5b8c5d093fe49df1139b45ad9d1bd6b9ebd2f1200b6e931adcf032639a4995af322cf05c1ef9050eb1cb6673e29e040d4e348b3d5
 AUX ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch 901 BLAKE2B 63c2fa7df27a1e60a88a7a3c3509aa834f4d67b1935958aa821db1c2136146819bfa8ae51a3156ba9ae4669c09eee8103181a4dc6a313fb2aee6e2804b6066a9 SHA512 1b681f50d646c04b7e22b214884bcee52866576b22370c32dec034d2119bd86cf767f48f2699ad482686c79c7b2e6b8d8f699f5ee1a58431dd6f1d0f2170b3ec
+AUX ceph-16.2.0-install-libblk.patch 353 BLAKE2B 762e61d8bde1a7ac9ae89b0092676539adbca058b6b52beafe960efe9a4e753ebe32c8adebe7c394a11204c6f2f59a842b18d892029de1c9082cdd4ec062299f SHA512 f01caac7e01097c8145a6c931c5b5854c664b0f2b1d4a09feeb09238e8366c771d69a2b13ffd57a1b48d273cf86a89a88d6e92cf72108015dbbb151685ec3734
+AUX ceph-16.2.0-jaeger-system-boost.patch 469 BLAKE2B ab46d53b0d129bacd4698ea73561b19e340772119e6a14dffa65b9aaccbf88c8b8ac26e919ab5af319fc21d4d4fb46e76652d99588e1261e484cf28d36fdf4d9 SHA512 22f8293138d928c0d0c1d977c15c355ce46b0e3c74ee88d29a04caa61024923d3032805f26e4115fa3e6f0a7e3cfd3f58e3feda2b1665e8ae73d49b50270c053
+AUX ceph-16.2.0-liburing.patch 1331 BLAKE2B 1f0e2e209cb827526b76e28f1334619c4d0348e8aa4a552ab543089e1b346c8689b956e2ae510f033a077db1156555980616fa3869ce500e5477d5dc5d96d131 SHA512 e8d03f04cbc307b131a0a55cb90d8a568b78a8e8f294d7e4415b7da7acec05b4d1dc32632935841fe2a492de7ee8ff52e544aab91b838431fda3815ca377fa64
+AUX ceph-16.2.0-no-virtualenvs.patch 3345 BLAKE2B 3cd01abb32fe3afa1ea22c0975dde9a0adeeef90c14d6bd20e5e852dc4e8436dd1e4080bf8089ac85899091569c9b616a096470b18503e0c019c5c14ddbfca00 SHA512 ddfb6610a6a18affd62d0f76129b15a4774fdcf8edb25652ac89075ce4865a680f61c39b542416f680155cba18b1af48d4d94412f2e19a71f4bfe567f26a791a
+AUX ceph-16.2.0-rocksdb-cmake.patch 705 BLAKE2B d40371aa0163cd78dbe12b1db648f4884b762e2ec2485663aa5cda83aea2175c8ee9a6b1a54e5ed9d68fbfda8c0ee0ef7625a67d948b6259227e56fb0ee69b52 SHA512 0c974ea937644b98dde6f20f1cab9b39c73f7fd8cc0fa0991e05de2e0a39fe69dee60a981c0ae14386f8c0c5c4073d5c8573e3bd0fa47d58b754351329eda220
+AUX ceph-16.2.0-spdk-tinfo.patch 344 BLAKE2B ea46ab83836ebc9ed96714e0ed3c3e8b00a221296ddf9b10a99eb5591740a844067078820d79ae784cdb600c97e2969e81c65a4fe3b958bcc9910f7cecb1a6fe SHA512 31b9ae63c8f1722e4834034ed04cfc9ab47665ecd8f24da356897b0c52787096acbfc9cccf600655938da0f9f39200c2470cdb087f389adba975b6d830e7228d
 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
@@ -35,12 +41,12 @@ AUX make-node-frontend-tarball.bash 3196 BLAKE2B 1779c8fe924d8a341bcf922da310c9e
 AUX rbdmap.initd 2373 BLAKE2B b88d79efc722e2de3d1f0269664a976ed45fbb0a1c9d46fcfd058ea64d3ae7fe27d13455f2ac5ca06663d77cfac1d2f9d86d12bba926541042ac09a8778a3a52 SHA512 bbd48d6987e52eaf6d02bccf3aecd06596465af4d3ac93063f9a814106de162a27bf1a33ae1646e669efb3c754f3ba57f395523293ad643b0d81ee588252216b
 AUX rbdmap.initd-r1 2372 BLAKE2B dee62cc3e92425bccfce86009be0fbecc84d55923a7dde302727d42f5f7703642121c690bdf079878c31b71d4c6c200ae6a7f595ede2dfe0bc46d8f6f9f5dd01 SHA512 d249d2299ef8dc4bbd12237cfe6ef626704872130b1092ab96d05894f04df09418364552433b264b80e49ee7e1587ebee71c1131fbbcd7d858cfadf1fe6357d5
 AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8aa98ae97349b42b56c65a531b207c5f970f873a79c41789941cdd10b279e38f1616f84d SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a
-DIST ceph-14.2.16.tar.gz 130220625 BLAKE2B 30fcf971dd3ebaad8decf0d8d3ade1b554c0f97844db037ca618fd3f133964c08248067dc82c525cbc7deb04949a3a3d07850a5f56e75bcb8e359957d31df85f SHA512 94cab2c9711f5ee2c826ee27b474676c7bb8507c0761ed8d0a520a7e5182c4b353402061ffafbe9b95ac45603f023015752bffbbe0936f4835dfafc9476d3275
-DIST ceph-14.2.18.tar.gz 129268399 BLAKE2B 31478316fc87a7a924ac653ad193adaa7c3f0e6c1ace8fe6158b139616eb7ed396f81045a4311d18ad8ac6ee555d921568da94e70cf74bbd4918b55e0e03f8ef SHA512 56f9e7fffd2ae6fb70c4a09a3569dff2a17ffeebacbd3a8af22586d2feef654561d0942bb8d2c12b2f313aac268f38ebc3bfb23a287f634fe5a76805445c4d03
-DIST ceph-15.2.10.tar.gz 148500214 BLAKE2B c24679bc5e41da45b093dcd01fa103fd3dff45ddc7d244acebd182547851f426dd140e24ae5afafd71d797b185d6825fbdb9b84abd5c7ead41d5f29b06ed01fa SHA512 20202c07a068f99d5ce56b1969f703f996ad34c201ea3ab9bb05ea278afac71ccba43fb03e9de641dc3ab9692eecfcc6f52ff1ac03e13a1dc2f939bd8159fc2d
-DIST ceph-15.2.9.tar.gz 149518360 BLAKE2B 3d1d2cf7e356587d77c1ca3e6b05078a3de656607007d38ff0369f5a76fb9e12a3f06929bcbf19ed5d3de7c8e402dc0972c0b3c7245f64e6f5d94a4a78bb1d00 SHA512 1f55b0a13bf06df782831d0c9d5f8617c22442ab97fb186e6ccb08183e02bf1756caf8633fa6b1cf156c3fb7b1bdff90a60a1249adfad0b9450036e2329bf8ff
-EBUILD ceph-14.2.16-r3.ebuild 10514 BLAKE2B d4f43c7ccba4ea386f6ca7f68b143ec55115c1c21a6cc170b8925de8a314d4a5529581727b873ca5507e037033688d6d25506f9ebae9700dff710160ee82fca6 SHA512 d15fcdecd4e79c990edb1a04df8330282b3b861fe525f8620e7a48fdaeb411649deabfaab4d8c4fa874a2614aa24b10b98251b14071462baf1e502ccb3d58331
-EBUILD ceph-14.2.18.ebuild 10515 BLAKE2B 85f6922697dd9de98808319a1a7d1063efb62a1bdeb03413e92db79ac976a009dd3d48b48ac1c49c9cf06696af27da9e836adc7ec1b43413862a0a074bf6b8ae SHA512 e385fbf5b06da07bba48ac5a492dc329558e7749f38f906cbf3662276d6efa55083907613bcc0087af0635a6f80f5dc67ac0d581c214a6e2815eb457f76b2012
-EBUILD ceph-15.2.10-r1.ebuild 10863 BLAKE2B 5c0396ea965b1b642989d6c1d311ac87ebdb66a75f17d1c462ebd8df41b2d135009cbd25a7a95dba248811fd1bb04f80feca25aa719ffc05498aac7395c39c54 SHA512 63b2d038a3d274a7c2aeec8322898f2aeacd76a95ef2d848aec84161ba2e1ab5dbe23ee9a6677eba41065f210333100d1aed437ceef6fad6af4e32e5d84895d6
-EBUILD ceph-15.2.9-r1.ebuild 10868 BLAKE2B 16bb7344e46c891c4727c85b9d345f62d92b61ffea615a67cc4e28426b1b1c652bfcdb36f81f429fe17086fda8ce85e8350bdaeb668bebaa193669fa55b91d75 SHA512 61116b159396fac0d65b9810722f32cb1c9ee4a07b9c909f44b82169dd430a2635491d337f56b0b98b0899bc72fb6cfb06279f1fdcb605abbf17cf080ed2a040
-MISC metadata.xml 1980 BLAKE2B 3250403d1ba99c5b26b6dba381d2a3b01649ab23a2e2eb1cbc94a49888851d4faf19fc85ca54ad4a4c64394d8c00cefb571e27979c3482f0a60f2fc891476305 SHA512 343a75b9b4fdf88d7ad91b9a0fff154041a2a56ed0d07204b3af61b8605da969a736b6ef9a4b334a5f7d5257b9bbcbb705fd20f6def7dab767f4c9d9b600f2c4
+DIST ceph-14.2.19.tar.gz 129290834 BLAKE2B d1de69afcdacd4507a4d1d230a9a4cbd75067f7efa67c01b9f7100d29bf91b7196a36df6514d307affc3194bd83f1e91b5c274b424d0cb1931c9457f6321dc36 SHA512 69e3adba292d003e364f3b7eb16878992a3f3015a1ad0b73a9bd9b4ccb2f2f46518833346d40e024b62274985d30b684e1927e533a34a1e357a1780812c231fa
+DIST ceph-14.2.20.tar.gz 129271968 BLAKE2B 45abcd35d4c854fcd7920ce19ea8d4369e567a77e89afb63d470220a2c5854cf5cad410dfd8f52f40fec732bc7e18cc3cdb93ecd7e4542866da9fd8fee4f1d92 SHA512 e67baabaf611dc9a52fb0114a491f72666f87ec7dd4dbd63448581baebaa9cd1e70a4e90b2f2db06bf675b778858d1b057aa39986ac858de7f3894b24b07bf7e
+DIST ceph-15.2.11.tar.gz 149695132 BLAKE2B 2dcb335a289314aaf6f68fc44950459c978dfd60fc0c064479f3230957a755d6a9bc238b57d3ec354efdfa5483461bac1080dd0afd7e4e2cd0a20c9410ae1a10 SHA512 e1b0627b7e4212c63b2ea2eb612247fcc9235247e63accc1fe456643b192275eea538e095cc859dbdffd5e00fe1c315563940f258708c8584ac0d0ad0641276f
+DIST ceph-16.2.1.tar.gz 155832182 BLAKE2B 9331d74ada9fb37e59f60daa813cdfe4711000f916365818435580c11d3295db5a13f98c2d2493cccf84cb4c6896c5a8137e3fe9b7a32ff0bedc0b524a0744b1 SHA512 42e404aa41565485dc4c08b66efb3de719adee72cfc535586992e15ab4601bfbd909ef61abf412badbbfa7ef13bf91a7c0576fbbf3f9f687bc7b465b21a8c416
+EBUILD ceph-14.2.19.ebuild 10514 BLAKE2B d4f43c7ccba4ea386f6ca7f68b143ec55115c1c21a6cc170b8925de8a314d4a5529581727b873ca5507e037033688d6d25506f9ebae9700dff710160ee82fca6 SHA512 d15fcdecd4e79c990edb1a04df8330282b3b861fe525f8620e7a48fdaeb411649deabfaab4d8c4fa874a2614aa24b10b98251b14071462baf1e502ccb3d58331
+EBUILD ceph-14.2.20.ebuild 10515 BLAKE2B 85f6922697dd9de98808319a1a7d1063efb62a1bdeb03413e92db79ac976a009dd3d48b48ac1c49c9cf06696af27da9e836adc7ec1b43413862a0a074bf6b8ae SHA512 e385fbf5b06da07bba48ac5a492dc329558e7749f38f906cbf3662276d6efa55083907613bcc0087af0635a6f80f5dc67ac0d581c214a6e2815eb457f76b2012
+EBUILD ceph-15.2.11.ebuild 10863 BLAKE2B 5c0396ea965b1b642989d6c1d311ac87ebdb66a75f17d1c462ebd8df41b2d135009cbd25a7a95dba248811fd1bb04f80feca25aa719ffc05498aac7395c39c54 SHA512 63b2d038a3d274a7c2aeec8322898f2aeacd76a95ef2d848aec84161ba2e1ab5dbe23ee9a6677eba41065f210333100d1aed437ceef6fad6af4e32e5d84895d6
+EBUILD ceph-16.2.1.ebuild 11914 BLAKE2B f08082ab1b541fec43d245b766f19826f28304c9beb70de5d9f3ddd66259bfbb81ad5ba930bb01fdc43bd6f5e7818b1cc770082886363f11d5597454f7f9df59 SHA512 d66477c158df48531441448fcb03de8a6bc4768ad806b3fb99118ae486a5520d55eceb498a2acf79771bebbd736e3b4b4259a3aa0d9bdb18b1fbbd8e5ba70981
+MISC metadata.xml 2318 BLAKE2B f9cf86426b0d8ea87cb80cb03315e9b0b581f604b2e1f28011dd49ab885232184fbcb6e496e8305d92e2c45bea973b8627235115e6bc7b7590874ac2ce9a00cc SHA512 e4eb8fb92dfe9161c217d880db3733aec36efc74431f529b12212702abbf633647bb8a22bfe7864d7389e8ed893bc37518e228ce165140058f98aec534b8f3de
diff --git a/sys-cluster/ceph/ceph-14.2.16-r3.ebuild b/sys-cluster/ceph/ceph-14.2.19.ebuild
index dd17dadcdbb7..dd17dadcdbb7 100644
--- a/sys-cluster/ceph/ceph-14.2.16-r3.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.19.ebuild
diff --git a/sys-cluster/ceph/ceph-14.2.18.ebuild b/sys-cluster/ceph/ceph-14.2.20.ebuild
index 9b819976edd8..9b819976edd8 100644
--- a/sys-cluster/ceph/ceph-14.2.18.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.20.ebuild
diff --git a/sys-cluster/ceph/ceph-15.2.10-r1.ebuild b/sys-cluster/ceph/ceph-15.2.11.ebuild
index d90c82927bc0..d90c82927bc0 100644
--- a/sys-cluster/ceph/ceph-15.2.10-r1.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.11.ebuild
diff --git a/sys-cluster/ceph/ceph-15.2.9-r1.ebuild b/sys-cluster/ceph/ceph-16.2.1.ebuild
index 2772dbbadd51..ba5408dd2204 100644
--- a/sys-cluster/ceph/ceph-15.2.9-r1.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.1.ebuild
@@ -2,14 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
-CMAKE_MAKEFILE_GENERATOR=emake
-
 DISTUTILS_OPTIONAL=1
+LUA_COMPAT=( lua5-3 )
+
+CMAKE_MAKEFILE_GENERATOR=emake
 
 inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \
-		python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
+		lua-single python-r1 udev readme.gentoo-r1 toolchain-funcs \
+		systemd tmpfiles
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -26,14 +29,16 @@ HOMEPAGE="https://ceph.com/"
 LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain"
 SLOT="0"
 
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
+CPU_FLAGS_X86=(avx2 avx512f pclmul sse{,2,3,4_1,4_2} ssse3)
 
-IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc
-	kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl +ssl spdk
-	system-boost systemd +tcmalloc test uring xfs zfs"
+IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana
+	jemalloc jaeger kafka kerberos ldap lttng +mgr numa pmdk rabbitmq
+	+radosgw rbd-rwl rbd-ssd rgw-lua +ssl spdk +sqlite system-boost systemd
+	+tcmalloc test uring xfs zbd zfs"
 IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
 
 DEPEND="
+	${LUA_DEPS}
 	acct-group/ceph
 	acct-user/ceph
 	virtual/libudev:=
@@ -50,6 +55,7 @@ DEPEND="
 	dev-libs/libfmt:=
 	dev-libs/libnl:3=
 	dev-libs/libxml2:=
+	dev-libs/libevent:=
 	<dev-libs/rocksdb-6.15:=
 	dev-libs/xmlsec:=[openssl]
 	dev-cpp/yaml-cpp:=
@@ -74,6 +80,7 @@ DEPEND="
 	fuse? ( sys-fs/fuse:0= )
 	jemalloc? ( dev-libs/jemalloc:= )
 	!jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
+	jaeger? ( dev-cpp/nlohmann_json:= )
 	kafka? ( dev-libs/librdkafka:= )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap:= )
@@ -81,20 +88,23 @@ DEPEND="
 	pmdk? ( dev-libs/pmdk:= )
 	rabbitmq? ( net-libs/rabbitmq-c:= )
 	radosgw? (
+		dev-libs/icu:=
 		dev-libs/expat:=
 		dev-libs/openssl:=
 		net-misc/curl:=[curl_ssl_openssl]
 	)
 	rbd-rwl? ( dev-libs/pmdk:= )
 	ssl? ( dev-libs/openssl:= )
+	sqlite? ( dev-db/sqlite:= )
 	system-boost? ( >=dev-libs/boost-1.72[threads,context,python,${PYTHON_USEDEP}] )
 	uring? ( sys-libs/liburing:= )
 	xfs? ( sys-fs/xfsprogs:= )
+	zbd? ( sys-block/libzbd:= )
 	zfs? ( sys-fs/zfs:= )
 	${PYTHON_DEPS}
 "
 BDEPEND="
-	amd64? ( dev-lang/yasm )
+	amd64? ( dev-lang/nasm )
 	x86? ( dev-lang/yasm )
 	app-arch/cpio
 	>=dev-util/cmake-3.5.0
@@ -112,6 +122,10 @@ BDEPEND="
 	sys-devel/bc
 	sys-devel/patch
 	virtual/pkgconfig
+	jaeger? (
+		sys-devel/bison
+		sys-devel/flex
+	)
 	test? (
 		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
@@ -120,7 +134,8 @@ BDEPEND="
 		sys-fs/btrfs-progs
 	)
 "
-RDEPEND="${DEPEND}
+RDEPEND="
+	${DEPEND}
 	app-admin/sudo
 	net-misc/socat
 	sys-apps/gptfdisk
@@ -145,11 +160,11 @@ RDEPEND="${DEPEND}
 		dev-python/jsonpatch[${PYTHON_USEDEP}]
 		dev-python/more-itertools[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		<dev-python/pyjwt-2.0[${PYTHON_USEDEP}]
+		dev-python/pyjwt[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/routes[${PYTHON_USEDEP}]
 		diskprediction? (
-			$(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
+			>=dev-python/scipy-1.4.0[${PYTHON_USEDEP}]
 		)
 		sci-libs/scikit-learn[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
@@ -159,8 +174,10 @@ RDEPEND="${DEPEND}
 # bug #724438
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
+	${LUA_REQUIRED_USE}
 	?? ( jemalloc tcmalloc )
-	diskprediction? ( mgr !python_targets_python3_8 )
+	jaeger? ( !system-boost )
+	diskprediction? ( mgr )
 	kafka? ( radosgw )
 	mgr? ( cephfs )
 	rabbitmq? ( radosgw )
@@ -184,22 +201,27 @@ PATCHES=(
 	"${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-15.2.0-no-virtualenvs.patch"
+	"${FILESDIR}/ceph-16.2.0-no-virtualenvs.patch"
 	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
 	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
 	"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
 	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
-	"${FILESDIR}/ceph-15.2.0-rocksdb-cmake.patch"
-	"${FILESDIR}/ceph-15.2.2-systemd-unit.patch"
+	"${FILESDIR}/ceph-16.2.0-rocksdb-cmake.patch"
 	"${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
-	"${FILESDIR}/ceph-15.2.4-system-uring.patch"
-	"${FILESDIR}/ceph-15.2.5-missing-includes.patch"
-	"${FILESDIR}/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch"
+	"${FILESDIR}/ceph-16.2.0-install-libblk.patch"
+	"${FILESDIR}/ceph-16.2.0-spdk-tinfo.patch"
+	"${FILESDIR}/ceph-16.2.0-jaeger-system-boost.patch"
+	"${FILESDIR}/ceph-16.2.0-liburing.patch"
 )
 
 check-reqs_export_vars() {
-	CHECKREQS_DISK_BUILD="5400M"
-	CHECKREQS_DISK_USR="510M"
+	CHECKREQS_DISK_BUILD="6G"
+
+	if use system-boost; then
+		CHECKREQS_DISK_USR="350M"
+	else
+		CHECKREQS_DISK_USR="510M"
+	fi
 
 	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
 }
@@ -211,6 +233,7 @@ pkg_pretend() {
 
 pkg_setup() {
 	python_setup
+	lua_setup
 	check-reqs_export_vars
 	check-reqs_pkg_setup
 }
@@ -235,6 +258,11 @@ src_prepare() {
 		rm -rf src/pybind/mgr/diskprediction_local || die
 	fi
 
+	# force lua version to use selected version
+	local lua_version
+	lua_version=$(ver_cut 1-2 $(lua_get_version))
+	sed -i "s:find_package(Lua [0-9][.][0-9] REQUIRED):find_package(Lua ${lua_version} EXACT REQUIRED):" src/CMakeLists.txt
+
 	# remove tests that need root access
 	rm src/test/cli/ceph-authtool/cap*.t || die
 }
@@ -260,12 +288,17 @@ ceph_src_configure() {
 		-DWITH_RADOSGW=$(usex radosgw)
 		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
 		-DWITH_RADOSGW_KAFKA_ENDPOINT=$(usex kafka)
+		-DWITH_RADOSGW_LUA_PACKAGES=$(usex rgw-lua "$(usex radosgw)" "NO")
 		-DWITH_RBD_RWL=$(usex rbd-rwl)
+		-DWITH_RBD_SSD_CACHE=$(usex rbd-ssd)
 		-DWITH_SSL=$(usex ssl)
 		-DWITH_SYSTEMD=$(usex systemd)
 		-DWITH_TESTS=$(usex test)
 		-DWITH_LIBURING=$(usex uring)
+		-DWITH_SYSTEM_LIBURING=$(usex uring)
+		-DWITH_LIBCEPHSQLITE=$(usex sqlite)
 		-DWITH_XFS=$(usex xfs)
+		-DWITH_ZBD=$(usex zbd)
 		-DWITH_ZFS=$(usex zfs)
 		-DENABLE_SHARED="ON"
 		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
@@ -282,9 +315,19 @@ ceph_src_configure() {
 		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
 		-Wno-dev
 	)
+
+	# this breaks when re-configuring for python impl
+	[[ ${EBUILD_PHASE} == configure ]] && mycmakeargs+=(-DWITH_JAEGER=$(usex jaeger))
+
 	if use amd64 || use x86; then
 		for flag in ${CPU_FLAGS_X86[@]}; do
-			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
+			case "${flag}" in
+				avx*)
+					local var=${flag%f}
+					mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_NASM_X64_${var^^}=1")")
+				;;
+				*) mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")");;
+			esac
 		done
 	fi
 
diff --git a/sys-cluster/ceph/files/ceph-16.2.0-install-libblk.patch b/sys-cluster/ceph/files/ceph-16.2.0-install-libblk.patch
new file mode 100644
index 000000000000..309e00d226dd
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-16.2.0-install-libblk.patch
@@ -0,0 +1,12 @@
+diff --git a/src/blk/CMakeLists.txt b/src/blk/CMakeLists.txt
+index b424482dee..dc4f9b82ae 100644
+--- a/src/blk/CMakeLists.txt
++++ b/src/blk/CMakeLists.txt
+@@ -26,6 +26,7 @@ if(WITH_ZBD)
+ endif()
+ 
+ add_library(blk ${libblk_srcs})
++install(TARGETS blk DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ target_include_directories(blk PRIVATE "./")
+ 
+ if(HAVE_LIBAIO)
diff --git a/sys-cluster/ceph/files/ceph-16.2.0-jaeger-system-boost.patch b/sys-cluster/ceph/files/ceph-16.2.0-jaeger-system-boost.patch
new file mode 100644
index 000000000000..18d5d9c6d513
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-16.2.0-jaeger-system-boost.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0a0d8672a7..a76e7e1842 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -631,6 +631,9 @@ if(WITH_SYSTEM_BOOST)
+     set_property(TARGET Boost::iostreams APPEND PROPERTY
+       INTERFACE_LINK_LIBRARIES ZLIB::ZLIB)
+   endif()
++  if (WITH_JAEGER)
++    include_directories("${CMAKE_SOURCE_DIR}/boost/include")
++  endif()
+ else()
+   set(BOOST_J 1 CACHE STRING
+     "max jobs for Boost build") # override w/-DBOOST_J=<n>
diff --git a/sys-cluster/ceph/files/ceph-16.2.0-liburing.patch b/sys-cluster/ceph/files/ceph-16.2.0-liburing.patch
new file mode 100644
index 000000000000..dd248d51ac61
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-16.2.0-liburing.patch
@@ -0,0 +1,35 @@
+diff --git a/cmake/modules/Finduring.cmake b/cmake/modules/Finduring.cmake
+index 10c8de4255..c0a4dadfe4 100644
+--- a/cmake/modules/Finduring.cmake
++++ b/cmake/modules/Finduring.cmake
+@@ -8,10 +8,10 @@ find_path(URING_INCLUDE_DIR liburing.h)
+ find_library(URING_LIBRARIES liburing.a liburing)
+ 
+ include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(uring DEFAULT_MSG URING_LIBRARIES URING_INCLUDE_DIR)
++pkg_check_modules(URING REQUIRED liburing)
+ 
+ if(uring_FOUND AND NOT TARGET uring::uring)
+-  add_library(uring::uring UNKNOWN IMPORTED)
++  add_library(uring::uring ALIAS ${URING_LIBRARIES})
+   set_target_properties(uring::uring PROPERTIES
+     INTERFACE_INCLUDE_DIRECTORIES "${URING_INCLUDE_DIR}"
+     IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+diff --git a/src/blk/CMakeLists.txt b/src/blk/CMakeLists.txt
+index dc4f9b82ae..e39d690394 100644
+--- a/src/blk/CMakeLists.txt
++++ b/src/blk/CMakeLists.txt
+@@ -52,10 +52,11 @@ endif()
+ 
+ if(WITH_LIBURING)
+   if(WITH_SYSTEM_LIBURING)
+-    find_package(uring REQUIRED)
++	list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}../../cmake/modules/")
++	pkg_check_modules(URING REQUIRED liburing)
+   else()
+     include(Builduring)
+     build_uring()
+   endif()
+-  target_link_libraries(blk PRIVATE uring::uring)
++  target_link_libraries(blk PRIVATE ${URING_LIBRARIES})
+ endif()
diff --git a/sys-cluster/ceph/files/ceph-16.2.0-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-16.2.0-no-virtualenvs.patch
new file mode 100644
index 000000000000..d8acd4355b59
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-16.2.0-no-virtualenvs.patch
@@ -0,0 +1,74 @@
+diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake
+index 2c8fdb0b93..07d52b3d67 100644
+--- a/cmake/modules/AddCephTest.cmake
++++ b/cmake/modules/AddCephTest.cmake
+@@ -70,14 +70,6 @@ function(add_tox_test name)
+   endif()
+   string(REPLACE ";" "," tox_envs "${tox_envs}")
+   find_package(Python3 QUIET REQUIRED)
+-  add_custom_command(
+-    OUTPUT ${venv_path}/bin/activate
+-    COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python="${Python3_EXECUTABLE}" ${venv_path}
+-    WORKING_DIRECTORY ${tox_path}
+-    COMMENT "preparing venv for ${name}")
+-  add_custom_target(${name}-venv
+-    DEPENDS ${venv_path}/bin/activate)
+-  add_dependencies(tests ${name}-venv)
+   add_test(
+     NAME ${test_name}
+     COMMAND ${CMAKE_SOURCE_DIR}/src/script/run_tox.sh
+diff --git a/src/ceph-volume/CMakeLists.txt b/src/ceph-volume/CMakeLists.txt
+index 4224499c47..9a6c87595b 100644
+--- a/src/ceph-volume/CMakeLists.txt
++++ b/src/ceph-volume/CMakeLists.txt
+@@ -8,22 +8,6 @@ if(FREEBSD)
+   add_subdirectory(plugin/zfs)
+ endif()
+ 
+-# Required for running ceph-volume inventory in a vstart environment
+-set(CEPH_VOLUME_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-volume-virtualenv)
+-
+-add_custom_command(
+-  OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/python
+-  COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${Python_EXECUTABLE} ${CEPH_VOLUME_VIRTUALENV}
+-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
+-  COMMENT "ceph-volume venv is being created")
+-
+-add_custom_command(
+-  OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume
+-  DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/python
+-  COMMAND . ${CEPH_VOLUME_VIRTUALENV}/bin/activate && ${CEPH_VOLUME_VIRTUALENV}/bin/python setup.py develop && deactivate
+-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
+-  COMMENT "${CMAKE_SOURCE_DIR}/src/ceph-volume")
+-
+ add_custom_target(ceph-volume-venv-setup
+   DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume)
+ 
+diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
+index 59c28a33f6..7f63e2adf4 100644
+--- a/src/pybind/mgr/dashboard/CMakeLists.txt
++++ b/src/pybind/mgr/dashboard/CMakeLists.txt
+@@ -5,9 +5,6 @@ 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|npx) .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
+-  endif()
+   string(REPLACE " " ";" command "${command}")
+   add_custom_command(
+     OUTPUT "${NC_OUTPUT}"
+@@ -51,11 +48,8 @@ else(WITH_SYSTEM_NPM)
+     set(node_mirror_opt "--mirror=$ENV{NODE_MIRROR}")
+   endif()
+   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 ${node_mirror_opt} -p --node=12.18.2
+-    COMMAND mkdir ${mgr-dashboard-nodeenv-dir}/.npm
++    OUTPUT "/bin/npm"
++    COMMAND /bin/nodeenv ${node_mirror_opt} -p --node=12.18.2
+     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+     COMMENT "dashboard nodeenv is being installed"
+     )
diff --git a/sys-cluster/ceph/files/ceph-16.2.0-rocksdb-cmake.patch b/sys-cluster/ceph/files/ceph-16.2.0-rocksdb-cmake.patch
new file mode 100644
index 000000000000..aff00c196d6c
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-16.2.0-rocksdb-cmake.patch
@@ -0,0 +1,15 @@
+diff --git a/cmake/modules/BuildRocksDB.cmake b/cmake/modules/BuildRocksDB.cmake
+index 58ce26a6ac..2f8702c1dc 100644
+--- a/cmake/modules/BuildRocksDB.cmake
++++ b/cmake/modules/BuildRocksDB.cmake
+@@ -6,10 +6,6 @@ function(build_rocksdb)
+   # CMAKE_PREFIX_PATH, for which reason we'll have to use some other separator.
+   string(REPLACE ";" "!" CMAKE_PREFIX_PATH_ALT_SEP "${CMAKE_PREFIX_PATH}")
+   list(APPEND rocksdb_CMAKE_ARGS -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH_ALT_SEP})
+-  if(CMAKE_TOOLCHAIN_FILE)
+-    list(APPEND rocksdb_CMAKE_ARGS
+-         -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
+-  endif()
+ 
+   if(ALLOCATOR STREQUAL "jemalloc")
+     list(APPEND rocksdb_CMAKE_ARGS -DWITH_JEMALLOC=ON)
diff --git a/sys-cluster/ceph/files/ceph-16.2.0-spdk-tinfo.patch b/sys-cluster/ceph/files/ceph-16.2.0-spdk-tinfo.patch
new file mode 100644
index 000000000000..19f2cce891fb
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-16.2.0-spdk-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/src/spdk/app/spdk_top/Makefile	2021-04-02 14:27:44.307824110 -0700
++++ b/src/spdk/app/spdk_top/Makefile	2021-04-02 14:27:56.722742839 -0700
+@@ -39,6 +39,6 @@
+ C_SRCS := spdk_top.c
+ 
+ SPDK_LIB_LIST = jsonrpc json rpc log util
+-LIBS=-lncurses -lpanel -lmenu
++LIBS=-lncurses -ltinfo -lpanel -lmenu
+ 
+ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml
index cd3df6b4e4c3..85de88c26615 100644
--- a/sys-cluster/ceph/metadata.xml
+++ b/sys-cluster/ceph/metadata.xml
@@ -24,6 +24,7 @@
     <flag name="spdk">Enable SPDK user-mode storage driver toolkit</flag>
     <flag name="fuse">Build fuse client</flag>
     <flag name="grafana">Install grafana dashboards</flag>
+    <flag name="jaeger">Enable jaegertracing and it's dependent libraries</flag>
     <flag name="kafka">Rados Gateway's pubsub support for Kafka push endpoint</flag>
     <flag name="lttng">Add support for LTTng</flag>
     <flag name="mgr">Build the ceph-mgr daemon</flag>
@@ -32,8 +33,11 @@
     <flag name="rabbitmq">Use rabbitmq-c to build rgw amqp push endpoint</flag>
     <flag name="radosgw">Add radosgw support</flag>
     <flag name="rbd-rwl">Enable librbd persistent write back cache</flag>
+    <flag name="rbd-ssd">Enable librbd persistent write back cache for SSDs</flag>
+    <flag name="rgw-lua">Rados Gateway's support for dynamically adding lua packagess</flag>
     <flag name="system-boost">Use system <pkg>dev-libs/boost</pkg> instead of the bundled one</flag>
     <flag name="uring">Build with support for <pkg>sys-libs/liburing</pkg></flag>
+    <flag name="zbd">Enable <pkg>sys-block/libzbd</pkg> bluestore backend</flag>
     <flag name="xfs">Add xfs support</flag>
     <flag name="zfs">Add zfs support</flag>
   </use>