[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-base/klipper/, kde-plasma/klipper/, ...

[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-base/klipper/, kde-plasma/klipper/, ...

[Johannes Huber]

commit:     2db6d22e4ddd34ca393694af4022d19a6f4188dc
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  6 10:01:54 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Dec  6 10:01:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2db6d22e

kde-base/klipper -> kde-plasma/klipper

 kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild | 2 +-
 {kde-base => kde-plasma}/klipper/Manifest                    | 0
 {kde-base => kde-plasma}/klipper/klipper-4.11.22.ebuild      | 2 +-
 {kde-base => kde-plasma}/klipper/metadata.xml                | 0
 kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild    | 2 +-
 kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild | 2 +-
 kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild    | 2 +-
 profiles/updates/4Q-2016                                     | 1 +
 8 files changed, 6 insertions(+), 5 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 42b04b8..fc7b6c8 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
@@ -72,13 +72,13 @@ RDEPEND="
 	handbook? ( kde-apps/khelpcenter:* )
 	!minimal? (
 		$(add_kdeapps_dep kdepasswd)
-		$(add_kdebase_dep klipper)
 		kde-plasma/freespacenotifier:4
 		kde-plasma/kcheckpass:4
 		kde-plasma/kdebase-cursors:4
 		kde-plasma/kephal:4
 		kde-plasma/khotkeys:4
 		kde-plasma/kinfocenter:4
+		kde-plasma/klipper:4
 		kde-plasma/kmenuedit:4
 		kde-plasma/kstyles:4
 		kde-plasma/ksysguard:4

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

diff --git a/kde-base/klipper/klipper-4.11.22.ebuild b/kde-plasma/klipper/klipper-4.11.22.ebuild
similarity index 90%
rename from kde-base/klipper/klipper-4.11.22.ebuild
rename to kde-plasma/klipper/klipper-4.11.22.ebuild
index b550709..0464734 100644
--- a/kde-base/klipper/klipper-4.11.22.ebuild
+++ b/kde-plasma/klipper/klipper-4.11.22.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"
 inherit kde4-meta
 
-DESCRIPTION="Applet for KDE and X clipboard management"
+DESCRIPTION="Applet for KDE Plasma and X clipboard management"
 HOMEPAGE+=" https://userbase.kde.org/Klipper"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="debug prison"

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

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild
index 7728416..29e0434 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild
@@ -110,7 +110,7 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/libtaskmanager:4
 	!kde-plasma/kcminit:4
 	!kde-base/kdebase-startkde:4
-	!kde-base/klipper:4
+	!kde-plasma/klipper:4
 	!kde-base/krunner:4
 	!kde-base/ksmserver:4
 	!kde-plasma/ksplash:4

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
index 762e87d..593eb91 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
@@ -110,7 +110,7 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/libtaskmanager:4
 	!kde-plasma/kcminit:4
 	!kde-base/kdebase-startkde:4
-	!kde-base/klipper:4
+	!kde-plasma/klipper:4
 	!kde-base/krunner:4
 	!kde-base/ksmserver:4
 	!kde-plasma/ksplash:4

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
index 9f13649..20fc0b9 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
@@ -109,7 +109,7 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/libtaskmanager:4
 	!kde-plasma/kcminit:4
 	!kde-base/kdebase-startkde:4
-	!kde-base/klipper:4
+	!kde-plasma/klipper:4
 	!kde-base/krunner:4
 	!kde-base/ksmserver:4
 	!kde-plasma/ksplash:4

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index 57c2d94..3f01512 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -45,3 +45,4 @@ move kde-base/libplasmagenericshell kde-plasma/libplasmagenericshell
 move kde-base/libplasmaclock kde-plasma/libplasmaclock
 move kde-base/libtaskmanager kde-plasma/libtaskmanager
 move media-libs/prison kde-frameworks/prison
+move kde-base/klipper kde-plasma/klipper