cmake-utils.eclass: Drop _cmake_execute_optionally after WANT_CMAKE

Follow-up to d741b4ef5054c8800b97748ef8caa11ad910d784

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 08057d812d3ca32142a3a127084ed12603459bfb..faf6cdb0b770903ff6aa254bcfa6b8a34707f6bc 100644 (file)
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -743,7 +743,7 @@ enable_cmake-utils_src_install() {
 # @DESCRIPTION:
 # Apply ebuild and user patches.
 cmake-utils_src_prepare() {
-       _cmake_execute_optionally "src_prepare" "$@"
+       enable_cmake-utils_src_prepare "$@"
 }
 
 # @FUNCTION: cmake-utils_src_configure
@@ -751,7 +751,7 @@ cmake-utils_src_prepare() {
 # General function for configuring with cmake. Default behaviour is to start an
 # out-of-source build.
 cmake-utils_src_configure() {
-       _cmake_execute_optionally "src_configure" "$@"
+       enable_cmake-utils_src_configure "$@"
 }
 
 # @FUNCTION: cmake-utils_src_compile
@@ -759,31 +759,21 @@ cmake-utils_src_configure() {
 # General function for compiling with cmake.
 # Automatically detects the build type. All arguments are passed to emake.
 cmake-utils_src_compile() {
-       _cmake_execute_optionally "src_compile" "$@"
+       enable_cmake-utils_src_compile "$@"
 }
 
 # @FUNCTION: cmake-utils_src_test
 # @DESCRIPTION:
 # Function for testing the package. Automatically detects the build type.
 cmake-utils_src_test() {
-       _cmake_execute_optionally "src_test" "$@"
+       enable_cmake-utils_src_test "$@"
 }
 
 # @FUNCTION: cmake-utils_src_install
 # @DESCRIPTION:
 # Function for installing the package. Automatically detects the build type.
 cmake-utils_src_install() {
-       _cmake_execute_optionally "src_install" "$@"
-}
-
-# Optionally executes phases based on WANT_CMAKE variable/USE flag.
-_cmake_execute_optionally() {
-       local phase="$1" ; shift
-       if [[ ${WANT_CMAKE} = always ]]; then
-               enable_cmake-utils_${phase} "$@"
-       else
-               use ${WANT_CMAKE} && enable_cmake-utils_${phase} "$@"
-       fi
+       enable_cmake-utils_src_install "$@"
 }
 
 fi