gentoo resync : 27.10.2018

5 files changed, 49 insertions, 7 deletions

diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index e35249046e8c..39699879bee7 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -4,11 +4,12 @@ AUX plasma-workspace-5.10-startplasmacompositor-script.patch 1213 BLAKE2B 2558a4
 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.12.7.tar.xz 4574632 BLAKE2B 225a63a199f0644e68e25316adc85c11818c0a8e57fbfa64188233a1172f819aa98920b96f9bd1039355651005f4df35f376104e1cdcb511d82ef43eba1eb89c SHA512 e9d4a85b11264eebbce0845eefa5d01818e944c2179d5cbc3e23b720118894d88fbfe96467c68849a3fa89728cecff248cd7f9dfc0ab133e50dad28ecc957623
 DIST plasma-workspace-5.13.5.tar.xz 4577444 BLAKE2B 4aef4cc12762113bb193f62a2a400b6cc53390ec1ff800048bc6f41391ed8a9228e1afd6379425d6e636f1d229d9cc9bb3d976515026c874fa27a3fe29bc0499 SHA512 f30dc3ea83ec3e2a754fb531be24b1f573e743724abcd7df88f83daba07b3bf360f2e6b5c7d2a54a8dd5c15a39e73123d6f2a00730d09f1caed08002c2da24d6
-DIST plasma-workspace-5.14.1.tar.xz 4571880 BLAKE2B 8d19b65d29cbbbe72df49b9ff9466c5454dec73126cb7a927298838c5a42c326c82e99c9747cec4cad4295d7abffeaec6e60c99749abca79bf5b2924542e32d1 SHA512 917386b278a7179b5f76f4b8bfa9e35b9505d5e7c07dcd448bbf86b75658963465f62dc6e999fe67bfcbb767b0b73921c6787b222d0642ddddd9158f645af18c
-EBUILD plasma-workspace-5.12.7.ebuild 4704 BLAKE2B 2899d0a2f4125ce0869bf7ebc2fc4e208f3f0d10b073205a04b25250e88d78f5ece067ccc4a4c5797af114f9d10363939eae36edae45b6832c5ecf3b82b4b56d SHA512 89019fe7d7ccc84512e2c2730321df635313952d26d45822fe4fa4befcebece515a10c18da97baa0126dcc5bb1885eae90889bb5d457847d0f3da167b43fb377
-EBUILD plasma-workspace-5.13.5-r1.ebuild 4762 BLAKE2B 64751a7ddd68056836ca5a11a608e28ee9a4550f966304450b8818f04093cfc46c1f96805d5b762dde3231cddf6af3127c6b65f32ad1d5a9eeab35d196bf0ec2 SHA512 3e2a1c7a6ffa2203e2008c1240f0060eaf85da509d0fa32dace6587d36b32f14637317b4579d1f37a4d210a1f8028b65a29e4673de991b307e78eaede54df32a
-EBUILD plasma-workspace-5.14.1.ebuild 4697 BLAKE2B e7c0021cef1bba71efe7a9508eb7ef41a63feba69035bd86ac1f48f7eab0f809da7ec0ac0a42a12de207c776a04ba1977f9b0af2352c74881deca3b67047a9e7 SHA512 52a717c70d3e081bb215f7e2834396ee8f13cd123e0344b700a646058a7d6b3b5bf4f60f386cb624b4a0ec8072efce483ba78416ab1a8b109b0eb5415a9f1446
+DIST plasma-workspace-5.14.2.tar.xz 4568588 BLAKE2B a1079f1a874aadc1c989f5a2bfbd7b94872bd66ab8304a63ace5c21f4e983e3956bf8ddc6db1a81945a138a26a4adb10f172272eaead92e0879d04141845baa3 SHA512 8bbb8604816ae61f4af9df8a130810fef8c0050f5a847153b787afadc330eee211dc3d66a4576cc20d45a22eb5e1f845b463f91985359400c1c9c1889ef4e676
+EBUILD plasma-workspace-5.12.7.ebuild 4676 BLAKE2B 60ccbedc155125adcdb0b633e72ba20666205797fb7fe05633e6b6aacd6e51b6cef5f5608ae59a9b1809539c0c7e46598fd71c381534cf3fdd91bc080183b45a SHA512 70ba395f728adfe2c90e783025d3e5f6c788fa5f52f46f20ff8c4ddce82c5b844916c38cc17b35663bcc91fdc977c1cef38300e0200a8416643cce8aaf6a7a22
+EBUILD plasma-workspace-5.13.5-r1.ebuild 4734 BLAKE2B 5213d7af8ab390eec81c5519dffe55caaaf811d9fdefd141f986bd374561324884f301f476fd6d126ace626c79cc5e165ac802cea4c7d0e314e48a2a371eff77 SHA512 ed61c5029936b438a096c4826ce624e06f98eb03b431ca7df1536722fff80893efc6f4e6300429c79c981e023257e1c4ae62c72ff41007bc0b66deeb21901394
+EBUILD plasma-workspace-5.14.2.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.14.2-split-libkworkspace.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch
new file mode 100644
index 000000000000..f12d9f4daf5b
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch
@@ -0,0 +1,35 @@
+From 4717089b68c386446be240f463f2f13e7024468b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon, 22 Oct 2018 10:35:10 +0200
+Subject: [PATCH] libkworkspace: Allow standalone build
+
+---
+ CMakeLists.txt               |  6 +++-
+ 1 file changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e587a386..d1a63527 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,6 +46,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching"
+ 
+ find_package(KF5TextEditor)
+ find_package(KWinDBusInterface CONFIG REQUIRED)
++find_package(LibKWorkspace 5.14.1)
+ 
+ find_package(KScreenLocker 5.13.80 REQUIRED)
+ find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
+@@ -135,7 +136,10 @@ endif()
+ add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+ 
+ add_subdirectory(doc)
+-add_subdirectory(libkworkspace)
++if(NOT LibKWorkspace_FOUND)
++    message(STATUS "System LibKWorkspace not found, using bundled.")
++    add_subdirectory(libkworkspace)
++endif()
+ add_subdirectory(libdbusmenuqt)
+ add_subdirectory(appmenu)
+ 
+-- 
+2.19.1
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.12.7.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.12.7.ebuild
index 0ab282393847..a28b62b805c2 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.12.7.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.12.7.ebuild
@@ -105,7 +105,6 @@ RDEPEND="${COMMON_DEPEND}
 	x11-apps/xsetroot
 	systemd? ( sys-apps/dbus[user-session] )
 	!systemd? ( sys-apps/dbus )
-	!dev-libs/xembed-sni-proxy
 	!kde-plasma/freespacenotifier:4
 	!kde-plasma/libtaskmanager:4
 	!kde-plasma/kcminit:4
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.13.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.13.5-r1.ebuild
index 2ffee171d828..8d0758cb39bb 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.13.5-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.13.5-r1.ebuild
@@ -108,7 +108,6 @@ RDEPEND="${COMMON_DEPEND}
 	x11-apps/xsetroot
 	systemd? ( sys-apps/dbus[user-session] )
 	!systemd? ( sys-apps/dbus )
-	!dev-libs/xembed-sni-proxy
 	!kde-plasma/freespacenotifier:4
 	!kde-plasma/libtaskmanager:4
 	!kde-plasma/kcminit:4
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.14.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.14.2.ebuild
index 50fc485bdff2..af53d274efc4 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.14.1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.14.2.ebuild
@@ -55,6 +55,7 @@ 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')
@@ -107,7 +108,6 @@ RDEPEND="${COMMON_DEPEND}
 	x11-apps/xsetroot
 	systemd? ( sys-apps/dbus[user-session] )
 	!systemd? ( sys-apps/dbus )
-	!dev-libs/xembed-sni-proxy
 	!kde-plasma/freespacenotifier:4
 	!kde-plasma/libtaskmanager:4
 	!kde-plasma/kcminit:4
@@ -126,6 +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}/${PN}-5.14.2-split-libkworkspace.patch"
 )
 
 RESTRICT+=" test"
@@ -135,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)