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

[Johannes Huber]

commit:     32843a5e2a9af37a1e8ef0b468f940ab1373e428
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 17 16:49:53 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jan 17 16:57:48 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=32843a5e

[kde-plasma/kfilemetadata] Fix file collision with kde-base/kfilemetadata

Package-Manager: portage-2.2.15

---
 kde-plasma/kfilemetadata/kfilemetadata-5.1.2.ebuild  | 4 +++-
 kde-plasma/kfilemetadata/kfilemetadata-5.5.95.ebuild | 4 +++-
 kde-plasma/kfilemetadata/kfilemetadata-9999.ebuild   | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/kde-plasma/kfilemetadata/kfilemetadata-5.1.2.ebuild 
b/kde-plasma/kfilemetadata/kfilemetadata-5.1.2.ebuild
index 02f70c6..2387137 100644
--- a/kde-plasma/kfilemetadata/kfilemetadata-5.1.2.ebuild
+++ b/kde-plasma/kfilemetadata/kfilemetadata-5.1.2.ebuild
@@ -21,7 +21,9 @@ DEPEND="
        pdf? ( app-text/poppler[qt5] )
        taglib? ( media-libs/taglib )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !kde-base/kfilemetadata:5
+"
 
 src_configure() {
        local mycmakeargs=(

diff --git a/kde-plasma/kfilemetadata/kfilemetadata-5.5.95.ebuild 
b/kde-plasma/kfilemetadata/kfilemetadata-5.5.95.ebuild
index 1e9bf27..bc0fd77 100644
--- a/kde-plasma/kfilemetadata/kfilemetadata-5.5.95.ebuild
+++ b/kde-plasma/kfilemetadata/kfilemetadata-5.5.95.ebuild
@@ -26,7 +26,9 @@ DEPEND="
        pdf? ( app-text/poppler[qt5] )
        taglib? ( media-libs/taglib )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !kde-base/kfilemetadata:5
+"
 
 src_configure() {
        local mycmakeargs=(

diff --git a/kde-plasma/kfilemetadata/kfilemetadata-9999.ebuild 
b/kde-plasma/kfilemetadata/kfilemetadata-9999.ebuild
index 98261ae..a83ca20 100644
--- a/kde-plasma/kfilemetadata/kfilemetadata-9999.ebuild
+++ b/kde-plasma/kfilemetadata/kfilemetadata-9999.ebuild
@@ -26,7 +26,9 @@ DEPEND="
        pdf? ( app-text/poppler[qt5] )
        taglib? ( media-libs/taglib )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !kde-base/kfilemetadata:5
+"
 
 src_configure() {
        local mycmakeargs=(