gentoo resync : 22.10.2018

5 files changed, 14 insertions, 65 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index b942e547de7e..d67d633a9936 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,11 +1,10 @@
-AUX plasma-desktop-5.12.5-submodules-update.patch 1016 BLAKE2B 7ff9a57181b1438027cdf2aaf0e5d6dad25125c79c9cdb349b1d4b271638f1fb77f0742b3d67060ad74f26a820765260796eacd8cd994263fc00fcb13b82ace0 SHA512 c283923a0f5473e6017b1160f3a15f7ec277196cc55b14c03bc77a56188b44c9d58010abfe85d1e6c2c25fdda1f3b35ea3bbe9525bbbd80c8ab82d6e28960a9a
 AUX plasma-desktop-5.13.5-activityswitcher.patch 2194 BLAKE2B 992d63a598b804f380a2d0f893f6d1295bc8e96f4afaff8472566f6c915e388542ed46cf183803687de04889e4d66cf63dc47c45d5ffabfa4b8e57cc7322587e SHA512 4431a3766e9faa6c2026ea73753691bf7f8d8d29c3e8dff67060772a9a2caaafa3bd760b19817874d411f6f4d275ea46abcb437460753b50edaf52dc4718a4a6
 AUX plasma-desktop-5.13.5-kickersearch-nav.patch 3897 BLAKE2B ca412633e3d09f924a03f26b0019e5967fea7a54e03f921c6ba23178cbb91f314094bffae28f97a96800379d723ad3db1e783a557d106a6a0a6e2cd4905e458d SHA512 c5e43ca565aeaa19bb8b5cf7307c60a1fdc2b1600552e4860a79fe261bf681a2954b44a3b34462e2b5164f7848b0f827ba21494022360eaa565a6675c2e6bd45
 AUX plasma-desktop-5.13.5-libinput-kcm-ignore-touchpads.patch 5132 BLAKE2B 5653c5d6e0403fedb314d2cef4c5de20adc9d142cd197fd41b2bbe471e2e3b28cca2a6ca052d1e88c3c07e511b2345ed68ec72108519945da34094ef6f700ae8 SHA512 33d8436643418e8e9806f23862c9c0cbea65dd1360face47f4f21a61b79ecadcbfc3dde93865a76ac76f7591198a7935496260a1c257e0291367c3455a025dc4
-DIST plasma-desktop-5.12.5.tar.xz 8558436 BLAKE2B ecd8a0ce7532dadde5f435e4c620333572b30e50a5003493495784bb31f7e9a4c1b0b1a023290b0443fa90ee7e663fefb9854016bb8eb5a03f82f879d6522fc6 SHA512 d19f8d640304bc1ffa0839e8ba453ddea76710f26fe580789c64e1b97d2a67c151ec62b2d0503fc35ad31cb8da4ef1125f3154e366b7f2bb4b8fb9bb2e0a6abb
 DIST plasma-desktop-5.12.7.tar.xz 9204292 BLAKE2B 90d7e659b2ba25975ae5883f783671cbd661388429bdac4afb9459f4d56771bf535166be75fcdc055a94a3072edc938155502bf1e9c9950c4e18f6ef0858d26d SHA512 671108c3c1c46bc0dfdbc2eb1438654c84ee3bc098c137466ab28d230651f20251894b3008a030a0c3bf2aa4904cca61418c458f41a023042630c6f80d4bf41d
 DIST plasma-desktop-5.13.5.tar.xz 9141164 BLAKE2B f48ab6648cb1c7c289b5a2cce670db774aa53cbd81095cd4aa60414d05a0fac1e460fde115d5d38dd639a7746b1ad83971e38b28841aa430cec3f318e3509930 SHA512 3dd8f27e0127f7568aeee3871ce2f0732267ef50f9659a4a2715eca65bdf8cc5cbd2ca5e39a261cbbf0d1127c9c153f1c2d279729b636184353c6fbb699c4383
-EBUILD plasma-desktop-5.12.5-r1.ebuild 4495 BLAKE2B 51f2671d3e48f65707b28cf6eb29f6ff26e5e444e06e16ec918d40b803d4c247168f226000ad167530852ff27d721331c0a3d4cd6c3c1aee72e7fcb6fe953f41 SHA512 a2d9148faf259057b3e6b7746b804fd1ae6384714adb57b53f306246992541968faaf9d44acc22e4f4ae34c46068310d37ea3fb66457fe0e52a424c32c96f592
-EBUILD plasma-desktop-5.12.7.ebuild 4418 BLAKE2B fe4d17ca74217a6a55aa18b73a4f7d4c4fbc1136c0c25197e6bf84d98dc46ca4025e75241cd4367e332752d1d3480574115186eea8fb03457f5683dfdd2ea87c SHA512 04019f52fe92716dbc401803519e2554c60f14a0097f0bb87ca022938d3fa4b02f89517460f486fd9a1481b11880ff8eaa0c41f67604b3163b2f3f2e7fe1a6ee
-EBUILD plasma-desktop-5.13.5-r2.ebuild 4617 BLAKE2B e7f678cbb95c53d4eb4e3bf14f344bbc1ef362b426fdccde47b73181093ff10a14afa8e508c0fee94fce332c41e86eacf970d154f06bc4b83cd0f82f75a27873 SHA512 f8c4d788f9cf10460a5398ce38264daa2ec8a76cda106847560f0f57e55913fda8100a1281f093418d7043f22d68055a906cd7e48ace07b2a85cef5130b5f6e3
+DIST plasma-desktop-5.14.1.tar.xz 9146976 BLAKE2B 125b3c83efe9496aeabb55530eca1ddb5ee9cd0fd58cd3ab0c2334add1244448284d0c2db7c6239b742c1a33dc11d5e6b101056cedfd8fe375d637cf21c592b9 SHA512 d54f731bb67545cad448ac8b3b94f93aa638bd4051b5f43eeaa0627e54fd2eca072efc8c659191c49be86f44b36762944ee89a17c7146d559d37aff51e9ca1b7
+EBUILD plasma-desktop-5.12.7-r1.ebuild 4421 BLAKE2B 76b1032520762f1c434eae31ef51bad32f045e5a0873beff0cc7a749b8bbcfb87c9117b2705f2bf21f1d74da39a555a9f04174aecb5c52e6c327affcb9f0b81d SHA512 1089db9d0c8a9c40532cea8fe7145680ea45201938492b1b6adab5a165732b50c8811a2964e8f95e4e7d1b8cfddbaa8e7bd27ebb108e281c746120b975a17173
+EBUILD plasma-desktop-5.13.5-r3.ebuild 4618 BLAKE2B 06c0eafa797deaf2e4d7b83d0b538dd9cc4b54b2090abe77f197dbced60bbb0718a70156468e9cf5150650a5ebb03b974e322749ccbcfa73320389cf63a24a26 SHA512 4aefbf759f4026e14ea16cc300df89f64f5ad47f26895c5708e8f558b66e5a67097cd5a8885167f29583c2c18666c2f1b4ee75b960ce0dd23575bff35db85470
+EBUILD plasma-desktop-5.14.1.ebuild 4275 BLAKE2B 3b46e7c89c9d56e9d934339106e009a4c06195764bd55cbd56115d675bb81a249fd43cb41917832cb57d7fb6396ce94fba110be814afde27c95d48a34a3b3207 SHA512 7e2fec62316db2df0ae89d51908bf231c040f16f92a8b0b48b872efa80681d17941648c2c87b5924dc345df792fa09629ff22003d756fdd78621ef5ea4d1dc49
 MISC metadata.xml 589 BLAKE2B 1638c90163cf31addbeb1f6f58ed68cf7e97da259bc22d4df7123a704bd66b3e628d9cbf1c2b20d67d44539f4d27588d348724510aeb3310e5baea63db79be8d SHA512 e6aece50e632897b8fca637028419eadb6d6fea24388314b5be7f3e915d0ee3c46d7ac09c354ffcc04a50b31d4998033fe21919d19a40368e26ec43987f4d18f
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.12.5-submodules-update.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.12.5-submodules-update.patch
deleted file mode 100644
index ce6c7a8a2791..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.12.5-submodules-update.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c0cd1f8d49e6d63f1988d4749c366a0bef177790 Mon Sep 17 00:00:00 2001
-From: Eike Hein <hein@kde.org>
-Date: Wed, 9 May 2018 16:24:15 +0900
-Subject: Fix submenus not updating when switching between categories of the
- same size
-
-Summary:
-This fixes a regression introduced in 38403268aad3, which forgot to
-handle the branch where the counts are the same.
-
-BUG:394013
-
-Reviewers: #plasma
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D12774
----
- applets/kicker/plugin/funnelmodel.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/applets/kicker/plugin/funnelmodel.cpp b/applets/kicker/plugin/funnelmodel.cpp
-index 26cad55..165e43d 100644
---- a/applets/kicker/plugin/funnelmodel.cpp
-+++ b/applets/kicker/plugin/funnelmodel.cpp
-@@ -81,6 +81,8 @@ void FunnelModel::setSourceModel(QAbstractItemModel *model)
-             setNewModel();
-             endRemoveRows();
-         }
-+    } else {
-+        setNewModel();
-     }
- 
-     if (newCount > 0) {
--- 
-cgit v0.11.2
-
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.12.7.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.12.7-r1.ebuild
index 5afe6f0adf69..ecd6765a9d7d 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.12.7.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.12.7-r1.ebuild
@@ -110,7 +110,6 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 	$(add_plasma_dep oxygen)
 	$(add_qt_dep qtgraphicaleffects)
-	sys-apps/accountsservice
 	sys-apps/util-linux
 	x11-apps/setxkbmap
 	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
@@ -140,11 +139,11 @@ src_configure() {
 }
 
 src_test() {
-	# parallel tests fail, foldermodeltest hangs, bug #646890
+	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
 	# needs D-Bus, bug #634166
 	local myctestargs=(
 		-j1
-		-E "(foldermodeltest|test_kio_fonts)"
+		-E "(foldermodeltest|positionertest|test_kio_fonts)"
 	)
 
 	kde5_src_test
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r3.ebuild
index d771236bad50..35a5c34cce6d 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r2.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r3.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="appstream +fontconfig ibus +mouse pulseaudio scim +semantic-desktop touchpad"
 
 COMMON_DEPEND="
@@ -110,7 +110,6 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 	$(add_plasma_dep oxygen)
 	$(add_qt_dep qtgraphicaleffects)
-	sys-apps/accountsservice
 	sys-apps/util-linux
 	x11-apps/setxkbmap
 	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
@@ -147,11 +146,11 @@ src_configure() {
 }
 
 src_test() {
-	# parallel tests fail, foldermodeltest hangs, bug #646890
+	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
 	# needs D-Bus, bug #634166
 	local myctestargs=(
 		-j1
-		-E "(foldermodeltest|test_kio_fonts)"
+		-E "(foldermodeltest|positionertest|test_kio_fonts)"
 	)
 
 	kde5_src_test
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.12.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.14.1.ebuild
index 604a174344f4..4cf7463de337 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.12.5-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,8 +9,8 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
-KEYWORDS="amd64 ~arm x86"
-IUSE="appstream +fontconfig ibus +mouse pulseaudio scim +semantic-desktop touchpad"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="appstream +fontconfig ibus +mouse scim +semantic-desktop touchpad"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep attica)
@@ -72,7 +72,7 @@ COMMON_DEPEND="
 	x11-libs/libXi
 	x11-libs/libxcb
 	x11-libs/libxkbfile
-	appstream? ( dev-libs/appstream[qt5] )
+	appstream? ( >=dev-libs/appstream-0.12.2[qt5] )
 	fontconfig? (
 		media-libs/fontconfig
 		media-libs/freetype
@@ -86,11 +86,6 @@ COMMON_DEPEND="
 		x11-libs/libxcb
 		x11-libs/xcb-util-keysyms
 	)
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libcanberra
-		media-sound/pulseaudio
-	)
 	scim? ( app-i18n/scim )
 	semantic-desktop? ( $(add_frameworks_dep baloo) )
 	touchpad? ( x11-drivers/xf86-input-synaptics )
@@ -110,10 +105,8 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 	$(add_plasma_dep oxygen)
 	$(add_qt_dep qtgraphicaleffects)
-	sys-apps/accountsservice
 	sys-apps/util-linux
 	x11-apps/setxkbmap
-	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
 	!kde-apps/kcontrol
 	!<kde-apps/kde4-l10n-17.08.1-r1
 	!kde-apps/knetattach[handbook]
@@ -124,15 +117,13 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/systemsettings:4
 "
 
-PATCHES=( "${FILESDIR}/${P}-submodules-update.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package appstream AppStreamQt)
 		$(cmake-utils_use_find_package fontconfig Fontconfig)
 		$(cmake-utils_use_find_package ibus IBus)
 		$(cmake-utils_use_find_package mouse Evdev)
-		$(cmake-utils_use_find_package pulseaudio PulseAudio)
+		$(cmake-utils_use_find_package mouse XorgLibinput)
 		$(cmake-utils_use_find_package scim SCIM)
 		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
 		$(cmake-utils_use_find_package touchpad Synaptics)