From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 29 Jun 2022 12:04:12 +0100
Subject: gentoo resync : 29.12.2022

---
 eclass/cmake.eclass | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'eclass/cmake.eclass')

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 59e5b60957c2..bd7e64cfe6c7 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -136,7 +136,7 @@ case ${CMAKE_MAKEFILE_GENERATOR} in
 		BDEPEND="sys-devel/make"
 		;;
 	ninja)
-		BDEPEND="dev-util/ninja"
+		BDEPEND="${NINJA_DEPEND}"
 		;;
 	*)
 		eerror "Unknown value for \${CMAKE_MAKEFILE_GENERATOR}"
@@ -363,13 +363,6 @@ cmake_src_prepare() {
 		die "FATAL: Unable to find CMakeLists.txt"
 	fi
 
-	# if ninja is enabled but not installed, the build could fail
-	# this could happen if ninja is manually enabled (eg. make.conf) but not installed
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]] && ! has_version -b dev-util/ninja; then
-		eerror "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed."
-		die "Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR."
-	fi
-
 	local modules_list
 	if [[ ${EAPI} == 7 && $(declare -p CMAKE_REMOVE_MODULES_LIST) != "declare -a"* ]]; then
 		modules_list=( ${CMAKE_REMOVE_MODULES_LIST} )
@@ -705,11 +698,7 @@ cmake_src_test() {
 cmake_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	_cmake_check_build_dir
-	pushd "${BUILD_DIR}" > /dev/null || die
-	DESTDIR="${D}" ${CMAKE_MAKEFILE_GENERATOR} install "$@" ||
-		die "died running ${CMAKE_MAKEFILE_GENERATOR} install"
-	popd > /dev/null || die
+	DESTDIR="${D}" cmake_build install "$@"
 
 	if [[ ${EAPI} == 7 ]]; then
 		pushd "${S}" > /dev/null || die
-- 
cgit v1.2.3