[eclass] Add new function comment_add_subdirectory to avoid code duplication.

2 files changed, 17 insertions, 6 deletions

diff --git a/eclass/kde-frameworks.eclass b/eclass/kde-frameworks.eclass
index bd64b393a9b..444060fdfd8 100644
--- a/eclass/kde-frameworks.eclass
+++ b/eclass/kde-frameworks.eclass
@@ -224,19 +224,16 @@ kde-frameworks_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	# never build manual tests
-	sed -e "/add_subdirectory[[:space:]]*([[:space:]]*tests[[:space:]]*)/s/^/#DONOTCOMPILE /" \
-		-i CMakeLists.txt || die
+	comment_add_subdirectory tests
 
 	# only build examples when required
 	if ! in_iuse examples || ! use examples ; then
-		sed	-e "/add_subdirectory[[:space:]]*([[:space:]]*examples[[:space:]]*)/s/^/#DONOTCOMPILE /" \
-			-i CMakeLists.txt || die
+		comment_add_subdirectory examples
 	fi
 
 	# only build unit tests when required
 	if ! in_iuse test || ! use test ; then
-		sed -e "/add_subdirectory[[:space:]]*([[:space:]]*autotests[[:space:]]*)/s/^/#DONOTCOMPILE /" \
-			-i CMakeLists.txt || die
+		comment_add_subdirectory autotests
 	fi
 
 	cmake-utils_src_prepare
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 7e1a96029f4..64f26df6262 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -124,6 +124,20 @@ buildsycoca() {
 	done
 }
 
+# @FUNCTION: comment_add_subdirectory
+# @USAGE: subdirectory
+# @DESCRIPTION:
+# Comment out an add_subdirectory call in CMakeLists.txt in the current directory
+comment_add_subdirectory() {
+	if [[ -z ${1} ]]; then
+		die "comment_add_subdirectory must be passed the directory name to comment"
+	fi
+
+        sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${1}[[:space:]]*)/s/^/#DONOTCOMPILE /" \
+		-i CMakeLists.txt || die "failed to comment add_subdirectory(${1})"
+	
+}
+
 # @FUNCTION: comment_all_add_subdirectory
 # @USAGE: [list of directory names]
 # @DESCRIPTION: