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

[Johannes Huber]

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

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

Package-Manager: portage-2.2.15

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

diff --git a/kde-plasma/kwin/kwin-5.1.2.ebuild 
b/kde-plasma/kwin/kwin-5.1.2.ebuild
index 1bf0839..311d704 100644
--- a/kde-plasma/kwin/kwin-5.1.2.ebuild
+++ b/kde-plasma/kwin/kwin-5.1.2.ebuild
@@ -60,8 +60,8 @@ COMMON_DEPEND="
        )
 "
 RDEPEND="${COMMON_DEPEND}
-       !kde-base/kwin:4
-       !kde-base/systemsettings:4
+       !kde-base/kwin
+       !kde-base/systemsettings
 "
 DEPEND="${COMMON_DEPEND}
        dev-qt/designer:5

diff --git a/kde-plasma/kwin/kwin-5.1.95.ebuild 
b/kde-plasma/kwin/kwin-5.1.95.ebuild
index 31e372f..d901379 100644
--- a/kde-plasma/kwin/kwin-5.1.95.ebuild
+++ b/kde-plasma/kwin/kwin-5.1.95.ebuild
@@ -61,8 +61,8 @@ COMMON_DEPEND="
        )
 "
 RDEPEND="${COMMON_DEPEND}
-       !kde-base/kwin:4
-       !kde-base/systemsettings:4
+       !kde-base/kwin
+       !kde-base/systemsettings
 "
 DEPEND="${COMMON_DEPEND}
        dev-qt/designer:5

diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index 26fd031..a998fcf 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -61,8 +61,8 @@ COMMON_DEPEND="
        )
 "
 RDEPEND="${COMMON_DEPEND}
-       !kde-base/kwin:4
-       !kde-base/systemsettings:4
+       !kde-base/kwin
+       !kde-base/systemsettings
 "
 DEPEND="${COMMON_DEPEND}
        dev-qt/designer:5