[gentoo-dev] [PATCH] cmake-multilib.eclass: Drop cmake-utils support

[gentoo-dev] [PATCH] cmake-multilib.eclass: Drop cmake-utils support

[Andreas Sturmlechner]

[-- Attachment #1: Type: text/plain, Size: 3074 bytes --]

cmake-utils.eclass was dropped on 2022-08-01 in commit 3e744f5a.

See also: https://github.com/gentoo/gentoo/pull/26858

---
 eclass/cmake-multilib.eclass | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass
index 61bacd3d60e3..7e4a86d56756 100644
--- a/eclass/cmake-multilib.eclass
+++ b/eclass/cmake-multilib.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: cmake-multilib.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Author: Michał Górny <mgorny@gentoo.org>
 # @SUPPORTED_EAPIS: 7 8
-# @PROVIDES: cmake cmake-utils multilib-minimal
+# @PROVIDES: cmake multilib-minimal
 # @BLURB: cmake wrapper for multilib builds
 # @DESCRIPTION:
 # The cmake-multilib.eclass provides a glue between cmake.eclass(5)
@@ -20,31 +20,21 @@
 # in multilib-minimal, yet they ought to call appropriate cmake
 # phase rather than 'default'.
 
-[[ ${EAPI} == 7 ]] && : ${CMAKE_ECLASS:=cmake-utils}
 # @ECLASS_VARIABLE: CMAKE_ECLASS
-# @PRE_INHERIT
+# @DEPRECATED
 # @DESCRIPTION:
-# Only "cmake" is supported in EAPI-8 and later.
-# In EAPI-7, default is "cmake-utils" for compatibility. Specify "cmake" for
-# ebuilds that ported to cmake.eclass already.
+# Only "cmake" is supported.
 : ${CMAKE_ECLASS:=cmake}
 
-# @ECLASS_VARIABLE: _CMAKE_ECLASS_IMPL
-# @INTERNAL
-# @DESCRIPTION:
-# TODO: Cleanup once EAPI-7 support is gone.
-_CMAKE_ECLASS_IMPL=cmake
-
 case ${EAPI} in
 	7|8)
 		case ${CMAKE_ECLASS} in
-			cmake-utils|cmake) ;;
+			cmake) ;;
 			*)
 				eerror "Unknown value for \$
{CMAKE_ECLASS}"
 				die "Value ${CMAKE_ECLASS} is not 
supported"
 				;;
 		esac
-		_CMAKE_ECLASS_IMPL=${CMAKE_ECLASS}
 		;;
 	*) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;;
 esac
@@ -56,7 +46,7 @@ fi
 if [[ -z ${_CMAKE_MULTILIB_ECLASS} ]]; then
 _CMAKE_MULTILIB_ECLASS=1
 
-inherit ${_CMAKE_ECLASS_IMPL} multilib-minimal
+inherit cmake multilib-minimal
 
 cmake-multilib_src_configure() {
 	local _cmake_args=( "${@}" )
@@ -65,7 +55,7 @@ cmake-multilib_src_configure() {
 }
 
 multilib_src_configure() {
-	${_CMAKE_ECLASS_IMPL}_src_configure "${_cmake_args[@]}"
+	cmake_src_configure "${_cmake_args[@]}"
 }
 
 cmake-multilib_src_compile() {
@@ -75,7 +65,7 @@ cmake-multilib_src_compile() {
 }
 
 multilib_src_compile() {
-	${_CMAKE_ECLASS_IMPL}_src_compile "${_cmake_args[@]}"
+	cmake_src_compile "${_cmake_args[@]}"
 }
 
 cmake-multilib_src_test() {
@@ -85,7 +75,7 @@ cmake-multilib_src_test() {
 }
 
 multilib_src_test() {
-	${_CMAKE_ECLASS_IMPL}_src_test "${_cmake_args[@]}"
+	cmake_src_test "${_cmake_args[@]}"
 }
 
 cmake-multilib_src_install() {
@@ -95,7 +85,7 @@ cmake-multilib_src_install() {
 }
 
 multilib_src_install() {
-	${_CMAKE_ECLASS_IMPL}_src_install "${_cmake_args[@]}"
+	cmake_src_install "${_cmake_args[@]}"
 }
 
 fi
-- 
2.37.2

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 789 bytes --]