gentoo resync : 24.12.2018

5 files changed, 14 insertions, 59 deletions

diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 06ce467e2670..e8faf953d815 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,13 +1,11 @@
 AUX 10-agent-shutdown.sh 395 BLAKE2B ee85e72fcdf07b483b0506ee4155f2623f03052ef4066f3a6086d34fb6f03163edef16001e23ae38b872821c6e6d106f19d7e5666f4b2fdfe381c5d6370191b8 SHA512 572b8bdb3ebbaffc51de347f2770fe3f36206f9dc66e1438abf93070775f8f3936865143f090c77e2959d56546cbf311ccc5d10102f7a3fa64112cac56b3b2c6
 AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e4c7a6ba1a8d223e890ca2287f9c842019e04ead5015840d6d2f9b9d89320a7b0f6c20197b1d90d56506b4 SHA512 718feed12544deb1750730bebf1d618cbccdec9a4815a28b9f17278fdc9c21466b098778b9a20785625b99b5eb930049a84a67a0c033b684610ec8eb5b5ec678
 AUX plasma-workspace-5.10-startplasmacompositor-script.patch 1213 BLAKE2B 2558a43db9cc65706fe2c3382918e47552ad702e9ac6a5071ae3c620bc05097306046e0cd3f74de68985d787120013ce76697cbe107bc3b0c5ace5d5d03a05c1 SHA512 eb7126ec8a7991c59c1c056c81d9b8d6934cf9c702cc70534a97b585eaf1ea3e33499e5525e821ce4e8682573a09538ed1d59db561c58a7464a144e9a24c5275
-AUX plasma-workspace-5.10.4-unused-dep.patch 804 BLAKE2B 7c77a4f64185f718da3e8a64540cf651f860ed6312423fce6e42ce0e86f8c7d3c4759acf206bdeeb4df5d4221c937e6771d32bb2fca05fb6cfc311f2fe2b1b96 SHA512 9718f0577ca468a6ec1eed7a665d3c0de236408b7aac442775daef4795040104a422b3c8325e5f2b9bc9e38da3f6d0dedf13826f49d3921a84960a0833557528
 AUX plasma-workspace-5.12.80-tests-optional.patch 905 BLAKE2B 02350e6aa907b91c84d50f06efe5ab4acbddc39226747660b21f6b5209a85bb35b023e583a51b583e87f3d75d02c4c59621463992d29ba6150941d464a07ad8c SHA512 df01f4f246d093606a72c8ca018ce829b42073cf6db2db00f9be7b22d7532f3a6fab5218579c666ae8ed6408c0a67912643f2c37e1c13aada49b7ef0c4111044
-AUX plasma-workspace-5.13.5-double-positions.patch 1341 BLAKE2B 9acb1116943cef24641b89be798c234bce784f31f87c2d25c8d37a185a5386a1899238928ce5b25d3c96f3b84519c35e558ccd3361e1dcbbcda9a7172749af32 SHA512 ae92f642177fd43a538e40fc113ca0febe6ee6274e6d9c38d6b21052abd676a5a00a205470fdda06f652d26bc899db89322ce5a059e96b19973a1abcd2a108f1
 AUX plasma-workspace-5.14.2-split-libkworkspace.patch 1100 BLAKE2B 7583bed4a71867de37c9741416d9a9711e2e8a9a26f5f50e826ec74a1b8efc03d4a592b06ca24df525381d7f98870329082cbafd86e1b29797ca68e78c928d81 SHA512 07a80880960719106ddb65d3b55fba5af7a71829dcb91bd9ae6bc1531ad019aeece968e01f243625f7fea2b34081590d317528797833fd9485b95cb1fd3f001d
 AUX plasma-workspace-5.4-startkde-script.patch 1090 BLAKE2B bb2b0f20bbc2ed467994c98840ffeefc71d4f621713e413ff09a855689bde66b81a61e607457b3fa1ae51a67a3a3e47049193fec530448483c6f87e63f713981 SHA512 45149d5a3db48d77da7a74fd0a5faf14c8f99aaceddc725c9056cac315fd3bae78506e7cd74f6548045e4daf73bf2a605a712311018ff11a4a26c7d9f2afee84
-DIST plasma-workspace-5.13.5.tar.xz 4577444 BLAKE2B 4aef4cc12762113bb193f62a2a400b6cc53390ec1ff800048bc6f41391ed8a9228e1afd6379425d6e636f1d229d9cc9bb3d976515026c874fa27a3fe29bc0499 SHA512 f30dc3ea83ec3e2a754fb531be24b1f573e743724abcd7df88f83daba07b3bf360f2e6b5c7d2a54a8dd5c15a39e73123d6f2a00730d09f1caed08002c2da24d6
 DIST plasma-workspace-5.14.3.tar.xz 4584420 BLAKE2B 50975eef224435e4359447fb0ea8f2ed447cd459860071bbdd32ac2239e0e8ab035fe2703474c856bc3ca173cfddd2d4166d281ca2fa2b6e2c355d19ee2f45ee SHA512 c79ffa14874f5ef1b476ebd5586f7175dcce1190601af3e75d8d0186aca8cb526c94b1445624d75b6a0dbc5bb780673d0c361aa49c5e5752a4639bba75af42a0
-EBUILD plasma-workspace-5.13.5-r1.ebuild 4734 BLAKE2B 5213d7af8ab390eec81c5519dffe55caaaf811d9fdefd141f986bd374561324884f301f476fd6d126ace626c79cc5e165ac802cea4c7d0e314e48a2a371eff77 SHA512 ed61c5029936b438a096c4826ce624e06f98eb03b431ca7df1536722fff80893efc6f4e6300429c79c981e023257e1c4ae62c72ff41007bc0b66deeb21901394
-EBUILD plasma-workspace-5.14.3.ebuild 5002 BLAKE2B 8e127a06bb281a74079f5454c359cef9d4b549c27fa9153fc84d6bf4011cc761072db814a8d8aba612448cee4bbf29db88b75705eb6c952509d42b167143486d SHA512 5379b76933fa0ad1ae8ccc220aebf4d427ff3cbd5178af623dcd2fe1aedbea6bd4410da41b5563ef0e806ef7c6d333527656a45ced3ef61350a1c0ecff51038c
+DIST plasma-workspace-5.14.4.tar.xz 4572780 BLAKE2B c0c59acdd4622949ec87e91e827595c048c3f736e27a2f7c649765aee3bbd7ef00ccba7909dd456881bf4cf382adbff3019be2a4f9d098591f8781399aee9902 SHA512 017b2b8d52c243072ffd6b7b4a766ed27d055dae36f6cf9d10e4f06748555680b55ebdae6db07a043b18359c391bf294f0bc0e601f26e5cd12b532fffcb07645
+EBUILD plasma-workspace-5.14.3.ebuild 5000 BLAKE2B 68a4683d732fedc92e5713e12e2b5cb39deb4470fd75884242bd0b6af6f4ecd3b03937f9f7f6aee4f49f9e89515aec84ef747380f16883e0ce17babe8b9fd87f SHA512 c9d44afe6712f5fbe0042adbb339a8d8e6885c90cbbf5e2bb744c25454d291a1094b6125236fffc3bedf0c1d0347c670b916baa3cffc796664601fd103931c2f
+EBUILD plasma-workspace-5.14.4.ebuild 5002 BLAKE2B 8e127a06bb281a74079f5454c359cef9d4b549c27fa9153fc84d6bf4011cc761072db814a8d8aba612448cee4bbf29db88b75705eb6c952509d42b167143486d SHA512 5379b76933fa0ad1ae8ccc220aebf4d427ff3cbd5178af623dcd2fe1aedbea6bd4410da41b5563ef0e806ef7c6d333527656a45ced3ef61350a1c0ecff51038c
 MISC metadata.xml 583 BLAKE2B f9b40b080569e6ec92f7a4f23bd6c7e7fb7711b44d3a00cef525478e9ad9a1b2eda3fe0a4686d625cf8530b6f7aa36b6f70eb71401a06ef2856ef3d0c068e11f SHA512 8b7b81edd1518c2b1ee18d609288c209d197d35f869d687e1019a10f29a2360bd071218ad3facf65217665287b3ceab84a78341e6cd799a7326fd3da2336958f
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-unused-dep.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-unused-dep.patch
deleted file mode 100644
index fa0f38509652..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-unused-dep.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 5a7d251cfbed417a2617945a94427a93cdd2e82d
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Thu Jul 27 17:50:17 2017 +0200
-
-    Drop unused dependency
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ba61d1cc..ab5536ff 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,7 +25,7 @@ include(ECMQtDeclareLoggingCategory)
- include(KDEPackageAppTemplates)
- 
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
--                    Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff Wallet KCMUtils
-+                    Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff Wallet
-                     IdleTime Declarative TextWidgets KDELibs4Support Crash GlobalAccel
-                     DBusAddons Wayland)
- find_package(KF5NetworkManagerQt ${KF5_MIN_VERSION})
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.13.5-double-positions.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.13.5-double-positions.patch
deleted file mode 100644
index 0c294af670aa..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.13.5-double-positions.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1bb02b98cfedfd6b51ac8de0c34a5778659433f7 Mon Sep 17 00:00:00 2001
-From: Arsen Arsen <arsenarsentmc@outlook.com>
-Date: Thu, 6 Sep 2018 10:29:09 +0200
-Subject: [Media Player] Change int to double for positions
-
-In previous versions of Plasma, media player had an overflow bug in positions, leading to the player resetting to 00:00.
-This only affects files longer than around 33 minutes 20 seconds.
-
-BUG: 397591
-FIXED-IN: 5.12.7
-
-Differential Revision: https://phabricator.kde.org/D15311
----
- applets/mediacontroller/contents/ui/ExpandedRepresentation.qml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/applets/mediacontroller/contents/ui/ExpandedRepresentation.qml b/applets/mediacontroller/contents/ui/ExpandedRepresentation.qml
-index 2922f99..904fe49 100644
---- a/applets/mediacontroller/contents/ui/ExpandedRepresentation.qml
-+++ b/applets/mediacontroller/contents/ui/ExpandedRepresentation.qml
-@@ -35,7 +35,7 @@ Item {
- 
-     readonly property int controlSize: Math.min(height, width) / 4
- 
--    property int position: mpris2Source.currentData.Position || 0
-+    property double position: mpris2Source.currentData.Position || 0
-     readonly property real rate: mpris2Source.currentData.Rate || 1
-     readonly property double length: currentMetadata ? currentMetadata["mpris:length"] || 0 : 0
- 
--- 
-cgit v0.11.2
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.14.3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.14.3.ebuild
index af53d274efc4..6e6996c7c11a 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.14.3.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.14.3.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5 qmake-utils
 
 DESCRIPTION="KDE Plasma workspace"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd"
 
 REQUIRED_USE="gps? ( geolocation )"
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.13.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.14.4.ebuild
index 8d0758cb39bb..af53d274efc4 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.13.5-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.14.4.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5 qmake-utils
 
 DESCRIPTION="KDE Plasma workspace"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd"
 
 REQUIRED_USE="gps? ( geolocation )"
@@ -55,11 +55,11 @@ COMMON_DEPEND="
 	$(add_plasma_dep kscreenlocker)
 	$(add_plasma_dep kwin)
 	$(add_plasma_dep libksysguard)
+	$(add_plasma_dep libkworkspace)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtdeclarative 'widgets')
 	$(add_qt_dep qtgui 'jpeg')
 	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtscript)
 	$(add_qt_dep qtsql)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtx11extras)
@@ -126,7 +126,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
 	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
 	"${FILESDIR}/${PN}-5.12.80-tests-optional.patch"
-	"${FILESDIR}/${P}-double-positions.patch"
+	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
 )
 
 RESTRICT+=" test"
@@ -136,10 +136,17 @@ src_prepare() {
 
 	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
 		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+
+	cmake_comment_add_subdirectory libkworkspace
+	# delete colliding libkworkspace translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
+	fi
 }
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_xembed-sni-proxy=OFF
 		$(cmake-utils_use_find_package appstream AppStreamQt)
 		$(cmake-utils_use_find_package calendar KF5Holidays)
 		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)