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 E12D3138334 for ; Mon, 10 Jun 2019 22:03:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AECE7E0835; Mon, 10 Jun 2019 22:03:30 +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 83A89E0835 for ; Mon, 10 Jun 2019 22:03:30 +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 B4DC2345CA8 for ; Mon, 10 Jun 2019 22:03:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 214585C0 for ; Mon, 10 Jun 2019 22:03:26 +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: <1560204171.1c696f46e11ace58458cd57542f23e3684822d6b.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim-runtime/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kdepim-runtime/kdepim-runtime-19.04.49.9999.ebuild kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild X-VCS-Directories: kde-apps/kdepim-runtime/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 1c696f46e11ace58458cd57542f23e3684822d6b X-VCS-Branch: master Date: Mon, 10 Jun 2019 22:03:26 +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: d1eb6614-9206-4c3a-bee6-9125909fe259 X-Archives-Hash: 8867d50bff814873e74b1d848684cf60 commit: 1c696f46e11ace58458cd57542f23e3684822d6b Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jun 10 21:52:03 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jun 10 22:02:51 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1c696f46 kde-apps/kdepim-runtime: Disable kdelibs4support again We don't build kolab, make sure Libkolabxml can not be found as well. Upstream has been busy porting away from deprecated stuff in EWS: 0935a3e91d32414db5cdc93ad807b7b026dc89c4 93c8dd8c1b49eb0ab593f7dcf620abed76b49475 Bug: https://bugs.gentoo.org/670958 Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Andreas Sturmlechner gentoo.org> .../kdepim-runtime/kdepim-runtime-19.04.49.9999.ebuild | 14 +++++++++++++- kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.04.49.9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-19.04.49.9999.ebuild index 46b423a923..69ba1afd75 100644 --- a/kde-apps/kdepim-runtime/kdepim-runtime-19.04.49.9999.ebuild +++ b/kde-apps/kdepim-runtime/kdepim-runtime-19.04.49.9999.ebuild @@ -24,7 +24,6 @@ COMMON_DEPEND=" $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdelibs4support) $(add_frameworks_dep kholidays) $(add_frameworks_dep ki18n) $(add_frameworks_dep kio) @@ -76,3 +75,16 @@ RDEPEND="${COMMON_DEPEND} " RESTRICT+=" test" + +src_prepare() { + kde5_src_prepare + # We don't build kolab, so we can disable this + punt_bogus_dep KF5 KDELibs4Support +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON + ) + kde5_src_configure +} diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild index 46b423a923..69ba1afd75 100644 --- a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild +++ b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild @@ -24,7 +24,6 @@ COMMON_DEPEND=" $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdelibs4support) $(add_frameworks_dep kholidays) $(add_frameworks_dep ki18n) $(add_frameworks_dep kio) @@ -76,3 +75,16 @@ RDEPEND="${COMMON_DEPEND} " RESTRICT+=" test" + +src_prepare() { + kde5_src_prepare + # We don't build kolab, so we can disable this + punt_bogus_dep KF5 KDELibs4Support +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON + ) + kde5_src_configure +}