[gentoo-commits] repo/gentoo:master commit in: x11-libs/libkscreen/, kde-plasma/libkscreen/, profiles/updates/, ...

[Johannes Huber]

commit:     5aa27aee372987f5ff2861fd7947f23a1b238efb
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  5 12:26:56 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Nov  5 12:28:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aa27aee

x11-libs/libkscreen -> kde-plasma/libkscreen

 kde-apps/okular/metadata.xml                                      | 2 +-
 kde-apps/okular/okular-16.04.3.ebuild                             | 2 +-
 kde-apps/okular/okular-16.08.2.ebuild                             | 2 +-
 kde-plasma/kscreen/kscreen-1.0.71_p20150824.ebuild                | 2 +-
 kde-plasma/libkscreen/Manifest                                    | 1 +
 .../libkscreen/libkscreen-1.0.5_p20150822.ebuild                  | 4 ++--
 profiles/updates/4Q-2016                                          | 1 +
 x11-libs/libkscreen/Manifest                                      | 1 -
 x11-libs/libkscreen/metadata.xml                                  | 8 --------
 9 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index ed7eb8e..7cbb210 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<use>
 		<flag name="chm">Enable support for Microsoft Compiled HTML Help files</flag>
-		<flag name="dpi">DPI detection support for PDF rendering via <pkg>x11-libs/libkscreen</pkg></flag>
+		<flag name="dpi">DPI detection support for PDF rendering via <pkg>kde-plasma/libkscreen</pkg></flag>
 		<flag name="ebook">Add E-Book support</flag>
 		<flag name="mobi">Add mobipocket support</flag>
 	</use>

diff --git a/kde-apps/okular/okular-16.04.3.ebuild b/kde-apps/okular/okular-16.04.3.ebuild
index 0a21597..db66c42 100644
--- a/kde-apps/okular/okular-16.04.3.ebuild
+++ b/kde-apps/okular/okular-16.04.3.ebuild
@@ -23,7 +23,7 @@ DEPEND="
 	chm? ( dev-libs/chmlib )
 	crypt? ( app-crypt/qca:2[qt4] )
 	djvu? ( app-text/djvu )
-	dpi? ( x11-libs/libkscreen:4 )
+	dpi? ( kde-plasma/libkscreen:4 )
 	ebook? ( app-text/ebook-tools )
 	jpeg? (
 		$(add_kdeapps_dep libkexiv2)

diff --git a/kde-apps/okular/okular-16.08.2.ebuild b/kde-apps/okular/okular-16.08.2.ebuild
index 97a9566..a79841d 100644
--- a/kde-apps/okular/okular-16.08.2.ebuild
+++ b/kde-apps/okular/okular-16.08.2.ebuild
@@ -24,7 +24,7 @@ DEPEND="
 	chm? ( dev-libs/chmlib )
 	crypt? ( app-crypt/qca:2[qt4] )
 	djvu? ( app-text/djvu )
-	dpi? ( x11-libs/libkscreen:4 )
+	dpi? ( kde-plasma/libkscreen:4 )
 	ebook? ( app-text/ebook-tools )
 	jpeg? (
 		$(add_kdeapps_dep libkexiv2)

diff --git a/kde-plasma/kscreen/kscreen-1.0.71_p20150824.ebuild b/kde-plasma/kscreen/kscreen-1.0.71_p20150824.ebuild
index fb8ac17..7acd284 100644
--- a/kde-plasma/kscreen/kscreen-1.0.71_p20150824.ebuild
+++ b/kde-plasma/kscreen/kscreen-1.0.71_p20150824.ebuild
@@ -21,7 +21,7 @@ IUSE="debug"
 
 RDEPEND="
 	>=dev-libs/qjson-0.8
-	>=x11-libs/libkscreen-1.0.4:4
+	>=kde-plasma/libkscreen-1.0.4:4
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext"

diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 6192068..2c52da0 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,2 +1,3 @@
+DIST libkscreen-1.0.5_p20150822.tar.bz2 38419 SHA256 25cf4117dc99c3278a8abf315fa31ea3a3a1e065a2b28c37a26b2da508bee4f6 SHA512 2a35b63f65d4440205ff11fe35cf1b87cb656e0647eb7d2c7bada7dd6b71cb86d32ffb20a3b63e57d6444f17d3cb0758fc015e95bec62747189fba5a50fab48a WHIRLPOOL 8ccdd2ff43fcb186ab31653ac47e8b8f86be4a5cfdb9231b2e4f57bb335be578658716fa490141ccc91ac636982f28ec0ebc724d69058242d3deacd3e8c00383
 DIST libkscreen-5.7.5.tar.xz 90280 SHA256 e11894969cfb6d094f6cdcca1ab3a2d3b1238f17fb6645119629737c1e989c7c SHA512 a4880911b931251dc12d1d04f9157d5815e382b42b6337aa9ce1ea580cb379e748b2b5b8aeb1f06af63d28c6a9e7e7ec21703d87d7d7655b7522336138c350e4 WHIRLPOOL e73a9a4f81a0d2957e733a8e243ad19fe3365c42753ffb32421d2279ba3d96e17c21b1e45b7fd6c30b8aa53b5897c3c0f2434d6a9ab72af4fecdf6f46c323b98
 DIST libkscreen-5.8.3.tar.xz 92896 SHA256 a76f976494ac98b742969830c350b89b354b11a854c1d884dbe0daecc79c4a26 SHA512 781610f438189dfe0afb057a97c3aae9b134faafb7b7badfc625c514838eb42fda4f591e19573ad33ffdf479648e67f915b0e7d23bf7142ec3972219eace2d9e WHIRLPOOL ad163590618b3dea408151e36f91d17eea718aaa747c335700f88dbd5bc15cdc55c34f5042213e95005eac94d8a20e662b2ff25489d9567e1198ce63b53b2403

diff --git a/x11-libs/libkscreen/libkscreen-1.0.5_p20150822.ebuild b/kde-plasma/libkscreen/libkscreen-1.0.5_p20150822.ebuild
similarity index 84%
rename from x11-libs/libkscreen/libkscreen-1.0.5_p20150822.ebuild
rename to kde-plasma/libkscreen/libkscreen-1.0.5_p20150822.ebuild
index a3df74e..383770b 100644
--- a/x11-libs/libkscreen/libkscreen-1.0.5_p20150822.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-1.0.5_p20150822.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,7 +7,7 @@ EAPI=5
 VIRTUALX_REQUIRED="test"
 inherit kde4-base
 
-DESCRIPTION="KDE screen management library"
+DESCRIPTION="Plasma screen management library"
 HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libkscreen"
 SRC_URI="https://dev.gentoo.org/~kensington/distfiles/${P}.tar.bz2"
 

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index ba7501b..bb95fef 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -17,3 +17,4 @@ 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
+move x11-libs/libkscreen kde-plasma/libkscreen

diff --git a/x11-libs/libkscreen/Manifest b/x11-libs/libkscreen/Manifest
deleted file mode 100644
index 440eb45..00000000
--- a/x11-libs/libkscreen/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libkscreen-1.0.5_p20150822.tar.bz2 38419 SHA256 25cf4117dc99c3278a8abf315fa31ea3a3a1e065a2b28c37a26b2da508bee4f6 SHA512 2a35b63f65d4440205ff11fe35cf1b87cb656e0647eb7d2c7bada7dd6b71cb86d32ffb20a3b63e57d6444f17d3cb0758fc015e95bec62747189fba5a50fab48a WHIRLPOOL 8ccdd2ff43fcb186ab31653ac47e8b8f86be4a5cfdb9231b2e4f57bb335be578658716fa490141ccc91ac636982f28ec0ebc724d69058242d3deacd3e8c00383

diff --git a/x11-libs/libkscreen/metadata.xml b/x11-libs/libkscreen/metadata.xml
deleted file mode 100644
index 2fdbf33..00000000
--- a/x11-libs/libkscreen/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@g.o</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>