From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7AE18138359 for ; Sun, 30 Aug 2020 19:02:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1ECFEE0AF1; Sun, 30 Aug 2020 19:02:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F29A0E0AEF for ; Sun, 30 Aug 2020 19:02:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6F653340DCE for ; Sun, 30 Aug 2020 19:02:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5F655348 for ; Sun, 30 Aug 2020 19:02:19 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1598808184.fe9b84e52d33c28ef09e6d8f74a868d581a8cc7f.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kscreenlocker/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild X-VCS-Directories: kde-plasma/kscreenlocker/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: fe9b84e52d33c28ef09e6d8f74a868d581a8cc7f X-VCS-Branch: master Date: Sun, 30 Aug 2020 19:02:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 91f9fc0a-ebc5-4517-97f1-02d77d7aec96 X-Archives-Hash: 178b6fea9beaa04908bf0283027059b4 commit: fe9b84e52d33c28ef09e6d8f74a868d581a8cc7f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 30 12:09:03 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 30 17:23:04 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fe9b84e5 kde-plasma/kscreenlocker: Use cmake_comment_add_subdirectory Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> .../kscreenlocker-5.19.49.9999.ebuild | 22 +++++++++------------- kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild | 20 ++++++++------------ 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 5b008a5dd9..9bbddfc7b9 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 7c11bbb222..0673067cfa 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