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

[Johannes Huber]

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

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

Package-Manager: portage-2.2.15

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

diff --git a/kde-plasma/oxygen/oxygen-5.1.2.ebuild 
b/kde-plasma/oxygen/oxygen-5.1.2.ebuild
index 9a7f1c3..d0d60aa 100644
--- a/kde-plasma/oxygen/oxygen-5.1.2.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.1.2.ebuild
@@ -30,7 +30,8 @@ DEPEND="
        kwin? ( $(add_kdeplasma_dep kwin) )
 "
 RDEPEND="${DEPEND}
-       !kde-base/kdebase-cursors:4
+       !kde-base/kdebase-cursors
+       !kde-base/oxygen
 "
 
 src_configure() {

diff --git a/kde-plasma/oxygen/oxygen-5.1.95.ebuild 
b/kde-plasma/oxygen/oxygen-5.1.95.ebuild
index 9a7f1c3..d0d60aa 100644
--- a/kde-plasma/oxygen/oxygen-5.1.95.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.1.95.ebuild
@@ -30,7 +30,8 @@ DEPEND="
        kwin? ( $(add_kdeplasma_dep kwin) )
 "
 RDEPEND="${DEPEND}
-       !kde-base/kdebase-cursors:4
+       !kde-base/kdebase-cursors
+       !kde-base/oxygen
 "
 
 src_configure() {

diff --git a/kde-plasma/oxygen/oxygen-9999.ebuild 
b/kde-plasma/oxygen/oxygen-9999.ebuild
index dc0bad8..ade805a 100644
--- a/kde-plasma/oxygen/oxygen-9999.ebuild
+++ b/kde-plasma/oxygen/oxygen-9999.ebuild
@@ -30,7 +30,8 @@ DEPEND="
        kwin? ( $(add_kdeplasma_dep kwin) )
 "
 RDEPEND="${DEPEND}
-       !kde-base/kdebase-cursors:4
+       !kde-base/kdebase-cursors
+       !kde-base/oxygen
 "
 
 src_configure() {