From 7004cb2a9495df36057a8add504b61103dfc838a Mon Sep 17 00:00:00 2001
From: Michael Palimaka <kensington@gentoo.org>
Date: Sun, 17 Jan 2016 23:01:36 +1100
Subject: cmake-utils.eclass: replace replace comment_add_subdirectory with a
 namespaced version

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

(limited to 'eclass/cmake-utils.eclass')

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 0190ae47704..dea35fd22cc 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -262,11 +262,11 @@ _generator_to_use() {
 	echo ${generator_name}
 }
 
-# @FUNCTION: comment_add_subdirectory
+# @FUNCTION: cmake_comment_add_subdirectory
 # @USAGE: <subdirectory>
 # @DESCRIPTION:
 # Comment out an add_subdirectory call in CMakeLists.txt in the current directory
-comment_add_subdirectory() {
+cmake_comment_add_subdirectory() {
         if [[ -z ${1} ]]; then
                 die "comment_add_subdirectory must be passed the directory name to comment"
         fi
@@ -277,6 +277,17 @@ comment_add_subdirectory() {
         fi
 }
 
+# @FUNCTION: comment_add_subdirectory
+# @USAGE: <subdirectory>
+# @DESCRIPTION:
+# Comment out an add_subdirectory call in CMakeLists.txt in the current directory
+# Banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead.
+comment_add_subdirectory() {
+	has "${EAPI:-0}" 2 3 4 5 || die "comment_add_subdirectory is banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead"
+
+	cmake_comment_add_subdirectory "$@"
+}
+
 # @FUNCTION: cmake-utils_use_with
 # @USAGE: <USE flag> [flag name]
 # @DESCRIPTION:
-- 
cgit v1.2.3