From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 13 Oct 2019 11:17:26 +0000 (+0200)
Subject: app-office/kmymoney: Accept kde-frameworks/kcontacts
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=66e508b4012efc7e68de44f354009936eb7fb3e8;p=gentoo.git

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 <asturm@gentoo.org>
---

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 e7469b835648..5d59ded0b0fa 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:= )