app-office/kmymoney: Accept kde-frameworks/kcontacts
authorAndreas Sturmlechner <asturm@gentoo.org>
Sun, 13 Oct 2019 11:17:26 +0000 (13:17 +0200)
committerAndreas Sturmlechner <asturm@gentoo.org>
Sun, 13 Oct 2019 11:18:48 +0000 (13:18 +0200)
Closes: https://bugs.gentoo.org/697618
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
app-office/kmymoney/kmymoney-5.0.6-r1.ebuild [moved from app-office/kmymoney/kmymoney-5.0.6.ebuild with 97% similarity]

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 e7469b8356488993a26b6426e185c679efd8f039..5d59ded0b0faad9fea64c5a4e42b2905990963a0 100644 (file)
@@ -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:= )