gentoo resync : 09.06.2018

14 files changed, 49 insertions, 271 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 84a911dc88ac..5944777c7769 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index 501cab12a655..2b1b95e97af0 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,8 +1,4 @@
 AUX kdeconnect-1.3.0-no-wayland.patch 523 BLAKE2B c29b58a3f1f97f09c67270f6b55f8122ccca834b979717bc1c5ad279675106acaa23da1d4a4a08dcc4194b6837cb5fce23ecfd12d5d8d1ed4adb8b4fdd077eae SHA512 68527f15ec3f0af14e33e857567c2fcc622f5dd5fc0652dc0af95e91dc5b96929df9db4961d9aa528be73b87e021877d7f6ee5894a2a195446a7235ca979b664
-DIST kdeconnect-kde-1.3.0.tar.xz 281972 BLAKE2B 62e8b59bc661be7a17ef4e160411dff2150ea8639f69388f32453d3b0066ebc7333987b7df31241eac7d95b994f91347432226ef7f5d7bb864b87108fb974544 SHA512 837f6129393fc1e6d68c1c0cc7eea244bc1702fa4beb9bfc764d001077a890ff7c9a954de738ccabb3369f1a9a08325300514eecdbced939ad8e8b360a4b2045
 DIST kdeconnect-kde-1.3.1.tar.xz 283636 BLAKE2B 8790ff2f411539db6759ddcad6a9401b2769c7c02f7a0465e0141f10eb6b5675fa56ac89bce94ae02326ce6eb13911f0b97684660df05195df596c1848d1f219 SHA512 52157dc7c7c3caec9871e9feb69c7aa8b82738fa5d4e60bb7492a9ded672351fbb6773ebf166281da9e585798583c1b23ac52bfd60927bb606472b19c5dc8538
-DIST kdeconnect-kde-v1.2.1.tar.xz 278612 BLAKE2B a0803f34232eca16baf2c00ea96ccc33be8c631b40041aa6cfffab933ba984ff95639ae3103bd6499583ac6ba0c8e70f50bd6db30ff3d50f93a5d9e232dec303 SHA512 d336350ce1698d1fc2aa2ee02a4fec9c7ce5eedbf346ec40d502f7b5c1c555a370f09a65d88d70ece09c4a7bcf240921df31f803215afce657c9b4cb113baa58
-EBUILD kdeconnect-1.2.1-r2.ebuild 2076 BLAKE2B 8f40f9ffb412de628ec3e5c5dc44d544cc671ee47d76b4c22161d3379b66cae93ed4512a76f94d79eaee9fb028f22541fd2bfa3cae0299094a96c2209846ea26 SHA512 ed0da87b29207690d11064329db26c70c28d2c168ae7d990574c582290ec3d533c3dc63ea83b10632370075c13bb7410ae3bbbdd0feac14a89fcb8c2e33211e8
-EBUILD kdeconnect-1.3.0.ebuild 2146 BLAKE2B e56911e541a3bbabb08a23fabced60d86974d8539a50c9f378e48f2a2a1618a0657b4b3e6ef213d7f711295e2b4d5aa0279b23c5e967e523cc15b4d3cf7f7221 SHA512 f5434ee734a0404c86ac660567acbd61c309ce840ac28c63f8950af7db135aefa07c9a59344cb7e96ff9f2fd55b823b2392391a196fc8c364896cb8d13c8360f
-EBUILD kdeconnect-1.3.1.ebuild 2207 BLAKE2B 3b75875fbe52ad33a627d412277c0be62312a1710dd8ddf9e8f3c308c8c77f40e96358ea9335bfdf635e9772710b46e552ba1e971e828b502faf3248be496150 SHA512 98ccf280b12b92177db192c7b1fac8eaeeeb634a7eb3158be777a7c551b350aba8127f575ad07e932baebba27830fb5874ffd58874d5a24bfb0ecc66b5317f6a
+EBUILD kdeconnect-1.3.1.ebuild 2205 BLAKE2B efe4fbd831eb259ea1feda30b17fbe305c3603a4891991e9be78fba96845ada5909856e68001c137f8fc49fabad2928fe860b651bbc38d7163e61c9a60de4d1d SHA512 e42292f167f7fc261249502dab25a9df91cae5123b616d497df872780721eada3d889f99dd17141ec9404e597347a01eedd5ffaf97b3ae90b8ca86c0bdae14f8
 MISC metadata.xml 542 BLAKE2B ca880a9dbf862f3b76d30b2fe8bdcf83487606179785fa7060dfc50342df4b73c55a45302b8eb0306559d5da907d958c71ccde0028f23ddf3353465b446a536a SHA512 76c1a4ccab6959be8982ffaab3830fbbe4e3c1c55ad5793bd07fa1c037b1632a2b568d2049bf83f71d437b72f01638d6fe54e17744df95cfe04b2d99828a08bf
diff --git a/kde-misc/kdeconnect/kdeconnect-1.2.1-r2.ebuild b/kde-misc/kdeconnect/kdeconnect-1.2.1-r2.ebuild
deleted file mode 100644
index bb97c4bef86f..000000000000
--- a/kde-misc/kdeconnect/kdeconnect-1.2.1-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FRAMEWORKS_MINIMAL="5.42.0"
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-KMNAME="${PN}-kde"
-KDE_SELINUX_MODULE="${PN}"
-inherit kde5
-
-DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
-HOMEPAGE="https://www.kde.org/ https://community.kde.org/KDEConnect"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${KMNAME}-v${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE="app 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]
-	x11-libs/libfakekey
-	x11-libs/libX11
-	x11-libs/libXtst
-	app? ( $(add_frameworks_dep kdeclarative) )
-	wayland? ( $(add_frameworks_dep kwayland) )
-"
-RDEPEND="${DEPEND}
-	app? ( $(add_frameworks_dep kirigami) )
-	wayland? ( $(add_plasma_dep kwin) )
-	!kde-misc/kdeconnect:4
-"
-
-RESTRICT+=" test"
-
-S="${WORKDIR}/${KMNAME}-v${PV}"
-
-src_prepare() {
-	sed \
-		-e 's#${LIBEXEC_INSTALL_DIR}#@KDE_INSTALL_FULL_LIBEXECDIR@#' \
-		-i daemon/kdeconnectd.desktop.cmake || die
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DEXPERIMENTALAPP_ENABLED=$(usex app)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst(){
-	kde5_pkg_postinst
-
-	elog
-	elog "Optional dependency:"
-	elog "net-fs/sshfs (for 'remote filesystem browser' plugin)"
-	elog
-	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"
-	elog
-}
diff --git a/kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild b/kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild
deleted file mode 100644
index a4c3a879ba28..000000000000
--- a/kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FRAMEWORKS_MINIMAL="5.42.0"
-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}/src/${KMNAME}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
-HOMEPAGE="https://www.kde.org/ https://community.kde.org/KDEConnect"
-LICENSE="GPL-2+"
-IUSE="app 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]
-	x11-libs/libfakekey
-	x11-libs/libX11
-	x11-libs/libXtst
-	app? ( $(add_frameworks_dep kdeclarative) )
-	wayland? ( $(add_frameworks_dep kwayland) )
-"
-RDEPEND="${DEPEND}
-	app? ( $(add_frameworks_dep kirigami) )
-	wayland? ( $(add_plasma_dep kwin) )
-	!kde-misc/kdeconnect:4
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-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)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst(){
-	kde5_pkg_postinst
-
-	elog
-	elog "Optional dependency:"
-	elog "net-fs/sshfs (for 'remote filesystem browser' plugin)"
-	elog
-	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"
-	elog
-}
diff --git a/kde-misc/kdeconnect/kdeconnect-1.3.1.ebuild b/kde-misc/kdeconnect/kdeconnect-1.3.1.ebuild
index e5896a909ecb..2becdf4d6b4b 100644
--- a/kde-misc/kdeconnect/kdeconnect-1.3.1.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-1.3.1.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${KMNAME}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
diff --git a/kde-misc/kdirstat/Manifest b/kde-misc/kdirstat/Manifest
index 6515f0c21751..d535c5e6bf49 100644
--- a/kde-misc/kdirstat/Manifest
+++ b/kde-misc/kdirstat/Manifest
@@ -1,5 +1,3 @@
-DIST k4dirstat-3.1.2.tar.bz2 227623 BLAKE2B 718360b79fb164960f99680a1501f72e65b0108a6ab9a38f72100df7ea9541a77d1d967d4eb645dd84978fa94553e9dd4b1b91d73144862bca8668ea401a0be1 SHA512 52c8fb58bde8f2ebb3404a3553ad5e3c838e95353808165f2e8f088f4848b40a5dda3427c6f24dd3d8bc8858e9c28f1f1db0993963c16cf355eeba253fc8344c
 DIST k4dirstat-3.1.3.tar.bz2 230480 BLAKE2B ddb91b9d6a4ce119f4f3c71541ad490b973de1e6648ce019e48374d825b18ba697b652f59d42995b14f53e730370ee41f9910056406711003e506e0826b9ad39 SHA512 b5e71d5d235ead64d1a7c6005551585316a8565c806a3ca07050331b2a8ff13f7048b1cc54489e84f49be3abedf01c65b5b6951724c955f540d7c3fa0bfd2afc
-EBUILD kdirstat-3.1.2.ebuild 1036 BLAKE2B 756228e6969124077919c7196ceab5c3f0f75a903d61f1c6f019cefa428df61f9fbfe577217b268c0b071d0f186d83bbd4014c46cc48fa8fbd2e9b5f8032d106 SHA512 3708c0378d32bcfb65d582ec5d84295669c998284e2ce1ee891ef06e73c03bed546a9242298e1ab0a3e1da6b97983c55b26b2faa7dbe43754a5bb81a3d774e2b
-EBUILD kdirstat-3.1.3.ebuild 1038 BLAKE2B 6466e587ce87458d30345e9c0b049f07fe672e8ee91c753cf8d9307e4276dae58df7f48d76207dafd8f4bbc9f856669f15e2e596cd1b6b2f89bd834541363708 SHA512 13691e8dd649ad5c09677be090e667a805884202507a7100587daea59f21493a984174f600f40ae071a04ce1cc28c0aa2816c12852e947415e8b6cffff12c1d0
+EBUILD kdirstat-3.1.3.ebuild 1036 BLAKE2B fa895b42652630eb5c74c64bbdebe300bf75e0c9fbc6eb8c521cbb2d2ed08aa724aea7e00e1e5ef705f21f9438b850c2785912d490221cef47eeb05c1c3ce82a SHA512 6f9e41d2c696388e45d426cb58335c28d48ad73350266eaf634b42963dc3326145043ef26918ae3ead56a1309870164845de5fd331c33fcbb09b5413e58a9708
 MISC metadata.xml 339 BLAKE2B 4d90cd665c996f0ff88b63c4d0184f1b090af57d024918fddb2fbe59f8d5de1f01e4acfcae03e08368958abb93abb841a5e18affc7e6345d60d556aaabbf775d SHA512 5ca88965bbed764c5ad756afe72df1aecf665b9325d1c40161836a0cbf44b117e20679dd8e62795b5a85f8b4b417f56a02ad8ce7a739198f4f5084d7c63dd3da
diff --git a/kde-misc/kdirstat/kdirstat-3.1.2.ebuild b/kde-misc/kdirstat/kdirstat-3.1.2.ebuild
deleted file mode 100644
index bef8cfdf24dc..000000000000
--- a/kde-misc/kdirstat/kdirstat-3.1.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 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.3.ebuild b/kde-misc/kdirstat/kdirstat-3.1.3.ebuild
index ef6184cdc45f..06caeec19ea9 100644
--- a/kde-misc/kdirstat/kdirstat-3.1.3.ebuild
+++ b/kde-misc/kdirstat/kdirstat-3.1.3.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=""
 
 COMMON_DEPEND="
diff --git a/kde-misc/kmarkdownwebview/Manifest b/kde-misc/kmarkdownwebview/Manifest
index a44196aab888..9d814152a273 100644
--- a/kde-misc/kmarkdownwebview/Manifest
+++ b/kde-misc/kmarkdownwebview/Manifest
@@ -1,3 +1,5 @@
 DIST kmarkdownwebview-0.5.2.tar.xz 60468 BLAKE2B f484d7c9efe370fb56243ce1ffaf04b37f3f45c9a5922045efcf1c6441278256335c98022fee1f78afa4877f5563be764dcbfd2e19f13cf9bbc205384147cc6c SHA512 0e0ff8880ea372c2ee406ebd54a7fd8e19e68bbed7a03096ff39e773d80728220ccc90a5791728d467fe10d8174c5bda46f25577c081cede2690648fe9964b9c
-EBUILD kmarkdownwebview-0.5.2.ebuild 870 BLAKE2B 6e3d20c70c6a966e0bdd99e73485942e50285b629cd59d9366fa72937c92281776695c9c749d786f44b9b2e06d0335c5be6512ecc851d8e648380d515e29db22 SHA512 1b812e6d85c1b10458eec8d94dc2ee584343b8f92c17bfe61dc6e1c502839a7be0923b9b5bf61c47f0562ea7475345094e4ad03eb9ca887e14458cc953cc2b3b
+DIST kmarkdownwebview-0.5.3.tar.xz 62480 BLAKE2B ea8104b084e4be66aa37001cf7b1b159c8f7f03c2a32eb75d69aff2d447c9a57c1a5f0419137bfa790510bd8532a8bd7e171dae901d0bceab0cc193868069d83 SHA512 04864a069b502f0293d7b66c7ecfb4e32048611028f54b4e33cfcef4931fdc6a3947aff8c863975ea639bd2c3b9c8f2fbc27624247864e20862d050b032b6fc2
+EBUILD kmarkdownwebview-0.5.2.ebuild 869 BLAKE2B 9f7fefdb255c10f908a78a9541f6be05bf8eac7dec210f8c5af23c533b1a44fd55d53cdcc7cce77f297feca26a0d8f47d18ea28286f16c023935958722a1ec65 SHA512 ed02c2320731c15c84ddaf84f2b2b67a8f022e7b76ec1431231517658f65ca842e1eef963664c6cb91a5f8a2dca934160ef6675eef7efb7f7eeb6673822d468c
+EBUILD kmarkdownwebview-0.5.3.ebuild 870 BLAKE2B 6e3d20c70c6a966e0bdd99e73485942e50285b629cd59d9366fa72937c92281776695c9c749d786f44b9b2e06d0335c5be6512ecc851d8e648380d515e29db22 SHA512 1b812e6d85c1b10458eec8d94dc2ee584343b8f92c17bfe61dc6e1c502839a7be0923b9b5bf61c47f0562ea7475345094e4ad03eb9ca887e14458cc953cc2b3b
 MISC metadata.xml 365 BLAKE2B 708304c47cade844b320dbdbe71124d0cdbab506b655095ab9ee703f3cc5f44c0bc1561ccd7dfec9d9b2b14edaae90abf323cbd1ea6cdda1fbc6fa5193c15c81 SHA512 dbb15189ec2a5c3cc0afd100dba5c187a2464c8fd12e048f4d65aa39165c7cc093fbca646792768371f5fb2997c3b721d64524e63542693b44562b6f3bf755f5
diff --git a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.2.ebuild b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.2.ebuild
index 4a3e6df449f9..e1551634f349 100644
--- a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.2.ebuild
+++ b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.2.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/kmarkdownwebview/kmarkdownwebview-0.5.3.ebuild b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.3.ebuild
new file mode 100644
index 000000000000..4a3e6df449f9
--- /dev/null
+++ b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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? ( $(add_qt_dep qtwebkit) )
+	!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/skanlite/Manifest b/kde-misc/skanlite/Manifest
index 9b2feb3b406d..b6a144990acd 100644
--- a/kde-misc/skanlite/Manifest
+++ b/kde-misc/skanlite/Manifest
@@ -1,6 +1,4 @@
 AUX skanlite-2.1.0.1-cmake.patch 2978 BLAKE2B 68d39415f4199b018028b16727f734117a7499be83904e80b9aeb2837a835141363516e0b452d81ddaab8b874de75e869168c9215babb3230c9a02a33b7f33e7 SHA512 7a7ee0f6b7b82a2b8e90ac58d632c92eb7c0992195f104ed794d14c451a21fefb7a3621bc22c14948b83b8e9aa86d9868ebd97d780a8d31f01186485d507d3ce
-DIST skanlite-2.0.1.tar.xz 2139624 BLAKE2B f6959650e6e59899e24f20214b2e94b0f4c004982e2ff961384c4a07e13305c6f839f679759db088c16ab879b499eb700edb5f7d8d65056ddd155c3a55f5365b SHA512 2dc29f3aeca32a7afb515ae9349fab7ef635de731718b53ceaf532cbd3860fbb07bd936fd2988b6dddb74109775e22752ffd05a0a3d0218b9c8ae393af52b14e
 DIST skanlite-2.1.0.1.tar.xz 2151312 BLAKE2B c03ace256fd4159e36c7eb871f4f88a11142e36e427120560a09a0d0516f91450d350d4ae5db2004da6493d3a2a0aaaf5d45b4a688f3943cf92b76a71fb5f937 SHA512 8eb1a32994259010d4a134c1b25b74b8cc03ba4fa6ce70ee2026a3070c675c2b11f38770453d197008fbe12df976cc653362eb44d6ef89a7f0173c3a2cef3658
-EBUILD skanlite-2.0.1.ebuild 1037 BLAKE2B b3c71e2dda3337152176a621b3fe600a10ff99fdb1ac8ee11a51d7e0bc1f2852e12cf13f0533ad77682ae3f7e91e027ea37f50cca07b0bdf2bcd8592c2511717 SHA512 9f736d35833822020e1d569c03ed67d1695fdfcdd81db2996fe2212b55db192ad27ce9bc659fb22b558066ccea60fcb1a9978da61501b88a6346fde0000a6717
-EBUILD skanlite-2.1.0.1.ebuild 887 BLAKE2B 07625cdeb396047ad3a55197f7d24b976b7f932756e4bce5067123a0019c0fb6a635deb5d205c676ed34a83a231c102a0194ec0a86768c9ba825561a3942f6a4 SHA512 1b570692ae768fd6cf9d581c0c47e4949e3aff32193446125188bf8305615743eb8ad2d500a8203b6cd53f89ca440bfd80425c8ae54a00d039cbad9355848787
+EBUILD skanlite-2.1.0.1.ebuild 885 BLAKE2B 98420a2dc02261ad4480f6e87b65fccbb227f6f6c2ddfdbd6462041a2ef03258cd444c9fd88e47add8e64368a4c7d439fd92b222cd77cd4f0c949e20d8057d19 SHA512 9c03dd4f8ae6190bb7274dbc3a625b71a3743a62ce93fa607647b213bf24153cc46cf8cd50fc5dbf29699a6a9557a52f7fb19ecc47450bcbb129c503ed93605f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/skanlite/skanlite-2.0.1.ebuild b/kde-misc/skanlite/skanlite-2.0.1.ebuild
deleted file mode 100644
index 1d3bed58d364..000000000000
--- a/kde-misc/skanlite/skanlite-2.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="KDE image scanning application"
-HOMEPAGE="http://www.kde.org/applications/graphics/skanlite/"
-SRC_URI="mirror://kde/stable/${PN}/2.0/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libksane)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/libpng:0=
-"
-RDEPEND="${DEPEND}
-	!kde-misc/skanlite:4
-"
-
-src_prepare() {
-	kde5_src_prepare
-	cmake_comment_add_subdirectory autotests
-	cmake_comment_add_subdirectory tests
-	sed -i -e "/TextWidgets/d" CMakeLists.txt || die
-	use handbook || sed -i -e "/DocTools/d" CMakeLists.txt || die
-}
diff --git a/kde-misc/skanlite/skanlite-2.1.0.1.ebuild b/kde-misc/skanlite/skanlite-2.1.0.1.ebuild
index c0883592a570..6c23b07d2c59 100644
--- a/kde-misc/skanlite/skanlite-2.1.0.1.ebuild
+++ b/kde-misc/skanlite/skanlite-2.1.0.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.kde.org/applications/graphics/skanlite"
 SRC_URI="mirror://kde/stable/${PN}/2.1/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="