[gentoo-commits] repo/gentoo:master commit in: kde-misc/kscreen/, kde-plasma/kscreen/, profiles/updates/, ...

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kscreen/, kde-plasma/kscreen/, profiles/updates/, ...

[Johannes Huber]

commit:     14a91c7d46f369b91f602b73a919b3e5113ecae8
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  5 12:08:25 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Nov  5 12:09:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14a91c7d

kde-misc/kscreen -> kde-plasma/kscreen

 kde-base/systemsettings/metadata.xml                             | 2 +-
 kde-base/systemsettings/systemsettings-4.11.22-r2.ebuild         | 2 +-
 kde-misc/kscreen/Manifest                                        | 1 -
 kde-misc/kscreen/metadata.xml                                    | 8 --------
 kde-plasma/kscreen/Manifest                                      | 1 +
 {kde-misc => kde-plasma}/kscreen/kscreen-1.0.71_p20150824.ebuild | 2 +-
 kde-plasma/kscreen/kscreen-5.7.5.ebuild                          | 2 +-
 kde-plasma/kscreen/kscreen-5.8.3.ebuild                          | 2 +-
 profiles/updates/4Q-2016                                         | 1 +
 9 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/kde-base/systemsettings/metadata.xml b/kde-base/systemsettings/metadata.xml
index 786cfe9..857b07b 100644
--- a/kde-base/systemsettings/metadata.xml
+++ b/kde-base/systemsettings/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="kscreen">Use <pkg>kde-misc/kscreen</pkg> for screen management</flag>
+		<flag name="kscreen">Use <pkg>kde-plasma/kscreen</pkg> for screen management</flag>
 	</use>
 </pkgmetadata>

diff --git a/kde-base/systemsettings/systemsettings-4.11.22-r2.ebuild b/kde-base/systemsettings/systemsettings-4.11.22-r2.ebuild
index 49f5e8b..665deb4 100644
--- a/kde-base/systemsettings/systemsettings-4.11.22-r2.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.11.22-r2.ebuild
@@ -44,7 +44,7 @@ RDEPEND="${COMMONDEPEND}
 	x11-apps/setxkbmap
 	x11-misc/xkeyboard-config
 	gtk? ( kde-plasma/kde-gtk-config:4 )
-	kscreen? ( kde-misc/kscreen:4 )
+	kscreen? ( kde-plasma/kscreen:4 )
 	|| ( $(add_kdebase_dep legacy-icons) >=kde-frameworks/oxygen-icons-5.19.0:5 )
 "
 

diff --git a/kde-misc/kscreen/Manifest b/kde-misc/kscreen/Manifest
deleted file mode 100644
index 2ce3b6c..00000000
--- a/kde-misc/kscreen/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kscreen-1.0.71_p20150824.tar.xz 93080 SHA256 ae0a1830d2d7dbb350e217188c77bd30a10decbd56f056f7e2fd0964071d95d4 SHA512 ac1f71219918363d298ee30022a9207da912c4293c6056d8875425b80c70010d7476591ca366eae5af97a298511c0e41ca748ba0c570d632f490eb5c3eae3c84 WHIRLPOOL 77721dc3a03a0a5eee543418379480da2c182497ab58a1aed7e513b228d406588187307ad848ddc3f6e6566e4a2039acec5428d04bcf597816c10b2d018a2f55

diff --git a/kde-misc/kscreen/metadata.xml b/kde-misc/kscreen/metadata.xml
deleted file mode 100644
index 2fdbf33..00000000
--- a/kde-misc/kscreen/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>

diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 46bfaeb..d7ba331 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,2 +1,3 @@
+DIST kscreen-1.0.71_p20150824.tar.xz 93080 SHA256 ae0a1830d2d7dbb350e217188c77bd30a10decbd56f056f7e2fd0964071d95d4 SHA512 ac1f71219918363d298ee30022a9207da912c4293c6056d8875425b80c70010d7476591ca366eae5af97a298511c0e41ca748ba0c570d632f490eb5c3eae3c84 WHIRLPOOL 77721dc3a03a0a5eee543418379480da2c182497ab58a1aed7e513b228d406588187307ad848ddc3f6e6566e4a2039acec5428d04bcf597816c10b2d018a2f55
 DIST kscreen-5.7.5.tar.xz 109144 SHA256 8d1d8c28591b2369510440f99321b0d97468ea9aa5a6eefa2a3385671f5e56c2 SHA512 df057cb36b095385d0e634a149faabd6a7f9413256569e7a2dcb759387e80ed517ccc21b1e0a7f79950444579fb0f2e2a28ee597f1d14cd3ea9667c41517f43d WHIRLPOOL aea5c49a9b3d17d2393893097fc03902136aef15678d1139c7b6f7045d9598121b53f503dad18974e525cfe6e946415501ca20d67a6b19c6d39bd1e9b138530c
 DIST kscreen-5.8.3.tar.xz 112844 SHA256 de06798fa6d73b9dafcf25c90ff1739bdea0d78082a2aa9e453e28db7b6fb41e SHA512 74de567da96e9b086b8da45f289e842c93e00069c291d3e6420528ef91cb5aa79d9413b8458c6f6653ae5646875a08322fe1da5fbdcf735fce26803445c4585d WHIRLPOOL 9b3b4286ed039c5c9f4a999b93b23e1e666e4e82b4522f839e8a9440dcee9a615281606583c41ab71edef2b54b2dd6ded0c0aa3c0e11e1f27cdb20b47075d3c0

diff --git a/kde-misc/kscreen/kscreen-1.0.71_p20150824.ebuild b/kde-plasma/kscreen/kscreen-1.0.71_p20150824.ebuild
similarity index 96%
rename from kde-misc/kscreen/kscreen-1.0.71_p20150824.ebuild
rename to kde-plasma/kscreen/kscreen-1.0.71_p20150824.ebuild
index c6580c6..fb8ac17 100644
--- a/kde-misc/kscreen/kscreen-1.0.71_p20150824.ebuild
+++ b/kde-plasma/kscreen/kscreen-1.0.71_p20150824.ebuild
@@ -10,7 +10,7 @@ KDE_LINGUAS="ast bg bs ca ca@valencia cs da de el en_GB es et fi fr ga gl hu it
 ja ko lt mr nb nds nl nn pa pl pt pt_BR ro ru sk sl sv tr ug uk zh_CN zh_TW"
 inherit kde4-base
 
-DESCRIPTION="Alternative KDE screen management"
+DESCRIPTION="Plasma screen management"
 HOMEPAGE="https://projects.kde.org/projects/extragear/base/kscreen"
 SRC_URI="http://dev.gentoo.org/~kensington/distfiles/${P}.tar.xz"
 

diff --git a/kde-plasma/kscreen/kscreen-5.7.5.ebuild b/kde-plasma/kscreen/kscreen-5.7.5.ebuild
index c87716d..f417ccb 100644
--- a/kde-plasma/kscreen/kscreen-5.7.5.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.7.5.ebuild
@@ -31,7 +31,7 @@ DEPEND="
 RDEPEND="${DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 	$(add_qt_dep qtgraphicaleffects)
-	!kde-misc/kscreen
+	!kde-plasma/kscreen:4
 "
 
 # bug #580440, last checked 5.6.3

diff --git a/kde-plasma/kscreen/kscreen-5.8.3.ebuild b/kde-plasma/kscreen/kscreen-5.8.3.ebuild
index 2bb9503..db1af65 100644
--- a/kde-plasma/kscreen/kscreen-5.8.3.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.8.3.ebuild
@@ -31,7 +31,7 @@ DEPEND="
 RDEPEND="${DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 	$(add_qt_dep qtgraphicaleffects)
-	!kde-misc/kscreen
+	!kde-plasma/kscreen:4
 "
 
 # bug #580440, last checked 5.6.3

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index af51358..ba7501b 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -16,3 +16,4 @@ move kde-base/khotkeys kde-plasma/khotkeys
 move kde-base/kinfocenter kde-plasma/kinfocenter
 move kde-base/ksysguard kde-plasma/ksysguard
 move dev-perl/google-api-adwords-perl dev-perl/Google-Ads-AdWords-Client
+move kde-misc/kscreen kde-plasma/kscreen