gentoo resync : 09.07.2022

6 files changed, 2 insertions, 1465 deletions

diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index bf14ddf35ed8..da01f77c8079 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -19,7 +19,6 @@ AUX ceph-16.2.0-rocksdb-cmake.patch 705 BLAKE2B d40371aa0163cd78dbe12b1db648f488
 AUX ceph-16.2.0-spdk-tinfo.patch 344 BLAKE2B ea46ab83836ebc9ed96714e0ed3c3e8b00a221296ddf9b10a99eb5591740a844067078820d79ae784cdb600c97e2969e81c65a4fe3b958bcc9910f7cecb1a6fe SHA512 31b9ae63c8f1722e4834034ed04cfc9ab47665ecd8f24da356897b0c52787096acbfc9cccf600655938da0f9f39200c2470cdb087f389adba975b6d830e7228d
 AUX ceph-16.2.2-cflags.patch 540 BLAKE2B d7f7ce9e65d59b7a9594f4cd34091df8b496d03cedfa814a14165d51ec0daa38ad0124fbfa62d9ee7cf2895676248b14b45a38f310efb544e61e9672c58fb25d SHA512 d65b2b33f2e43169e5131ef3ca51617931fc3d362af8c79bef2baa2bbee6495729ee7a4fca4401a6be716283fcdf83511bdfb90e0c4b526b90e91c9c32591439
 AUX ceph-16.2.2-system-zstd.patch 1501 BLAKE2B 6540822407802dacb43c4fd9c432b45ec747a77d6892f2193fe55cb09da90b035d7630bdf5f9ec6f49df5e351c1d38c96cd14e9ed180bee897f11413ba53ed64 SHA512 5e21e29b30ee67411e3631fa65d0dc8a7b232e582c995049b4e89ea709e87a42edbf5cd4bbe535e62aebb7c9509a85b92c62e0f9914b2d4ee197994e2665139a
-AUX ceph-16.2.7-no-virtualenvs.patch 3362 BLAKE2B 4ed9e3f2bc681f9b06071f11eaead2dc3571d45f3efbd27d83c78b38014d28ce4d37a01873dee56b88dd1fafac37a41e5454a4ba50f096c8e5d446108a714c7e SHA512 78ab25f3138832263892d357b160611cb5a13376fdb4d4197a2d052deaacf9ae4ae7776c0475e49bb685ac840f4ebc49bde678c3b952a964b5e88058e2aa51b8
 AUX ceph-16.2.7-string-includes.patch 670 BLAKE2B 308a1434afc6c81def5b7ef43cfb6f1bd37b5b46c5a2591c0615b941cf80cb4814c090edb6805545c333355b4dcf55991bd2459572cd16e6b2d393f1fffe2c00 SHA512 c6e0d35aa2f6a8cb4c63b7cd7baa4909e0becd0ff09f7bb712fa53c62e3f5a26c0352066c1f4fe5186a69faccc8d902bf83fea7f2df0f5324d98cc90e546d627
 AUX ceph-16.2.8-no-virtualenvs.patch 3650 BLAKE2B 3c350e1ff171ec40443bcb2e8b844192bf07d8cc84181b9c20b11bfd8785e7bbf029ee9a6abc1d52655618417769b7f32d3e758cc9456f38e7ea918499bd9ab5 SHA512 f82210448617f448205b8a51fc286fc88c149ec65eb23b4ea439e5e69ad07d30d9fb254e2ffac13b2d18c7be8a0d69110c089ff22a301ee0fe92357fcfde9c25
 AUX ceph-17.2.0-cyclic-deps.patch 2202 BLAKE2B 14bfdada20b4d1a27308c42c4cadfe11060ccb6f8e2d84a744bd94b08f03fc810f53f2d7fdfdbd646c5d3c649ac7b64a32517d05169bd157ed0725c0fa722b43 SHA512 e1ef790fc62f03b2edb8a069b50848923f0b01b64777f0641cc76dfd7129a42b2d5eb5d778cd6e730e917ad90a325a6f51e4b1e3534a9231bfffefe488167e1d
@@ -47,16 +46,10 @@ AUX rbdmap.initd 2373 BLAKE2B b88d79efc722e2de3d1f0269664a976ed45fbb0a1c9d46fcfd
 AUX rbdmap.initd-r1 2372 BLAKE2B dee62cc3e92425bccfce86009be0fbecc84d55923a7dde302727d42f5f7703642121c690bdf079878c31b71d4c6c200ae6a7f595ede2dfe0bc46d8f6f9f5dd01 SHA512 d249d2299ef8dc4bbd12237cfe6ef626704872130b1092ab96d05894f04df09418364552433b264b80e49ee7e1587ebee71c1131fbbcd7d858cfadf1fe6357d5
 AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8aa98ae97349b42b56c65a531b207c5f970f873a79c41789941cdd10b279e38f1616f84d SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a
 DIST ceph-15.2.16.tar.gz 148628915 BLAKE2B 4f624078027c706428eae3eddd5b5479efe3b4442c19a4e6b6cdf8d3839cf56e2863b18249dc3c5079a7e25f60796bfec3202ffd695537587654f5e2f820caaa SHA512 532b8a5073e157fe9ed552b26976faeb64dc29b79a249910c0982134ad5f945d4f57d8bf451adf63487b6d285c6e4bd5c39f0e3fcd449230d6fb3087539f8c3b
-DIST ceph-16.2.7.tar.gz 156621262 BLAKE2B 3c79cb1586e71927df4578fe7f3a13f4ab257a5e145b6bf76d942292cbca7bf32583350373f3d816f6d8f8700ee0f98a14f350c823b0eb89ffd7735acee7de63 SHA512 eab047e646970d444acf1064d98237b8b1677fb16b5e771082d55880f7bc6d8bdb278c2fe514c82ae12c438878d9ecea29139fa6b8d890f9f737138f10fb740c
 DIST ceph-16.2.9.tar.gz 157168096 BLAKE2B 0a667a9699925cfc920ca0cc535e5331cbcd95997fb0b9816a4d84c8add454b6b17813018bc1d1de07c802167ef50aa528704b10b01f42759189392ccdb5088f SHA512 bf369038ad6383f88abbed267f0239e9d8a1d33b46b34ed260aeeb1fda1b374cb6e658238e1ace013fbbb68e73b8cd2922b7def318d7a110e5f4560eeae8fca3
-DIST ceph-17.2.0.tar.gz 168742006 BLAKE2B 15272da3471722936198f62b5ef7537d29bd944b35ef1552e87cf0f0f400a8be5fd1fa873494eb17ca71df9360d7ffa4fa20a6f1b1ba819520b180770a4e6299 SHA512 70b96e709f153f16069bec8346ea73812d699eaab91a012351d02addb3fd176b84fce32c3dae84fdf91d0ffe49f2bb258410b47caeee81d81a672b4dbd04cc7e
 DIST ceph-17.2.1.tar.gz 168819036 BLAKE2B 2d6506f3a43ccbe4a149163c13ab2de72aeba568308ca7c0c59d0ff32316519d27b334451fd8d78af799cabe3b5a8c5b7b19d5da028e52c420ec7fc38efe5aad SHA512 cb88a3feff67ce41c575cb6c0067a32de51fcbf36d8f9f7273cccd54a3413ee890f473e83fcc1429a86b858b05c412fca8b2cfc24871c5adf612e3d224227cf0
-DIST ceph-xsimd-17.2.0.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
 DIST ceph-xsimd-17.2.1.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
 EBUILD ceph-15.2.16.ebuild 10917 BLAKE2B c1b135b0cbdb9f390248ec861e9c196095cec4011f934fa859c39475483d815c6f369bf88e7d8ca21690f500e372d9707ae00084d3dcbdffc72e7e928c55a07e SHA512 281d6915a55ebe16619549f9bdee35ff4af0ffc68ef1360ec2c132a03a57d4361e7216f9b663486ebd77512aa563bdeb70d30e3feb8cd8e1c3a21c7a21277a43
-EBUILD ceph-16.2.7-r1.ebuild 12370 BLAKE2B 4e74d44c0d46f97640f678937eafa120c2e186dff56f83582e9b6dba06e952f6d79c0977d6ac4c121642c3ce8eec1b3bc180c93925282932f7ad30671bd2e783 SHA512 3f90ca8e5c6e1e3498deeee342d6f8ac7123420232aa502f147e2d0544033ec9d48d2d964db04a0fef3e42aba0c5e72c55ec6090d3b8fe9449872286d9925919
-EBUILD ceph-16.2.7.ebuild 12257 BLAKE2B 60c2b1f086b8a58331720f478319140b65d76e25cf6f975596cbece5830e7feb702e1ed0c4ab4a1dff5c929a132dd7e444fc943d623ded94bd7bbb8909a26726 SHA512 3e800a7651c94e848cd0c071ca16be87ea28f49dbb7ee2837817d435679c82f02488a259672678c5613c6c00b57cba1148f12e5aa58e58d03118c17fcce956c9
-EBUILD ceph-16.2.9.ebuild 12558 BLAKE2B 14fda4e8384ba1ea06f6669938901af8c8a76cbd41ee150eb1d6f9af783fee049c5f9a80989b9e3874025834b8755927b11f757ada69b1bb6a56701de6b403a9 SHA512 41a75d08c6806ffb2300c6a76e11c20707a1959657be51f21a4ee4df42f571f19a073da3bc5f5188d31fd56f10938e69d1c439f403ef33f6066a1489d57dfaf6
-EBUILD ceph-17.2.0-r2.ebuild 12384 BLAKE2B c7a9b24352909db12f0a888d9fa4b5ef7358020f97a0a420728a7bca07537b174fcb5cffc525b579bb9b22cd69c67d481e36e9f9f5b0afd152eb81b60b04fd1e SHA512 c927b1232b7f833904e24670f858fe81aa342cf7c8996ce54f905455467f8975b3960dbb0bbe2572d6d3d1e16da933bc6961c9660fb835b99652d390e13e8981
+EBUILD ceph-16.2.9.ebuild 12557 BLAKE2B dbdbfd4664e51b2e86f8034aac15fa46601c0d557bc20e5218b93aef23df80eff2a0b493252f9a3610cec41c7867c0ac91fcc9e7dcb0d38e3a7dbafeb9e18c80 SHA512 7b9f961015974b443b1f85603acb4088928068636d213d3e5cf25ff0341446be0f3806154a4697c2eef6920802cded2bbad5ab93d02d31e1c6bea4f6d38bf343
 EBUILD ceph-17.2.1.ebuild 12384 BLAKE2B fa5768b7dcfb46797065335cf87bfe9e4f553a404bbdf58bf0695b968c54d7f11435c9db1005eaa75ba614512c453f82349010c0bb87185254eefcfb6c962a08 SHA512 2c6ab3c69d8d08a77ff5a71e577d4c9f4cd642bed041fca1528f360ba21104e2e4426caa02ecaccc9ce64b5e997245e731bd64ec52372ee5d9b130f73d92caf5
 MISC metadata.xml 2453 BLAKE2B 988cbe4fa5176fde46a503932a58555554e577a311180df706021ea67a8c861b82fbc476cc757c090ea4e753b519212a2cca8c0605921c4e121b770fd1cc61ea SHA512 14c25df4749cd86f82782f8e7cda587a0310e4cf28b6d4f8ac1fa4abee532d6d553f35fcfb8ab0393ce876d36a8fe2851408ad5eaaf5cf28834f03cf744ac6c1
diff --git a/sys-cluster/ceph/ceph-16.2.7-r1.ebuild b/sys-cluster/ceph/ceph-16.2.7-r1.ebuild
deleted file mode 100644
index 64fd34329764..000000000000
--- a/sys-cluster/ceph/ceph-16.2.7-r1.ebuild
+++ /dev/null
@@ -1,465 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-LUA_COMPAT=( lua5-3 )
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit check-reqs bash-completion-r1 cmake python-r1 flag-o-matic \
-		lua-single python-r1 udev readme.gentoo-r1 toolchain-funcs \
-		systemd tmpfiles
-
-SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-
-DESCRIPTION="Ceph distributed filesystem"
-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=(avx2 avx512f pclmul sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="
-	babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana
-	jemalloc jaeger kafka kerberos ldap lttng +mgr numa pmdk rabbitmq
-	+radosgw rbd-rwl rbd-ssd rdma 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}
-	${PYTHON_DEPS}
-	acct-group/ceph
-	acct-user/ceph
-	virtual/libudev:=
-	app-arch/bzip2:=
-	app-arch/lz4:=
-	app-arch/snappy:=
-	|| ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 )
-	app-arch/zstd:=
-	app-shells/bash:0
-	app-misc/jq:=
-	dev-libs/crypto++:=
-	dev-cpp/gflags:=
-	<dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?]
-	dev-libs/libaio:=
-	dev-libs/libfmt:=
-	dev-libs/libnl:3=
-	dev-libs/libxml2:=
-	dev-libs/libevent:=
-	dev-libs/openssl:=
-	<dev-libs/rocksdb-6.15:=
-	dev-libs/xmlsec:=[openssl]
-	dev-cpp/yaml-cpp:=
-	dev-libs/nss:=
-	dev-libs/protobuf:=
-	net-dns/c-ares:=
-	net-libs/gnutls:=
-	sys-auth/oath-toolkit:=
-	sys-apps/coreutils
-	sys-apps/hwloc:=
-	sys-apps/keyutils:=
-	sys-apps/util-linux:=
-	sys-apps/util-linux
-	sys-libs/libcap-ng:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:=
-	sys-process/numactl:=
-	virtual/libcrypt:=
-	x11-libs/libpciaccess:=
-	babeltrace? ( dev-util/babeltrace )
-	fuse? ( sys-fs/fuse:3= )
-	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:= )
-	lttng? ( dev-util/lttng-ust:= )
-	pmdk? ( dev-libs/pmdk:= )
-	rabbitmq? ( net-libs/rabbitmq-c:= )
-	radosgw? (
-		dev-libs/icu:=
-		dev-libs/expat:=
-		net-misc/curl:=[curl_ssl_openssl]
-	)
-	rbd-rwl? ( dev-libs/pmdk:= )
-	rdma? ( sys-cluster/rdma-core:= )
-	spdk? ( dev-util/cunit )
-	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:= )
-"
-BDEPEND="
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/yasm )
-	app-arch/cpio
-	>=dev-util/cmake-3.5.0
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	dev-util/gperf
-	dev-util/ragel
-	dev-util/valgrind
-	sys-apps/coreutils
-	sys-apps/grep
-	sys-apps/sed
-	sys-apps/util-linux
-	sys-apps/which
-	sys-devel/bc
-	sys-devel/patch
-	virtual/pkgconfig
-	jaeger? (
-		sys-devel/bison
-		sys-devel/flex
-	)
-	test? (
-		dev-util/cunit
-		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="
-	${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/lsscsi
-	sys-fs/lvm2[-device-mapper-only(-)]
-	virtual/awk
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${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/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	mgr? (
-		dev-python/jsonpatch[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pyjwt[${PYTHON_USEDEP}]
-		dev-python/routes[${PYTHON_USEDEP}]
-		diskprediction? (
-			>=dev-python/scipy-1.4.0[${PYTHON_USEDEP}]
-		)
-		sci-libs/scikit-learn[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-# diskprediction needs older scipy not compatible with py38
-# bug #724438
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	${LUA_REQUIRED_USE}
-	?? ( jemalloc tcmalloc )
-	jaeger? ( !system-boost )
-	diskprediction? ( mgr )
-	kafka? ( radosgw )
-	mgr? ( cephfs )
-	rabbitmq? ( radosgw )
-"
-
-RESTRICT="
-	!test? ( test )
-"
-
-# tests need root access, and network access
-RESTRICT+="test"
-
-# create a non-debug release
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-# 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-16.2.2-cflags.patch"
-	"${FILESDIR}/ceph-16.2.7-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-cython-0.29.patch"
-	"${FILESDIR}/ceph-16.2.0-rocksdb-cmake.patch"
-	"${FILESDIR}/ceph-15.2.3-spdk-compile.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"
-	"${FILESDIR}/ceph-16.2.2-system-zstd.patch"
-	"${FILESDIR}/ceph-16.2.7-string-includes.patch"
-	"${FILESDIR}/ceph-17.2.0-fuse3.patch"
-)
-
-check-reqs_export_vars() {
-	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
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup
-	lua_setup
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use system-boost; then
-		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
-			| xargs --null sed -r \
-			-e 's|Boost::|boost_|g' \
-			-e 's|Boost_|boost_|g' \
-			-e 's|[Bb]oost_boost|boost_system|g' \
-			-i || die
-	fi
-
-	if ! use systemd; then
-		find "${S}"/src/ceph-volume/ceph_volume -name '*.py' -print0 \
-			| xargs --null sed \
-			-e '/^from ceph_volume.systemd import systemctl/ d' \
-			-i || die
-	fi
-
-	sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
-		-i src/bash_completion/CMakeLists.txt || die
-
-	sed  -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die
-
-	if ! use diskprediction; then
-		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 "s:find_package(Lua [0-9][.][0-9] REQUIRED):find_package(Lua ${lua_version} EXACT REQUIRED):" \
-		-i src/CMakeLists.txt
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t || die
-}
-
-ceph_src_configure() {
-	local mycmakeargs=(
-		-DWITH_BABELTRACE:BOOL=$(usex babeltrace)
-		-DWITH_BLUESTORE_PMEM:BOOL=$(usex pmdk)
-		-DWITH_CEPHFS:BOOL=$(usex cephfs)
-		-DWITH_CEPHFS_SHELL:BOOL=$(usex cephfs)
-		-DWITH_DPDK:BOOL=$(usex dpdk)
-		-DWITH_SPDK:BOOL=$(usex spdk)
-		-DWITH_FUSE:BOOL=$(usex fuse)
-		-DWITH_LTTNG:BOOL=$(usex lttng)
-		-DWITH_GSSAPI:BOOL=$(usex kerberos)
-		-DWITH_GRAFANA:BOOL=$(usex grafana)
-		-DWITH_MGR:BOOL=$(usex mgr)
-		-DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF
-		-DWITH_OPENLDAP:BOOL=$(usex ldap)
-		-DWITH_PYTHON3:STRING=3
-		-DWITH_RADOSGW:BOOL=$(usex radosgw)
-		-DWITH_RADOSGW_AMQP_ENDPOINT:BOOL=$(usex rabbitmq)
-		-DWITH_RADOSGW_KAFKA_ENDPOINT:BOOL=$(usex kafka)
-		-DWITH_RADOSGW_LUA_PACKAGES:BOOL=$(usex rgw-lua "$(usex radosgw)" "NO")
-		-DWITH_RBD_RWL:BOOL=$(usex rbd-rwl)
-		-DWITH_RBD_SSD_CACHE:BOOL=$(usex rbd-ssd)
-		-DWITH_SYSTEMD:BOOL=$(usex systemd)
-		-DWITH_TESTS:BOOL=$(usex test)
-		-DWITH_LIBURING:BOOL=$(usex uring)
-		-DWITH_SYSTEM_LIBURING:BOOL=$(usex uring)
-		-DWITH_LIBCEPHSQLITE:BOOL=$(usex sqlite)
-		-DWITH_XFS:BOOL=$(usex xfs)
-		-DWITH_ZBD:BOOL=$(usex zbd)
-		-DWITH_ZFS:BOOL=$(usex zfs)
-		-DENABLE_SHARED:BOOL=ON
-		-DALLOCATOR:STRING=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
-		-DWITH_SYSTEM_PMDK:BOOL=$(usex pmdk 'YES' "$(usex rbd-rwl)")
-		-DWITH_SYSTEM_BOOST:BOOL=$(usex system-boost)
-		-DWITH_SYSTEM_ROCKSDB:BOOL=ON
-		-DWITH_RDMA:BOOL=$(usex rdma)
-		-DCMAKE_INSTALL_DOCDIR:PATH="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-		-DCMAKE_INSTALL_SYSCONFDIR:PATH="${EPREFIX}/etc"
-		-Wno-dev
-	)
-
-	# this breaks when re-configuring for python impl
-	if [[ ${EBUILD_PHASE} == configure ]]; then
-		mycmakeargs+=(
-			-DWITH_JAEGER:BOOL=$(usex jaeger)
-		)
-	else
-		mycmakeargs+=(
-			-DWITH_RADOSGW_SELECT_PARQUET:BOOL=OFF
-		)
-	fi
-
-	# conditionally used cmake args
-	use test && mycmakearts+=( -DWITH_SYSTEM_GTEST:BOOL=$(usex test) )
-	use systemd && mycmakeargs+=( -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR:PATH=$(systemd_get_systemunitdir) )
-
-	if use amd64 || use x86; then
-		local flag
-		for flag in "${CPU_FLAGS_X86[@]}"; do
-			case "${flag}" in
-				avx*)
-					local var=${flag%f}
-					mycmakeargs+=(
-						"-DHAVE_NASM_X64_${var^^}:BOOL=$(usex cpu_flags_x86_${flag})"
-					)
-				;;
-				*) mycmakeargs+=(
-						"-DHAVE_INTEL_${flag^^}:BOOL=$(usex cpu_flags_x86_${flag})"
-					);;
-			esac
-		done
-	fi
-
-	# needed for >=glibc-2.32
-	has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=( -DWITH_REENTRANT_STRSIGNAL:BOOL=ON )
-
-	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
-		|| die "failed to remove cmake cache"
-
-	cmake_src_configure
-
-	# bug #630232
-	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${S}}"/include/acconfig.h \
-		|| die "sed failed"
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	ceph_src_configure
-}
-
-src_compile() {
-	cmake_build VERBOSE=1 all
-
-	# we have to do this here to prevent from building everything multiple times
-	python_copy_sources
-	python_foreach_impl python_compile
-}
-
-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_test() {
-	make check || die "make check failed"
-}
-
-src_install() {
-	python_foreach_impl python_install
-
-	python_setup
-	cmake_src_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-r1" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
-
-	insinto /etc/sudoers.d
-	doins sudoers.d/*
-
-	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
-	newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf
-
-	readme.gentoo_create_doc
-
-	# 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}}"
-}
-
-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
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	tmpfiles_process ${PN}.conf
-	udev_reload
-}
diff --git a/sys-cluster/ceph/ceph-16.2.7.ebuild b/sys-cluster/ceph/ceph-16.2.7.ebuild
deleted file mode 100644
index 7a95b9398834..000000000000
--- a/sys-cluster/ceph/ceph-16.2.7.ebuild
+++ /dev/null
@@ -1,460 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-DISTUTILS_OPTIONAL=1
-LUA_COMPAT=( lua5-3 )
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \
-		lua-single python-r1 udev readme.gentoo-r1 toolchain-funcs \
-		systemd tmpfiles multiprocessing
-
-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="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=(avx2 avx512f pclmul sse{,2,3,4_1,4_2} ssse3)
-
-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:=
-	app-arch/bzip2:=
-	app-arch/lz4:=
-	app-arch/snappy
-	|| ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 )
-	app-arch/zstd:=
-	app-shells/bash:0
-	app-misc/jq:=
-	dev-libs/crypto++:=
-	dev-cpp/gflags:=
-	<dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?]
-	dev-libs/libaio:=
-	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:=
-	dev-libs/nss:=
-	dev-libs/protobuf:=
-	net-dns/c-ares:=
-	net-libs/gnutls:=
-	sys-auth/oath-toolkit:=
-	sys-apps/coreutils
-	sys-apps/grep
-	sys-apps/hwloc:=
-	sys-apps/keyutils:=
-	sys-apps/util-linux:=
-	sys-apps/sed
-	sys-apps/util-linux
-	sys-libs/libcap-ng:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:=
-	sys-process/numactl:=
-	virtual/libcrypt:=
-	x11-libs/libpciaccess:=
-	babeltrace? ( dev-util/babeltrace )
-	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:= )
-	lttng? ( dev-util/lttng-ust:= )
-	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/nasm )
-	x86? ( dev-lang/yasm )
-	app-arch/cpio
-	>=dev-util/cmake-3.5.0
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	dev-util/cunit
-	dev-util/gperf
-	dev-util/ragel
-	dev-util/valgrind
-	sys-apps/coreutils
-	sys-apps/grep
-	sys-apps/sed
-	sys-apps/which
-	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}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		sys-apps/grep[pcre]
-		sys-fs/btrfs-progs
-	)
-"
-RDEPEND="
-	${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/lsscsi
-	sys-fs/lvm2[-device-mapper-only(-)]
-	virtual/awk
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${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/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	mgr? (
-		dev-python/jsonpatch[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pyjwt[${PYTHON_USEDEP}]
-		dev-python/routes[${PYTHON_USEDEP}]
-		diskprediction? (
-			>=dev-python/scipy-1.4.0[${PYTHON_USEDEP}]
-		)
-		sci-libs/scikit-learn[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-# diskprediction needs older scipy not compatible with py38
-# bug #724438
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	${LUA_REQUIRED_USE}
-	?? ( jemalloc tcmalloc )
-	jaeger? ( !system-boost )
-	diskprediction? ( mgr )
-	kafka? ( radosgw )
-	mgr? ( cephfs )
-	rabbitmq? ( radosgw )
-"
-RESTRICT="!test? ( test )"
-
-# the tests need root access
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-# create a non-debug release
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-# 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-16.2.2-cflags.patch"
-	"${FILESDIR}/ceph-16.2.7-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-cython-0.29.patch"
-	"${FILESDIR}/ceph-16.2.0-rocksdb-cmake.patch"
-	"${FILESDIR}/ceph-15.2.3-spdk-compile.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"
-	"${FILESDIR}/ceph-16.2.2-system-zstd.patch"
-	"${FILESDIR}/ceph-16.2.7-string-includes.patch"
-)
-
-check-reqs_export_vars() {
-	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
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup
-	lua_setup
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use system-boost; then
-		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
-			| xargs --null sed -r \
-			-e 's|Boost::|boost_|g' \
-			-e 's|Boost_|boost_|g' \
-			-e 's|[Bb]oost_boost|boost_system|g' -i || die
-	fi
-
-	if ! use systemd; then
-		find "${S}"/src/ceph-volume/ceph_volume -name '*.py' -print0 \
-			| xargs --null sed \
-			-e '/^from ceph_volume.systemd import systemctl/ d' \
-			-i || die
-	fi
-
-	sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
-		-i src/bash_completion/CMakeLists.txt || die
-
-	sed  -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die
-
-	if ! use diskprediction; then
-		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
-}
-
-ceph_src_configure() {
-	local flag
-	local mycmakeargs=(
-		-DWITH_BABELTRACE=$(usex babeltrace)
-		-DWITH_BLUESTORE_PMEM=$(usex pmdk)
-		-DWITH_CEPHFS=$(usex cephfs)
-		-DWITH_CEPHFS_SHELL=$(usex cephfs)
-		-DWITH_DPDK=$(usex dpdk)
-		-DWITH_SPDK=$(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=OFF
-		-DWITH_NUMA=$(usex numa)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_PYTHON3=3
-		-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')")
-		-DWITH_SYSTEM_PMDK=$(usex pmdk 'YES' "$(usex rbd-rwl)")
-		-DWITH_SYSTEM_BOOST=$(usex system-boost)
-		-DBOOST_J=$(makeopts_jobs)
-		-DWITH_SYSTEM_ROCKSDB=ON
-		-DWITH_RDMA=OFF
-		-DWITH_TBB=OFF
-		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
-		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=$(systemd_get_systemunitdir)
-		-DEPYTHON_VERSION="${EPYTHON#python}"
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-		-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
-			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
-
-	# needed for >=glibc-2.32
-	has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=(-DWITH_REENTRANT_STRSIGNAL:BOOL=ON)
-
-	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
-		|| die "failed to remove cmake cache"
-
-	cmake_src_configure
-
-	# bug #630232
-	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${S}}"/include/acconfig.h \
-		|| die "sed failed"
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	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_build 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_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-r1" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
-
-	insinto /etc/sudoers.d
-	doins sudoers.d/*
-
-	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
-	newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf
-
-	readme.gentoo_create_doc
-
-	python_setup
-
-	# 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
-	tmpfiles_process ${PN}.conf
-}
diff --git a/sys-cluster/ceph/ceph-16.2.9.ebuild b/sys-cluster/ceph/ceph-16.2.9.ebuild
index 4c0e1be4061e..688c98bb2b8f 100644
--- a/sys-cluster/ceph/ceph-16.2.9.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.9.ebuild
@@ -12,7 +12,7 @@ inherit check-reqs bash-completion-r1 cmake python-r1 flag-o-matic \
 		lua-single udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
 
 SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
 
 DESCRIPTION="Ceph distributed filesystem"
 HOMEPAGE="https://ceph.com/"
diff --git a/sys-cluster/ceph/ceph-17.2.0-r2.ebuild b/sys-cluster/ceph/ceph-17.2.0-r2.ebuild
deleted file mode 100644
index 6254678f5431..000000000000
--- a/sys-cluster/ceph/ceph-17.2.0-r2.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-LUA_COMPAT=( lua5-{3..4} )
-
-inherit check-reqs bash-completion-r1 cmake flag-o-matic lua-single \
-		python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
-
-SRC_URI="
-	https://download.ceph.com/tarballs/${P}.tar.gz
-	parquet? ( https://github.com/xtensor-stack/xsimd/archive/aeec9c872c8b475dedd7781336710f2dd2666cb2.tar.gz -> ceph-xsimd-${PV}.tar.gz )
-"
-KEYWORDS="~amd64 ~arm64"
-
-DESCRIPTION="Ceph distributed filesystem"
-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=(avx2 avx512f pclmul sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="
-	babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana
-	jemalloc jaeger kafka kerberos ldap lttng +mgr +parquet pmdk rabbitmq
-	+radosgw rbd-rwl rbd-ssd rdma 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}
-	${PYTHON_DEPS}
-	acct-group/ceph
-	acct-user/ceph
-	virtual/libudev:=
-	app-arch/bzip2:=
-	app-arch/lz4:=
-	app-arch/snappy:=
-	|| ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 )
-	app-arch/zstd:=
-	app-shells/bash:0
-	app-misc/jq:=
-	dev-libs/crypto++:=
-	dev-cpp/gflags:=
-	<dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?]
-	dev-libs/libaio:=
-	>=dev-libs/libfmt-6.2.1:=
-	dev-libs/libnl:3=
-	dev-libs/libxml2:=
-	dev-libs/libevent:=
-	dev-libs/libutf8proc:=
-	dev-libs/openssl:=
-	<dev-libs/rocksdb-6.15:=
-	dev-libs/thrift:=
-	dev-libs/xmlsec:=[openssl]
-	dev-cpp/yaml-cpp:=
-	dev-libs/nss:=
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	net-dns/c-ares:=
-	net-libs/gnutls:=
-	sys-auth/oath-toolkit:=
-	sys-apps/coreutils
-	sys-apps/hwloc:=
-	sys-apps/keyutils:=
-	sys-apps/util-linux:=
-	sys-libs/libcap-ng:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:=
-	sys-process/numactl:=
-	virtual/libcrypt:=
-	x11-libs/libpciaccess:=
-	babeltrace? ( dev-util/babeltrace )
-	fuse? ( sys-fs/fuse:3= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	!jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
-	jaeger? (
-		dev-cpp/nlohmann_json:=
-		dev-cpp/opentelemetry-cpp:=[jaeger]
-	)
-	kafka? ( dev-libs/librdkafka:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	lttng? ( dev-util/lttng-ust:= )
-	parquet? ( dev-libs/re2:= )
-	pmdk? ( dev-libs/pmdk:= )
-	rabbitmq? ( net-libs/rabbitmq-c:= )
-	radosgw? (
-		dev-libs/icu:=
-		dev-libs/expat:=
-		net-misc/curl:=[curl_ssl_openssl]
-	)
-	rbd-rwl? ( dev-libs/pmdk:= )
-	rdma? ( sys-cluster/rdma-core:= )
-	spdk? ( dev-util/cunit )
-	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:= )
-"
-BDEPEND="
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/yasm )
-	app-arch/cpio
-	>=dev-util/cmake-3.5.0
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	dev-util/gperf
-	dev-util/ragel
-	dev-util/valgrind
-	sys-apps/coreutils
-	sys-apps/grep
-	sys-apps/sed
-	sys-apps/util-linux
-	sys-apps/which
-	sys-devel/bc
-	sys-devel/patch
-	virtual/pkgconfig
-	jaeger? (
-		sys-devel/bison
-		sys-devel/flex
-	)
-	test? (
-		dev-util/cunit
-		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="
-	${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/lsscsi
-	sys-fs/lvm2[-device-mapper-only(-)]
-	virtual/awk
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${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}]
-	mgr? (
-		dev-python/jsonpatch[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pyjwt[${PYTHON_USEDEP}]
-		dev-python/routes[${PYTHON_USEDEP}]
-		diskprediction? (
-			>=dev-python/scipy-1.4.0[${PYTHON_USEDEP}]
-		)
-		sci-libs/scikit-learn[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-# diskprediction needs older scipy not compatible with py38
-# bug #724438
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	${LUA_REQUIRED_USE}
-	?? ( jemalloc tcmalloc )
-	diskprediction? ( mgr )
-	kafka? ( radosgw )
-	mgr? ( cephfs )
-	rabbitmq? ( radosgw )
-	rgw-lua? ( radosgw )
-"
-
-RESTRICT="
-	!test? ( test )
-"
-
-# tests need root access, and network access
-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-16.2.2-cflags.patch"
-	"${FILESDIR}/ceph-17.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-16.2.0-rocksdb-cmake.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"
-	"${FILESDIR}/ceph-17.2.0-cyclic-deps.patch"
-	"${FILESDIR}/ceph-17.2.0-pybind-boost-1.74.patch"
-	"${FILESDIR}/ceph-17.2.0-findre2.patch"
-	"${FILESDIR}/ceph-17.2.0-install-dbstore.patch"
-	"${FILESDIR}/ceph-17.2.0-deprecated-boost.patch"
-	"${FILESDIR}/ceph-17.2.0-system-opentelemetry.patch"
-	"${FILESDIR}/ceph-17.2.0-fuse3.patch"
-	"${FILESDIR}/ceph-17.2.0-osd_class_dir.patch"
-)
-
-check-reqs_export_vars() {
-	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
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup
-	lua_setup
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use system-boost; then
-		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
-			| xargs --null sed -r \
-			-e 's|Boost::|boost_|g' \
-			-e 's|Boost_|boost_|g' \
-			-e 's|[Bb]oost_boost|boost_system|g' \
-			-i || die
-	fi
-
-	if ! use systemd; then
-		find "${S}"/src/ceph-volume/ceph_volume -name '*.py' -print0 \
-			| xargs --null sed \
-			-e '/^from ceph_volume.systemd import systemctl/ d' \
-			-i || die
-	fi
-
-	sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
-		-i src/bash_completion/CMakeLists.txt || die
-
-	sed -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die
-
-	# force lua version to use selected version
-	local lua_version
-	lua_version=$(ver_cut 1-2 $(lua_get_version))
-	sed "s:find_package(Lua [0-9][.][0-9] REQUIRED):find_package(Lua ${lua_version} EXACT REQUIRED):" \
-		-i src/CMakeLists.txt
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t || die
-}
-
-ceph_src_configure() {
-	local mycmakeargs=(
-		-DWITH_BABELTRACE:BOOL=$(usex babeltrace)
-		-DWITH_BLUESTORE_PMEM:BOOL=$(usex pmdk)
-		-DWITH_CEPHFS:BOOL=$(usex cephfs)
-		-DWITH_CEPHFS_SHELL:BOOL=$(usex cephfs)
-		-DWITH_DPDK:BOOL=$(usex dpdk)
-		-DWITH_SPDK:BOOL=$(usex spdk)
-		-DWITH_FUSE:BOOL=$(usex fuse)
-		-DWITH_LTTNG:BOOL=$(usex lttng)
-		-DWITH_GSSAPI:BOOL=$(usex kerberos)
-		-DWITH_GRAFANA:BOOL=$(usex grafana)
-		-DWITH_MGR:BOOL=$(usex mgr)
-		-DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF
-		-DWITH_OPENLDAP:BOOL=$(usex ldap)
-		-DWITH_PYTHON3:STRING=3
-		-DWITH_RADOSGW:BOOL=$(usex radosgw)
-		-DWITH_RADOSGW_AMQP_ENDPOINT:BOOL=$(usex rabbitmq)
-		-DWITH_RADOSGW_KAFKA_ENDPOINT:BOOL=$(usex kafka)
-		-DWITH_RADOSGW_LUA_PACKAGES:BOOL=$(usex rgw-lua "$(usex radosgw)" "NO")
-		-DWITH_RBD_RWL:BOOL=$(usex rbd-rwl)
-		-DWITH_RBD_SSD_CACHE:BOOL=$(usex rbd-ssd)
-		-DWITH_SYSTEMD:BOOL=$(usex systemd)
-		-DWITH_TESTS:BOOL=$(usex test)
-		-DWITH_LIBURING:BOOL=$(usex uring)
-		-DWITH_SYSTEM_LIBURING:BOOL=$(usex uring)
-		-DWITH_LIBCEPHSQLITE:BOOL=$(usex sqlite)
-		-DWITH_XFS:BOOL=$(usex xfs)
-		-DWITH_ZBD:BOOL=$(usex zbd)
-		-DWITH_ZFS:BOOL=$(usex zfs)
-		-DENABLE_SHARED:BOOL=ON
-		-DALLOCATOR:STRING=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
-		-DWITH_SYSTEM_PMDK:BOOL=$(usex pmdk 'YES' "$(usex rbd-rwl '')")
-		-DWITH_SYSTEM_BOOST:BOOL=$(usex system-boost)
-		-DWITH_SYSTEM_ROCKSDB:BOOL=ON
-		-DWITH_SYSTEM_ZSTD:BOOL=ON
-		-DWITH_RDMA:BOOL=$(usex rdma)
-		-DCMAKE_INSTALL_DOCDIR:PATH="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-		-DCMAKE_INSTALL_SYSCONFDIR:PATH="${EPREFIX}/etc"
-		-Wno-dev
-	)
-
-	# this breaks when re-configuring for python impl
-	if [[ ${EBUILD_PHASE} == configure ]]; then
-		mycmakeargs+=(
-			-DWITH_JAEGER:BOOL=$(usex jaeger)
-			-DWITH_RADOSGW_SELECT_PARQUET:BOOL=$(usex parquet)
-		)
-	else
-		mycmakeargs+=(
-			-DWITH_RADOSGW_SELECT_PARQUET:BOOL=OFF
-		)
-	fi
-
-	# conditionally used cmake args
-	use test && mycmakearts+=( -DWITH_SYSTEM_GTEST:BOOL=$(usex test) )
-	use systemd && mycmakeargs+=( -DSYSTEMD_SYSTEM_UNIT_DIR:PATH=$(systemd_get_systemunitdir) )
-
-	if use amd64 || use x86; then
-		local flag
-		for flag in "${CPU_FLAGS_X86[@]}"; do
-			case "${flag}" in
-				avx*)
-					local var=${flag%f}
-					mycmakeargs+=(
-						"-DHAVE_NASM_X64_${var^^}:BOOL=$(usex cpu_flags_x86_${flag})"
-					)
-				;;
-				*) mycmakeargs+=(
-						"-DHAVE_INTEL_${flag^^}:BOOL=$(usex cpu_flags_x86_${flag})"
-					);;
-			esac
-		done
-	fi
-
-	# needed for >=glibc-2.32
-	has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=( -DWITH_REENTRANT_STRSIGNAL:BOOL=ON )
-
-	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
-		|| die "failed to remove cmake cache"
-
-	# hopefully this will not be necessary in the next release
-	use parquet && export ARROW_XSIMD_URL="file:///${DISTDIR}/ceph-xsimd-${PV}.tar.gz"
-
-	cmake_src_configure
-
-	# bug #630232
-	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${S}}"/include/acconfig.h \
-		|| die "sed failed"
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	ceph_src_configure
-}
-
-src_compile() {
-	cmake_build all
-
-	# we have to do this here to prevent from building everything multiple times
-	python_copy_sources
-	python_foreach_impl python_compile
-}
-
-python_compile() {
-	local CMAKE_USE_DIR="${S}"
-	ceph_src_configure
-
-	cmake_build src/pybind/CMakeFiles/cython_modules
-}
-
-src_install() {
-	python_foreach_impl python_install
-
-	python_setup
-	cmake_src_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-r1" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
-
-	insinto /etc/sudoers.d
-	doins sudoers.d/*
-
-	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
-	newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf
-
-	readme.gentoo_create_doc
-
-	# 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}}"
-}
-
-python_install() {
-	local CMAKE_USE_DIR="${S}"
-	DESTDIR="${ED}" cmake_build src/pybind/install
-
-	python_optimize
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	tmpfiles_process ${PN}.conf
-	udev_reload
-}
diff --git a/sys-cluster/ceph/files/ceph-16.2.7-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-16.2.7-no-virtualenvs.patch
deleted file mode 100644
index 977a3ab50cba..000000000000
--- a/sys-cluster/ceph/files/ceph-16.2.7-no-virtualenvs.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake
-index d26d003c779..bc962e3aa73 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 9166553dc73..9a6c87595b9 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=${Python3_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 9b3432213a0..973b185f5de 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 --verbose ${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"
-     )