From 05b8b0e0af1d72e51a3ee61522941bf7605cd01c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 4 Jul 2020 14:05:23 +0100
Subject: gentoo resync : 04.07.2020

---
 sys-cluster/ceph/ceph-14.2.10.ebuild | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'sys-cluster/ceph/ceph-14.2.10.ebuild')

diff --git a/sys-cluster/ceph/ceph-14.2.10.ebuild b/sys-cluster/ceph/ceph-14.2.10.ebuild
index b9bca5dfb763..f335155f0e1e 100644
--- a/sys-cluster/ceph/ceph-14.2.10.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.10.ebuild
@@ -7,9 +7,8 @@ CMAKE_MAKEFILE_GENERATOR=emake
 
 DISTUTILS_OPTIONAL=1
 
-inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \
-		multiprocessing python-r1 udev readme.gentoo-r1 toolchain-funcs \
-		systemd tmpfiles
+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
@@ -175,7 +174,7 @@ RESTRICT="test? ( userpriv )"
 RESTRICT+=" test"
 
 # false positives unless all USE flags are on
-CMAKE_WARN_UNUSED_CLI="no"
+CMAKE_WARN_UNUSED_CLI=no
 
 PATCHES=(
 	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
@@ -192,6 +191,7 @@ PATCHES=(
 	"${FILESDIR}/ceph-14.2.4-python-executable.patch"
 	"${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch"
 	"${FILESDIR}/ceph-14.2.10-missing-includes.patch"
+	"${FILESDIR}/ceph-14.2.10-python-warnings.patch"
 )
 
 check-reqs_export_vars() {
@@ -213,7 +213,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if use system-boost; then
 		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
@@ -281,7 +281,7 @@ ceph_src_configure() {
 	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
 		|| die "failed to remove cmake cache"
 
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	# bug #630232
 	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
@@ -309,7 +309,7 @@ python_compile() {
 }
 
 src_compile() {
-	cmake-utils_src_make VERBOSE=1 all
+	cmake_build VERBOSE=1 all
 
 	# we have to do this here to prevent from building everything multiple times
 	python_copy_sources
@@ -330,7 +330,7 @@ python_install() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	python_foreach_impl python_install
 
 	find "${ED}" -name '*.la' -type f -delete || die
-- 
cgit v1.2.3