kde-plasma/kscreenlocker: Use cmake_comment_add_subdirectory

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

2 files changed, 17 insertions, 25 deletions

diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild
index 5b008a5dd93..9bbddfc7b9c 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild
@@ -62,19 +62,7 @@ RESTRICT+=" test"
 
 src_prepare() {
 	ecm_src_prepare
-
-	if ! use test; then
-		sed -e "/add_subdirectory(autotests)/ s/^/#/" \
-			-i greeter/CMakeLists.txt || die
-	fi
-}
-
-src_test() {
-	# requires running environment
-	local myctestargs=(
-		-E x11LockerTest
-	)
-	ecm_src_test
+	use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests
 }
 
 src_configure() {
@@ -86,6 +74,14 @@ src_configure() {
 	ecm_src_configure
 }
 
+src_test() {
+	# requires running environment
+	local myctestargs=(
+		-E x11LockerTest
+	)
+	ecm_src_test
+}
+
 src_install() {
 	ecm_src_install
 
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
index 7c11bbb2220..0673067cfa4 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
@@ -61,11 +61,15 @@ RESTRICT+=" test"
 
 src_prepare() {
 	ecm_src_prepare
+	use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests
+}
 
-	if ! use test; then
-		sed -e "/add_subdirectory(autotests)/ s/^/#/" \
-			-i greeter/CMakeLists.txt || die
-	fi
+src_configure() {
+	local mycmakeargs=(
+		-DPAM_REQUIRED=$(usex pam)
+		$(cmake_use_find_package pam PAM)
+	)
+	ecm_src_configure
 }
 
 src_test() {
@@ -76,14 +80,6 @@ src_test() {
 	ecm_src_test
 }
 
-src_configure() {
-	local mycmakeargs=(
-		-DPAM_REQUIRED=$(usex pam)
-		$(cmake_use_find_package pam PAM)
-	)
-	ecm_src_configure
-}
-
 src_install() {
 	ecm_src_install