commit:     3a5485912cf373653b8a801b816160723fcab082
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 18:59:35 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 19:01:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a548591

kde-base/liboxygenstyle -> kde-plasma/liboxygenstyle

 kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild        | 2 +-
 kde-base/kstyles/kstyles-4.11.22.ebuild                             | 6 +++---
 kde-plasma/kwin/kwin-4.11.22.ebuild                                 | 2 +-
 {kde-base => kde-plasma}/liboxygenstyle/Manifest                    | 0
 .../liboxygenstyle/liboxygenstyle-4.11.22.ebuild                    | 4 ++--
 {kde-base => kde-plasma}/liboxygenstyle/metadata.xml                | 0
 kde-plasma/oxygen/oxygen-5.7.5.ebuild                               | 2 +-
 kde-plasma/oxygen/oxygen-5.8.3.ebuild                               | 2 +-
 profiles/updates/4Q-2016                                            | 1 +
 9 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild 
b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
index d8cfdf0..8c53377 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
@@ -76,7 +76,6 @@ RDEPEND="
                $(add_kdebase_dep kstyles)
                $(add_kdebase_dep ksystraycmd)
                $(add_kdebase_dep libkworkspace)
-               $(add_kdebase_dep liboxygenstyle)
                $(add_kdebase_dep libplasmaclock)
                $(add_kdebase_dep libplasmagenericshell)
                $(add_kdebase_dep libtaskmanager)
@@ -90,6 +89,7 @@ RDEPEND="
                kde-plasma/kmenuedit:4
                kde-plasma/ksysguard:4
                kde-plasma/kwrited:4
+               kde-plasma/liboxygenstyle:4
                kde-plasma/powerdevil:4
                kde-plasma/solid-actions-kcm:4
        )

diff --git a/kde-base/kstyles/kstyles-4.11.22.ebuild 
b/kde-base/kstyles/kstyles-4.11.22.ebuild
index 94515b2..e364987 100644
--- a/kde-base/kstyles/kstyles-4.11.22.ebuild
+++ b/kde-base/kstyles/kstyles-4.11.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,12 +7,12 @@ EAPI=5
 KMNAME="kde-workspace"
 inherit kde4-meta
 
-DESCRIPTION="KDE: A set of different KDE styles"
+DESCRIPTION="A set of different KDE Plasma styles"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-       kde-base/liboxygenstyle:4=
+       kde-plasma/liboxygenstyle:4=
        x11-libs/libX11
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-plasma/kwin/kwin-4.11.22.ebuild 
b/kde-plasma/kwin/kwin-4.11.22.ebuild
index a51c8a5..9ec7cdb 100644
--- a/kde-plasma/kwin/kwin-4.11.22.ebuild
+++ b/kde-plasma/kwin/kwin-4.11.22.ebuild
@@ -23,8 +23,8 @@ COMMONDEPEND="
        $(add_kdebase_dep kactivities)
        $(add_kdebase_dep kdelibs opengl)
        $(add_kdebase_dep libkworkspace)
-       $(add_kdebase_dep liboxygenstyle)
        kde-plasma/kephal:4
+       kde-plasma/liboxygenstyle:4
        x11-libs/libICE
        x11-libs/libSM
        x11-libs/libX11

diff --git a/kde-base/liboxygenstyle/Manifest 
b/kde-plasma/liboxygenstyle/Manifest
similarity index 100%
rename from kde-base/liboxygenstyle/Manifest
rename to kde-plasma/liboxygenstyle/Manifest

diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.11.22.ebuild 
b/kde-plasma/liboxygenstyle/liboxygenstyle-4.11.22.ebuild
similarity index 72%
rename from kde-base/liboxygenstyle/liboxygenstyle-4.11.22.ebuild
rename to kde-plasma/liboxygenstyle/liboxygenstyle-4.11.22.ebuild
index 2bec2ad..9e25549 100644
--- a/kde-base/liboxygenstyle/liboxygenstyle-4.11.22.ebuild
+++ b/kde-plasma/liboxygenstyle/liboxygenstyle-4.11.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,7 +8,7 @@ KMNAME="kde-workspace"
 KMMODULE="libs/oxygen"
 inherit kde4-meta
 
-DESCRIPTION="Library to support the Oxygen style in KDE"
+DESCRIPTION="Library to support the Oxygen style in KDE Plasma"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 SLOT="4/${PV}"

diff --git a/kde-base/liboxygenstyle/metadata.xml 
b/kde-plasma/liboxygenstyle/metadata.xml
similarity index 100%
rename from kde-base/liboxygenstyle/metadata.xml
rename to kde-plasma/liboxygenstyle/metadata.xml

diff --git a/kde-plasma/oxygen/oxygen-5.7.5.ebuild 
b/kde-plasma/oxygen/oxygen-5.7.5.ebuild
index 7ae2235..c8d8f69 100644
--- a/kde-plasma/oxygen/oxygen-5.7.5.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.7.5.ebuild
@@ -42,7 +42,7 @@ RDEPEND="${COMMON_DEPEND}
        $(add_plasma_dep kde-cli-tools)
        qt4? (
                !kde-base/kstyles:4
-               !kde-base/liboxygenstyle:4
+               !kde-plasma/liboxygenstyle:4
        )
        !kde-plasma/kdebase-cursors:4
 "

diff --git a/kde-plasma/oxygen/oxygen-5.8.3.ebuild 
b/kde-plasma/oxygen/oxygen-5.8.3.ebuild
index 3e33ee6..6121f5d 100644
--- a/kde-plasma/oxygen/oxygen-5.8.3.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.8.3.ebuild
@@ -42,7 +42,7 @@ RDEPEND="${COMMON_DEPEND}
        $(add_plasma_dep kde-cli-tools)
        qt4? (
                !kde-base/kstyles:4
-               !kde-base/liboxygenstyle:4
+               !kde-plasma/liboxygenstyle:4
        )
        !kde-plasma/kdebase-cursors:4
 "

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index 8006706..8cc5052 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -34,3 +34,4 @@ move kde-base/kcminit kde-plasma/kcminit
 move kde-base/kdebase-cursors kde-plasma/kdebase-cursors
 move kde-base/kscreensaver kde-plasma/kscreensaver
 move kde-base/libkgreeter kde-plasma/libkgreeter
+move kde-base/liboxygenstyle kde-plasma/liboxygenstyle

Reply via email to