commit:     1a85196fb04bb10b91b46442bd54f8e206bf9fc1
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 23 00:54:54 2021 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Oct 25 17:02:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a85196f

sys-cluster/ceph: Drop old versions

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 sys-cluster/ceph/Manifest                          |   5 -
 sys-cluster/ceph/ceph-14.2.21-r2.ebuild            | 393 ------------------
 sys-cluster/ceph/ceph-15.2.12-r2.ebuild            | 404 ------------------
 sys-cluster/ceph/ceph-15.2.13-r2.ebuild            | 402 ------------------
 sys-cluster/ceph/ceph-15.2.14.ebuild               | 402 ------------------
 sys-cluster/ceph/ceph-16.2.4-r2.ebuild             | 451 ---------------------
 .../ceph/files/ceph-15.2.13-no-virtualenvs.patch   |  73 ----
 7 files changed, 2130 deletions(-)

diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 7f5036a1bc4..0998b3de4ea 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,9 +1,4 @@
-DIST ceph-14.2.21.tar.gz 129272778 BLAKE2B 
f82f452e0f0c40a95ea1bdb3654c2d322caa3edeeb05e41247e02a8ffe731c570d9e49aefa61c447a8b73620d4a9b9872335171f1e08fbd9a08eea930ccbfe76
 SHA512 
39b4a0624dcab2bafa50f51a42155fcf96dad74531a001d75009ad246a8ca80ce81ae538b34c0a1b773691c363626f1d0342f2439b711bd0dd16214592171884
 DIST ceph-14.2.22.tar.gz 130597047 BLAKE2B 
58bbb3243de076ed1d25dfd7bd75717c50ad15d16690dcbd1511d1b506477845efc3ff7fbe713cf18fb8cfcc8c16707ad2a0f30159e3198ff82e57fbd2eb3cf2
 SHA512 
1c66661e1a39fa9151e95e33c390b810ffe269465d8785e2197cc15b8d83bd2edde77de48a8abd71a4da68cd5830ff14bcdf6b98fd17edabe85caeb1eca018d3
-DIST ceph-15.2.12.tar.gz 148509713 BLAKE2B 
4962e7d574b38592a874a1b3fa8610bb2d0afc8713d995d67a790c025bb086cb619cbbaec76482ec096b4c55b9f1df383f5bd4806a231bc88e70ac3efbac24b5
 SHA512 
08266a2e9a7ca5a37e03f340873571fd012c630dd898a87241cd97c29760b2bf41fe64c8883e7b08e0f83c26245072cd26e69ecb1db02378d1ec38335ba1cd0f
-DIST ceph-15.2.13.tar.gz 148542333 BLAKE2B 
2e9668bcb0fd283ec4ab51b0c6142fc9a3b6310eb5d34e07da5e6b73b55dd7976db5ab9c78a93684ddc2f51873b1a17c4d31c5f5647b2d43a2826ee5362f7e5d
 SHA512 
bde28c331c489db0845959f65c425146c317466a7793f56a83e2827dec35b8cd6f600bf9056151c1e6926cc0155deebbc8681c240ac9f37ad876b9a6afae96da
-DIST ceph-15.2.14.tar.gz 148573546 BLAKE2B 
dc49a86e17702d73afdcde3932ee3bcb79e50bc5a97e207095a7907e34dac9f44de391b5dcace7f26d3466ca715d9cfd172f65ebbad4ddbc0280daa4643a5976
 SHA512 
eacc4dea0d8dfe2753aff78d89324d81c5634a784313c3da8ded778e2734958c216f8c705b25f070d7ba66b559424ad3c47cb68852f66f8c9c83a83ca78ad5a5
 DIST ceph-15.2.15.tar.gz 148584988 BLAKE2B 
6ff629846a74c9b30c7e5d54731e2c85c67942f1871194cc8e704c56826b86cdd6163d6693805d9d6210bc0e3fc4d84fada12b9d81a5640e34d76be83cfe6e47
 SHA512 
e4d929ffda5c3e31767d93340fb97b5d49ca1d5641f6c30134ce5542486fc4f72684aef2ef47cb940a332e8b9144d8cec63ce8a9f86c773dbc0ccebdd8e7fb19
-DIST ceph-16.2.4.tar.gz 155840423 BLAKE2B 
a803ffa61ac9fd6d42790d6d8e12aa8df843968627df0051475355f3ba0dc1272afa3d9e2716115ad769b2f322d7bd239d99b89e51610e89ce9efe39af4f01ae
 SHA512 
8904e7fcabd50276e4e86735fd85dba96f417c194c219025146f994707def7abe372528b0f2e862e274b2f405d7b791bac86b6cbb8d57cecd6f44023a2ffb6f6
 DIST ceph-16.2.5.tar.gz 155933825 BLAKE2B 
3c8f3f1663b91d4de1e3736317add0b88d9083db5ab2fc3e2e913278977deec076bd4410e309f4e47ccc169d74356c2ab1221c94532cc45ee75ec73673fc42a0
 SHA512 
5c32f9aa817ecfa788725bcfe5743756853ca9b3f9ee453242110f1b5e1bdd1feaef79ad9ccf2b185445c9644bcecb1355e151a2255bfd27edc9818e0d6d4c4a
 DIST ceph-16.2.6.tar.gz 156087762 BLAKE2B 
e2595d1a958200e4f1877e4597c53319a9eee2e95606ea1b3ba2966a0d17f1cfcf52e05cca59752cc6ac383e32d944c380920d111aec840631235aef273a4de1
 SHA512 
f01e29088ae566d4111c21b5d0c173ddb02badaa0d8272f7f1548eb8e66a95dc7052b3945d9fb342e6c97a65c57648fda394317340d1f4236a57af7580073658

diff --git a/sys-cluster/ceph/ceph-14.2.21-r2.ebuild 
b/sys-cluster/ceph/ceph-14.2.21-r2.ebuild
deleted file mode 100644
index 5d1b43cae8f..00000000000
--- a/sys-cluster/ceph/ceph-14.2.21-r2.ebuild
+++ /dev/null
@@ -1,393 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-CMAKE_MAKEFILE_GENERATOR=emake
-
-DISTUTILS_OPTIONAL=1
-
-inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \
-               python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
-
-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 ~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=(sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana 
jemalloc
-       kafka kerberos ldap lttng +mgr numa rabbitmq +radosgw +ssl spdk 
system-boost
-       systemd +tcmalloc test xfs zfs"
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-DEPEND="
-       acct-group/ceph
-       acct-user/ceph
-       virtual/libcrypt:=
-       virtual/libudev:=
-       app-arch/bzip2:=
-       app-arch/lz4:=
-       app-arch/snappy:=
-       app-arch/zstd:=
-       app-shells/bash:0
-       app-misc/jq:=
-       dev-libs/crypto++:=
-       dev-libs/leveldb:=[snappy,tcmalloc(-)?]
-       dev-libs/libaio:=
-       dev-libs/libnl:3=
-       dev-libs/libxml2:=
-       <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:=
-       x11-libs/libpciaccess:=
-       babeltrace? ( dev-util/babeltrace )
-       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:= )
-       lttng? ( dev-util/lttng-ust:= )
-       rabbitmq? ( net-libs/rabbitmq-c:= )
-       radosgw? (
-               dev-libs/expat:=
-               dev-libs/openssl:=
-               net-misc/curl:=[curl_ssl_openssl]
-       )
-       ssl? ( dev-libs/openssl:= )
-       system-boost? ( 
dev-libs/boost:=[threads(+),context,python,${PYTHON_USEDEP}] )
-       xfs? ( sys-fs/xfsprogs:= )
-       zfs? ( sys-fs/zfs:= )
-       ${PYTHON_DEPS}
-"
-BDEPEND="
-       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
-       dev-util/gperf
-       dev-util/ragel
-       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
-       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/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/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/more-itertools[${PYTHON_USEDEP}]
-               dev-python/numpy[${PYTHON_USEDEP}]
-               <dev-python/pyjwt-2.0[${PYTHON_USEDEP}]
-               dev-python/pyyaml[${PYTHON_USEDEP}]
-               dev-python/routes[${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}
-       ?? ( jemalloc tcmalloc )
-       diskprediction? ( mgr !python_targets_python3_8 )
-       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-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.3-dpdk-compile-fix-1.patch"
-       "${FILESDIR}/ceph-14.2.4-python-executable.patch"
-       "${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch"
-       "${FILESDIR}/ceph-14.2.10-build-without-mgr.patch"
-       "${FILESDIR}/ceph-14.2.11-systemd-unit-fix.patch"
-       
"${FILESDIR}/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch"
-)
-
-check-reqs_export_vars() {
-       CHECKREQS_DISK_BUILD="5200M"
-       CHECKREQS_DISK_USR="510M"
-
-       export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-pkg_pretend() {
-       check-reqs_export_vars
-       check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-       python_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
-
-       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
-
-       # 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=$(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_SSL=$(usex ssl)
-               -DWITH_SYSTEMD=$(usex systemd)
-               -DWITH_TESTS=$(usex test)
-               -DWITH_XFS=$(usex xfs)
-               -DWITH_ZFS=$(usex zfs)
-               -DENABLE_SHARED="ON"
-               -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 
'jemalloc' 'libc')")
-               -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
-       )
-       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
-
-       # 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" 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
-       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-15.2.12-r2.ebuild 
b/sys-cluster/ceph/ceph-15.2.12-r2.ebuild
deleted file mode 100644
index 7e0b490c135..00000000000
--- a/sys-cluster/ceph/ceph-15.2.12-r2.ebuild
+++ /dev/null
@@ -1,404 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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
-
-inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \
-               python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
-
-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=(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+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-DEPEND="
-       acct-group/ceph
-       acct-user/ceph
-       virtual/libcrypt:=
-       virtual/libudev:=
-       app-arch/bzip2:=
-       app-arch/lz4:=
-       app-arch/snappy:=
-       app-arch/zstd:=
-       app-shells/bash:0
-       app-misc/jq:=
-       dev-libs/crypto++:=
-       dev-cpp/gflags:=
-       dev-libs/leveldb:=[snappy,tcmalloc(-)?]
-       dev-libs/libaio:=
-       dev-libs/libfmt:=
-       dev-libs/libnl:3=
-       dev-libs/libxml2:=
-       <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:=
-       x11-libs/libpciaccess:=
-       babeltrace? ( dev-util/babeltrace )
-       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:= )
-       lttng? ( dev-util/lttng-ust:= )
-       pmdk? ( dev-libs/pmdk:= )
-       rabbitmq? ( net-libs/rabbitmq-c:= )
-       radosgw? (
-               dev-libs/expat:=
-               dev-libs/openssl:=
-               net-misc/curl:=[curl_ssl_openssl]
-       )
-       rbd-rwl? ( dev-libs/pmdk:= )
-       ssl? ( dev-libs/openssl:= )
-       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="
-       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
-       dev-util/gperf
-       dev-util/ragel
-       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
-       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/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/pyyaml[${PYTHON_USEDEP}]
-               dev-python/routes[${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}
-       ?? ( jemalloc tcmalloc )
-       diskprediction? ( mgr !python_targets_python3_8 )
-       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-13.2.0-cflags.patch"
-       "${FILESDIR}/ceph-15.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-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"
-)
-
-check-reqs_export_vars() {
-       CHECKREQS_DISK_BUILD="5400M"
-       CHECKREQS_DISK_USR="510M"
-
-       export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-pkg_pretend() {
-       check-reqs_export_vars
-       check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-       python_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
-
-       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
-
-       # 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_RBD_RWL=$(usex rbd-rwl)
-               -DWITH_SSL=$(usex ssl)
-               -DWITH_SYSTEMD=$(usex systemd)
-               -DWITH_TESTS=$(usex test)
-               -DWITH_LIBURING=$(usex uring)
-               -DWITH_XFS=$(usex xfs)
-               -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
-       )
-       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
-
-       # 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/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-15.2.13-r2.ebuild 
b/sys-cluster/ceph/ceph-15.2.13-r2.ebuild
deleted file mode 100644
index bc1a96acf14..00000000000
--- a/sys-cluster/ceph/ceph-15.2.13-r2.ebuild
+++ /dev/null
@@ -1,402 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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
-
-inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \
-               python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
-
-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=(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+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-DEPEND="
-       acct-group/ceph
-       acct-user/ceph
-       virtual/libudev:=
-       app-arch/bzip2:=
-       app-arch/lz4:=
-       app-arch/snappy:=
-       app-arch/zstd:=
-       app-shells/bash:0
-       app-misc/jq:=
-       dev-libs/crypto++:=
-       dev-cpp/gflags:=
-       dev-libs/leveldb:=[snappy,tcmalloc(-)?]
-       dev-libs/libaio:=
-       dev-libs/libfmt:=
-       dev-libs/libnl:3=
-       dev-libs/libxml2:=
-       <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:= )
-       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/expat:=
-               dev-libs/openssl:=
-               net-misc/curl:=[curl_ssl_openssl]
-       )
-       rbd-rwl? ( dev-libs/pmdk:= )
-       ssl? ( dev-libs/openssl:= )
-       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="
-       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
-       dev-util/gperf
-       dev-util/ragel
-       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
-       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/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/pyyaml[${PYTHON_USEDEP}]
-               dev-python/routes[${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}
-       ?? ( jemalloc tcmalloc )
-       diskprediction? ( mgr !python_targets_python3_8 )
-       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-13.2.0-cflags.patch"
-       "${FILESDIR}/ceph-15.2.13-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-15.2.0-rocksdb-cmake.patch"
-       "${FILESDIR}/ceph-15.2.2-systemd-unit.patch"
-       "${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
-       "${FILESDIR}/ceph-15.2.4-system-uring.patch"
-       
"${FILESDIR}/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch"
-)
-
-check-reqs_export_vars() {
-       CHECKREQS_DISK_BUILD="5400M"
-       CHECKREQS_DISK_USR="510M"
-
-       export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-pkg_pretend() {
-       check-reqs_export_vars
-       check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-       python_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
-
-       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
-
-       # 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_RBD_RWL=$(usex rbd-rwl)
-               -DWITH_SSL=$(usex ssl)
-               -DWITH_SYSTEMD=$(usex systemd)
-               -DWITH_TESTS=$(usex test)
-               -DWITH_LIBURING=$(usex uring)
-               -DWITH_XFS=$(usex xfs)
-               -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
-       )
-       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
-
-       # 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/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-15.2.14.ebuild 
b/sys-cluster/ceph/ceph-15.2.14.ebuild
deleted file mode 100644
index bc1a96acf14..00000000000
--- a/sys-cluster/ceph/ceph-15.2.14.ebuild
+++ /dev/null
@@ -1,402 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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
-
-inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \
-               python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
-
-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=(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+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-DEPEND="
-       acct-group/ceph
-       acct-user/ceph
-       virtual/libudev:=
-       app-arch/bzip2:=
-       app-arch/lz4:=
-       app-arch/snappy:=
-       app-arch/zstd:=
-       app-shells/bash:0
-       app-misc/jq:=
-       dev-libs/crypto++:=
-       dev-cpp/gflags:=
-       dev-libs/leveldb:=[snappy,tcmalloc(-)?]
-       dev-libs/libaio:=
-       dev-libs/libfmt:=
-       dev-libs/libnl:3=
-       dev-libs/libxml2:=
-       <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:= )
-       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/expat:=
-               dev-libs/openssl:=
-               net-misc/curl:=[curl_ssl_openssl]
-       )
-       rbd-rwl? ( dev-libs/pmdk:= )
-       ssl? ( dev-libs/openssl:= )
-       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="
-       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
-       dev-util/gperf
-       dev-util/ragel
-       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
-       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/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/pyyaml[${PYTHON_USEDEP}]
-               dev-python/routes[${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}
-       ?? ( jemalloc tcmalloc )
-       diskprediction? ( mgr !python_targets_python3_8 )
-       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-13.2.0-cflags.patch"
-       "${FILESDIR}/ceph-15.2.13-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-15.2.0-rocksdb-cmake.patch"
-       "${FILESDIR}/ceph-15.2.2-systemd-unit.patch"
-       "${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
-       "${FILESDIR}/ceph-15.2.4-system-uring.patch"
-       
"${FILESDIR}/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch"
-)
-
-check-reqs_export_vars() {
-       CHECKREQS_DISK_BUILD="5400M"
-       CHECKREQS_DISK_USR="510M"
-
-       export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-pkg_pretend() {
-       check-reqs_export_vars
-       check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-       python_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
-
-       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
-
-       # 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_RBD_RWL=$(usex rbd-rwl)
-               -DWITH_SSL=$(usex ssl)
-               -DWITH_SYSTEMD=$(usex systemd)
-               -DWITH_TESTS=$(usex test)
-               -DWITH_LIBURING=$(usex uring)
-               -DWITH_XFS=$(usex xfs)
-               -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
-       )
-       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
-
-       # 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/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.4-r2.ebuild 
b/sys-cluster/ceph/ceph-16.2.4-r2.ebuild
deleted file mode 100644
index e3804ec653b..00000000000
--- a/sys-cluster/ceph/ceph-16.2.4-r2.ebuild
+++ /dev/null
@@ -1,451 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-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
-
-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-1.1.9:=
-       app-arch/zstd:=
-       app-shells/bash:0
-       app-misc/jq:=
-       dev-libs/crypto++:=
-       dev-cpp/gflags:=
-       dev-libs/leveldb:=[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/sphinx
-       dev-util/cunit
-       dev-util/gperf
-       dev-util/ragel
-       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
-       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/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/pyyaml[${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.2-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-16.2.0-rocksdb-cmake.patch"
-       "${FILESDIR}/ceph-15.2.3-spdk-compile.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"
-       "${FILESDIR}/ceph-16.2.2-system-zstd.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
-
-       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/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/files/ceph-15.2.13-no-virtualenvs.patch 
b/sys-cluster/ceph/files/ceph-15.2.13-no-virtualenvs.patch
deleted file mode 100644
index 665bb891426..00000000000
--- a/sys-cluster/ceph/files/ceph-15.2.13-no-virtualenvs.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake
-index c9ee8c1b8f..09f75543da 100644
---- a/cmake/modules/AddCephTest.cmake
-+++ b/cmake/modules/AddCephTest.cmake
-@@ -68,14 +68,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 92e4cdc538..3153c93c45 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}"
-@@ -29,10 +26,8 @@ else()
-   set(nodeenv NODEENV)
- 
-   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 -p 
--node=10.18.1
-+    OUTPUT "npm"
-+    COMMAND nodeenv --verbose -p --node=10.18.1
-     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-     COMMENT "dashboard nodeenv is being installed"
-   )

Reply via email to