[gentoo-commits] proj/kde:master commit in: kde-apps/kdepim-runtime/

[Johannes Huber]

commit:     9c4412d64b46cb3d445af88e53b16a2f7c478a66
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Jul 16 06:22:22 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 18:02:27 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9c4412d6

[kde-apps/kdepim-runtime] Add block against kde-base/kdepim-runtime

Package-Manager: portage-2.2.20

 kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild 
b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
index f3dbb18..e1d0253 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
@@ -12,7 +12,7 @@ IUSE="google"
 
 # TODO kolab, Qt5TextToSpeech
 
-RDEPEND="
+COMMON_DEPEND="
        $(add_kdeapps_dep akonadi-calendar)
        $(add_kdeapps_dep kalarmcal)
        $(add_kdeapps_dep kcalcore)
@@ -54,7 +54,7 @@ RDEPEND="
        dev-qt/qtxml:5
        dev-qt/qtxmlpatterns:5
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_RDEPEND}
        dev-libs/boost
        dev-libs/cyrus-sasl:2
        dev-libs/libxml2:2
@@ -63,6 +63,9 @@ DEPEND="${RDEPEND}
        x11-misc/shared-mime-info
        google? ( net-libs/libkgapi:5 )
 "
+RDEPEND="${COMMON_RDEPEND}
+       !kde-base/kdepim-runtime
+"
 
 src_configure() {
        local mycmakeargs=(