gentoo resync : 07.05.2021

8 files changed, 653 insertions, 0 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 3fa1529c9b43..9e5019c3b62e 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 2edf833b6789..0ea27a5deade 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -27,6 +27,9 @@ AUX ceph-16.2.0-liburing.patch 1331 BLAKE2B 1f0e2e209cb827526b76e28f1334619c4d03
 AUX ceph-16.2.0-no-virtualenvs.patch 3345 BLAKE2B 3cd01abb32fe3afa1ea22c0975dde9a0adeeef90c14d6bd20e5e852dc4e8436dd1e4080bf8089ac85899091569c9b616a096470b18503e0c019c5c14ddbfca00 SHA512 ddfb6610a6a18affd62d0f76129b15a4774fdcf8edb25652ac89075ce4865a680f61c39b542416f680155cba18b1af48d4d94412f2e19a71f4bfe567f26a791a
 AUX ceph-16.2.0-rocksdb-cmake.patch 705 BLAKE2B d40371aa0163cd78dbe12b1db648f4884b762e2ec2485663aa5cda83aea2175c8ee9a6b1a54e5ed9d68fbfda8c0ee0ef7625a67d948b6259227e56fb0ee69b52 SHA512 0c974ea937644b98dde6f20f1cab9b39c73f7fd8cc0fa0991e05de2e0a39fe69dee60a981c0ae14386f8c0c5c4073d5c8573e3bd0fa47d58b754351329eda220
 AUX ceph-16.2.0-spdk-tinfo.patch 344 BLAKE2B ea46ab83836ebc9ed96714e0ed3c3e8b00a221296ddf9b10a99eb5591740a844067078820d79ae784cdb600c97e2969e81c65a4fe3b958bcc9910f7cecb1a6fe SHA512 31b9ae63c8f1722e4834034ed04cfc9ab47665ecd8f24da356897b0c52787096acbfc9cccf600655938da0f9f39200c2470cdb087f389adba975b6d830e7228d
+AUX ceph-16.2.2-cflags.patch 540 BLAKE2B d7f7ce9e65d59b7a9594f4cd34091df8b496d03cedfa814a14165d51ec0daa38ad0124fbfa62d9ee7cf2895676248b14b45a38f310efb544e61e9672c58fb25d SHA512 d65b2b33f2e43169e5131ef3ca51617931fc3d362af8c79bef2baa2bbee6495729ee7a4fca4401a6be716283fcdf83511bdfb90e0c4b526b90e91c9c32591439
+AUX ceph-16.2.2-no-virtualenvs.patch 3355 BLAKE2B e18ed3f6fca434df58b41d10cd087a2109f85448d77ddc1c4e3058fce1ea010ad88b6bf8271afac05260b78bd30bc23ec35532fbd7d0076f2e1169348219c9f5 SHA512 9d8ebddec895f369bdeb37556af85142a4a6edd330b1c9a4340bcfd8b33c951bf243f76f16eb05f9b7acc2f61aaca2594134cd74f40c3ead4d9760a68cdce69c
+AUX ceph-16.2.2-system-zstd.patch 1501 BLAKE2B 6540822407802dacb43c4fd9c432b45ec747a77d6892f2193fe55cb09da90b035d7630bdf5f9ec6f49df5e351c1d38c96cd14e9ed180bee897f11413ba53ed64 SHA512 5e21e29b30ee67411e3631fa65d0dc8a7b232e582c995049b4e89ea709e87a42edbf5cd4bbe535e62aebb7c9509a85b92c62e0f9914b2d4ee197994e2665139a
 AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d
 AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8
 AUX ceph-osd_at.service 362 BLAKE2B 7ccbf3428d687d1dfc3a8e10d56083802bba621d7cc9b965b55677e7ae8ce19bd178d31be687e47ed4ae21eef017c8913339cb465822ceadecd2e90cf84d692d SHA512 99c932fa99679a26b288ad57ca725a50847199915368a07ae1bb589ca777cd6e6a68e84f4d506a1097a06ace06eede176ea573e694bcbe43b434381116d63300
@@ -45,8 +48,10 @@ DIST ceph-14.2.19.tar.gz 129290834 BLAKE2B d1de69afcdacd4507a4d1d230a9a4cbd75067
 DIST ceph-14.2.20.tar.gz 129271968 BLAKE2B 45abcd35d4c854fcd7920ce19ea8d4369e567a77e89afb63d470220a2c5854cf5cad410dfd8f52f40fec732bc7e18cc3cdb93ecd7e4542866da9fd8fee4f1d92 SHA512 e67baabaf611dc9a52fb0114a491f72666f87ec7dd4dbd63448581baebaa9cd1e70a4e90b2f2db06bf675b778858d1b057aa39986ac858de7f3894b24b07bf7e
 DIST ceph-15.2.11.tar.gz 149695132 BLAKE2B 2dcb335a289314aaf6f68fc44950459c978dfd60fc0c064479f3230957a755d6a9bc238b57d3ec354efdfa5483461bac1080dd0afd7e4e2cd0a20c9410ae1a10 SHA512 e1b0627b7e4212c63b2ea2eb612247fcc9235247e63accc1fe456643b192275eea538e095cc859dbdffd5e00fe1c315563940f258708c8584ac0d0ad0641276f
 DIST ceph-16.2.1.tar.gz 155832182 BLAKE2B 9331d74ada9fb37e59f60daa813cdfe4711000f916365818435580c11d3295db5a13f98c2d2493cccf84cb4c6896c5a8137e3fe9b7a32ff0bedc0b524a0744b1 SHA512 42e404aa41565485dc4c08b66efb3de719adee72cfc535586992e15ab4601bfbd909ef61abf412badbbfa7ef13bf91a7c0576fbbf3f9f687bc7b465b21a8c416
+DIST ceph-16.2.3.tar.gz 155866118 BLAKE2B 7b1766effaa7b72697fad06e43eb1a3f2450b64fe970857cefc1d05271611a50b8cf55c574163b3f43d4a42b35b0bc0236c9089ac88b149f9b4d7fd706887db9 SHA512 07bc2b386fb0607df3128c151ee41565afe28b5efe3d907972198fc7fff9cecbafd51570d1b2624d1f921b259f788f0c3d133fb31f11bf6650cb2552f72f8047
 EBUILD ceph-14.2.19.ebuild 10514 BLAKE2B d4f43c7ccba4ea386f6ca7f68b143ec55115c1c21a6cc170b8925de8a314d4a5529581727b873ca5507e037033688d6d25506f9ebae9700dff710160ee82fca6 SHA512 d15fcdecd4e79c990edb1a04df8330282b3b861fe525f8620e7a48fdaeb411649deabfaab4d8c4fa874a2614aa24b10b98251b14071462baf1e502ccb3d58331
 EBUILD ceph-14.2.20.ebuild 10515 BLAKE2B 85f6922697dd9de98808319a1a7d1063efb62a1bdeb03413e92db79ac976a009dd3d48b48ac1c49c9cf06696af27da9e836adc7ec1b43413862a0a074bf6b8ae SHA512 e385fbf5b06da07bba48ac5a492dc329558e7749f38f906cbf3662276d6efa55083907613bcc0087af0635a6f80f5dc67ac0d581c214a6e2815eb457f76b2012
 EBUILD ceph-15.2.11.ebuild 10863 BLAKE2B 5c0396ea965b1b642989d6c1d311ac87ebdb66a75f17d1c462ebd8df41b2d135009cbd25a7a95dba248811fd1bb04f80feca25aa719ffc05498aac7395c39c54 SHA512 63b2d038a3d274a7c2aeec8322898f2aeacd76a95ef2d848aec84161ba2e1ab5dbe23ee9a6677eba41065f210333100d1aed437ceef6fad6af4e32e5d84895d6
 EBUILD ceph-16.2.1.ebuild 11914 BLAKE2B f08082ab1b541fec43d245b766f19826f28304c9beb70de5d9f3ddd66259bfbb81ad5ba930bb01fdc43bd6f5e7818b1cc770082886363f11d5597454f7f9df59 SHA512 d66477c158df48531441448fcb03de8a6bc4768ad806b3fb99118ae486a5520d55eceb498a2acf79771bebbd736e3b4b4259a3aa0d9bdb18b1fbbd8e5ba70981
+EBUILD ceph-16.2.3.ebuild 11959 BLAKE2B ae99609c4f5f303c42f23b8941a4acea81696ca47a00bb0f0cf1e39edab32b3ac2b1dd20e0493deccee71bde402bacce390656af5ad536b736d95cd6a1abcbf2 SHA512 0cca6494dd99fa508ea61b3f08aee6bb0d205860aa8b410ee773f9855edbc823655c58a2ac51edeb2c1199c1158adf526ddd11237d8cda29d3ac4568e99476dc
 MISC metadata.xml 2318 BLAKE2B f9cf86426b0d8ea87cb80cb03315e9b0b581f604b2e1f28011dd49ab885232184fbcb6e496e8305d92e2c45bea973b8627235115e6bc7b7590874ac2ce9a00cc SHA512 e4eb8fb92dfe9161c217d880db3733aec36efc74431f529b12212702abbf633647bb8a22bfe7864d7389e8ed893bc37518e228ce165140058f98aec534b8f3de
diff --git a/sys-cluster/ceph/ceph-16.2.3.ebuild b/sys-cluster/ceph/ceph-16.2.3.ebuild
new file mode 100644
index 000000000000..8775e532d158
--- /dev/null
+++ b/sys-cluster/ceph/ceph-16.2.3.ebuild
@@ -0,0 +1,449 @@
+# 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:=
+	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:=
+	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
+}
diff --git a/sys-cluster/ceph/files/ceph-16.2.2-cflags.patch b/sys-cluster/ceph/files/ceph-16.2.2-cflags.patch
new file mode 100644
index 000000000000..8c7bb79803c8
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-16.2.2-cflags.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
+index ba86ecaa63..b969c42911 100644
+--- a/cmake/modules/BuildBoost.cmake
++++ b/cmake/modules/BuildBoost.cmake
+@@ -62,7 +62,7 @@ function(do_build_boost version)
+   else()
+     list(APPEND boost_features "address-model=32")
+   endif()
+-  set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX
++  set(BOOST_CXXFLAGS "${CMAKE_CXX_FLAGS} -fPIC -w") # check on arm, etc <---XXX
+   list(APPEND boost_features "cxxflags=${BOOST_CXXFLAGS}")
+ 
+   set(boost_with_libs)
diff --git a/sys-cluster/ceph/files/ceph-16.2.2-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-16.2.2-no-virtualenvs.patch
new file mode 100644
index 000000000000..fa865529d424
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-16.2.2-no-virtualenvs.patch
@@ -0,0 +1,74 @@
+diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake
+index d26d003c77..bc962e3aa7 100644
+--- a/cmake/modules/AddCephTest.cmake
++++ b/cmake/modules/AddCephTest.cmake
+@@ -70,14 +70,6 @@ function(add_tox_test name)
+   endif()
+   string(REPLACE ";" "," tox_envs "${tox_envs}")
+   find_package(Python3 QUIET REQUIRED)
+-  add_custom_command(
+-    OUTPUT ${venv_path}/bin/activate
+-    COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python="${Python3_EXECUTABLE}" ${venv_path}
+-    WORKING_DIRECTORY ${tox_path}
+-    COMMENT "preparing venv for ${name}")
+-  add_custom_target(${name}-venv
+-    DEPENDS ${venv_path}/bin/activate)
+-  add_dependencies(tests ${name}-venv)
+   add_test(
+     NAME ${test_name}
+     COMMAND ${CMAKE_SOURCE_DIR}/src/script/run_tox.sh
+diff --git a/src/ceph-volume/CMakeLists.txt b/src/ceph-volume/CMakeLists.txt
+index 4224499c47..9a6c87595b 100644
+--- a/src/ceph-volume/CMakeLists.txt
++++ b/src/ceph-volume/CMakeLists.txt
+@@ -8,22 +8,6 @@ if(FREEBSD)
+   add_subdirectory(plugin/zfs)
+ endif()
+ 
+-# Required for running ceph-volume inventory in a vstart environment
+-set(CEPH_VOLUME_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-volume-virtualenv)
+-
+-add_custom_command(
+-  OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/python
+-  COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${Python_EXECUTABLE} ${CEPH_VOLUME_VIRTUALENV}
+-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
+-  COMMENT "ceph-volume venv is being created")
+-
+-add_custom_command(
+-  OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume
+-  DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/python
+-  COMMAND . ${CEPH_VOLUME_VIRTUALENV}/bin/activate && ${CEPH_VOLUME_VIRTUALENV}/bin/python setup.py develop && deactivate
+-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
+-  COMMENT "${CMAKE_SOURCE_DIR}/src/ceph-volume")
+-
+ add_custom_target(ceph-volume-venv-setup
+   DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume)
+ 
+diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
+index 94c0a56827..7f63e2adf4 100644
+--- a/src/pybind/mgr/dashboard/CMakeLists.txt
++++ b/src/pybind/mgr/dashboard/CMakeLists.txt
+@@ -5,9 +5,6 @@ function(add_npm_command)
+   set(multi_kw COMMAND DEPENDS)
+   cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN})
+   string(REPLACE ";" " " command "${NC_COMMAND}")
+-  if(NC_NODEENV)
+-    string(REGEX REPLACE "^(.*(npm|npx) .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
+-  endif()
+   string(REPLACE " " ";" command "${command}")
+   add_custom_command(
+     OUTPUT "${NC_OUTPUT}"
+@@ -51,11 +48,8 @@ else(WITH_SYSTEM_NPM)
+     set(node_mirror_opt "--mirror=$ENV{NODE_MIRROR}")
+   endif()
+   add_custom_command(
+-    OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm"
+-    COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
+-    COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
+-    COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv --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"
+     )
diff --git a/sys-cluster/ceph/files/ceph-16.2.2-system-zstd.patch b/sys-cluster/ceph/files/ceph-16.2.2-system-zstd.patch
new file mode 100644
index 000000000000..c50cca4e2ca0
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-16.2.2-system-zstd.patch
@@ -0,0 +1,40 @@
+diff --git a/src/compressor/zstd/CMakeLists.txt b/src/compressor/zstd/CMakeLists.txt
+index b53b0d9444..5bf5796da2 100644
+--- a/src/compressor/zstd/CMakeLists.txt
++++ b/src/compressor/zstd/CMakeLists.txt
+@@ -1,34 +1,11 @@
+ # zstd
+ 
+-# libzstd - build it statically
+-set(ZSTD_C_FLAGS "-fPIC -Wno-unused-variable -O3")
+-
+-include(ExternalProject)
+-ExternalProject_Add(zstd_ext
+-  SOURCE_DIR ${CMAKE_SOURCE_DIR}/src/zstd/build/cmake
+-  CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+-             -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+-             -DCMAKE_C_FLAGS=${ZSTD_C_FLAGS}
+-             -DCMAKE_AR=${CMAKE_AR}
+-             -DCMAKE_POSITION_INDEPENDENT_CODE=${ENABLE_SHARED}
+-             -G${CMAKE_GENERATOR}
+-  BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzstd
+-  BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target libzstd_static
+-  BUILD_BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/libzstd/lib/libzstd.a"
+-  INSTALL_COMMAND "true")
+-
+-add_library(zstd STATIC IMPORTED)
+-set_target_properties(zstd PROPERTIES
+-  INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/src/zstd/lib"
+-  IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/libzstd/lib/libzstd.a")
+-add_dependencies(zstd zstd_ext)
+-
+ set(zstd_sources
+   CompressionPluginZstd.cc
+ )
+ 
+ add_library(ceph_zstd SHARED ${zstd_sources})
+-target_link_libraries(ceph_zstd PRIVATE zstd $<$<PLATFORM_ID:Windows>:ceph-common>)
++target_link_libraries(ceph_zstd zstd)
+ set_target_properties(ceph_zstd PROPERTIES
+   VERSION 2.0.0
+   SOVERSION 2
diff --git a/sys-cluster/ipvsadm/Manifest b/sys-cluster/ipvsadm/Manifest
index 320c008b6650..f0a3de6d42a6 100644
--- a/sys-cluster/ipvsadm/Manifest
+++ b/sys-cluster/ipvsadm/Manifest
@@ -3,6 +3,8 @@ AUX ipvsadm-1.27-fix-daemon-state.patch 2001 BLAKE2B efc15ede85aae2c069399c0137c
 AUX ipvsadm-init 649 BLAKE2B 9414395d1093c1bff940982f90e7416fef6d74e9972b5416d571fe8a41363c03c9a4ff819cd2be578911a7c6c021cc7f52910371030a479a58800b8eb4f3d2ff SHA512 3fb2467fc157599fbf308e27f39f0cb4164e3d36423500d89c7fbedec3ba6f5c7b3cbe52b077811011fc0faef73072a0bf3b204d728841773ef2a520c03130f7
 DIST ipvsadm-1.27.tar.xz 38196 BLAKE2B 1b8a72b11c14a909b8b7459c459195d32bb7944ed4a01d963e2b85e8279c5d7d2fd095d9c23473c64dc15881a2b22b439b39c10b2019b3183f54e22535a258a9 SHA512 cf982b7981674c91d1b7516de7b55cf378b306ce4a53e13976b8eeb8610015c4fa4aa9d251bc4d329db8e05c1862863160af2d3c63b76263f290087cffdf1b80
 DIST ipvsadm-1.28.tar.xz 38600 BLAKE2B 2a892f858324788b425f7c5aa6ce6a1548c6cd166977d1d36a5236061d1a6ce7e31f6bc1e24a7d53a57406e468271ccebc01330de6be9784c1a955b60eb89d16 SHA512 a1e10ce30751d9439f832e221e5c41b338f87dcc94a0b21329d908a9164f8882049af9d9d918b764b36c30e353d5b8db49d7088e60c24e4748713c06cccf7035
+DIST ipvsadm-1.31.tar.xz 42396 BLAKE2B a42ceea834fb16e25ea34417227f6b632fe3b94c8a7ce5d3daff4375884fd47f14999551eab3bf7226d5eb02f25aef4c77a8287592b642946683bc5ddc6783da SHA512 1c7187405771e702eff0009d688fa697375b833a486ff88b41a4a0dcfaa3e9884c7e3bc34375efea5f6a2d025847c9fac9fd6ba694ec3bf2fc9d357eef2cb631
 EBUILD ipvsadm-1.27-r1.ebuild 1752 BLAKE2B 763a282dd008e7609f5f67f9f67085b5f2b21005667f95d4a0476315ddb09bb26b02bae2acdc33ab8eeb17554ee1edea920ea7399d0d5bc681984cd5d5f36113 SHA512 c0f8dedd134dc917ed869264113e6119a30687a4f75449a54ecad3658337584a5bbb8bf973c9b566d7601de1aee438ac957418e67ec72eb0768a9676cd046d9c
 EBUILD ipvsadm-1.28-r1.ebuild 1662 BLAKE2B ed4fc083b785cddae22fdbff7cd272f5bfb5ecd05d2e7260a55abb2e32ca7fcdc2743d0c315dcfa4a06f795e06dc7c42cc24e8a9a15d1e0d3cd3b317a95763a2 SHA512 3e566c48b551b34943d96fe0ad806eea138aaaa051c5060457f10d0d7eb017a1f1cedda5e8367c34c1b150decfd0d45feef3a10664e56bd7b934661bff86867b
+EBUILD ipvsadm-1.31.ebuild 1606 BLAKE2B 2f6dbb1f4ab241e4fdf1fd5f5d917cb397ef820d95acf53b1d32a6307b58affc02b8d4d0c84ab5c0b6b0bc285cd9d27e0105310f17595ddce24514c898e59f29 SHA512 8b6482559bc95fd4cb832e30c9f700d405c370d242483d25ff845f29a9937c415aabfde8bf5ee5efd512260aa09537ee01eeb7a8776b0e2a1e1941d56686060c
 MISC metadata.xml 263 BLAKE2B c9db7dc7f12c1017bee420587681f80a838eba2efed271c5a1fafa4595993917ea14b69fcc865a225561fa736bd93d9bfdac7b830a50d78707428d7fec4e987e SHA512 6ec307d6a3827ce21f67f8565a79a13d2833215571c459f42f06b8dd9184e1a41fa06b1cce8b3cf3555f4f875d9e366dd34ee786b6881dc18fb7d0b2d5c2acd5
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.31.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.31.ebuild
new file mode 100644
index 000000000000..67b27b47b59c
--- /dev/null
+++ b/sys-cluster/ipvsadm/ipvsadm-1.31.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit epatch linux-info toolchain-funcs
+
+DESCRIPTION="utility to administer the IP virtual server services"
+HOMEPAGE="http://linuxvirtualserver.org/"
+SRC_URI="https://kernel.org/pub/linux/utils/kernel/ipvsadm/ipvsadm-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=sys-libs/ncurses-5.2:*
+	dev-libs/libnl:=
+	>=dev-libs/popt-1.16"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if kernel_is 2 4; then
+		eerror "${P} supports only 2.6 series and later kernels, please try ${PN}-1.21 for 2.4 kernels"
+		die "wrong kernel version"
+	fi
+}
+
+src_prepare() {
+	default
+	epatch "${FILESDIR}"/${PN}-1.27-buildsystem.patch
+	use static-libs && export STATIC=1
+}
+
+src_compile() {
+	local libnl_include
+	if has_version ">=dev-libs/libnl-3.0"; then
+		libnl_include=$($(tc-getPKG_CONFIG) --cflags libnl-3.0)
+	else
+		libnl_include=""
+	fi
+	emake -e \
+		INCLUDE="-I.. -I. ${libnl_include}" \
+		CC="$(tc-getCC)" \
+		HAVE_NL=1 \
+		STATIC=${STATIC} \
+		POPT_LIB="$($(tc-getPKG_CONFIG) --libs popt)"
+}
+
+src_install() {
+	into /
+	dosbin ipvsadm ipvsadm-save ipvsadm-restore
+
+	into /usr
+	doman ipvsadm.8 ipvsadm-save.8 ipvsadm-restore.8
+
+	newinitd "${FILESDIR}"/ipvsadm-init ipvsadm
+	keepdir /var/lib/ipvsadm
+
+	use static-libs && dolib.a libipvs/libipvs.a
+	dolib.so libipvs/libipvs.so
+
+	insinto /usr/include/ipvs
+	newins libipvs/libipvs.h ipvs.h
+}
+
+pkg_postinst() {
+	einfo "You will need a kernel that has ipvs patches to use LVS."
+}