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

[Johannes Huber]

commit:     3d1c186b634fdf87594314150303689386def7ec
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Jul 15 23:23:03 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 18:01:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3d1c186b

[kde-apps/kdepimlibs] Add block against kde-base/kdepimlibs

Package-Manager: portage-2.2.20

 kde-apps/kdepimlibs/kdepimlibs-9999.ebuild | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild 
b/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
index 9b1fe04..9bd89cd 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
@@ -16,7 +16,7 @@ IUSE="designer prison ssl"
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
 RESTRICT="test"
 
-RDEPEND="
+COMMON_DEPEND="
        $(add_frameworks_dep kbookmarks)
        $(add_frameworks_dep kcodecs)
        $(add_frameworks_dep kcompletion)
@@ -57,8 +57,12 @@ RDEPEND="
        prison? ( media-libs/prison:5 )
        ssl? ( dev-libs/cyrus-sasl )
 "
-DEPEND="${RDEPEND}
-       dev-libs/boost"
+DEPEND="${COMMON_DEPEND}
+       dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+       !kde-base/kdepimlibs
+"
 
 src_prepare() {
        use handbook || \