[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/

[Michael Palimaka]

commit:     71a3e06d960fbcd5fab442afbf36c778d85bc3a8
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  9 12:22:18 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Sep  9 12:22:18 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=71a3e06d

[kde-frameworks/kcoreaddons] Add blocker as desktoptojson was moved here from 
kservice in 5.2.0

Package-Manager: portage-2.2.10

---
 kde-frameworks/kcoreaddons/kcoreaddons-5.2.0.ebuild | 1 +
 kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.2.0.ebuild 
b/kde-frameworks/kcoreaddons/kcoreaddons-5.2.0.ebuild
index dda6c10..460db7c 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.2.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.2.0.ebuild
@@ -14,6 +14,7 @@ IUSE="fam"
 RDEPEND="
        dev-qt/qtcore:5[icu]
        fam? ( virtual/fam )
+       !<kde-frameworks/kservice-5.2.0
 "
 DEPEND="${RDEPEND}
        x11-misc/shared-mime-info

diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild 
b/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild
index c74f867..69fcaae 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild
@@ -14,6 +14,7 @@ IUSE="fam"
 RDEPEND="
        dev-qt/qtcore:5[icu]
        fam? ( virtual/fam )
+       !<kde-frameworks/kservice-5.2.0
 "
 DEPEND="${RDEPEND}
        x11-misc/shared-mime-info