[gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/

["Patrick McLean" <chutzpah@gentoo.org>]

commit:     66f1f0200ca91be0aa30cee5f1e26213b5ef6b9f
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Mon Apr 15 23:29:09 2019 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 23:29:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66f1f020

sys-cluster/ceph: clean up old versions

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 sys-cluster/ceph/Manifest               |   3 -
 sys-cluster/ceph/ceph-10.2.10-r2.ebuild | 306 -----------------------------
 sys-cluster/ceph/ceph-10.2.3-r2.ebuild  | 264 -------------------------
 sys-cluster/ceph/ceph-13.2.4.ebuild     | 331 --------------------------------
 sys-cluster/ceph/metadata.xml           |   3 -
 5 files changed, 907 deletions(-)

diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 9cd012986cb..bfbbc7b64d7 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,8 +1,5 @@
-DIST ceph-10.2.10.tar.gz 14573701 BLAKE2B 78c68deb8537cae8394b4d35569983431e938eff42b01f448dea68016b33ca5770c83d1e1d382bfd6c8164d5259e821779c6515f8c8fb4d5d52ee90b7df43180 SHA512 883d1b8340aaefc7a1eee4bbfb5b1d1cc15bffed8f35fb1e8fb86b1208a4d0d16753eb6c688ea0e661c4877d3d148b2b6c2b41620c4e8a61e47c69f46f98e537
-DIST ceph-10.2.3.tar.gz 11596171 BLAKE2B c24c879649f0d42f58cfb1d03701797bc685d83c157031156d13308c731412a4a0149b658193722b358ebf0c4f9760d9664668cd797b69d207e81dc572f49700 SHA512 9de1e6851fc343d2c52c72cec3f7887d998d5b588f1251ee3a1fda14427badfa10408e6691fb03a374a10f4ec9844868423fee70fbbe2c0d962af98481412f19
 DIST ceph-12.2.11.tar.gz 79009034 BLAKE2B d8b1c188fe39603e90511eb436100ba14c0a9c4d9531f1a4ca52e78449462aacd274b80f8d0549918979fcb1ca4632ae0eaade1ae311a730fbe6657be044fc35 SHA512 14f46cc6f38d7d894cc657a040b428309632e5c163109a8a4a79a346ba2901a37d79966a0bc09148810c22b89375d9a4cb3b23f16364685b094c518bfafe9bef
 DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7881cd9c2e185eca12096efb79d21578659d248eb5bae678924983d57452d370e23ab7e78663764d7bea834a461 SHA512 e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc
 DIST ceph-12.2.8.tar.gz 77243685 BLAKE2B 37c34396a0c276b8d79735e14934ac70da024822c2a060061531c234e03e5d41aad6c41dc64b05c2ce47f03287d0cae9ef9bed67e4a0861b6380c8ce1de4ea69 SHA512 91c5c11aaeef701b3e31c9f8a1192b6b79fd34f3b96c61595c65173c98bfce0009c5b7c9b29764f5e4d4b1f5ac2ca7109fed5ae598c176aba717a34a132fabac
-DIST ceph-13.2.4.tar.gz 90910119 BLAKE2B eb395f435552d91789869bd92fee2a8b2fef155205f13b118bd01be4ff78a8e1dde682425a24311822bb819ec8cf41a9d45245ffa3cb7a921d3269f6658bf920 SHA512 5055979067234ad7fd2774007d524ef4643d968bf7ce42fc8c3f8e469fd84cbd7afc163cd6ddda53584bd5677fdea2fecf8194a378d49724504f639b9f688ff7
 DIST ceph-13.2.5.tar.gz 91006057 BLAKE2B 68551e2f54d78aff7b0e9ec3c62e6a3394dd7c23e80924a5b400cd9666a05a42e5f22445deee4040f1b78201c6a6660b283109878d4c92d845821bff831c8a5e SHA512 6daea524523f829e725609328ea71f416b2c3a9530fa8956720a7bc69dc08e55a169654f500704579dc9ba693f04eedd7e04614c0850e9ab1169cd45f19039f8
 DIST ceph-14.2.0.tar.gz 118882504 BLAKE2B e650d99dceb11c7b035480c8cdd9f63ee4a5f81ffea27988e180a2956433e3e4b34e496a73bf5992c428eff859311c623b92a6f006eb694ebf928d8204dc9b06 SHA512 c86a335714fd5678988133ec0e60cb10cd948250a133c073d1ed055c5bba232fa6f1e102dd7fcb0c70b37a07c9c2d1220d4a1713720e4dcab9659152ee577480

diff --git a/sys-cluster/ceph/ceph-10.2.10-r2.ebuild b/sys-cluster/ceph/ceph-10.2.10-r2.ebuild
deleted file mode 100644
index 74ca90cef62..00000000000
--- a/sys-cluster/ceph/ceph-10.2.10-r2.ebuild
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit check-reqs autotools eutils python-r1 udev user \
-	readme.gentoo-r1 systemd versionator flag-o-matic toolchain-funcs
-
-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 ~x86"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio"
-IUSE+=" libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs"
-
-# unbundling code commented out pending bugs 584056 and 584058
-#>=dev-libs/jerasure-2.0.0-r1
-#>=dev-libs/gf-complete-2.0.0
-COMMON_DEPEND="
-	app-arch/snappy:=
-	sys-libs/zlib:=
-	app-arch/lz4:=
-	app-arch/bzip2:=
-	app-arch/zstd:=
-	dev-libs/boost:=[threads]
-	dev-libs/libaio:=
-	dev-libs/leveldb:=[snappy]
-	nss? ( dev-libs/nss:= )
-	libatomic? ( dev-libs/libatomic_ops:= )
-	cryptopp? ( dev-libs/crypto++:= )
-	sys-apps/keyutils
-	sys-apps/util-linux
-	dev-libs/libxml2:=
-	radosgw? ( dev-libs/fcgi:= )
-	ldap? ( net-nds/openldap:= )
-	babeltrace? ( dev-util/babeltrace )
-	fuse? ( sys-fs/fuse:0= )
-	xfs? ( sys-fs/xfsprogs:= )
-	zfs? ( sys-fs/zfs:= )
-	gtk? (
-		x11-libs/gtk+:2=
-		dev-cpp/gtkmm:2.4
-		gnome-base/librsvg:=
-	)
-	radosgw? (
-		dev-libs/fcgi:=
-		dev-libs/expat:=
-		net-misc/curl:=
-	)
-	jemalloc? ( dev-libs/jemalloc:= )
-	!jemalloc? ( =dev-util/google-perftools-2.4*:= )
-	lttng? ( dev-util/lttng-ust:= )
-	${PYTHON_DEPS}
-	"
-DEPEND="${COMMON_DEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	app-arch/cpio
-	dev-lang/yasm
-	virtual/pkgconfig
-	dev-python/sphinx
-	test? (
-		sys-fs/btrfs-progs
-		sys-apps/grep[pcre]
-		dev-python/tox[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/hdparm
-	sys-block/parted
-	sys-fs/cryptsetup
-	sys-apps/gptfdisk
-	!<sys-apps/openrc-0.26.3
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	"
-REQUIRED_USE="
-	$(python_gen_useflags 'python2*')
-	${PYTHON_REQUIRED_USE}
-	^^ ( nss cryptopp )
-	?? ( jemalloc tcmalloc )
-	"
-
-# work around bug in ceph compilation (rgw/ceph_dencoder-rgw_dencoder.o... undefined reference to `vtable for RGWZoneGroup')
-REQUIRED_USE+=" radosgw"
-
-#RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-UNBUNDLE_LIBS=(
-	src/erasure-code/jerasure/jerasure
-	src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
-	"${FILESDIR}/ceph-10.2.0-dont-use-virtualenvs.patch"
-	#"${FILESDIR}/ceph-10.2.1-unbundle-jerasure.patch"
-	"${FILESDIR}/${PN}-10.2.1-libzfs.patch"
-	"${FILESDIR}/${PN}-10.2.3-build-without-openldap.patch"
-	"${FILESDIR}/${PN}-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch"
-	"${FILESDIR}/${PN}-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch"
-	"${FILESDIR}/${PN}-10.2.7-fix-compilation-with-zstd.patch"
-	"${FILESDIR}/${PN}-10.2.9-cflags.patch"
-	"${FILESDIR}/${PN}-10.2.9-dont-run-lsb_release.patch"
-)
-
-check-reqs_export_vars() {
-	if use debug; then
-		CHECKREQS_DISK_BUILD="23G"
-		CHECKREQS_DISK_USR="7G"
-	elif use amd64; then
-		CHECKREQS_DISK_BUILD="12G"
-		CHECKREQS_DISK_USR="450M"
-	else
-		CHECKREQS_DISK_BUILD="1400M"
-		CHECKREQS_DISK_USR="450M"
-	fi
-
-	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-user_setup() {
-	enewgroup ceph ${CEPH_GID}
-	enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
-}
-
-emake_python_bindings() {
-	local action="${1}" params binding module
-	shift
-	params=("${@}")
-
-	__emake_python_bindings_do_impl() {
-		ceph_run_econf "${EPYTHON}"
-		emake "${params[@]}" PYTHON="${EPYTHON}" "${binding}-pybind-${action}"
-
-		# these don't work and aren't needed on python3
-		if [[ ${EBUILD_PHASE} == install ]]; then
-			for module in "${S}"/src/pybind/*.py; do
-				module_basename="$(basename "${module}")"
-				if [[ ${module_basename} == ceph_volume_client.py ]] && ! use cephfs; then
-					continue
-				elif [[ ! -e "${ED}/$(python_get_sitedir)/${module_basename}" ]]; then
-					python_domodule ${module}
-				fi
-			done
-		fi
-	}
-
-	pushd "${S}/src"
-	for binding in rados rbd $(use cephfs && echo cephfs); do
-		python_foreach_impl __emake_python_bindings_do_impl
-	done
-	popd
-
-	unset __emake_python_bindings_do_impl
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-	user_setup
-}
-
-src_prepare() {
-	default
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t
-
-	#rm -rf "${UNBUNDLE_LIBS[@]}"
-
-	append-flags -fPIC
-
-	if tc-is-gcc && [[ $(gcc-fullversion) == "7.2.0" ]] && is-flag "-g*"; then
-		ewarn "Filtering out -g* flags since gcc-7.2 tends to ICE with them and ceph"
-		filter-flags "-g*"
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	ECONFARGS=(
-		--without-hadoop
-		--includedir=/usr/include
-		$(use_with cephfs)
-		$(use_with debug)
-		$(use_with fuse)
-		$(use_with libaio)
-		$(use_with libatomic libatomic-ops)
-		$(use_with nss)
-		$(use_with cryptopp)
-		$(use_with radosgw)
-		$(use_with gtk gtk2)
-		$(use_enable static-libs static)
-		$(use_with jemalloc)
-		$(use_with xfs libxfs)
-		$(use_with zfs libzfs)
-		$(use_with lttng )
-		$(use_with babeltrace)
-		$(use_with ldap openldap)
-		$(use jemalloc || usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal")
-		--with-mon
-		--with-eventfd
-		--with-cython
-		--without-kinetic
-		--without-librocksdb
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	# we can only use python2.7 for building at the moment
-	ceph_run_econf "python2*"
-}
-
-ceph_run_econf() {
-	[[ -z ${ECONFARGS} ]] && die "called ${FUNCNAME[0]} with ECONFARGS unset"
-	[[ -z ${1} ]] && die "called ${FUNCNAME[0]} without passing python implementation"
-
-	pushd "${S}" >/dev/null || die
-	#
-	# This generates a QA warning about running econf in src_compile
-	# and src_install. Unfortunately the only other way to do this would
-	# involve building all of for each python implementation times, which
-	# wastes a _lot_ of CPU time and disk space. This hack will no longer
-	# be needed with >=ceph-11.2.
-	#
-	python_setup "${1}"
-	econf "${ECONFARGS[@]}"
-
-	popd >/dev/null || die
-}
-
-src_compile() {
-	emake
-	emake_python_bindings all
-
-	use test && emake check-local
-}
-
-src_test() {
-	make check || die "make check failed"
-}
-
-src_install() {
-	default
-	emake_python_bindings install-exec "DESTDIR=\"${D}\""
-
-	prune_libtool_files --all
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe src/init-ceph ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate ${PN}
-
-	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
-	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
-
-	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r7" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
-	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
-	systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
-	systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
-
-	udev_dorules udev/*.rules
-
-	readme.gentoo_create_doc
-
-	python_setup 'python2*'
-	python_fix_shebang "${ED}"/usr/{,s}bin/
-
-	# python_fix_shebang apparently is not idempotent
-	sed -i -r  's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
-		"${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}

diff --git a/sys-cluster/ceph/ceph-10.2.3-r2.ebuild b/sys-cluster/ceph/ceph-10.2.3-r2.ebuild
deleted file mode 100644
index 74e61b4aceb..00000000000
--- a/sys-cluster/ceph/ceph-10.2.3-r2.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
-
-inherit check-reqs autotools eutils python-r1 udev user \
-	readme.gentoo-r1 systemd versionator flag-o-matic
-
-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 ~arm ~ppc ~ppc64 x86"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio"
-IUSE+=" libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs"
-
-# unbundling code commented out pending bugs 584056 and 584058
-#>=dev-libs/jerasure-2.0.0-r1
-#>=dev-libs/gf-complete-2.0.0
-COMMON_DEPEND="
-	app-arch/snappy
-	app-arch/lz4:=
-	app-arch/bzip2
-	dev-libs/boost:=[threads]
-	dev-libs/libaio
-	dev-libs/leveldb:=[snappy]
-	nss? ( dev-libs/nss )
-	libatomic? ( dev-libs/libatomic_ops )
-	cryptopp? ( dev-libs/crypto++:= )
-	sys-apps/keyutils
-	sys-apps/util-linux
-	dev-libs/libxml2
-	radosgw? ( dev-libs/fcgi )
-	ldap? ( net-nds/openldap )
-	babeltrace? ( dev-util/babeltrace )
-	fuse? ( sys-fs/fuse:0 )
-	xfs? ( sys-fs/xfsprogs )
-	zfs? ( sys-fs/zfs )
-	gtk? (
-		x11-libs/gtk+:2
-		dev-cpp/gtkmm:2.4
-		gnome-base/librsvg
-	)
-	radosgw? (
-		dev-libs/fcgi
-		dev-libs/expat
-		net-misc/curl
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	!jemalloc? ( dev-util/google-perftools )
-	lttng? ( dev-util/lttng-ust )
-	${PYTHON_DEPS}
-	"
-DEPEND="${COMMON_DEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	app-arch/cpio
-	sys-apps/lsb-release
-	virtual/pkgconfig
-	dev-python/sphinx
-	test? (
-		sys-fs/btrfs-progs
-		sys-apps/grep[pcre]
-		dev-python/tox[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/hdparm
-	sys-block/parted
-	sys-fs/cryptsetup
-	sys-apps/gptfdisk
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	"
-REQUIRED_USE="
-	$(python_gen_useflags 'python2*')
-	${PYTHON_REQUIRED_USE}
-	^^ ( nss cryptopp )
-	?? ( jemalloc tcmalloc )
-	"
-
-# work around bug in ceph compilation (rgw/ceph_dencoder-rgw_dencoder.o... undefined reference to `vtable for RGWZoneGroup')
-REQUIRED_USE+=" radosgw"
-
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-UNBUNDLE_LIBS=(
-	src/erasure-code/jerasure/jerasure
-	src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
-	"${FILESDIR}/ceph-10.2.0-dont-use-virtualenvs.patch"
-	#"${FILESDIR}/ceph-10.2.1-unbundle-jerasure.patch"
-	"${FILESDIR}/${PN}-10.2.1-libzfs.patch"
-	"${FILESDIR}/${PN}-10.2.3-build-without-openldap.patch"
-	"${FILESDIR}/${PN}-10.2.3-CVE-2016-8626.patch"
-)
-
-check-reqs_export_vars() {
-	if use debug; then
-		CHECKREQS_DISK_BUILD="23G"
-		CHECKREQS_DISK_USR="7G"
-	elif use amd64; then
-		CHECKREQS_DISK_BUILD="12G"
-		CHECKREQS_DISK_USR="450M"
-	else
-		CHECKREQS_DISK_BUILD="1400M"
-		CHECKREQS_DISK_USR="450M"
-	fi
-
-	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-user_setup() {
-	enewgroup ceph ${CEPH_GID}
-	enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
-}
-
-emake_python_bindings() {
-	local action="${1}" params binding
-	shift
-	params=("${@}")
-
-	__emake_python_bindings_do_impl() {
-		emake "${params[@]}" PYTHON="${EPYTHON}" "${binding}-pybind-${action}"
-
-		# these don't work and aren't needed on python3
-		if [[ ${EBUILD_PHASE} == install ]] && python_is_python3; then
-			rm -f "${ED}/$(python_get_sitedir)"/ceph_{argparse,volume_client}.py
-		fi
-	}
-
-	pushd "${S}/src"
-	for binding in rados rbd $(use cephfs && echo cephfs); do
-		python_foreach_impl __emake_python_bindings_do_impl
-	done
-	popd
-
-	unset __emake_python_bindings_do_impl
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-	user_setup
-}
-
-src_prepare() {
-	default
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t
-
-	#rm -rf "${UNBUNDLE_LIBS[@]}"
-
-	append-flags -fPIC
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--without-hadoop
-		--includedir=/usr/include
-		$(use_with cephfs)
-		$(use_with debug)
-		$(use_with fuse)
-		$(use_with libaio)
-		$(use_with libatomic libatomic-ops)
-		$(use_with nss)
-		$(use_with cryptopp)
-		$(use_with radosgw)
-		$(use_with gtk gtk2)
-		$(use_enable static-libs static)
-		$(use_with jemalloc)
-		$(use_with xfs libxfs)
-		$(use_with zfs libzfs)
-		$(use_with lttng )
-		$(use_with babeltrace)
-		$(use_with ldap openldap)
-		$(use jemalloc || usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal")
-		--with-mon
-		--with-eventfd
-		--with-cython
-		--without-kinetic
-		--without-librocksdb
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	# we can only use python2.7 for building at the moment
-	python_setup 'python2*'
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake
-	emake_python_bindings all
-
-	use test && emake check-local
-}
-
-src_test() {
-	make check || die "make check failed"
-}
-
-src_install() {
-	default
-	emake_python_bindings install-exec "DESTDIR=\"${D}\""
-
-	prune_libtool_files --all
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe src/init-ceph ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate ${PN}
-
-	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
-	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
-
-	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-
-	systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
-	systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
-
-	udev_dorules udev/*.rules
-
-	readme.gentoo_create_doc
-
-	python_setup 'python2*'
-	python_fix_shebang "${ED}"/usr/{,s}bin/
-
-	# python_fix_shebang apparently is not idempotent
-	sed -i -r  's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
-		"${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}

diff --git a/sys-cluster/ceph/ceph-13.2.4.ebuild b/sys-cluster/ceph/ceph-13.2.4.ebuild
deleted file mode 100644
index f0e6c5adacd..00000000000
--- a/sys-cluster/ceph/ceph-13.2.4.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-DISTUTILS_OPTIONAL=1
-
-inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \
-		multiprocessing python-r1 udev user readme.gentoo-r1 toolchain-funcs \
-		systemd
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT"
-SLOT="0"
-
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="babeltrace cephfs dpdk fuse jemalloc ldap libressl lttng +mgr"
-IUSE+=" +radosgw +ssl static-libs +system-boost systemd +tcmalloc test"
-IUSE+=" xfs zfs"
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-# unbundling code commented out pending bugs 584056 and 584058
-#>=dev-libs/jerasure-2.0.0-r1
-#>=dev-libs/gf-complete-2.0.0
-COMMON_DEPEND="
-	virtual/libudev:=
-	app-arch/bzip2:=[static-libs?]
-	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs?]
-	app-arch/zstd:=[static-libs?]
-	app-misc/jq:=[static-libs?]
-	dev-libs/crypto++:=[static-libs?]
-	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
-	dev-libs/libaio:=[static-libs?]
-	dev-libs/libxml2:=[static-libs?]
-	dev-libs/nss:=
-	sys-auth/oath-toolkit:=
-	sys-apps/keyutils:=[static-libs?]
-	sys-apps/util-linux:=[static-libs?]
-	sys-libs/zlib:=[static-libs?]
-	babeltrace? ( dev-util/babeltrace )
-	ldap? ( net-nds/openldap:=[static-libs?] )
-	lttng? ( dev-util/lttng-ust:= )
-	fuse? ( sys-fs/fuse:0=[static-libs?] )
-	ssl? (
-		!libressl? ( dev-libs/openssl:=[static-libs?] )
-		libressl? ( dev-libs/libressl:=[static-libs?] )
-	)
-	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
-	zfs? ( sys-fs/zfs:=[static-libs?] )
-	radosgw? (
-		dev-libs/expat:=[static-libs?]
-		!libressl? (
-			dev-libs/openssl:=[static-libs?]
-			net-misc/curl:=[curl_ssl_openssl,static-libs?]
-		)
-		libressl? (
-			dev-libs/libressl:=[static-libs?]
-			net-misc/curl:=[curl_ssl_libressl,static-libs?]
-		)
-	)
-	system-boost? (
-		>=dev-libs/boost-1.67:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-	)
-	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
-	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
-	${PYTHON_DEPS}
-	"
-DEPEND="${COMMON_DEPEND}
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-	app-arch/cpio
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	dev-util/cunit
-	dev-util/gperf
-	dev-util/valgrind
-	sys-apps/which
-	sys-devel/bc
-	virtual/pkgconfig
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		sys-apps/grep[pcre]
-		sys-fs/btrfs-progs
-	)"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/socat
-	sys-apps/gptfdisk
-	sys-block/parted
-	sys-fs/cryptsetup
-	sys-fs/lvm2
-	!<sys-apps/openrc-0.26.3
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pecan[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( $(python_gen_useflags 'python3*') )
-	?? ( jemalloc tcmalloc )
-	"
-
-# the tests need root access
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-# false positives unless all USE flags are on
-CMAKE_WARN_UNUSED_CLI="no"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-UNBUNDLE_LIBS=(
-	src/erasure-code/jerasure/jerasure
-	src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
-	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
-	"${FILESDIR}/ceph-12.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
-	"${FILESDIR}/ceph-13.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
-	"${FILESDIR}/ceph-13.2.0-mgr-python-version.patch"
-	"${FILESDIR}/ceph-13.2.0-no-virtualenvs.patch"
-	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
-)
-
-check-reqs_export_vars() {
-	if use amd64; then
-		CHECKREQS_DISK_BUILD="12G"
-		CHECKREQS_DISK_USR="460M"
-	else
-		CHECKREQS_DISK_BUILD="1400M"
-		CHECKREQS_DISK_USR="450M"
-	fi
-
-	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-user_setup() {
-	enewgroup ceph ${CEPH_GID}
-	enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup 'python3*'
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-	user_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use system-boost; then
-		eapply "${FILESDIR}/ceph-13.2.0-boost-sonames.patch"
-	fi
-
-	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
-		src/bash_completion/CMakeLists.txt || die
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t || die
-
-	#rm -rf "${UNBUNDLE_LIBS[@]}"
-}
-
-ceph_src_configure() {
-	local flag
-	local mycmakeargs=(
-		-DWITH_BABELTRACE=$(usex babeltrace)
-		-DWITH_CEPHFS=$(usex cephfs)
-		-DWITH_DPDK=$(usex dpdk)
-		-DWITH_FUSE=$(usex fuse)
-		-DWITH_LTTNG=$(usex lttng)
-		-DWITH_MGR=$(usex mgr)
-		-DWITH_MGR_DASHBOARD_FRONTEND=NO
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_RADOSGW=$(usex radosgw)
-		-DWITH_SSL=$(usex ssl)
-		-DWITH_SYSTEMD=$(usex systemd)
-		-DWITH_TESTS=$(usex test)
-		-DWITH_XFS=$(usex xfs)
-		-DWITH_ZFS=$(usex zfs)
-		-DENABLE_SHARED=$(usex static-libs '' 'yes' 'no')
-		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
-		-DWITH_SYSTEM_BOOST=$(usex system-boost)
-		-DBOOST_J=$(makeopts_jobs)
-		-DWITH_RDMA=no
-		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
-		-DEPYTHON_VERSION="${EPYTHON#python}"
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-Wno-dev
-	)
-	if use amd64 || use x86; then
-		for flag in ${CPU_FLAGS_X86[@]}; do
-			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
-		done
-	fi
-
-	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt"
-	cmake-utils_src_configure
-
-	# bug #630232
-	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \
-		|| die "sed failed"
-}
-
-src_configure() {
-	ceph_src_configure
-}
-
-python_compile() {
-	local CMAKE_USE_DIR="${S}"
-	ceph_src_configure
-
-	rm -r "${BUILD_DIR}/lib/cython_modules" || die
-
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	emake VERBOSE=1 clean
-	emake VERBOSE=1 all
-
-	# python modules are only compiled with "make install" so we need to do this to
-	# prevent doing a bunch of compilation in src_install
-	DESTDIR="${T}" emake VERBOSE=1 install
-	popd >/dev/null || die
-}
-
-src_compile() {
-	cmake-utils_src_make VERBOSE=1 all
-
-	# we have to do this here to prevent from building everything multiple times
-	BUILD_DIR="${CMAKE_BUILD_DIR}" 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 install
-	popd >/dev/null || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_foreach_impl python_install
-
-	prune_libtool_files --all
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
-
-	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
-	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
-
-	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r11" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
-	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
-	# units aren't installed by the build system unless systemd is enabled
-	# so no point installing these with the USE flag disabled
-	if use systemd; then
-		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
-			"ceph-mds@.service"
-
-		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
-			"ceph-osd@.service"
-	fi
-
-	udev_dorules udev/*.rules
-
-	readme.gentoo_create_doc
-
-	python_setup 'python3*'
-
-	# bug #630232
-	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \
-		|| die "sed failed"
-
-	python_fix_shebang "${ED}"/usr/{,s}bin/
-
-	# python_fix_shebang apparently is not idempotent
-	sed -i -r  's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
-		"${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}

diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml
index 03215bde3fd..bfbf70b7a30 100644
--- a/sys-cluster/ceph/metadata.xml
+++ b/sys-cluster/ceph/metadata.xml
@@ -18,13 +18,10 @@
   </longdescription>
   <use>
     <flag name="babeltrace">Add support for LTTng babeltrace</flag>
-    <flag name="cryptopp">Use <pkg>dev-libs/crypto++</pkg> for cryptography</flag>
     <flag name="cephfs">Build support for cephfs, a POSIX compatible filesystem built on top of ceph</flag>
     <flag name="dpdk">Enable DPDK messaging</flag>
     <flag name="fuse">Build fuse client</flag>
     <flag name="grafana">Install grafana dashboards</flag>
-    <flag name="libatomic">Use libatomic instead of builtin atomic operations</flag>
-    <flag name="libaio">Use libaio as asynchronous input/output library</flag>
     <flag name="lttng">Add support for LTTng</flag>
     <flag name="mgr">Build the ceph-mgr daemon</flag>
     <flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography</flag>