eclass/cmake-utils: merge some upstream deltas

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

1 files changed, 14 insertions, 17 deletions

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index b8c75be..f449220 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -327,6 +327,15 @@ cmake-utils_use_use() { _use_me_now USE_ "$@" ; }
 # and -DFOO=OFF if it is disabled.
 cmake-utils_use() { _use_me_now "" "$@" ; }
 
+# @FUNCTION: cmake-utils_useno
+# @USAGE: <USE flag> [flag name]
+# @DESCRIPTION:
+# Based on use_enable. See ebuild(5).
+#
+# `cmake-utils_useno foo NOFOO` echoes -DNOFOO=OFF if foo is enabled
+# and -DNOFOO=ON if it is disabled.
+cmake-utils_useno() { _use_me_now_inverted "" "$@" ; }
+
 # Internal function for modifying hardcoded definitions.
 # Removes dangerous definitions that override Gentoo settings.
 _modify-cmakelists() {
@@ -578,7 +587,7 @@ enable_cmake-utils_src_configure() {
 
 			ELSE ()
 
-			SET(CMAKE_PREFIX_PATH "${EPREFIX}${PREFIX}" CACHE STRING ""FORCE)
+			SET(CMAKE_PREFIX_PATH "${EPREFIX}${PREFIX}" CACHE STRING "" FORCE)
 			SET(CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE)
 			SET(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
 			SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE CACHE BOOL "")
@@ -798,18 +807,18 @@ cmake-utils_src_make() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	_check_build_dir
-	pushd "${BUILD_DIR}" > /dev/null
+	pushd "${BUILD_DIR}" >/dev/null
 
 	${CMAKE_MAKEFILE_GENERATOR}_src_make "$@"
 
-	popd > /dev/null
+	popd >/dev/null
 }
 
 enable_cmake-utils_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	_check_build_dir
-	pushd "${BUILD_DIR}" > /dev/null
+	pushd "${BUILD_DIR}" >/dev/null
 	declare -a mycmakeinstallargs=(install "${mycmakeinstallargs[@]}" "$@")
 	if [[ "${CMAKE_VERBOSE}" != "OFF" ]] ; then
 		case ${CMAKE_MAKEFILE_GENERATOR} in
@@ -864,7 +873,7 @@ enable_cmake-utils_src_install() {
 		fi
 	fi
 	ehook_fire cmake-utils-post_install -u
-	popd > /dev/null
+	popd >/dev/null
 }
 
 enable_cmake-utils_src_test() {
@@ -970,16 +979,4 @@ _execute_optionally() {
 	fi
 }
 
-# This deprecated, mis-spelled version of this internal
-# function shouldn't be called anyhow... but just in case,
-_execute_optionaly() {
-	debug-print-function "${FUNCNAME}" "$@"
-	eerror
-	eerror "Please use _execute_optionally instead of _execute_optionaly."
-	eerror "Better yet, don't use it at all -- it's supposed to be an internal"
-	eerror "function of cmake-utils."
-	eerror
-	_execute_optionally "$@"
-}
-
 fi