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 96880138334 for ; Sun, 13 Oct 2019 11:19:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF553E0835; Sun, 13 Oct 2019 11:19:18 +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 B30C6E0835 for ; Sun, 13 Oct 2019 11:19:18 +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 AA38F34BCC5 for ; Sun, 13 Oct 2019 11:19:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 940EB802 for ; Sun, 13 Oct 2019 11:19:15 +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: <1570965528.66e508b4012efc7e68de44f354009936eb7fb3e8.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/kmymoney/kmymoney-5.0.6-r1.ebuild app-office/kmymoney/kmymoney-5.0.6.ebuild X-VCS-Directories: app-office/kmymoney/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 66e508b4012efc7e68de44f354009936eb7fb3e8 X-VCS-Branch: master Date: Sun, 13 Oct 2019 11:19:15 +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: e4e38b6c-50b7-4bfa-87ce-f7970110adfa X-Archives-Hash: 47061874f89ccad75f9978dd9952643b commit: 66e508b4012efc7e68de44f354009936eb7fb3e8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 13 11:17:26 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 13 11:18:48 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66e508b4 app-office/kmymoney: Accept kde-frameworks/kcontacts Closes: https://bugs.gentoo.org/697618 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> .../kmymoney/{kmymoney-5.0.6.ebuild => kmymoney-5.0.6-r1.ebuild} | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app-office/kmymoney/kmymoney-5.0.6.ebuild b/app-office/kmymoney/kmymoney-5.0.6-r1.ebuild similarity index 97% rename from app-office/kmymoney/kmymoney-5.0.6.ebuild rename to app-office/kmymoney/kmymoney-5.0.6-r1.ebuild index e7469b83564..5d59ded0b0f 100644 --- a/app-office/kmymoney/kmymoney-5.0.6.ebuild +++ b/app-office/kmymoney/kmymoney-5.0.6-r1.ebuild @@ -3,7 +3,6 @@ EAPI=7 -EGIT_BRANCH="5.0" PYTHON_COMPAT=( python2_7 ) KDE_HANDBOOK="optional" @@ -61,8 +60,11 @@ COMMON_DEPEND=" dev-libs/libgpg-error activities? ( $(add_frameworks_dep kactivities) ) addressbook? ( + || ( + $(add_frameworks_dep kcontacts) + $(add_kdeapps_dep kcontacts) + ) $(add_kdeapps_dep akonadi) - $(add_kdeapps_dep kcontacts) $(add_kdeapps_dep kidentitymanagement) ) calendar? ( dev-libs/libical:= )