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

[Johannes Huber]

commit:     3c7a7295c6b5885a9d4b523fac141a196a8fa1e0
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 17 17:00:50 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jan 17 17:00:50 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3c7a7295

[kde-plasma/baloo] Fix file collisions with kde-base/baloo:5

Package-Manager: portage-2.2.15

---
 kde-plasma/baloo/baloo-5.1.2.ebuild  | 1 +
 kde-plasma/baloo/baloo-5.5.95.ebuild | 1 +
 kde-plasma/baloo/baloo-9999.ebuild   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/kde-plasma/baloo/baloo-5.1.2.ebuild 
b/kde-plasma/baloo/baloo-5.1.2.ebuild
index 7aa23e3..169335b 100644
--- a/kde-plasma/baloo/baloo-5.1.2.ebuild
+++ b/kde-plasma/baloo/baloo-5.1.2.ebuild
@@ -37,6 +37,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
        !kde-base/baloo:4[-minimal(-)]
+       !kde-base/baloo:5
 "
 
 src_configure() {

diff --git a/kde-plasma/baloo/baloo-5.5.95.ebuild 
b/kde-plasma/baloo/baloo-5.5.95.ebuild
index a6bcd8f..517bc5d 100644
--- a/kde-plasma/baloo/baloo-5.5.95.ebuild
+++ b/kde-plasma/baloo/baloo-5.5.95.ebuild
@@ -41,4 +41,5 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
        !kde-base/baloo:4[-minimal(-)]
+       !kde-base/baloo:5
 "

diff --git a/kde-plasma/baloo/baloo-9999.ebuild 
b/kde-plasma/baloo/baloo-9999.ebuild
index 57b3f1f..8271f07 100644
--- a/kde-plasma/baloo/baloo-9999.ebuild
+++ b/kde-plasma/baloo/baloo-9999.ebuild
@@ -41,4 +41,5 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
        !kde-base/baloo:4[-minimal(-)]
+       !kde-base/baloo:5
 "