[gentoo-commits] proj/kde:master commit in: kde-base/baloo/

[Andreas Hüttel]

commit:     3a628dccbfc35a90078847f606f82fac779a7c00
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  4 22:32:31 2014 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Apr  4 22:32:52 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3a628dcc

[kde-base/baloo] add blocker because of file collisions

Package-Manager: portage-2.2.10

---
 kde-base/baloo/baloo-4.12.97.ebuild      | 1 +
 kde-base/baloo/baloo-4.13.49.9999.ebuild | 1 +
 kde-base/baloo/baloo-9999.ebuild         | 1 +
 3 files changed, 3 insertions(+)

diff --git a/kde-base/baloo/baloo-4.12.97.ebuild 
b/kde-base/baloo/baloo-4.12.97.ebuild
index 3fca7dc..2ea4c28 100644
--- a/kde-base/baloo/baloo-4.12.97.ebuild
+++ b/kde-base/baloo/baloo-4.12.97.ebuild
@@ -16,6 +16,7 @@ DEPEND="
        dev-libs/qjson
        dev-libs/xapian
        sys-apps/attr
+       !<kde-base/nepomuk-4.12.50
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-base/baloo/baloo-4.13.49.9999.ebuild 
b/kde-base/baloo/baloo-4.13.49.9999.ebuild
index 2fe0f58..69f396c 100644
--- a/kde-base/baloo/baloo-4.13.49.9999.ebuild
+++ b/kde-base/baloo/baloo-4.13.49.9999.ebuild
@@ -16,6 +16,7 @@ DEPEND="
        dev-libs/qjson
        dev-libs/xapian
        sys-apps/attr
+       !<kde-base/nepomuk-4.12.50
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-base/baloo/baloo-9999.ebuild b/kde-base/baloo/baloo-9999.ebuild
index 2fe0f58..69f396c 100644
--- a/kde-base/baloo/baloo-9999.ebuild
+++ b/kde-base/baloo/baloo-9999.ebuild
@@ -16,6 +16,7 @@ DEPEND="
        dev-libs/qjson
        dev-libs/xapian
        sys-apps/attr
+       !<kde-base/nepomuk-4.12.50
 "
 RDEPEND="${DEPEND}"