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

[Johannes Huber]

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

[kde-plasma/kdeplasma-addons] Fix file collisions with kde-base/kdeplasma-addons

Package-Manager: portage-2.2.15

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

diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.1.2.ebuild 
b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.1.2.ebuild
index 4d11290..bf793db 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.1.2.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.1.2.ebuild
@@ -32,7 +32,9 @@ DEPEND="
        )
        scim? ( app-i18n/scim )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !kde-base/kdeplasma-addons
+"
 
 src_configure() {
        local mycmakeargs=(

diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.1.95.ebuild 
b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.1.95.ebuild
index 6c9e529..9aaded5 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.1.95.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.1.95.ebuild
@@ -36,7 +36,9 @@ DEPEND="
        )
        scim? ( app-i18n/scim )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !kde-base/kdeplasma-addons
+"
 
 src_configure() {
        local mycmakeargs=(

diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild 
b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
index 5adf67b..3877ce7 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
@@ -36,7 +36,9 @@ DEPEND="
        )
        scim? ( app-i18n/scim )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !kde-base/kdeplasma-addons
+"
 
 src_configure() {
        local mycmakeargs=(