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 13388138334 for ; Sun, 18 Aug 2019 15:21:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1FBBAE0A91; Sun, 18 Aug 2019 15:21:05 +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 DF49AE0A91 for ; Sun, 18 Aug 2019 15:21:04 +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 3ECB9349DB8 for ; Sun, 18 Aug 2019 15:21:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E3A862A for ; Sun, 18 Aug 2019 15:21:00 +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: <1566141447.175afb357bd189429002ffdb39ea1d971979250b.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-19.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: 175afb357bd189429002ffdb39ea1d971979250b X-VCS-Branch: master Date: Sun, 18 Aug 2019 15:21:00 +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: cce63c87-6a69-492b-bc85-70a3238db5f9 X-Archives-Hash: b7eceaf096867ba3299f2849995eff94 commit: 175afb357bd189429002ffdb39ea1d971979250b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Aug 17 19:03:27 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 18 15:17:27 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=175afb35 kde-apps/marble: Fix DEPENDs, src_configure() with USE !kde Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/marble/marble-19.08.49.9999.ebuild | 16 +++++++++++----- kde-apps/marble/marble-9999.ebuild | 16 +++++++++++----- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/kde-apps/marble/marble-19.08.49.9999.ebuild b/kde-apps/marble/marble-19.08.49.9999.ebuild index c66895e677..4db7aa7256 100644 --- a/kde-apps/marble/marble-19.08.49.9999.ebuild +++ b/kde-apps/marble/marble-19.08.49.9999.ebuild @@ -30,6 +30,7 @@ DEPEND=" $(add_qt_dep qtsvg) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) + sys-libs/zlib aprs? ( $(add_qt_dep qtserialport) ) dbus? ( $(add_qt_dep qtdbus) ) designer? ( $(add_qt_dep designer) ) @@ -58,13 +59,14 @@ RDEPEND="${DEPEND}" RESTRICT+=" test" src_prepare() { + kde5_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" + -i src/apps/CMakeLists.txt || die "Failed to disable marble-qt" fi - - kde5_src_prepare } src_configure() { @@ -83,5 +85,9 @@ src_configure() { # bug 608890 -DKDE_INSTALL_CONFDIR="/etc/xdg" ) - kde5_src_configure + if use kde; then + kde5_src_configure + else + cmake-utils_src_configure + fi } diff --git a/kde-apps/marble/marble-9999.ebuild b/kde-apps/marble/marble-9999.ebuild index c66895e677..4db7aa7256 100644 --- a/kde-apps/marble/marble-9999.ebuild +++ b/kde-apps/marble/marble-9999.ebuild @@ -30,6 +30,7 @@ DEPEND=" $(add_qt_dep qtsvg) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) + sys-libs/zlib aprs? ( $(add_qt_dep qtserialport) ) dbus? ( $(add_qt_dep qtdbus) ) designer? ( $(add_qt_dep designer) ) @@ -58,13 +59,14 @@ RDEPEND="${DEPEND}" RESTRICT+=" test" src_prepare() { + kde5_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" + -i src/apps/CMakeLists.txt || die "Failed to disable marble-qt" fi - - kde5_src_prepare } src_configure() { @@ -83,5 +85,9 @@ src_configure() { # bug 608890 -DKDE_INSTALL_CONFDIR="/etc/xdg" ) - kde5_src_configure + if use kde; then + kde5_src_configure + else + cmake-utils_src_configure + fi }