[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7481f997ac2739fa95800092eed45269f52826cb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 13 00:41:14 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct  7 18:36:51 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7481f997

cmake-utils.eclass: Turn `eqawarn` into `die` for >= EAPI 7

 eclass/cmake-utils.eclass | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 527b26de80..0bb3ec7131 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -125,7 +125,13 @@ esac
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
-[[ ${WANT_CMAKE} ]] && eqawarn "\${WANT_CMAKE} has been removed and is a no-op now"
+if [[ ${WANT_CMAKE} ]]; then
+	if [[ ${EAPI} != [56] ]]; then
+		die "\${WANT_CMAKE} has been removed and is a no-op now"
+	else
+		eqawarn "\${WANT_CMAKE} has been removed and is a no-op now"
+	fi
+fi
 [[ ${PREFIX} ]] && die "\${PREFIX} has been removed and is a no-op now"
 
 case ${CMAKE_MAKEFILE_GENERATOR} in
@@ -208,8 +214,13 @@ _cmake_check_build_dir() {
 		# Respect both the old variable and the new one, depending
 		# on which one was set by the ebuild.
 		if [[ ! ${BUILD_DIR} && ${CMAKE_BUILD_DIR} ]]; then
-			eqawarn "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR."
-			eqawarn "Please migrate the ebuild to use the new one."
+			if [[ ${EAPI} != [56] ]]; then
+				eerror "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR."
+				die "The ebuild must be migrated to BUILD_DIR."
+			else
+				eqawarn "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR."
+				eqawarn "Please migrate the ebuild to use the new one."
+			fi
 
 			# In the next call, both variables will be set already
 			# and we'd have to know which one takes precedence.
@@ -224,7 +235,7 @@ _cmake_check_build_dir() {
 	fi
 
 	# Backwards compatibility for getting the value.
-	CMAKE_BUILD_DIR=${BUILD_DIR}
+	[[ ${EAPI} == [56] ]] && CMAKE_BUILD_DIR=${BUILD_DIR}
 
 	mkdir -p "${BUILD_DIR}" || die
 	echo ">>> Working in BUILD_DIR: \"$BUILD_DIR\""
@@ -508,7 +519,11 @@ cmake-utils_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	if [[ ! ${_CMAKE_UTILS_SRC_PREPARE_HAS_RUN} ]]; then
-		eqawarn "cmake-utils_src_prepare has not been run, please open a bug on https://bugs.gentoo.org/"
+		if [[ ${EAPI} != [56] ]]; then
+			die "FATAL: cmake-utils_src_prepare has not been run"
+		else
+			eqawarn "cmake-utils_src_prepare has not been run, please open a bug on https://bugs.gentoo.org/"
+		fi
 	fi
 
 	[[ ${EAPI} == 5 ]] && _cmake_cleanup_cmake