summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-10-13 13:17:26 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-10-13 13:18:48 +0200
commit66e508b4012efc7e68de44f354009936eb7fb3e8 (patch)
tree64a9ab05cb93ea8a1cd06abe3430973ca165f558 /app-office
parentapp-emacs/proofgeneral: Remove old. (diff)
downloadgentoo-66e508b4012efc7e68de44f354009936eb7fb3e8.tar.gz
gentoo-66e508b4012efc7e68de44f354009936eb7fb3e8.tar.bz2
gentoo-66e508b4012efc7e68de44f354009936eb7fb3e8.zip
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>
Diffstat (limited to 'app-office')
-rw-r--r--app-office/kmymoney/kmymoney-5.0.6-r1.ebuild (renamed from app-office/kmymoney/kmymoney-5.0.6.ebuild)6
1 files 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
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:= )