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 E3134138359 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 20AA5E0AF4; Sun, 30 Aug 2020 19:02:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 08765E0AF4 for ; Sun, 30 Aug 2020 19:02:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 217D9340DDA for ; Sun, 30 Aug 2020 19:02:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4CAFB347 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: <1598808183.4e2a96e1d9b2e1b0ea141af8c650daed17c5a1bd.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/marble/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/marble/marble-20.08.49.9999.ebuild kde-apps/marble/marble-9999.ebuild X-VCS-Directories: kde-apps/marble/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 4e2a96e1d9b2e1b0ea141af8c650daed17c5a1bd 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: 9368b6ac-abce-49af-bbbd-961a19ed2f0f X-Archives-Hash: 63685a2b66b4426faeacafb27f8d0b5c commit: 4e2a96e1d9b2e1b0ea141af8c650daed17c5a1bd Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 30 11:45:32 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 30 17:23:03 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4e2a96e1 kde-apps/marble: Use cmake_comment_add_subdirectory Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/marble/marble-20.08.49.9999.ebuild | 5 +---- kde-apps/marble/marble-9999.ebuild | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/kde-apps/marble/marble-20.08.49.9999.ebuild b/kde-apps/marble/marble-20.08.49.9999.ebuild index 99d1d01008..4609ad1836 100644 --- a/kde-apps/marble/marble-20.08.49.9999.ebuild +++ b/kde-apps/marble/marble-20.08.49.9999.ebuild @@ -69,10 +69,7 @@ src_prepare() { rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs" - if use kde; then - sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \ - -i src/apps/CMakeLists.txt || die "Failed to disable marble-qt" - fi + use kde && cmake_run_in src/apps cmake_comment_add_subdirectory marble-qt } src_configure() { diff --git a/kde-apps/marble/marble-9999.ebuild b/kde-apps/marble/marble-9999.ebuild index 40935d7f38..9a386b1857 100644 --- a/kde-apps/marble/marble-9999.ebuild +++ b/kde-apps/marble/marble-9999.ebuild @@ -69,10 +69,7 @@ src_prepare() { rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs" - if use kde; then - sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \ - -i src/apps/CMakeLists.txt || die "Failed to disable marble-qt" - fi + use kde && cmake_run_in src/apps cmake_comment_add_subdirectory marble-qt } src_configure() {