gentoo resync : 05.04.2019

48 files changed, 397 insertions, 396 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 19e8b0b15cca..b27bacb454da 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/basket/Manifest b/kde-misc/basket/Manifest
index 87078d4e827a..9d8e1df1df8d 100644
--- a/kde-misc/basket/Manifest
+++ b/kde-misc/basket/Manifest
@@ -1,5 +1,3 @@
-DIST basket-2.49a_p20181205.tar.gz 4689215 BLAKE2B dce87001622aac8e50957d87d36c9094a807765d96bc60fe450fed0f293e0e21ead7529c57eaecc97c4f56d5bce7fabd34a564f632fc56f0c83621fac4092dee SHA512 62c6a337f634be374ee8631c8b88a78097ae4badd905e6be556f11fa841cc03ab32ab563f59a865d1bc85f105ec273472734c42f1bff834e4d7219c258d82281
 DIST basket-2.49b.tar.gz 4686990 BLAKE2B 6915d673abae6902bd2a0073a88cdf5bc497a7e7eec47dc87dbafcce68915e55bb02505c81a24cc00ed081e60b4c135afd337c6c4d08843182175f42c39e9119 SHA512 70d4241928712a7366cbc592e414864896cfb27bea251e5e4d3606b34534a932d7c208f98a8f48b49c11234c52f78d9003ca00af979e61112dbe139627e6f134
-EBUILD basket-2.49a_p20181205.ebuild 1883 BLAKE2B 14ace1b507b583e38de4ba2c89b53afe8151ce1e581f24cec303c087e7e76e8cda6a00b754c3654e3215b8f3d2288dc6258866b1cf6b9a9a5aade5337c1f5dea SHA512 4bad565cd69db35d0ca06acfef2560f496925566067333f4f814a6ee154a74a50e70750d09f11194f995c19ff5b0f166ce53c7dc409728c96a27cd5152fb4c76
-EBUILD basket-2.49b.ebuild 1810 BLAKE2B 80d150b32120cb3d8efde80b202f254020bd8fd678a76edb9fe0352eaff0fd41d01e1fd2629ae39aafa62ec5b21478aa4b9f359c5d1080b94601b5632474bc0e SHA512 46d6398ac03ecabc2bc496e44d505c70a3c8b2298fe3a95e1d74bc5736541e8a673e00075eb473ef648120003aa507f5964d4438c05bc38763f96ca37cf0f6b1
+EBUILD basket-2.49b.ebuild 1808 BLAKE2B 96bbac08b9be7d25fc19b0132a8dfa4f00969e6ceefa17563ab77d2b91f7784b623e70e82d0bfe6119215465eb29499296e841b4103dde4becbe06262d85b15c SHA512 783d591ab532de235c1817cd08c2a9f43c8f96d36313d2e34f61afd4d0ecad40503c6b7802daadd1740cc5cdf8edd22858e7a42fcee6588d5c97d3624b27f03b
 MISC metadata.xml 336 BLAKE2B 0a9704885fd7a47cb2b0b01f51baf34c3cfac7eefcfb06c4328d83aa51b4909e5ad20a29ffc7df79df38d01d1a86e37ece806a0f905714eb0e86a29f12e2aade SHA512 8c2e68454f9153eefec98b4c918de8390de6e3384b0d3339b64bcbe54592e582c933a372852444f031fe0574e4d1ad3e4b6fcd80fe9f610cd6624e13eaec3eb0
diff --git a/kde-misc/basket/basket-2.49a_p20181205.ebuild b/kde-misc/basket/basket-2.49a_p20181205.ebuild
deleted file mode 100644
index 3d33e6838d55..000000000000
--- a/kde-misc/basket/basket-2.49a_p20181205.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT="60e38c6028e42efdaf042212097a34044c724a57"
-KDE_TEST="true"
-KDE_HANDBOOK="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="A DropDrawers clone. Multiple information organizer"
-HOMEPAGE="https://github.com/basket-notepads/basket"
-SRC_URI="https://github.com/${PN}-notepads/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="crypt git"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kfilemetadata)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	crypt? ( app-crypt/gpgme:= )
-	git? ( dev-libs/libgit2:= )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-	git? ( virtual/pkgconfig )
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
-	kde5_src_prepare
-	if ! use test; then
-		sed -e "/add_subdirectory(tests/s/^/#DONT/" -i src/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package crypt Gpgme)
-		$(cmake-utils_use_find_package git Libgit2)
-	)
-	kde5_src_configure
-}
diff --git a/kde-misc/basket/basket-2.49b.ebuild b/kde-misc/basket/basket-2.49b.ebuild
index 817d6ace0663..cb8a10b757ed 100644
--- a/kde-misc/basket/basket-2.49b.ebuild
+++ b/kde-misc/basket/basket-2.49b.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/basket-notepads/basket"
 SRC_URI="https://github.com/${PN}-notepads/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="crypt git"
 
 BDEPEND="git? ( virtual/pkgconfig )"
diff --git a/kde-misc/colord-kde/Manifest b/kde-misc/colord-kde/Manifest
index 1261e75bfa2f..aa91d74c55d3 100644
--- a/kde-misc/colord-kde/Manifest
+++ b/kde-misc/colord-kde/Manifest
@@ -1,4 +1,4 @@
-AUX colord-kde-0.5.0-unused-deps.patch 2022 BLAKE2B 68e61c1e7a65618cf61b42522a9bef344644f9447a6cd1132bf809d6940792025e91dde28695827b77f5efc73d092b4a8b219a453f4e35eb861efb8e683e1275 SHA512 7ecee4ed82bcdb2b4c2616956267e6ae5dd88862a76f50b830d13b211973d94ebe685509e4397160dd83ba9388d02c490b7fb5c9eddada398be01d52a727334a
+DIST colord-kde-0.5.0-patches.tar.xz 9500 BLAKE2B e8f4b2f07b7e17eeaddf1cba94945b47a5485213941d7cce3fb9bd0f67bcef37467541e154dfda8babac22fd46778809e84691cc4bebc2e149888a3927e73da7 SHA512 0f153413bd55c294eef1bbb8ae0af60972cdd68df4fe41c1a6fade34c4fa37d7195766561a9570a712b87c055cb9bbc54a5c2bf725c7776066f8fa91c00563e5
 DIST colord-kde-0.5.0.tar.xz 97572 BLAKE2B 7cb5434c25e576c98e2ffbf428bf81d37605fd489199bacc2c040d443021f1f1055b3640f2698b622b021e34f4c517e168a45cd2c1006fdc2c24590789b482e3 SHA512 f285931f0f97462fcf173f64aaf2f32752bddb0b724d2055055ce5beb7dbe89ccebc62cb8c2ce455a8d68beb737fd55bf89be8e4dc7eaa37f09878b757370f07
-EBUILD colord-kde-0.5.0.ebuild 1217 BLAKE2B 7ecbb709d5158a3c2946b4b5e85b1e45a4a3883de54f73dd914fa1868e6e4d861b6384ca8917a62bed6c321f5767585de94ddcf0b37b577d780052c270c3875b SHA512 98fd1ae9f661ca509bbde1858c9fcf1ee0cad930a6fcc686bc49e87667f7cad78710ec0e8fcfb8d165d2de27c483415db3967c704fb4b0e65ab1751cc787fb72
+EBUILD colord-kde-0.5.0-r1.ebuild 1236 BLAKE2B ee7d992c933d1c04a387f95f0d90187a04204333bcb950800380198cafce15af57e701a393effdfec8fecd9eead55f65c6d87827e5bacff9fae6f642e3aa855d SHA512 d8fa43e82d626c01e33eb88d77024ff03e180f74078507c544e69d153a789e4fdf8b3191256b0d9ba282f90b5abb0ec9be01264fe533e58e1c2b2d2d2a5759d8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/colord-kde/colord-kde-0.5.0.ebuild b/kde-misc/colord-kde/colord-kde-0.5.0-r1.ebuild
index 174efa5979c9..74efceffb01a 100644
--- a/kde-misc/colord-kde/colord-kde-0.5.0.ebuild
+++ b/kde-misc/colord-kde/colord-kde-0.5.0-r1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
 DESCRIPTION="Provides interfaces and session daemon to colord"
-HOMEPAGE="http://projects.kde.org/projects/playground/graphics/colord-kde"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+HOMEPAGE="https://cgit.kde.org/colord-kde.git"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz
+https://dev.gentoo.org/~asturm/distfiles/${P}-patches.tar.xz"
 
 LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
@@ -38,7 +39,7 @@ RDEPEND="${COMMON_DEPEND}
 	x11-misc/colord
 "
 
-PATCHES=( "${FILESDIR}/${P}-unused-deps.patch" )
+PATCHES=( "${WORKDIR}/${P}-patches" )
 
 pkg_postinst() {
 	kde5_pkg_postinst
diff --git a/kde-misc/colord-kde/files/colord-kde-0.5.0-unused-deps.patch b/kde-misc/colord-kde/files/colord-kde-0.5.0-unused-deps.patch
deleted file mode 100644
index 48b1f4277df5..000000000000
--- a/kde-misc/colord-kde/files/colord-kde-0.5.0-unused-deps.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From be1d302200fb3f3f2ef9cf41c34cb4ac5d970df2 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Sat, 22 Oct 2016 21:46:18 +1100
-Subject: [PATCH] Remove unused dependencies.
-
-REVIEW: 129240
----
- CMakeLists.txt              | 4 ++--
- colord-kcm/CMakeLists.txt   | 1 -
- icc-importer/CMakeLists.txt | 2 --
- icc-importer/main.cpp       | 1 -
- 4 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fcace67..6d6093a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,8 +28,8 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
- find_package(X11)
- find_package(XCB COMPONENTS XCB RANDR)
- 
--find_package(KF5 REQUIRED Config ConfigWidgets CoreAddons DBusAddons IconThemes I18n KCMUtils KIO
--             Notifications Plasma WidgetsAddons WindowSystem ItemViews)
-+find_package(KF5 REQUIRED ConfigWidgets CoreAddons DBusAddons I18n KCMUtils
-+             WidgetsAddons WindowSystem)
- 
- add_definitions(-DTRANSLATION_DOMAIN=\"colord-kde\")
- 
-diff --git a/colord-kcm/CMakeLists.txt b/colord-kcm/CMakeLists.txt
-index a078ed3..712bf1a 100644
---- a/colord-kcm/CMakeLists.txt
-+++ b/colord-kcm/CMakeLists.txt
-@@ -53,7 +53,6 @@ target_link_libraries(kcm_colord
-     Qt5::DBus
-     KF5::CoreAddons
-     KF5::I18n
--    KF5::IconThemes
-     KF5::KCMUtils
-     ${LCMS2_LIBRARIES}
- )
-diff --git a/icc-importer/CMakeLists.txt b/icc-importer/CMakeLists.txt
-index af3cee0..a6ac1f9 100644
---- a/icc-importer/CMakeLists.txt
-+++ b/icc-importer/CMakeLists.txt
-@@ -18,8 +18,6 @@ target_link_libraries(colord-kde-icc-importer
-     KF5::CoreAddons
-     KF5::I18n
-     KF5::WidgetsAddons
--    KF5::IconThemes
--    KF5::ConfigCore
-     ${LCMS2_LIBRARIES}
- )
- 
-diff --git a/icc-importer/main.cpp b/icc-importer/main.cpp
-index 2af0e85..bb72f32 100644
---- a/icc-importer/main.cpp
-+++ b/icc-importer/main.cpp
-@@ -31,7 +31,6 @@
- #include <QCommandLineParser>
- 
- #include <KMessageBox>
--#include <KConfig>
- #include <KAboutData>
- #include <KLocalizedString>
- 
--- 
-2.7.3
-
diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index af4f571bb076..7fc568c46257 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,4 +1,6 @@
 AUX kdeconnect-1.3.0-no-wayland.patch 523 BLAKE2B c29b58a3f1f97f09c67270f6b55f8122ccca834b979717bc1c5ad279675106acaa23da1d4a4a08dcc4194b6837cb5fce23ecfd12d5d8d1ed4adb8b4fdd077eae SHA512 68527f15ec3f0af14e33e857567c2fcc622f5dd5fc0652dc0af95e91dc5b96929df9db4961d9aa528be73b87e021877d7f6ee5894a2a195446a7235ca979b664
 DIST kdeconnect-kde-1.3.3.tar.xz 284712 BLAKE2B 1e36cf9e59cefd6d30f63805d3a91d86dbb98e7b73cfbe7b3a9263996b3f500f245a2cbdec2176fcf9ff7ff6a6820d5c3509a637a5de441e3d6c50e515980ce8 SHA512 177f525a17c771e31acb2d36a66bc653fb7c584740409ed4a487d30a411737ee6716e353a607d08e699a579593491b9f36f46d9fe57221307f9327fc59a6779f
+DIST kdeconnect-kde-1.3.4.tar.xz 286724 BLAKE2B bf3353c317ebbb98e770a1c408940cb4ff5884f1e4a6a7ec4add5e26edf280c723af60f05ece904e624035f214757a8c8b7aeda578479bb6626c848a02155ee3 SHA512 286620cd5ed8da7a0f237710467f12be41ae139b14127b7049ee72c8a7042f67b599b642eb7c3e10a3504f1df11f5a9778db80fba4ac2e2fcd2ab4e8cafccfb9
 EBUILD kdeconnect-1.3.3.ebuild 2162 BLAKE2B ab261100abbf62c376ae0cbe065fc328d31d25318683be939ece2cc0f525bf65af86ffc44c71f0e31ae9f8a3377e9262a354817df6dc15dca831a9474eeece5a SHA512 e054d64b01947ea837e26116d8926fd7f4ff820baa8836aeea95a427d960fc7b930e0a12f4246c86ccd4c64c748bee454a95391d608b80e2db7a038db4c82000
+EBUILD kdeconnect-1.3.4.ebuild 2156 BLAKE2B 3fea84cc4c4505215a67604ce2500b318f172035b9b06cc6f5de5b0ed26e96a0f7925888072cc87a2f0c2e5c8dbe806ec989ea1006493f39506079ad2d9865ce SHA512 e008013a70b76eb107699f2547e1abcc223c605beedf8967bcc10b33d9197215cc234eb82b75f33e03017c1b1f0384bbba22ff5adf999a949ff59a1f8d4bb414
 MISC metadata.xml 542 BLAKE2B ca880a9dbf862f3b76d30b2fe8bdcf83487606179785fa7060dfc50342df4b73c55a45302b8eb0306559d5da907d958c71ccde0028f23ddf3353465b446a536a SHA512 76c1a4ccab6959be8982ffaab3830fbbe4e3c1c55ad5793bd07fa1c037b1632a2b568d2049bf83f71d437b72f01638d6fe54e17744df95cfe04b2d99828a08bf
diff --git a/kde-misc/kdeconnect/kdeconnect-1.3.4.ebuild b/kde-misc/kdeconnect/kdeconnect-1.3.4.ebuild
new file mode 100644
index 000000000000..551f34a864a7
--- /dev/null
+++ b/kde-misc/kdeconnect/kdeconnect-1.3.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+KMNAME="${PN}-kde"
+KDE_SELINUX_MODULE="${PN}"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${KMNAME}-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
+HOMEPAGE="https://kde.org/ https://community.kde.org/KDEConnect"
+LICENSE="GPL-2+"
+IUSE="app bluetooth mousepad wayland"
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	>=app-crypt/qca-2.1.0:2[qt5(+),ssl]
+	app? ( $(add_frameworks_dep kdeclarative) )
+	bluetooth? ( $(add_qt_dep qtbluetooth) )
+	mousepad? (
+		x11-libs/libfakekey
+		x11-libs/libX11
+		x11-libs/libXtst
+	)
+	wayland? ( $(add_frameworks_dep kwayland) )
+"
+RDEPEND="${DEPEND}
+	net-fs/sshfs
+	app? ( $(add_frameworks_dep kirigami) )
+	!kde-misc/kdeconnect:4
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-1.3.0-no-wayland.patch" )
+
+src_prepare() {
+	kde5_src_prepare
+
+	sed \
+		-e 's#${LIBEXEC_INSTALL_DIR}#@KDE_INSTALL_FULL_LIBEXECDIR@#' \
+		-i daemon/kdeconnectd.desktop.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DEXPERIMENTALAPP_ENABLED=$(usex app)
+		-DBLUETOOTH_ENABLED=$(usex bluetooth)
+		$(cmake-utils_use_find_package mousepad LibFakeKey)
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst(){
+	kde5_pkg_postinst
+
+	elog "The Android .apk file is available via"
+	elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"
+	elog "or via"
+	elog "https://f-droid.org/repository/browse/?fdid=org.kde.kdeconnect_tp"
+}
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 8daac4c5470c..c795c0522ef0 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,7 +1,6 @@
 AUX kdiff3-0.9.98_p20170219-cli-args.patch 3620 BLAKE2B c85c377a8c5898a15233f5f4a1260dbd24c50f53869e673979c9d5ac42c2729a7cad39d066e0f4b6ae2f31687aa246c9420f1803c003168eb8e9b3bd7d43ed1b SHA512 5231791c4147a6e54d784fbb39d0088dedd22d15c77c91e293bccb42046417bb32d6354a5032f5da1daa60b3ef9a46800932092b0891c58bdbc0dd9592be7a41
-AUX kdiff3-0.9.98_p20190224-clangtidy-optional.patch 1178 BLAKE2B bed1ad8015283d3fa80bc16468ac4973cf0675f734d63c660c75c4710f50fec476d1d4651fb1affd43482a9086f39e9de96d73675f4ceb26592c847afb4035c8 SHA512 32e8da69ac37e81a24018f35c99aac990602e0c27497c826067e74a8a57d92cf248d097b5c319b4d2141bba9891d892ab41a3581de4a691454237f8ea50ab268
 DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927 SHA512 847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
-DIST kdiff3-0.9.98_p20190224.tar.gz 501286 BLAKE2B 3bb7550b2546b0e6fb57209e27777954718e0b0c03fda0fa5c24ef347b16e9669ebd98cf6718a670d96aa2b36b9fee5615807b63a2d615e13e96b5ceb91de1bf SHA512 a2c4aef6797593a127a2f7ffaf1fbbde45422a823902a3ab7bf32aeb7bd4216e52f223ee914f39035db2ce5ca6758e00581b228acf3dcf295e87feb3a6326419
+DIST kdiff3-1.8.0_pre20190331.tar.gz 505587 BLAKE2B 7dbe2efc548291848d30d8889f28ccf75610c2cb88e12d918fccd524ee8619e07501788d7e103175c211000aecc7ad1a48193b40d296f9a30eefcda02b1cda34 SHA512 02c6840a0015f096f0f3561a0306a078508520ea09733690522f74351925a00122b78eda2886267b3b0eb3d744bcfe80b7f710164bb1f22997e0fd0814e64649
 EBUILD kdiff3-0.9.98_p20170219-r1.ebuild 914 BLAKE2B 2575524af4656ebad0ca450a2ebf7039a3bd76128b14a6e9b0e9e08707ba79b4a7b328a9026ab5ebb5ac589f8539e750ce12a3a302d23e61334ba793618396ab SHA512 65821bcbcdec147a55c9b989cde2c45ea68bbf947436c890aaf3b3affc4dc0f293183f5036ac81b12e5d41e9e86cb6815edac3aff235eebaa5afa4ca93007d0c
-EBUILD kdiff3-0.9.98_p20190224.ebuild 1030 BLAKE2B 3f909979b832036b05ec7bbe55658397f78a3101c4d2583ea1c4bfe6a788f81556cc30df9ca8b38988909984adccad77058c5b63fb1a77f92e0f767bd2903bdb SHA512 4500962be0ab52a63a15cee260ef0d940c2c8377323c84e74fb2caa701019e1c326d4ae76725dc614a64a996d80719419acaeeef1c70e5d3866de19c6818c265
+EBUILD kdiff3-1.8.0_pre20190331.ebuild 973 BLAKE2B bb18e8429baf921d08df9243bd3963d1260b8a4845dd806a77647832903dabc1ce518c38be70e4bda94bfaf6f041374b51639b58fc30fbd6faec1e02bb8dd8e3 SHA512 092f19172fdf8f03800bc6f199b76dccfc4af251fcb2c2446d6bbbc4ae66fb6dbcca98b33684b6146dac9f8979031f58e221dba5fbeed8c83ca512047e4a5cc1
 MISC metadata.xml 362 BLAKE2B 45686f239bfb936fe11982d8bd2b51380cdfef94c11e5a6fb224c030154bda8b27190052b1705e010fd22305dd2830b8f8b385b47fc647f7c80b2ec01a1f579a SHA512 1fb8f10c3632c0007e65be57dbeb2492ad0e90a79f0403ce4a350a6ea0e1764dd1ee5038b0381049a6715bab2d7c38fc83c0b8f338ea7958bb34df499f355100
diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.98_p20190224-clangtidy-optional.patch b/kde-misc/kdiff3/files/kdiff3-0.9.98_p20190224-clangtidy-optional.patch
deleted file mode 100644
index a2a5f54f7d13..000000000000
--- a/kde-misc/kdiff3/files/kdiff3-0.9.98_p20190224-clangtidy-optional.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 26657d8bf425415c97801fe976939329f11c3979 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Mon, 4 Mar 2019 11:21:31 +0100
-Subject: [PATCH] Optionalise clang-tidy
-
-It should not be run as part of a standard build.
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b1d72a7..2e8bad4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -50,6 +50,7 @@ find_package(
-     IconThemes
- )
- 
-+option(ENABLE_CLANG_TIDY "Run clang-tidy if available and cmake version >=3.6" OFF)
- 
- set(KDiff3_LIBRARIES ${Qt5PrintSupport_LIBRARIES} KF5::I18n KF5::CoreAddons KF5::Crash KF5::IconThemes )
- 
-@@ -68,7 +69,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
- endif()
- 
- #new in cmake 3.6+ integrate clang-tidy
--if(NOT ${CMAKE_VERSION} VERSION_LESS "3.6.0")
-+if(ENABLE_CLANG_TIDY AND NOT ${CMAKE_VERSION} VERSION_LESS "3.6.0")
-     find_program(CLANG_TIDY_EXE NAMES "clang-tidy" "clang-tidy-7" "clang-tidy-6.0" "clang-tidy-6" DOC "Path to clang-tidy executable")
-     if(NOT CLANG_TIDY_EXE)
-         message(STATUS "clang-tidy not found disabling integration.")
--- 
-2.21.0
-
diff --git a/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild b/kde-misc/kdiff3/kdiff3-1.8.0_pre20190331.ebuild
index 43713fc03ec4..437350e6feba 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.0_pre20190331.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-COMMIT="5a8ebed6a30bba2e001fc5c5acc4f414d6405005"
+COMMIT="12d54309def29c3bcb69d92e1b70540c4aa0f9cd"
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
@@ -36,6 +36,4 @@ RDEPEND="${DEPEND}
 	!kde-misc/kdiff3:4
 "
 
-PATCHES=( "${FILESDIR}/${P}-clangtidy-optional.patch" )
-
 S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/kde-misc/kdirstat/Manifest b/kde-misc/kdirstat/Manifest
index 88ec10a66248..6a802ea7d78f 100644
--- a/kde-misc/kdirstat/Manifest
+++ b/kde-misc/kdirstat/Manifest
@@ -1,5 +1,3 @@
-DIST k4dirstat-3.1.3.tar.bz2 230480 BLAKE2B ddb91b9d6a4ce119f4f3c71541ad490b973de1e6648ce019e48374d825b18ba697b652f59d42995b14f53e730370ee41f9910056406711003e506e0826b9ad39 SHA512 b5e71d5d235ead64d1a7c6005551585316a8565c806a3ca07050331b2a8ff13f7048b1cc54489e84f49be3abedf01c65b5b6951724c955f540d7c3fa0bfd2afc
 DIST k4dirstat-3.1.4.tar.bz2 230737 BLAKE2B af1f22c3ab636a78f402fa002aa08f8ae83f57f134b4c7a2087d9be6cb9f89aca6065316e59cedbbb3d9c92a82d0dafaf465c66e1c0a2921e5064c6683431ffe SHA512 f931440541a663f83a9c6cb2ad32a9e32b8b83ef6a5b4bba0f07b664e3a2e5d5d3e97b6e53819bac75739f236138b9f7945354cc7b0c31909710b37e9cfe296d
-EBUILD kdirstat-3.1.3.ebuild 1036 BLAKE2B fa895b42652630eb5c74c64bbdebe300bf75e0c9fbc6eb8c521cbb2d2ed08aa724aea7e00e1e5ef705f21f9438b850c2785912d490221cef47eeb05c1c3ce82a SHA512 6f9e41d2c696388e45d426cb58335c28d48ad73350266eaf634b42963dc3326145043ef26918ae3ead56a1309870164845de5fd331c33fcbb09b5413e58a9708
-EBUILD kdirstat-3.1.4.ebuild 983 BLAKE2B 62ce933d538c159171b28c0e8723a77b636a1ddec489b4c159a87e5297d73bc724b716141d1a225112abaf04887971c4b5053a774b4971f6582a33998e665e00 SHA512 dc278a8edaddb9f7a61dde02b0e324f7130d37b88016c613ad722bf41250e51e48be7d74a501cb8732aefc27ab1d9b4bfcd53c3df393d32264437b655cbe6792
+EBUILD kdirstat-3.1.4.ebuild 981 BLAKE2B bfc5fee47bd37bf79fc4ed2f073c6b010bcf9e6026a5f9f7df08bd1225d02c156b26e49ed7134b3a80495eefdcf2e34a2f8c20cc239231f2fd0c8a64092bbd81 SHA512 29f30de205f1b6391013cbe1585a5c1cee951061b0727d3220c3eb118146ef2100e8591eabde1a0f87135b588cb4f532056be621353a00b089008e0ae85cbe6c
 MISC metadata.xml 339 BLAKE2B 4d90cd665c996f0ff88b63c4d0184f1b090af57d024918fddb2fbe59f8d5de1f01e4acfcae03e08368958abb93abb841a5e18affc7e6345d60d556aaabbf775d SHA512 5ca88965bbed764c5ad756afe72df1aecf665b9325d1c40161836a0cbf44b117e20679dd8e62795b5a85f8b4b417f56a02ad8ce7a739198f4f5084d7c63dd3da
diff --git a/kde-misc/kdirstat/kdirstat-3.1.3.ebuild b/kde-misc/kdirstat/kdirstat-3.1.3.ebuild
deleted file mode 100644
index 06caeec19ea9..000000000000
--- a/kde-misc/kdirstat/kdirstat-3.1.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="GUI equivalent to the du command based on KDE Frameworks"
-HOMEPAGE="https://bitbucket.org/jeromerobert/k4dirstat/"
-SRC_URI="https://bitbucket.org/jeromerobert/k4dirstat/get/k4dirstat-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	sys-libs/zlib
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-misc/kdirstat:4
-"
-
-src_unpack() {
-	# tarball contains git revision hash, which we don't want in the ebuild.
-	default
-	mv "${WORKDIR}"/*k4dirstat-* "${S}" || die
-}
diff --git a/kde-misc/kdirstat/kdirstat-3.1.4.ebuild b/kde-misc/kdirstat/kdirstat-3.1.4.ebuild
index ab7194da1e96..274f8a7cacae 100644
--- a/kde-misc/kdirstat/kdirstat-3.1.4.ebuild
+++ b/kde-misc/kdirstat/kdirstat-3.1.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://bitbucket.org/jeromerobert/k4dirstat/"
 SRC_URI="https://bitbucket.org/jeromerobert/k4dirstat/get/k4dirstat-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-misc/kio-stash/Manifest b/kde-misc/kio-stash/Manifest
index 23fd97666e04..452a0d811d56 100644
--- a/kde-misc/kio-stash/Manifest
+++ b/kde-misc/kio-stash/Manifest
@@ -1,4 +1,5 @@
+AUX kio-stash-1.0-kioslave-no-desktop-app.patch 1407 BLAKE2B 5ad6fce0758832de2f2a765f747afe141a730d135f244eb4b58cfe5c0c0e0314f90dc9abb086091f19e39b8e4ae8539fd186e55e56703a08bbfdf0639c47e96a SHA512 f65426d9b201d9db7ba4907ee7276f9cc4e766116d418bdfc0a8f69266754cb9f655900cebf0086e54bbfde696d82e8e75729cb9ee1b2e216871c47ddef787d3
 AUX kio-stash-1.0-no-kf5config.patch 1172 BLAKE2B 99c6f09278e649b375ff8dd4f42790aa25e88d3c7e8faa703111f585d315977eee2172f5baa12206d6ecd0d3acef93b56b8907cf6bb1328d22c07a701bf99574 SHA512 f50ca12e08a04fff8c4066875007237a97189a83de97d62b3f133b3ab79bb90cdc9c7bbc4160281800df16cb7fdce35083b5559f18698238c0b719894e0b13d9
 DIST kio-stash-1.0.tar.xz 25308 BLAKE2B 36329831bacd9cd271a52f7018ef4a46894a9ef65190d3372584cc489998197057e7d3ec64017446963ea024e9c50afb5fd5dc8c2d01c27cde7bc83844419cc5 SHA512 ca345a2cd2d8df72ad1f8de366ba290a21f0f3a98ac098d0393d66ec43334258e1e7222a19f89de9a53f152fe4c63aab1221dc045efee94385299fc63e65a931
-EBUILD kio-stash-1.0.ebuild 678 BLAKE2B 9ced5a87eb6f06fc1484dc3ccb1829a314e829b18cd3f970f38fa90ad2581fbadcc98a973c515adf40712b6cac4f874cd91cf3cfb6f47289ccf8c0548950477c SHA512 66f019f46bb80e8fe853d93d3bf523b822ee9c68b6dbab8c48cf9f2c3866b67a1431e1640886a6ebd2156027a282f3e9a414be4dcf1aa4a82c8a042fb4f08c76
+EBUILD kio-stash-1.0-r1.ebuild 738 BLAKE2B 592ac4cd54648583b4b06e2756ecc02d89ed19b55116c6839f57c6f25017648d56e593f9986fc7d787effd5a71cf1f32117e455af3db494fa5a8e56be2168ef3 SHA512 7556ea63b59d0f93a443a055a0d3f8e1661c15f48642ae3349adc32cd149974b689f2dc8493c8712fa803686ec42560c1b93a1b716e8e27e8cc24c34aab47a9e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/kio-stash/files/kio-stash-1.0-kioslave-no-desktop-app.patch b/kde-misc/kio-stash/files/kio-stash-1.0-kioslave-no-desktop-app.patch
new file mode 100644
index 000000000000..35b656fb6b73
--- /dev/null
+++ b/kde-misc/kio-stash/files/kio-stash-1.0-kioslave-no-desktop-app.patch
@@ -0,0 +1,43 @@
+From f977b43a47ebf6d26ee0bd6d35e0ac576bbbbf8a Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Fri, 9 Mar 2018 17:48:15 +0100
+Subject: kio slaves aren't desktop applications & drop incorrect provides
+
+Summary:
+https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#sect-Metadata-GenericComponent
+https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Application.html
+
+also it seems a filestash binary isn't actually installed, so drop the
+provides entry for that
+
+Reviewers: shortstheory, bgupta, apol
+
+Reviewed By: apol
+
+Differential Revision: https://phabricator.kde.org/D11187
+---
+ src/org.kde.filestash.appdata.xml | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/org.kde.filestash.appdata.xml b/src/org.kde.filestash.appdata.xml
+index d532186..2df1a70 100644
+--- a/src/org.kde.filestash.appdata.xml
++++ b/src/org.kde.filestash.appdata.xml
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="utf-8"?>
+-<component type="desktop">
++<component>
+   <id>org.kde.filestash.desktop</id>
+   <metadata_license>CC0-1.0</metadata_license>
+   <project_license>GPL-2.0</project_license>
+@@ -89,8 +89,5 @@
+       <image>https://cdn.kde.org/screenshots/kio-stash/kio-stash.png</image>
+     </screenshot>
+   </screenshots>
+-  <provides>
+-    <binary>filestash</binary>
+-  </provides>
+   <project_group>KDE</project_group>
+ </component>
+-- 
+cgit v1.1
diff --git a/kde-misc/kio-stash/kio-stash-1.0.ebuild b/kde-misc/kio-stash/kio-stash-1.0-r1.ebuild
index 5aeb21e2b3c0..e660fdc935cf 100644
--- a/kde-misc/kio-stash/kio-stash-1.0.ebuild
+++ b/kde-misc/kio-stash/kio-stash-1.0-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_TEST="forceoptional"
 inherit kde5
 
 DESCRIPTION="KIO Slave and daemon to stash discontinuous file selections"
-HOMEPAGE="http://arnavdhamija.com/blog/kio-stash-release.html https://cgit.kde.org/kio-stash.git"
+HOMEPAGE="http://arnavdhamija.com/2017/07/04/kio-stash-shipped/index.html https://cgit.kde.org/kio-stash.git"
 SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
@@ -26,4 +26,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-no-kf5config.patch" )
+PATCHES=(
+	"${FILESDIR}"/${P}-no-kf5config.patch
+	"${FILESDIR}"/${P}-kioslave-no-desktop-app.patch
+)
diff --git a/kde-misc/kmarkdownwebview/Manifest b/kde-misc/kmarkdownwebview/Manifest
index 775bae3bf31e..f45e3386a364 100644
--- a/kde-misc/kmarkdownwebview/Manifest
+++ b/kde-misc/kmarkdownwebview/Manifest
@@ -1,5 +1,3 @@
-DIST kmarkdownwebview-0.5.4.tar.xz 64148 BLAKE2B 58a837afe1a85c0f5dfc5c7b3e2c93562e1cba61296712fb0fef7a03bc8d88feb97a65a67dc50f9d33f1099820112e501eb595dbf56ab9f13f19938bcad40719 SHA512 30dfd68f63b0b83905a9e2c8aff026313e4df3a4745e26fa9f420677788744e575ef848ffe3e930f0ea3d266a005006a9e033cbf9354c0072c4f2d2902bfc59d
 DIST kmarkdownwebview-0.5.5.tar.xz 64468 BLAKE2B 7116173ace51c3b4189c5af433114e6a7156ad6ce8381078d61aa20e17c4e067b2affa0f816fed27b02c4ddc0f4c15263220384a9afc6ae592b287dac2d93938 SHA512 c10bb4da4ff2b3a05dc82887ddbc45447387a4cd4bee64cefb5f21e42dbbb777b3b00118867e78af684c579e4f3c604be1973b1ee4e18692fc6bfd6b24bffeee
-EBUILD kmarkdownwebview-0.5.4.ebuild 883 BLAKE2B 0e3eaf599ae552f688ae2a2d8ddd48e29794280edfe45c671372fd4c81e95e2278858a6c7f8cb3acc7bfaf2ab0838a049b8d7ea14d826345620f3907ca3c3aeb SHA512 ba025591713fe1accb850fc07759cf326f776b5931af5839e1518b1f722f34cebd485b2615443d7420c007acc8690910cc66981f3cea27965fba4f45a9507fd6
-EBUILD kmarkdownwebview-0.5.5.ebuild 884 BLAKE2B 25de225a65ad81c5e6fc0f0f2b919dcdaa9fa9a365e22a7f333a1da185ecb241fbe35ff0e1dba58ce377f6e82999218bc83496f3c74136bd8d1262e6dbe68129 SHA512 86fe7bf081bbacbb74722e8028c61b83bf10024bc48f8c68e98c3d6470dd9efeae695cf4e335175972e75f09de4b02cba281e647ae59aade90236b6dccbfdd12
+EBUILD kmarkdownwebview-0.5.5.ebuild 883 BLAKE2B 0e3eaf599ae552f688ae2a2d8ddd48e29794280edfe45c671372fd4c81e95e2278858a6c7f8cb3acc7bfaf2ab0838a049b8d7ea14d826345620f3907ca3c3aeb SHA512 ba025591713fe1accb850fc07759cf326f776b5931af5839e1518b1f722f34cebd485b2615443d7420c007acc8690910cc66981f3cea27965fba4f45a9507fd6
 MISC metadata.xml 365 BLAKE2B 708304c47cade844b320dbdbe71124d0cdbab506b655095ab9ee703f3cc5f44c0bc1561ccd7dfec9d9b2b14edaae90abf323cbd1ea6cdda1fbc6fa5193c15c81 SHA512 dbb15189ec2a5c3cc0afd100dba5c187a2464c8fd12e048f4d65aa39165c7cc093fbca646792768371f5fb2997c3b721d64524e63542693b44562b6f3bf755f5
diff --git a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.4.ebuild b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.4.ebuild
deleted file mode 100644
index 86226db89b6f..000000000000
--- a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="KPart for rendering Markdown content"
-HOMEPAGE="https://frinring.wordpress.com/2017/09/14/kmarkdownwebview-0-1-0/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="!webkit? ( BSD ) LGPL-2.1+"
-KEYWORDS="amd64"
-IUSE="webkit"
-
-DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-	!webkit? (
-		$(add_qt_dep qtwebchannel)
-		$(add_qt_dep qtwebengine 'widgets')
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QTWEBKIT=$(usex webkit)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.5.ebuild b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.5.ebuild
index 154c0e8d7749..86226db89b6f 100644
--- a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.5.ebuild
+++ b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://frinring.wordpress.com/2017/09/14/kmarkdownwebview-0-1-0/"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="!webkit? ( BSD ) LGPL-2.1+"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="webkit"
 
 DEPEND="
diff --git a/kde-misc/kolor-manager/Manifest b/kde-misc/kolor-manager/Manifest
index 89e9b343cc87..ab5414b571d5 100644
--- a/kde-misc/kolor-manager/Manifest
+++ b/kde-misc/kolor-manager/Manifest
@@ -1,4 +1,4 @@
 AUX kolor-manager-1.1.0-deps.patch 1012 BLAKE2B 8ac2811a43fbcabb4a61df44b9029e5ee603c38d191ad8025ad153764d108eae2a43464f7b683f9884d098b584595f457385ce1d936d5e143583715c529786d4 SHA512 fa236ba48c22ede9b774b607fa5cfe413a055571c113466e6b58a8f8a4d47c21e433fabaad324db5a3cefa4404506f0634cff619cff7cf8e2f01bddbd9be1f59
 DIST kolor-manager-1.1.0.tar.gz 37756 BLAKE2B 85aaad99c7c29e6cf58deea19d30aed4b4b09059e4f1681c005a08e6550d68cc171a1f43a775bbbab8f50476642c4956b67a8e600cb590035fedee03617f1249 SHA512 52bfc162d1162f8c75f627beed322d4a79a2fa6bf955ff669e5809975b160f5af3d8174a867fd629f8ae3c8d65a7ea8409b059786d062ff725cf5552348e1893
-EBUILD kolor-manager-1.1.0.ebuild 657 BLAKE2B 467618de266c525e83da62031d412b2c97df115ec352b65c71c61ce6c86813e61bb282eabf0bd10080c570d6052a02f35799d26c0a0c581ba772b939d5f2f265 SHA512 5701d2a2e2aacf49926fa349ba50b1aa0adf24f03406f5347b4ac40468a37a628b86c11cb7d7d36099765177212b4061e52c39a5d64a676519ac8766dc962431
+EBUILD kolor-manager-1.1.0.ebuild 654 BLAKE2B d19c1b8d99edb3783a3043e6959374d06ee4deb00949430983f7d7e53c0e36e3a9ea7fb36f238192743016f34633ff9a1325bcbfdb7d10114619df0a0cc1e29c SHA512 5006f5503c8744107b7eed35ec3c2ef802e596f3199b29c7031e0bf86bb4b4668c2ceb9014ab256223cfb7f95ce25238468171eb142b1c5299e2a10a9c674682
 MISC metadata.xml 331 BLAKE2B c7bc27aa8ae81c12f38e15372be19325b51631cb1b499ef357d50b2cb152c3c50372a17f9c54a1d44c5cac44928c08e9f8633e0279bb14b9e7369c5574a2f581 SHA512 604db547f3ea3eed6442041cf26d5fb04fd7b97c697657f86884f84a72e17ff4a7bb58a9d93c82dc3d85ea5edd73d94e013a6fd8f4e4d77d098cc6e72e24b434
diff --git a/kde-misc/kolor-manager/kolor-manager-1.1.0.ebuild b/kde-misc/kolor-manager/kolor-manager-1.1.0.ebuild
index 35c93ed7f0bb..10eb9bfd90e2 100644
--- a/kde-misc/kolor-manager/kolor-manager-1.1.0.ebuild
+++ b/kde-misc/kolor-manager/kolor-manager-1.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
diff --git a/kde-misc/ktoshiba/Manifest b/kde-misc/ktoshiba/Manifest
index be82d44f7a35..05abcf5eef43 100644
--- a/kde-misc/ktoshiba/Manifest
+++ b/kde-misc/ktoshiba/Manifest
@@ -1,4 +1,4 @@
 AUX ktoshiba-5.3.1-qt-5.11.patch 239 BLAKE2B 371cc0c4b8db4e79135b60b9f3fa65b1a7e44cba14feed270667b6e7e806d6b9030be029014a1164d41aad6bb97886552eb14c04efb734c6a9ba903cd6cf77bf SHA512 3cc37f547bab7d7de5565cc7baf6126374256dce8ab99fa263a2a5f2be138f43bc1d133d285d53488cbf7fa4143ace078aeb2d67d184cb57e9fae6daee5228d4
 DIST ktoshiba-5.3.1.tar.xz 71360 BLAKE2B 83d2abcda34c68d36a021ce0ff906eb0877c2768d1e40f676017509f4c6e2fbf70fa668b6c181bf15395a31c6bcfab629512545289c3012ff0637b414dbfa83a SHA512 730f38f8e8c8559255c3228994af95e47b00c501fce0a9fc56a0bfc27d8ed0b2f0f31767efc12c3c589e7490a41b27ab8365da22ffd4905f81d3d1c750cc3469
-EBUILD ktoshiba-5.3.1.ebuild 938 BLAKE2B 1698956b36295ff2956700b2b5813657c58e56452243d2e9095f92da9a610777979aff1175807d04e6d641bc202f6a717133743123820feab1f7186b8dc45fff SHA512 d3c74d31c19c0131e7f30df520a40a2629bfa3d06971476ed35633041980e8d3747b531dd14cae0aeff99bc278a34818f05d3f0aaac144514ddc54f8e23038a2
+EBUILD ktoshiba-5.3.1.ebuild 948 BLAKE2B bc146a83128766490d3f562fb8a4ebed9d10e73dbf92d3710c9208c29f446096601717f323ed5cf7a694cc0f9327d3614fbf0668abc1702180b74ca6774ea0f6 SHA512 bdfbb0faeb662d5d1ebd0dbe2fab548d7147ba58b5a1555550050abe826c4a8803a5e490b7d4314bf5881a64d4b647bc3887fb1ca102d4cf771ae1436527beb9
 MISC metadata.xml 327 BLAKE2B 5c24dfe918a79190b4b74c15bd3cab19fe2d8d62e73e7d518546bdcf924cd100266a7252f7ce17739f33241a36ede588c83c4634b8b5db9fb6b466d40dfe588a SHA512 30bbe9a59d5b48c08710d6fa31372f9b89c3572d5a005a7883b5d76605be3eb43cdfe396f2f44b9f62cd9bea134f574f65f5018b95b6908dfcbd5dfd4142d983
diff --git a/kde-misc/ktoshiba/ktoshiba-5.3.1.ebuild b/kde-misc/ktoshiba/ktoshiba-5.3.1.ebuild
index 6bfd01a7e52c..8ab70aa32458 100644
--- a/kde-misc/ktoshiba/ktoshiba-5.3.1.ebuild
+++ b/kde-misc/ktoshiba/ktoshiba-5.3.1.ebuild
@@ -1,19 +1,22 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
 DESCRIPTION="Function key (FN) monitoring for Toshiba laptops"
 HOMEPAGE="http://ktoshiba.sourceforge.net/"
 SRC_URI="http://prdownloads.sourceforge.net/${PN}/${P}.tar.xz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND="
+BDEPEND="
+	sys-devel/gettext
+"
+DEPEND="
 	$(add_frameworks_dep kauth)
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kconfig)
@@ -28,9 +31,7 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	net-libs/libmnl
 "
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
+RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
 
diff --git a/kde-misc/kwebkitpart/Manifest b/kde-misc/kwebkitpart/Manifest
index 2ca1a60cb760..e13f0deff349 100644
--- a/kde-misc/kwebkitpart/Manifest
+++ b/kde-misc/kwebkitpart/Manifest
@@ -1,5 +1,3 @@
-DIST kwebkitpart-1.4.0_pre20180406.tar.gz 119514 BLAKE2B c85eeedc7ec1e4d24af054c2b56cd8d0b41dd6ab28a37144617233f9d67fadc78a105101af7766d6da4d79360cbb0175654b8744ca20f579e1934f2ea1a9d3ae SHA512 27f5275fc0d8e84d97c2165f82852d8fb4876312c7f27607f5f75f191e56ec6dad59b44e4fc3f14efde98a6d38856953b1112d61d939b9650e9ac24fb4c39a29
 DIST kwebkitpart-1.4.0_pre20190110.tar.gz 119514 BLAKE2B c85eeedc7ec1e4d24af054c2b56cd8d0b41dd6ab28a37144617233f9d67fadc78a105101af7766d6da4d79360cbb0175654b8744ca20f579e1934f2ea1a9d3ae SHA512 27f5275fc0d8e84d97c2165f82852d8fb4876312c7f27607f5f75f191e56ec6dad59b44e4fc3f14efde98a6d38856953b1112d61d939b9650e9ac24fb4c39a29
-EBUILD kwebkitpart-1.4.0_pre20180406.ebuild 1041 BLAKE2B 56000d439b6e405f6c3d745921b4294208d233073d8d9dac5f87eea80578e2fac0b98e9cdf608ac61b8e9984a34b9620fd8f9501638e53737cb7570c620823d5 SHA512 8e6251b7053a9d9f0a19d80fa1386ef960911f2558961a2bfc734a7817f272c8c69ab01b921f1033570c96b52fe34361371a9e55b91d3e0ae0b4bdd5e25062db
-EBUILD kwebkitpart-1.4.0_pre20190110.ebuild 1016 BLAKE2B 3624ed6670916eda5eb8386b51085d738a836ac3a7dda4e370a7639590e5fc0acac7225802cffc56e8f11fa0ff1439cd719fe80c0071c669751fdac552643ebd SHA512 dc32058b3129c797d4b7a3edc502506446afc86e23cb0414e830deda6a0dbe4f12d53e345e93bf9cade6b7fd01e1f8140e2dc698538a4f16f6c7e944156d080e
+EBUILD kwebkitpart-1.4.0_pre20190110.ebuild 1014 BLAKE2B 1936031eaa0518e8e3e2d2d1c298288caa3c305e24f75819026324bfcbd0600421d1202e82daeec7f0fca4365855431639e33ef04f042f9c9b9c34e774624675 SHA512 6372885c13e0172865d993338796eda958a850cbbb89010fd7a6a88232945c1a17c5e2236f91cf5efe34a1603aff663754f6c352b05a5324cd5b2d2505e83c13
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/kwebkitpart/kwebkitpart-1.4.0_pre20180406.ebuild b/kde-misc/kwebkitpart/kwebkitpart-1.4.0_pre20180406.ebuild
deleted file mode 100644
index 6f4e8734d63b..000000000000
--- a/kde-misc/kwebkitpart/kwebkitpart-1.4.0_pre20180406.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT="ed6b8c87fabeb563109a093c1f79eeb03867b053"
-inherit kde5 vcs-snapshot
-
-DESCRIPTION="WebKit KPart for Konqueror"
-HOMEPAGE="https://cgit.kde.org/kwebkitpart.git"
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdewebkit)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-misc/kwebkitpart:4
-"
diff --git a/kde-misc/kwebkitpart/kwebkitpart-1.4.0_pre20190110.ebuild b/kde-misc/kwebkitpart/kwebkitpart-1.4.0_pre20190110.ebuild
index f856466180df..eda8aff7b261 100644
--- a/kde-misc/kwebkitpart/kwebkitpart-1.4.0_pre20190110.ebuild
+++ b/kde-misc/kwebkitpart/kwebkitpart-1.4.0_pre20190110.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://cgit.kde.org/kwebkitpart.git"
 SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-misc/openofficeorg-thumbnail/Manifest b/kde-misc/openofficeorg-thumbnail/Manifest
index f3a8e51d911f..4f62761e3a4c 100644
--- a/kde-misc/openofficeorg-thumbnail/Manifest
+++ b/kde-misc/openofficeorg-thumbnail/Manifest
@@ -1,4 +1,4 @@
 AUX openofficeorg-thumbnail-1.0.0-kf5-support.patch 3243 BLAKE2B faff5c53fe8fe5b01271c2cf9e454f57455977542367f24e3685ad1d868498183432fe7825a6c70d886a67af68c99a24c29ff7cc207688f0ef53785bec6f27c6 SHA512 7a9b1bf7f058ca5d807a86d80a0d6a96b0ab97dc69ce6827571b55342c99fa3d9e1ced9356f10b238dbd2408d2e2edf0f726c72ad786f39b09a45e0afdfb91c1
 DIST OpenOfficeorgThumbnail-1.0.0.tar.gz 11335 BLAKE2B 4f8daf9821a7a6c598f5cd32fc044674da19255c2e58b4beed32e581235d3b37f02ebdcbf10ad4884d1adfab53f97662ffa94d42aac7164ab91b67c45fd8c3e4 SHA512 cd4173e7fb31ef9928184005abd92d467eda37cbb807c7fadd02fc8cd4a276388c1898015f79357ac657c3aa29dec0668c5aa3b8b1dfebb9466a045fad990ee5
-EBUILD openofficeorg-thumbnail-1.0.0-r500.ebuild 624 BLAKE2B 7255c3276d3a043dd5e8651bf2b410427c4c171a4fe0e92b356407050f5ee7555f0a97222a621b786bc0e8f89571b64e75e9db8fbbe5f5399449101c3a7c7705 SHA512 f0ddd1ba4639e507e26258daa87859a29a24ac260cc389e46f117463870abbf3c1f2c60d7e6996462d4cda61c44bbc0a1c555e3e3af7c6db6192e3bf4bcc7912
+EBUILD openofficeorg-thumbnail-1.0.0-r500.ebuild 617 BLAKE2B 6f9c6a9a6b3f8217eabdaf42120a66a8a08b4583e00d22275500785e19372a0ec5585abe49b7cd7f714aa3c6271371cda7bdf1d452065402d41b74db561e19d7 SHA512 12cdef326b4721d1cbf36c68e5ade131f793baeabc3d1d2060cd07c21412aeea4ccdafb9a49e1761e1d06d097e5dd0f87a60bac9e62274bf63f0024dae6b5f8e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/openofficeorg-thumbnail/openofficeorg-thumbnail-1.0.0-r500.ebuild b/kde-misc/openofficeorg-thumbnail/openofficeorg-thumbnail-1.0.0-r500.ebuild
index 8c5f3e9949fe..d14d3463b52d 100644
--- a/kde-misc/openofficeorg-thumbnail/openofficeorg-thumbnail-1.0.0-r500.ebuild
+++ b/kde-misc/openofficeorg-thumbnail/openofficeorg-thumbnail-1.0.0-r500.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="OpenOfficeorgThumbnail"
 MY_P="${MY_PN}-${PV}"
 inherit kde5
 
-DESCRIPTION="KDE thumbnail-plugin that generates thumbnails for ODF files"
+DESCRIPTION="Thumbnail-plugin that generates thumbnails for ODF files"
 HOMEPAGE="https://www.kde-apps.org/content/show.php?content=110864"
 SRC_URI="http://arielch.fedorapeople.org/devel/src/${MY_P}.tar.gz"
 
diff --git a/kde-misc/plasma-applet-network-monitor/Manifest b/kde-misc/plasma-applet-network-monitor/Manifest
index 7ca7b360446c..f694f7b926d2 100644
--- a/kde-misc/plasma-applet-network-monitor/Manifest
+++ b/kde-misc/plasma-applet-network-monitor/Manifest
@@ -1,3 +1,5 @@
+AUX plasma-applet-network-monitor-1.7.3-crashfix-startuptime.patch 1926 BLAKE2B 57b63c36080095aa439c47437d3d3289c68ed8692e72863fac14800acc54fb3998ab38844ebd5e2102d410259b804497305f849c36d18b3b7e8082d2c4ec7551 SHA512 2b89d63bd3cf4d53f4a1d8d8730304d7516c4ff874fd4fab26dc41c4cba24a3202ef7a52b0cf8ab15280ff521b34b7a230191bc2c91e1d32faa12d81fc9fcee8
+AUX plasma-applet-network-monitor-1.7.3-ddwrt-icon.patch 804 BLAKE2B 6c70e88e532eeb6f93e9534aabde1b9b0b755ff0aea555eaed876a7e02d652ab4b90c817ea9dfcd096db0407f6b8589885daf6072fbd09d7a57aa9c82526bf17 SHA512 a23e6a6198762e09f8b5f403e9e65ad2796833a77a38adfb5cc66fd39361dd183120b73d053da88c8e848090f90c05df8d4c175620fff4eb7d3b9c03ae5b38ac
 DIST plasma-applet-network-monitor-1.7.3.tar.gz 40970 BLAKE2B f87a2def4a763c507ce65c42143d5e631c950a7cfdd59bfebeb4f225919feedcd3e9855ee1a48c83dfc7d572efe43fc81e5f2a8e4ffddc3d7e440de36552ff8b SHA512 61bd78e05c3557cfab4977a58db8c80f857d3c84627b794e10e003ceff7e3fd1e15d77761af90cb38ee02a45ed9404629a3c571776a43b7af07c07d8d120ed37
-EBUILD plasma-applet-network-monitor-1.7.3.ebuild 654 BLAKE2B 950ee413c456dc98515b6be3822a2d4055c1f485500040bad703960122c3346d278216934d1169fa5408d168fe803c6e1cef6541cc4fd77a137d5f51e5e8ad74 SHA512 fa3506fd226799e604ae5b6f5b5760ef205b0c687c04ae5a70950b7c9372ae7ddd30cc63d55570161dcd73ecbfd734f0df69a8ade326595dc39f7003721fd80e
+EBUILD plasma-applet-network-monitor-1.7.3-r1.ebuild 584 BLAKE2B 6018fe66827c8c2d2da0180cbaca40bd7e2729f76f0432ef601a144f502d9c91c6eea8a8a2cfccb5b60773e104e45f833f62c8401ff33b59a6f6d3cba578f661 SHA512 088dd1e194938df83291ae52ef8b84f8a19c77ed58c005b3a817542501a973ff9bc77f6c8e54dd8776dd44267f21e5d3de8c0f99b8bb6b183d3021e0d30c55d6
 MISC metadata.xml 352 BLAKE2B fb3f480206952a33e48b73c56c4047447c39e19c6cc8fb19bb50f16181315795c336d7f406194236cf02496c998b0f547325b4f8d8623e9d4a2d510f2f10b298 SHA512 4dd9fec8f19ba1504507761660e8e81a28fe8445d9259f6ddaf34e66d31da1060aae6637a39c86558d38c83553feebe3cea34a76cf7e5c22773f85762eed60a9
diff --git a/kde-misc/plasma-applet-network-monitor/files/plasma-applet-network-monitor-1.7.3-crashfix-startuptime.patch b/kde-misc/plasma-applet-network-monitor/files/plasma-applet-network-monitor-1.7.3-crashfix-startuptime.patch
new file mode 100644
index 000000000000..c86932757a33
--- /dev/null
+++ b/kde-misc/plasma-applet-network-monitor/files/plasma-applet-network-monitor-1.7.3-crashfix-startuptime.patch
@@ -0,0 +1,63 @@
+From 7aa094a156914aac5d1ac85967f9063bc6faa61e Mon Sep 17 00:00:00 2001
+From: Michail Vourlakos <mvourlakos@gmail.com>
+Date: Tue, 7 Feb 2017 22:03:29 +0200
+Subject: [PATCH] fix crash and imrove startup time
+
+--fix crash because the repeater can not catch up
+with the model changes during startup
+--this also improves a lot the start up loading as
+the visuals are painted only when the component
+has completed its initialization phase
+---
+ package/contents/ui/main.qml | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
+index d781266..4ba4b5a 100644
+--- a/package/contents/ui/main.qml
++++ b/package/contents/ui/main.qml
+@@ -24,6 +24,7 @@ Item {
+     id: main
+     
+     // general settings
++    property bool inStart: true
+     property bool showLo: plasmoid.configuration.showLo
+     property bool showDdWrt: plasmoid.configuration.showDdWrt
+     property double updateInterval: plasmoid.configuration.updateInterval * 1000
+@@ -155,7 +156,8 @@ Item {
+     }
+     
+     Component.onCompleted: {
+-        reloadComponent()
++        reloadComponent();
++        inStart = false;
+     }
+     
+     function reloadComponent() {
+@@ -232,8 +234,15 @@ Item {
+         setItemSize()
+     }
+     
+-    onShowLoChanged: devicesChanged()
+-    onShowDdWrtChanged: devicesChanged()
++    onShowLoChanged: {
++        if (!inStart)
++            devicesChanged();
++    }
++    
++    onShowDdWrtChanged: {
++        if (!inStart)
++            devicesChanged();
++    }
+ 
+     GridLayout {
+         columns: gridColumns
+@@ -247,7 +256,7 @@ Item {
+         Layout.preferredHeight: height
+         
+         Repeater {
+-            model: networkDevicesModel
++            model: inStart ? 0 : networkDevicesModel
+             delegate: ActiveConnection {
+                 Layout.preferredWidth: itemWidth
+                 Layout.preferredHeight: itemHeight
diff --git a/kde-misc/plasma-applet-network-monitor/files/plasma-applet-network-monitor-1.7.3-ddwrt-icon.patch b/kde-misc/plasma-applet-network-monitor/files/plasma-applet-network-monitor-1.7.3-ddwrt-icon.patch
new file mode 100644
index 000000000000..094900aff4ba
--- /dev/null
+++ b/kde-misc/plasma-applet-network-monitor/files/plasma-applet-network-monitor-1.7.3-ddwrt-icon.patch
@@ -0,0 +1,22 @@
+From 70481c09ac1434ea1e72d89faeb5d9194463de4e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tomasz=20Przyby=C5=82?= <fademind@gmail.com>
+Date: Mon, 18 Apr 2016 20:55:22 +0200
+Subject: [PATCH] fix dd-wrt icon visible against qt5.6 changes
+
+---
+ package/contents/config/config.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/package/contents/config/config.qml b/package/contents/config/config.qml
+index 5ebb5e6..b9e286a 100644
+--- a/package/contents/config/config.qml
++++ b/package/contents/config/config.qml
+@@ -19,7 +19,7 @@ ConfigModel {
+     }
+     ConfigCategory {
+          name: i18n('DD-WRT')
+-         icon: Qt.resolvedUrl('../images/dd-wrt.png')
++         icon: Qt.resolvedUrl('../images/dd-wrt.png').replace('file://', '')
+          source: 'config/ConfigDDWRT.qml'
+     }
+ }
diff --git a/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-1.7.3-r1.ebuild b/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-1.7.3-r1.ebuild
new file mode 100644
index 000000000000..8c2d1ef1e5fb
--- /dev/null
+++ b/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-1.7.3-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kde5
+
+DESCRIPTION="Plasma 5 applet for monitoring active network connections"
+HOMEPAGE="https://store.kde.org/p/998914/
+https://github.com/kotelnik/plasma-applet-network-monitor"
+SRC_URI="https://github.com/kotelnik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep plasma)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-crashfix-startuptime.patch"
+	"${FILESDIR}/${P}-ddwrt-icon.patch"
+)
diff --git a/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-1.7.3.ebuild b/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-1.7.3.ebuild
deleted file mode 100644
index 45af2a060baa..000000000000
--- a/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-1.7.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Plasma 5 applet for monitoring active network connections"
-HOMEPAGE="https://store.kde.org/content/show.php/Network+Monitor?content=169377
-https://github.com/kotelnik/plasma-applet-network-monitor"
-
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	EGIT_REPO_URI="https://github.com/kotelnik/${PN}.git"
-else
-	SRC_URI="https://github.com/kotelnik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep plasma)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
diff --git a/kde-misc/plasma-pass/Manifest b/kde-misc/plasma-pass/Manifest
index b1c889671c5d..858d3d1b3f96 100644
--- a/kde-misc/plasma-pass/Manifest
+++ b/kde-misc/plasma-pass/Manifest
@@ -1,3 +1,3 @@
 DIST plasma-pass-1.0.0.tar.xz 26496 BLAKE2B 290e5f326be3bb7d8a2771dd9481da2721a9a7151d64e9bb4a5b5db3d9d8d03dc5202d4c7ee6def32c7c5a7c01eb602cec62c65bfef4a353db46e733281fb5ca SHA512 b67f3e8e18260564873000aa0b07f24dd95334882f3b81685dc1da59c06315b48112c26aed040f625e7240e3776ed29ec927ee79c81458ed01bb8a98cccbfa44
-EBUILD plasma-pass-1.0.0.ebuild 720 BLAKE2B ce926e8beb552083c13ad21078d8c3dc411fd5ee4176fa568f00525d0a561e55c8adff5927a7ba15dc39a01d1a166e4a0025f8c876f63f36380483dbc83027f0 SHA512 870f4518bed5ec6d5c31e1ccc2923e622cde9f8774b7f0be967346e120d3213023979b538dbd65c121611ad708886b67826cb6a19965bb127987c0697b2e28c7
+EBUILD plasma-pass-1.0.0.ebuild 719 BLAKE2B 7c154470ac6f8dbce3b06864b302d508b1dc916e7565475cbda9b087a134776c450b015eb8ed50e90edf6f71c46d6cb03eaaa9539492f15a06fbd1ea2f9f5e1c SHA512 e5db4c189de33c518afe471bd5c124f64dcff831b0aadcc24cb9e3e92da99bf265fd560449699ca3b880bda88ec111b8ae748ed91abe3f9c6b5e51749011e06a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/plasma-pass/plasma-pass-1.0.0.ebuild b/kde-misc/plasma-pass/plasma-pass-1.0.0.ebuild
index d1ea19ba7f7f..e8298ecbc6e8 100644
--- a/kde-misc/plasma-pass/plasma-pass-1.0.0.ebuild
+++ b/kde-misc/plasma-pass/plasma-pass-1.0.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.dvratil.cz/2018/05/plasma-pass/ https://cgit.kde.org/plasm
 
 if [[ ${KDE_BUILD_TYPE} != live ]] ; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/kde-misc/plasma-redshift-control/Manifest b/kde-misc/plasma-redshift-control/Manifest
index 442203034cda..0247dcd586d3 100644
--- a/kde-misc/plasma-redshift-control/Manifest
+++ b/kde-misc/plasma-redshift-control/Manifest
@@ -1,3 +1,5 @@
+AUX plasma-redshift-control-1.0.18-fix-custom-icc-profiles.patch 1280 BLAKE2B 7d95e99742cb235efbfcff85bd875c97b2afe2ddbde07be840145e60eb3a317dfc0f2965dc78782985aee0a3a85396f43769deacf17b381d48175705af9b48f4 SHA512 5b7415f2a3d2ceea940c3bde962dc4617df7e5c2b0b479a0b4d2186086a3e7da4dc6eaf1ca7aa842a66eda41eec5d7aa06bd6034da378ff60571bfcaa2a48e1c
+AUX plasma-redshift-control-1.0.18-reset-gamma-ramps.patch 1332 BLAKE2B 1ca3f9455804afeb728667561259eece32c338f336063c4e48db03caee0b48247a35e3784b40e29559cb86309e2cd1329beb2806e9410916973fc87fbaf2b4af SHA512 fff3268862be279ffc380132650a07ab516b617f3c45edbc09a3f738a20e562c023fe605dffc674863d4e921bcc44f059ac6a2e843ce81d8a5a1d5eee4186481
 DIST plasma-applet-redshift-control-1.0.18.tar.gz 93744 BLAKE2B 4e7516767ed045007d7b658917c4cea9371bda016de66ea42e3f39b0a703e599569d880cb3a76d34069e7daa266366fe8ebe01837c4f98266289474b38e52612 SHA512 072fe3866bdbc261e382c69ed7384063660f7667bb6630538394c3ccf55b5f17a5d0edebe5009b4b0b904d711ac30859187201a6017ef718dc9edd15253bb30b
-EBUILD plasma-redshift-control-1.0.18.ebuild 511 BLAKE2B ad865a7a5b20faf7c762cd5fccc7b194f4521c57eddf04ec9796aef2ad0c53779d1a92020f904519e257a46a9576ca7aeeb0aab0c074efb4557fe6b82ca143a8 SHA512 75f59fe4b4030385b36030fd12733223d3818fc6448bf9de599e5b3bfe2422c48c1d901cb42d7d3729b585acf6f24bcdfdf603b4eab6d8c4a98b4a8bcc8d8b65
+EBUILD plasma-redshift-control-1.0.18-r1.ebuild 618 BLAKE2B 51c71491835d3915afffa29c16d61eec64f1737dc804eec2299c4eda2dd54327a1a6f044bed8e1fcdd7420d14d5634b8f708980fe42c9e7694b0a281718b14e1 SHA512 58a28e876184a99641574e208a416e1e3693845b7287a46461858dfbb6d0f9d7f66833458712759a900d2326068adb720e07768d2b49b73020d2bc831b2562b7
 MISC metadata.xml 353 BLAKE2B 5ab1daac82b6448f4d7c875d271bb1751c627e71eb3a687b83291d5bf90ad1f062422060eb3ba681d975ca48dc7081b1d4246f021f96571a2725e50138816fd2 SHA512 068caeadecefc6d2f8b976da6fa287cb1b5ec78ebc337279168b0f7fb9b7ce0618210dfbef788208623abaa355c79828039433a0410cca85244824cc7c801f37
diff --git a/kde-misc/plasma-redshift-control/files/plasma-redshift-control-1.0.18-fix-custom-icc-profiles.patch b/kde-misc/plasma-redshift-control/files/plasma-redshift-control-1.0.18-fix-custom-icc-profiles.patch
new file mode 100644
index 000000000000..28a1cc00cf0d
--- /dev/null
+++ b/kde-misc/plasma-redshift-control/files/plasma-redshift-control-1.0.18-fix-custom-icc-profiles.patch
@@ -0,0 +1,39 @@
+From 1e2a920633d7085fc4e48f1163f434525b777c5b Mon Sep 17 00:00:00 2001
+From: John Salatas <jsalatas@gmail.com>
+Date: Wed, 6 Mar 2019 14:25:28 -0800
+Subject: Preserve screen colour doesn't work as expected
+
+Summary:
+using a custom .icc profile, running redshift from a command line works good but the applet seems to mess with it, the preserve option doesn't work, either in randr mode or vidmode the .icc is ignored even if it is running in daytime.
+
+See also:
+https://github.com/kotelnik/plasma-applet-redshift-control/issues/54
+
+Reviewers: #Plasma, martinkostolny, broulik
+
+Reviewed By: broulik
+
+Subscribers: broulik, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D17249
+---
+ package/contents/ui/main.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
+index 2ea8fd3..268cb33 100644
+--- a/package/contents/ui/main.qml
++++ b/package/contents/ui/main.qml
+@@ -96,7 +96,7 @@ Item {
+ 
+     function stopRedshift() {
+         print('disabling redshift')
+-        redshiftDS.connectedSources.length = 0
++        redshiftDS.removeSource(redshiftCommand)
+         redshiftDS.connectedSources.push(redshiftDS.redshiftStopSource)
+         active = false
+     }
+-- 
+cgit v1.1
diff --git a/kde-misc/plasma-redshift-control/files/plasma-redshift-control-1.0.18-reset-gamma-ramps.patch b/kde-misc/plasma-redshift-control/files/plasma-redshift-control-1.0.18-reset-gamma-ramps.patch
new file mode 100644
index 000000000000..5e2b36822137
--- /dev/null
+++ b/kde-misc/plasma-redshift-control/files/plasma-redshift-control-1.0.18-reset-gamma-ramps.patch
@@ -0,0 +1,25 @@
+From a26a425145120b8e7782d0225e146fcef7b0640f Mon Sep 17 00:00:00 2001
+From: grmat <grmat@sub.red>
+Date: Wed, 20 Jun 2018 10:14:40 +0200
+Subject: [PATCH] add -P switch to one-shot redshift call
+
+---
+ package/contents/ui/main.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
+index 2ea8fd3..38d7b8a 100644
+--- a/package/contents/ui/main.qml
++++ b/package/contents/ui/main.qml
+@@ -67,7 +67,7 @@ Item {
+     // - commands
+     property string redshiftCommand: 'redshift' + locationCmdPart + modeCmdPart + ' -t ' + dayTemperature + ':' + nightTemperature + brightnessAndGamma + (smoothTransitions ? '' : ' -r')
+     property string redshiftOneTimeBrightnessAndGamma: ' -b ' + (currentBrightness*0.01).toFixed(2) + ':' + (currentBrightness*0.01).toFixed(2) + ' -g ' + gammaR + ':' + gammaG + ':' + gammaB
+-    property string redshiftOneTimeCommand: 'redshift -O ' + manualTemperature + redshiftOneTimeBrightnessAndGamma + ' -r'
++    property string redshiftOneTimeCommand: 'redshift -PO ' + manualTemperature + redshiftOneTimeBrightnessAndGamma + ' -r'
+     property string redshiftPrintCommand: 'LANG=C ' + redshiftCommand + ' -p'
+ 
+     property bool inTray: (plasmoid.parent === null || plasmoid.parent.objectName === 'taskItemContainer')
+-- 
+2.17.1
+
diff --git a/kde-misc/plasma-redshift-control/plasma-redshift-control-1.0.18.ebuild b/kde-misc/plasma-redshift-control/plasma-redshift-control-1.0.18-r1.ebuild
index c3e665cf1fe7..f6bc843aedda 100644
--- a/kde-misc/plasma-redshift-control/plasma-redshift-control-1.0.18.ebuild
+++ b/kde-misc/plasma-redshift-control/plasma-redshift-control-1.0.18-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="plasma-applet-redshift-control"
 inherit kde5
@@ -20,3 +20,8 @@ RDEPEND="${DEPEND}
 "
 
 S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-custom-icc-profiles.patch"
+	"${FILESDIR}/${P}-reset-gamma-ramps.patch"
+)
diff --git a/kde-misc/systemd-kcm/Manifest b/kde-misc/systemd-kcm/Manifest
index d7849f47c181..22451768a8c9 100644
--- a/kde-misc/systemd-kcm/Manifest
+++ b/kde-misc/systemd-kcm/Manifest
@@ -1,4 +1,4 @@
 AUX systemd-kcm-1.2.1-qt-5.11b3.patch 1166 BLAKE2B 3b53dbe00b4395cd73cea1ac659e34d110baa9b8aa73d49a154aa6b556c58691fdf4ec7297fb7ddd4b8291f300f532a09476f43ee2f384be501aa80875cc1bd6 SHA512 27cf2430e6428459a2a172acf50066abed43478723ace6b033efacdc78b021c7af9e42d0de51539e76b4408e00e601d353fb51831626320e6b078507af1567fe
 DIST systemd-kcm-1.2.1.tar.xz 86268 BLAKE2B ca9c1682d3dc352b4165fa6e08c5ddc249fa7ae47da3e16e3f8de02f6e2e3020252125464c856d48b1cda3e42f61892d3113a89397cac05ef66658595e74ebcb SHA512 e3dcf6db6513b88b37e724b3a472939fbb155642a605527ca669e71c5a0b8616c4c6add1796037c94170af788bce519415c698f22f010f1133c0e14452245e76
-EBUILD systemd-kcm-1.2.1.ebuild 835 BLAKE2B db5a5c34dfa312157c9212bf06ce2bc31637029d051ca4c7051d5596917cf4815fbcebfc367f248b40b5f725ebd0d95b0731e3738d2b28b3e52f3266b31918b3 SHA512 c8bab6517292aa82507c333933de117e64aba507e5ce6d73d366aaecfb404323988e42af802b3fd610469f44e4272754cf49620a2e939d92328a5b4847232084
+EBUILD systemd-kcm-1.2.1.ebuild 820 BLAKE2B 48321819050b49728835ba34c6e6a226b34db6a2db0ba8ea9e11852a4b8cc922c2e9d47aaa9c168d8244477a38e1c95125641b34e9c1c0f45540bbb2438a365f SHA512 3a1d08566f7aba8c7c29383b10368eb98e5854725547c4ff948da5773ca4b7b7e8c6c764c63ce7afe035f47aea4d586cad1c83426698d6e03d6a1a165ed66b8a
 MISC metadata.xml 722 BLAKE2B 54cc68f238e06b902ac59eaed20ee66aba3647f6eacacf33456ceaef56f4723d4722e4810643f39014da05b0635270b01c029261be0d441e752e93cdea2535cd SHA512 7306fea413580f75843812f0b0ce1510cee6387f31df5e411ddfa6b25d6409cfeb8465e40bffe352255a13cec21278b38ceb18276964406549b35220f8a8e9c7
diff --git a/kde-misc/systemd-kcm/systemd-kcm-1.2.1.ebuild b/kde-misc/systemd-kcm/systemd-kcm-1.2.1.ebuild
index b5c491e0a3e9..7fbb9af43b7b 100644
--- a/kde-misc/systemd-kcm/systemd-kcm-1.2.1.ebuild
+++ b/kde-misc/systemd-kcm/systemd-kcm-1.2.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
@@ -13,7 +13,8 @@ IUSE=""
 LICENSE="GPL-2+"
 KEYWORDS="amd64 ~x86"
 
-CDEPEND="
+BDEPEND="sys-devel/gettext"
+DEPEND="
 	$(add_frameworks_dep kauth)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -24,12 +25,9 @@ CDEPEND="
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	sys-apps/systemd
+	sys-apps/systemd:=
 "
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	!kde-misc/kcmsystemd:4
 	!kde-misc/systemd-kcm:4
 "
diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest
index 36b6be83d0a1..5d668c17481c 100644
--- a/kde-misc/wacomtablet/Manifest
+++ b/kde-misc/wacomtablet/Manifest
@@ -1,3 +1,4 @@
+AUX wacomtablet-3.1.1-xlib-optional.patch 838 BLAKE2B 997d42737c593c5074b6541ca91a1976afc36c7f43041ecd90a32d309c856a9b9b7fb203b135cf997a9a944e9a47febefdc196b36fde94975677ba16b2f17be4 SHA512 b7b8e3c1a2ad97788d6a1bbebc3183b4b1e13ab6295bfc716d5e083a0a317fcd6ba75b49051706c9d776a028a40d3f7cc8edec9b1186b67cdd727ef3e2019990
 DIST wacomtablet-3.1.1.tar.xz 724176 BLAKE2B 062f05067b9ca423527f1fbbc498d3228fba9333f96e918493a00c3ceb669a23c3ab9297bf6c2d3d161559f1d9cf6ccff8f502971718e71a360f3db2e7d9bd67 SHA512 91f8ab9326b8307d63e09c7d75d613553f16c6cb93837cc404cb251aeda93078011b0c5aa0fc20ca4613d82421d73804cc55fa71a688bf4dd0f1d616733ade97
-EBUILD wacomtablet-3.1.1.ebuild 1276 BLAKE2B 18ff83bbc4cc3fd8bb8b8c9debe44670a05c8933fe1deac788f1987631bd2f6af033d926e6928636840f40f3b727b2c3ebd738b1959c3536fe51413af3d173ab SHA512 3c69db91261f68739aaf79a23ed985dabc19fba8a3b2aee757dd50bf335d98e792ed0c4645b67519bece7b7869c3cc982adcdfcedf0a6ebdefdc5c0d25cbda51
+EBUILD wacomtablet-3.1.1.ebuild 1324 BLAKE2B ad8cf2da6207cd093e0b740a61106c3b00782721a30a71dc8622dadb6d54e29f5fc528aa82406a2669936929a96e4983df9d762a5441df4aecdcfc405c4e6e72 SHA512 0dde63f12d9beef44947ca1639e2722fd806afbe1539f7b8a5d8aaf0e033325cdad88821c9b8ca3cf98f8906225460b40b53424e3b429e9c083d231468658c41
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.1.1-xlib-optional.patch b/kde-misc/wacomtablet/files/wacomtablet-3.1.1-xlib-optional.patch
new file mode 100644
index 000000000000..ae40d90a64b0
--- /dev/null
+++ b/kde-misc/wacomtablet/files/wacomtablet-3.1.1-xlib-optional.patch
@@ -0,0 +1,19 @@
+--- a/CMakeLists.txt	2019-03-24 18:34:44.642298259 +0100
++++ b/CMakeLists.txt	2019-03-24 18:38:45.593440974 +0100
+@@ -24,7 +24,7 @@
+ find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets DBus X11Extras Qml)
+ find_package(KF5 REQUIRED COMPONENTS CoreAddons I18n GlobalAccel Config XmlGui WidgetsAddons WindowSystem Notifications DBusAddons Plasma DocTools)
+ find_package(XCB OPTIONAL_COMPONENTS XINPUT)
+-find_package(X11 REQUIRED COMPONENTS XLIB)
++find_package(X11 REQUIRED)
+ find_package(XorgWacom REQUIRED)
+ find_package(LibWacom REQUIRED)
+ 
+@@ -41,6 +41,7 @@
+     set(USING_X_LIBRARIES XCB::XINPUT ${X11_Xinput_LIB})
+     add_definitions(-DHAVE_XCB_XINPUT)
+ else()
++    find_package(X11 REQUIRED COMPONENTS XLIB)
+     message(STATUS "Falling back to X11_XINPUT.")
+     set(USING_X_LIBRARIES ${X11_LIBRARIES} ${X11_Xinput_LIB})
+ endif()
diff --git a/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild b/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild
index 296d3c160272..733552086e0d 100644
--- a/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild
+++ b/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild
@@ -40,12 +40,13 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	sys-devel/gettext
 	x11-base/xorg-proto
-	x11-libs/libX11
 "
 RDEPEND="${CDEPEND}
 	!kde-misc/wacomtablet:4
 "
 
+PATCHES=( "${FILESDIR}/${P}-xlib-optional.patch" ) # bug 681674
+
 src_test() {
 	# test needs DBus, bug 675548
 	local myctestargs=(
diff --git a/kde-misc/yakuake/Manifest b/kde-misc/yakuake/Manifest
index 417b65d6f43b..bf8e8ad6e262 100644
--- a/kde-misc/yakuake/Manifest
+++ b/kde-misc/yakuake/Manifest
@@ -1,4 +1,4 @@
 DIST yakuake-3.0.5-patches.tar.xz 4996 BLAKE2B 0ffef1bf066b962c73ef6a28251d9abf3df66b28cf324bcd2d4f49c7038ba64dd3554490534cb0b001a589c42309253a0cf77683b4f97661d0fbfc17c96e5be0 SHA512 6c66043e22e98d65230de566e4594f4c1bfdcccc229ab8b66d604bf6fa666964f8b05746eb914f65d1e52fa850010aa5016a26b629f8eec09b67548dd2b00251
 DIST yakuake-3.0.5.tar.xz 347412 BLAKE2B 964b5abdbc377b2ff3c1c37ebf4cb2537dde00d8c4178bc7db1785701dee82c600cd775a38896d8ad8976cbe14427df094c4db0c425355b0330d2e8b4fbe23cd SHA512 17640590bb87b7c27e1e336cb82141b986103af95cfae2da129b69537d89a78eb0e21a6f5fb9ab26ed9e572f9edad055264f642afee6012e1a5a5c55d9dc2d22
-EBUILD yakuake-3.0.5-r1.ebuild 1654 BLAKE2B e517125e4b2dab8e7bab29bff3be8ec2478663ec4efe7a04ac2a70a3f342f58dd2068481be31cf360498e5aaee34f88db90eb280080f893f61fa5fdcd2bf0cae SHA512 ce12fc3b99780d4c37153ac1f804212b5e00c6ae1defc5df44b70f3ce00d8549e113d14dfaec77626c361c51e34359197b0cbd6575ce593ef86bdebe5160e052
+EBUILD yakuake-3.0.5-r1.ebuild 1534 BLAKE2B 6de442e4cdaa24b53540f379b414e94e5241821cdb2147c2c8c6906087e79e7375997378e2bef185dbdc3d21aa757e697348b900303a4a3e14e56f3b4a867e07 SHA512 9f4efc784c9f8b4e7d645ae21d598cf6431d29584dcfd146af84907893367509cb098336add1c219c8e45c8f5ce5de2109412e54c96f1ac78e96ed945f8afdd8
 MISC metadata.xml 661 BLAKE2B c0ff7bbfa76614ec0d6ed52ca7af363bf4c441cc06343c613ba6100a68269915d71dea39329d02fc95384ce71331bb367d4cddfdc0c560ea2748843ea7c31c8a SHA512 a842fdcbb48892a13e74eacd0aca111cbba02bd4c43fb9544ed4e4a9c72d122a3190f0090e8b7f63cceba1d449fb7bf629954a9e60dd541e40908818478fcb13
diff --git a/kde-misc/yakuake/yakuake-3.0.5-r1.ebuild b/kde-misc/yakuake/yakuake-3.0.5-r1.ebuild
index 53cb9758ae62..afa2667addc2 100644
--- a/kde-misc/yakuake/yakuake-3.0.5-r1.ebuild
+++ b/kde-misc/yakuake/yakuake-3.0.5-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
@@ -49,11 +49,7 @@ RDEPEND="${DEPEND}
 	!kde-misc/yakuake:4
 "
 
-PATCHES=(
-	"${WORKDIR}/${P}-patches/${P}-kmainwindow.patch"
-	"${WORKDIR}/${P}-patches/${P}-qicon.patch"
-	"${WORKDIR}/${P}-patches/${P}-kwindowsystem.patch"
-)
+PATCHES=( "${WORKDIR}/${P}-patches" )
 
 src_configure() {
 	local mycmakeargs=(