gentoo resync : 17.02.2020

18 files changed, 199 insertions, 42 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index b5ec2e8b2044..32706f6a8a90 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 356e014f40d4..ffc1b2ee3e2a 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,5 +1,6 @@
+AUX dolphin-19.12.2-create-new-consistency.patch 2399 BLAKE2B f4f11330e7a7f31085556df24f0cb71f644b8caf21e2871b5bbfa63a922cc0b7fd3268be4c60887cb281c03060e55450515f001790b5b5c6016a833f966e38a6 SHA512 d03e5ddbd428f7b4b1eae1496ae4bbad0985b16ab2f94b63ce09ad0fbf3cf03bd6ad12811b4f88639b29e5bce330d40bffeef0da9098d6b49f42c2974d51ad4d
 DIST dolphin-19.08.3.tar.xz 5276344 BLAKE2B f894ab567be12bd3c6194c84897c13201a286064f9b1e10690b88433ae712d4d14870783d729d1d61fde89700709ae75262111684ef592e66c1c3c66bb606e9d SHA512 4390f97398b437b24f0139982e068e32a042a0740790b7dbf19747cd77b41c70dd04f0c6ba3120775f8ce48f43bdd3d2cff4590ba5556773950dd73dd9f7aad0
 DIST dolphin-19.12.2.tar.xz 4778864 BLAKE2B d334e1d672a5856be0a13588f4238e0866eda11205b7284cb0e20b9f933b65168ab7a26c7aa716453bc2ef1d107c88a30feb595022abe93ea98a0ee98753dd9f SHA512 c9b43a3e923e6f261225ab7ebc0a35722f4aba197015e48739c7b0cc442dfa227875b55e85a28c8703abdfab7b592432d14ca3560155e59ad39a4542345646dc
 EBUILD dolphin-19.08.3.ebuild 2895 BLAKE2B 5330439a85c94fb18a97bb6066f03e9e58706fb69c423cd8afe68da49a935bd109f6835d0cb5c90658e125cf2019f86c3fdf3d610ac3b2f288ee544d28f9761b SHA512 6b454883f6ee0ea7b56f68a5fc76cdd90179f6982ebee89564d0cd2aa9e8336d3aac320459e69c52df361b2d1d232cdecc226147b2c85de12c52d321814f87f4
-EBUILD dolphin-19.12.2.ebuild 2914 BLAKE2B 5d352b8c5e855fc3b431ea30f679dcac689f75b1b17e02f1c2d0f36314af57a75a4efeb01d56761e5923db82f6d72cbbf04ed7381dc68dbe555aa6f121680d0c SHA512 226b6f3b8011fcceca5fb7a50d6d49f6f80b1af286e4070ec537b3d50338fc9852e7f05aa5df8cc5fc4d8787a50900afc5c0583ebd33a4821d64b48391d0e426
+EBUILD dolphin-19.12.2-r1.ebuild 2988 BLAKE2B 9ae1ddea9dc3ff22d588db271d3afe659cb32c68c8692945915e3286b9dd706a6a890d6b3e99c9bb350a1321785756f1e1466e63a0721ae05ed20f6e0a082721 SHA512 3f0893a8169b1604843c20524bb684657cd8a59f01b428c674a59e37397dd74c3316620b31a17686f9247f57db03a268f0d46c3e3d169a22a02aded5bf8bb913
 MISC metadata.xml 361 BLAKE2B 1974fb2be150af6e3276e6c55b54b4659fcdd781b58228b60bea6ceb605f0a5b412d5b6451231b47fd67856ecf9486dd30e3d440b6e9a35d1566fc09de9a5cd9 SHA512 2fea432f0da8502acb0e2bc467e6c010a54612c2850de6abf422304e8d260a5417f7361f66c6a697ae9e138d3b6714e3d8121ae4904e24804abc188758576176
diff --git a/kde-apps/dolphin/dolphin-19.12.2.ebuild b/kde-apps/dolphin/dolphin-19.12.2-r1.ebuild
index 1dae379b7beb..5d2d40673864 100644
--- a/kde-apps/dolphin/dolphin-19.12.2.ebuild
+++ b/kde-apps/dolphin/dolphin-19.12.2-r1.ebuild
@@ -64,6 +64,8 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-create-new-consistency.patch" ) # from 20.04
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package activities KF5Activities)
diff --git a/kde-apps/dolphin/files/dolphin-19.12.2-create-new-consistency.patch b/kde-apps/dolphin/files/dolphin-19.12.2-create-new-consistency.patch
new file mode 100644
index 000000000000..dc70220d9568
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-19.12.2-create-new-consistency.patch
@@ -0,0 +1,66 @@
+From 4c923a531f77bc4c44b5c8687fe18dd6438eb9c5 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Sun, 9 Feb 2020 08:58:10 -0700
+Subject: Restore former position of "Create New" menu item in viewport context
+ menu
+
+Summary:
+I've seem various complaints from users about the fact that the {nav Create New...} menu
+item in the viewport context menu is now below {nav Open With} item. All the other
+changes to menus seem to have been well-received but this one has garnered criticism.
+Looking through D23757 and D11884, I can't actually see that this was intentional, so
+it might even be a bug.
+
+Either way, this patch restores the old position of the {nav Create New} menu items at
+the top of the Viewport context menu.
+
+BUG: 417640
+FIXED-IN: 20.04.0
+
+Test Plan: {F8093605}
+
+Reviewers: #vdg, #dolphin, elvisangelaccio, ndavis
+
+Reviewed By: #vdg, ndavis
+
+Subscribers: asturmlechner, markuss, kfm-devel
+
+Tags: #dolphin
+
+Differential Revision: https://phabricator.kde.org/D27267
+---
+ src/dolphincontextmenu.cpp | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
+index 79143d4..9f39671 100644
+--- a/src/dolphincontextmenu.cpp
++++ b/src/dolphincontextmenu.cpp
+@@ -342,12 +342,6 @@ void DolphinContextMenu::openViewportContextMenu()
+     fileItemActions.setParentWidget(m_mainWindow);
+     fileItemActions.setItemListProperties(baseUrlProperties);
+ 
+-    // Don't show "Open With" menu items if the current dir is empty, because there's
+-    // generally no app that can do anything interesting with an empty directory
+-    if (view->itemsCount() != 0) {
+-        addOpenWithActions(fileItemActions);
+-    }
+-
+     // Set up and insert 'Create New' menu
+     KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();
+     newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown());
+@@ -355,6 +349,12 @@ void DolphinContextMenu::openViewportContextMenu()
+     newFileMenu->setPopupFiles(QList<QUrl>() << m_baseUrl);
+     addMenu(newFileMenu->menu());
+ 
++    // Don't show "Open With" menu items if the current dir is empty, because there's
++    // generally no app that can do anything interesting with an empty directory
++    if (view->itemsCount() != 0) {
++        addOpenWithActions(fileItemActions);
++    }
++
+     QAction* pasteAction = createPasteAction();
+     addAction(pasteAction);
+ 
+-- 
+cgit v1.1
diff --git a/kde-apps/kdecore-meta/Manifest b/kde-apps/kdecore-meta/Manifest
index e6aec11df1f2..7c3aec529a7f 100644
--- a/kde-apps/kdecore-meta/Manifest
+++ b/kde-apps/kdecore-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdecore-meta-19.08.3.ebuild 929 BLAKE2B 2b374fcd30bb26df2499e57c668de3fec4a4579830d81d3dcb945005878289634bb2eff284c9fd0e3ecb740db082acb3942cdbb85b912e06710ad941b6e385be SHA512 b78fb1acfd7e387337e3f06a3047a9da841ae23c8b19b17e380eacb53b54b144cff29773847c822f5f55e4880531e4a5e602ad894a40aff26216cc0856090209
+EBUILD kdecore-meta-19.08.3-r1.ebuild 878 BLAKE2B 6bfbef791bcdddbdf1ff1443a5d4e7ddf118c0a2019f523f86a6200c9be32e927901d5c54ea92b52ed2e85ca39f1ab1ea4e791731e05203c46b2e3175cc47549 SHA512 1bc4e73d033b9a15b51701dd771b3838d1de3a587828a283d0198ed1ef2a65beff03e14bf65df3f29e5de34fcfc971b658e97f3700011b6e14eae1432a7f7748
 EBUILD kdecore-meta-19.12.2.ebuild 888 BLAKE2B 6c82bc361673fd00764f55d935754c4d74d4450d88c3dd5e93a2311109d5d7614d7826df72a4cb5eff95058eeddc3d7827e3b92795d0ea5ba06baafcb547d0b4 SHA512 1703f0c7c7970744519891d5ecec87aeeebe833743c9104507e169cfb09b432dfeeafc01327bd7705d93dd0487cf2f5bb597b9332dc48c319ef35f030f5b8411
-MISC metadata.xml 828 BLAKE2B 62d5af7d5413a38e7a0d04df003a80a7f863abb11b35e1c16fde156a06667e754b23504d550d585b03eba979c5d3a6d379a1aec4d8d56c54951a63d5b3298287 SHA512 557c5a2ba75b21a8a8f13531cf6e252b5e38d0e0b0475038968ba5bbed1672dceb7518791e88ee01a94966108e2b315aa67341d775fcded1a5e43a5858c902dd
+MISC metadata.xml 682 BLAKE2B f02620682a0f1f2b1e8a7621ce9fca0f0bec646787a8e2b00b0d7b4b0b2236d07429fb31bab4935f0ad7f969857ccfae49f8c4ca8849c9b733583ce0e41533c1 SHA512 414e4d9cd87a259c5ce473d33e9f55c6aa54428f2024925f6bf49e68df2d458d45e42f865cc8a5ba97eca04ab85c035c253ab98503c5c3855e199b7b97043098
diff --git a/kde-apps/kdecore-meta/kdecore-meta-19.08.3.ebuild b/kde-apps/kdecore-meta/kdecore-meta-19.08.3-r1.ebuild
index 7c6b556b81c8..ad73222f26f6 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-19.08.3.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-19.08.3-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://kde.org/"
 LICENSE="metapackage"
 SLOT="5"
 KEYWORDS="amd64 arm64 x86"
-IUSE="+handbook +share +thumbnail +webengine webkit"
+IUSE="+handbook +share +thumbnail +webengine"
 
 RDEPEND="
 	>=kde-apps/dolphin-${PV}:${SLOT}
@@ -19,11 +19,10 @@ RDEPEND="
 	>=kde-apps/konsole-${PV}:${SLOT}
 	>=kde-apps/kwrite-${PV}:${SLOT}
 	handbook? ( >=kde-apps/khelpcenter-${PV}:${SLOT} )
-	webengine? ( www-client/falkon )
-	webkit? (
-		>=kde-apps/konqueror-${PV}:${SLOT}[webengine(+)?]
-		kde-misc/kwebkitpart:5
-	)
+	webengine? ( || (
+		www-client/falkon
+		>=kde-apps/konqueror-${PV}:${SLOT}
+	) )
 "
 # Optional runtime deps: kde-apps/dolphin
 RDEPEND="${RDEPEND}
diff --git a/kde-apps/kdecore-meta/metadata.xml b/kde-apps/kdecore-meta/metadata.xml
index 99b40a291ade..ce448ffcffbe 100644
--- a/kde-apps/kdecore-meta/metadata.xml
+++ b/kde-apps/kdecore-meta/metadata.xml
@@ -9,6 +9,5 @@
 		<flag name="share">Install <pkg>kde-frameworks/purpose</pkg> for share file context menu actions in <pkg>kde-apps/dolphin</pkg></flag>
 		<flag name="thumbnail">Install <pkg>kde-apps/ffmpegthumbs</pkg> and <pkg>kde-apps/thumbnailers</pkg> for thumbnail generation in <pkg>kde-apps/dolphin</pkg></flag>
 		<flag name="webengine">Enable <pkg>www-client/falkon</pkg> which depends on <pkg>dev-qt/qtwebengine</pkg></flag>
-		<flag name="webkit">Enable <pkg>kde-apps/konqueror</pkg> with <pkg>kde-misc/kwebkitpart</pkg> which depend on <pkg>dev-qt/qtwebkit</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index 7c2afd4f2b27..92c7878c9ed1 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,5 +1,5 @@
 DIST kitinerary-19.08.3.tar.xz 955500 BLAKE2B 1f09ccb61ca37b44efad2af4b2e9adf48f3f60e7368847e8602213602f7d23f016a525fa9e7f0bcd644dbaf2c43bde53d8dfe52d8bf4941b6f2930b30022d774 SHA512 357c8e18353dea4fbf5c73d5948dc81c5ed620e3e43503b62efa6367c13d9807f9c3e6790918c02b968864eabaad12b4f1001f69d2f4cffd4845b40cbb7f2a4d
 DIST kitinerary-19.12.2.tar.xz 1182776 BLAKE2B 3061207d02ee65bcf5f9232c1c6cac8302e7f5f0a598e2515b354f8d3da41edc4af9ac39a330d54e87cfd780d7c28ae1efd7426120a43f95b02ec9ad5fcac987 SHA512 09795bc36aadef228c1e2139dce3b09af18682d941b32a035e903942a2f1e2bf6db4aefef9d854a9cb11f5cab3aa3ec6a9b22b1d7b838d2fcbdc56da1872ec90
 EBUILD kitinerary-19.08.3.ebuild 1021 BLAKE2B 4ce8e8a9005769a0acefba2d3ff62de3b3005c90400af0014e3ac90eefc7d1baa8120c517f606982dbe2542f9c6afd7c2dc1f9a51fedd7e7a536f85aae93decd SHA512 536bce33249772c00f4a332ff1a7b9e532de7ca566193d3595887c73ee2dd8e47faae0b0d499f28243c6ce52b4e46fb76dec306dcaf9f14aebf12dee4232f38b
-EBUILD kitinerary-19.12.2.ebuild 1031 BLAKE2B b50987b4c2c7e9ebb544a71200fce45beb0b8eaf66cb809bfd23168a725c800285ee3a3eafa99289ee950c695ebce0b9980aba3cd71f426282d1d9cd7634b8bd SHA512 b350f9bf610bca7948c014d9c35bb9ed7e41bad1a83240ec7c93155a04aef7580a0172d0a057402a08faee405c894acca5e49ca12bf04a56b63f03f7d273cc84
+EBUILD kitinerary-19.12.2.ebuild 978 BLAKE2B 7efbff2d75eae7c0c3dd70c696b57ddc03db530f5e51371d0cc1be7c2804552034ce1a166bf7b83e413aa5da644e142a83719fc7f619c97f06b1798a2973be47 SHA512 77ee2c51e0b25c62cf52ee954f885edda76bbc2f1c4fcd3470427fe028ae8851f0809eb9d91db0b82b832fe155e2701766b2c65926619ed7b1b0fa1886f88d02
 MISC metadata.xml 385 BLAKE2B 3831c360aacb09127cbaf52b779ff5b17708424dcbdc59d3c40739cae4742c9d22a95222aae7cbf188e74ddffd22ac58275440ede013b6c18c2f6b8a148bde5f SHA512 3bca0a73900f8dbdd9baf83b3e108d73e074d5713abfbfb5d4ec2923104096f516f409501e05fe9c42c59a949eac333d36ecb1e31b370a2810d7eeec515e86b5
diff --git a/kde-apps/kitinerary/kitinerary-19.12.2.ebuild b/kde-apps/kitinerary/kitinerary-19.12.2.ebuild
index 1cdaeded5a55..e5354f4b32fc 100644
--- a/kde-apps/kitinerary/kitinerary-19.12.2.ebuild
+++ b/kde-apps/kitinerary/kitinerary-19.12.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
 LICENSE="LGPL-2.1+"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+barcode pdf"
+IUSE="+barcode"
 
 DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5
@@ -27,9 +27,9 @@ DEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-apps/kmime-${PVCUT}:5
 	>=kde-apps/kpkpass-${PVCUT}:5
+	app-text/poppler:=[qt5]
 	sys-libs/zlib
 	barcode? ( media-libs/zxing-cpp )
-	pdf? ( app-text/poppler:=[qt5] )
 "
 RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-addons-18.07.80
@@ -38,7 +38,6 @@ RDEPEND="${DEPEND}
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package barcode ZXing)
-		$(cmake_use_find_package pdf Poppler)
 	)
 	ecm_src_configure
 }
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index f26b4eec41a2..6f565686bc42 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,5 +1,5 @@
 DIST konqueror-19.08.3.tar.xz 7604888 BLAKE2B c66ebcdaffc0b3e502ce4b9bdd981cfd732d37dc7973f6f4f48b5a2a3ced98f55e9c14af699599d4dbb22d398999b899e89adbed72106fd2b8612e93cc682baa SHA512 ea2416fdcc102b41302635964983bf27945e49d53b237479f1cbe7d81a781671884c4e020295dc92d84e2eb14e7a503d0f994ba509eaf4372b8f2c63ae450728
 DIST konqueror-19.12.2.tar.xz 7379568 BLAKE2B 2e5c28283db111abc7c2a1306ab409a5bc2d2159b455d80ec189e5d0b06652f35a9a3a725b4c099b4ede0cad6c086efd5b20da1dde8f2eaba0e0b8694f64d590 SHA512 fc65280ade68db9d6e6156059d4c0f88a1f0f4c7866b88149aae7f90812f553bb9b8c9525495d692261e27ea90af50ab73bd45ea96a829f80bd339b97339d9f7
-EBUILD konqueror-19.08.3.ebuild 3297 BLAKE2B f2c50fb3e8fbbb33220d2a0fca19acb618e6a94d6703ff6f1e3fbab936fa96b7da854cee5d822da43d52cd9d101f8db13640e461985bc415d200651e95dc75c0 SHA512 1d00c84028b43257390284500aeb7cc01f9b223987d047cf64a64d302c59e5c7c681383b77a0390ec944beac76ac6b34e4927ee1cff7792299c3199059a31148
+EBUILD konqueror-19.08.3-r1.ebuild 3019 BLAKE2B 2214dd9e22a63e4d84ed917bf7fdd0921cdd908868ac05295074a9b2a65794fd60065198a481b9921adf185f66b733a3e6bc69895ab10e9bb7d7e455eaceca14 SHA512 92c5135becdee85a15430363a7e4a594e9ab46546c2bd7a5912503acf7054afed578c920060d4fb162aa8fe95e97030f84191eb24cf359d22e3ad5c82e1d87ec
 EBUILD konqueror-19.12.2.ebuild 2945 BLAKE2B e585447b9a2aa5f5cba26e444e3738b8cd360e4eeb45cdd21edf42b54e7a3ab7f4b266227c80093587222d59afa42b4eb75f4713da1796d27fcc320804375a24 SHA512 0ff6acc982116d3f2f162037bd1cae6aa61ac8b20b66e0d7c31220004f9f92ac8a37b3ab1b16c3b480f06cc8e99079d2e9b8beb819adb01655b320dff287d655
-MISC metadata.xml 518 BLAKE2B 4b7859d0edb6e15cf4b14e7d7092ab3cf48214f6895bef94476920440a072aa1dce619bb9e1ba6c0f848fb261faa08f1ec425e39dfd734238648274ed91157a8 SHA512 675012d4e94393e9bec06325f0551253dd70a26f4328b37403170dd6f705fb33bc2ae87c63dbd5c659827619b22038fa3921112ec7643c775302681e3573c0d2
+MISC metadata.xml 381 BLAKE2B 79667410a7131e11432baf95c334232a6ced7438359477f6cace5f70ca28a9bb8b4e9d43c251c87614fa049a91e50b0dc7cd3b92a148d551abc84e5cfc2f63a9 SHA512 09ff944d639b46cc6f203db77821ac0c063ba08102d94c751f887a84f6daff3569a6665d7ba58c2cab32ee58454e3acb8742cc2843152c98ec355cd0af648955
diff --git a/kde-apps/konqueror/konqueror-19.08.3.ebuild b/kde-apps/konqueror/konqueror-19.08.3-r1.ebuild
index fbf41c362937..bc0d8af44d4e 100644
--- a/kde-apps/konqueror/konqueror-19.08.3.ebuild
+++ b/kde-apps/konqueror/konqueror-19.08.3-r1.ebuild
@@ -1,30 +1,32 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
 ECM_TEST="true"
-VIRTUALX_REQUIRED="test"
-PVCUT=$(ver_cut 1-3)
 KFMIN=5.60.0
-PLASMA_MINIMAL=5.16.5
 QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
 inherit flag-o-matic ecm kde.org
 
 DESCRIPTION="Web browser and file manager based on KDE Frameworks"
-HOMEPAGE="
-	https://kde.org/applications/internet/konqueror/
-	https://konqueror.org/
-"
+HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror"
+
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="amd64 arm64 x86"
-IUSE="activities speech tidy +webengine X"
+IUSE="activities speech tidy X"
+
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT+=" test"
 
 COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-frameworks/karchive-${KFMIN}:5
 	>=kde-frameworks/kbookmarks-${KFMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
@@ -50,33 +52,22 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
 	sys-libs/zlib
 	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
 	tidy? ( app-text/tidy-html5 )
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
 	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 "
 RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kfind-${PVCUT}:5
-	>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
-	!webengine? ( kde-misc/kwebkitpart:5 )
+	kde-apps/kfind:5
+	kde-plasma/kde-cli-tools:5
 "
 
 src_prepare() {
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
-	if ! use webengine; then
-		ecm_punt_bogus_dep Qt5 WebEngineWidgets
-		cmake_comment_add_subdirectory webenginepart
-	fi
-
 	ecm_src_prepare
 }
 
diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml
index 462e8ca3746b..a198affb5420 100644
--- a/kde-apps/konqueror/metadata.xml
+++ b/kde-apps/konqueror/metadata.xml
@@ -8,6 +8,5 @@
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
 		<flag name="speech">Build text-to-speech plugin</flag>
-		<flag name="webengine">Enable <pkg>dev-qt/qtwebengine</pkg> as web browser engine (fallback is <pkg>kde-misc/kwebkitpart</pkg>)</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 08c8d001c8d0..70675e01c101 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,5 +1,7 @@
+AUX konsole-19.12.2-darkbackground-detect.patch 823 BLAKE2B 8b28b3823c2b42b9cc511c7535efc539ad869216374fb89c7a8ee17df460fbcae5fc0ca556d63cb2c39a248947aca2fcb6c49100c53985c0af032ad8a20f606a SHA512 e2a91949ff80579a50c3e16d83d493f42258cf889e443dde464f23f158428157a9b049d7bf684acf5914436dcef12b664516d8d9fd76ccf2f66d138dc0aec3dc
 DIST konsole-19.08.3.tar.xz 1147832 BLAKE2B 65d781a3a571b2c80d496c5885d517c9df89623858ce0fb6954d05eabc497add8fcc546b7994413d93de613877e30edc7bcb4944a1d95fc2c443c66d95bc0510 SHA512 140a34b8f73786557b71ac5b23b500950c598ef88795e660c7fde3077c9f5d842ae1eed73966eb14dfb54d2833fa63c310fa2cb340a81c30f31fdd77e9f263dc
 DIST konsole-19.12.2.tar.xz 1159780 BLAKE2B 6a95ac5a37f25c7ec6387ff51e9c2318bc9bf9a9460c00c646e85febca1405e26a4ebbd8ed665e759c7a8fc5357792c881fd106b3d0cccf0443d341dd4c87809 SHA512 90d0bcf53a6721fb9bc7391be961cd6ed83fdb4c6ad1517fcaf1685e0aa2c9d4a3a7755c8036b6e54f35fa087dc13d4effb076c8218e7be5c9e13da63e12b9f9
 EBUILD konsole-19.08.3.ebuild 1658 BLAKE2B 79664a72d7097627ac2835d6ea2f99e0be07f52d27e438ba3e71419b038b4625acad2f3de7ddfb0e472796a121ae2c3baa6caea9d8735b75f1cb326f229b339e SHA512 4b5476bcb5820c7538d74631d649b37b37778826641cd1397436adc29fcfb93d4b6d16998cf746e77ab986dbc5a864915f6c87626323ef604d4e38306a399d99
+EBUILD konsole-19.12.2-r1.ebuild 1736 BLAKE2B 0a71aed7c39a38cf58149aa988e98f73191d41924496edc09f1dd9b5c8fa1c3e81b7f22c63b3a2d7675cb6da934c16183e5fd884bd8bc66ba87d0af914472edf SHA512 6e7e0e182a3abd8483302b084caf3a50239cdc12fe5964a07cccb319161e12e0c1599494aa106b2f18b99d6bd15bd59faf2e40e5ff58bf524c7f4bad1275cf0d
 EBUILD konsole-19.12.2.ebuild 1676 BLAKE2B 4114e448725d354e26a05aa54b8a9c3586b20c11d996aac6223c83ada475fc938da8f732705aec41995af58c59692a495723c4d63cb2641e8708b2fad21f635e SHA512 348a05e040e0c8024d01e523d53e395e7175779311324ec892f7e3cdc90e95f52d10e0633d117d3b67c24475009ebe1014695f5d0b94a47d9a4e09aff284d1da
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/files/konsole-19.12.2-darkbackground-detect.patch b/kde-apps/konsole/files/konsole-19.12.2-darkbackground-detect.patch
new file mode 100644
index 000000000000..990bad142c3d
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-19.12.2-darkbackground-detect.patch
@@ -0,0 +1,27 @@
+From e5b2ada1a6f06e0eea76af1f26ff4c0c4aad8497 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
+Date: Thu, 23 Jan 2020 11:00:06 +0100
+Subject: ColorScheme: Fix DarkBackground Detection
+
+Luminance is a value between 0 and 100.
+
+https://bugs.kde.org/show_bug.cgi?id=416638
+---
+ src/ColorScheme.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ColorScheme.cpp b/src/ColorScheme.cpp
+index 1693c22..5d6b408 100644
+--- a/src/ColorScheme.cpp
++++ b/src/ColorScheme.cpp
+@@ -403,7 +403,7 @@ bool ColorScheme::hasDarkBackground() const
+     const double g = backgroundColor().greenF();
+     const double b = backgroundColor().blueF();
+     rgb2hsluv(r, g, b, &h, &s, &l);
+-    return l < 0.5;
++    return l < 50;
+ }
+ 
+ void ColorScheme::setOpacity(qreal opacity)
+-- 
+cgit v1.1
diff --git a/kde-apps/konsole/konsole-19.12.2-r1.ebuild b/kde-apps/konsole/konsole-19.12.2-r1.ebuild
new file mode 100644
index 000000000000..3e45534a5d5a
--- /dev/null
+++ b/kde-apps/konsole/konsole-19.12.2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://kde.org/applications/system/org.kde.konsole
+https://konsole.kde.org"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+DEPEND="
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kpty-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-darkbackground-detect.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 23a79340def2..dd81be511fcc 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,5 +1,5 @@
 DIST umbrello-19.08.3.tar.xz 3703784 BLAKE2B e992ef076f96da5599fe4315c4b6d8dc948485bf0bd2b14878e481c49fa4fe76087606f58268503dc401e817047d60ee52c27fa90749e28767bf7c4af70b4565 SHA512 1db25788a60e2a639c649a4d01809751b85a122426bdaedbebf6e6cce539b2b0f37893a8a61675df81517d7fe3e57a59377e49fd11e7ceebea5980372e284c9a
 DIST umbrello-19.12.2.tar.xz 3794060 BLAKE2B 831f7a7da672d70c3cf326d588d42e6df028e4c096e4b7be1df89f99e535c56ae117b4a5cbb5cd5719a5273d369092101d1394d0ac629d24e1a35a18fac7025a SHA512 85f3fda1d1f075aaf747265e377fd064e26ffb813fb92ec9157dfebfc5e3ba0e27f28ad1a879083db14f49908d6af688c747b24572705778538adab74d25fde3
 EBUILD umbrello-19.08.3.ebuild 1514 BLAKE2B a5eea2db0fe2cde1895fa17a43dd1af3c246e10b429bf32efc2be1e6fbb721f9438bfc7992bdb3a7bf3584e7dba6abac8009ba7b5981644522b60f1b2d864d82 SHA512 72074ce2dc5f92ea7108f2518882a131c29c400f8c799cef577cc956fea01933d39ac0c16594b7fb069cb8fabe222f1b0db38fe9ed8c854df16ef5f9057c4139
-EBUILD umbrello-19.12.2.ebuild 1522 BLAKE2B 8e5042930a28e6e737cf29002e11ef59a1235d63b66d7b93373ca07d114ecb8b75e9e3b83b56f1ca07dc1ec248e2b5094f0886fe388a0b66a112ee60863d5a43 SHA512 0ab6ea8e34fed4a6f87a4c13ce95668576ba23c8aafcf8d85d432374a4600bd4335e4c1b00bde014de91fa944c9b53f734e25e207efd1cecd8a6817b83e0415c
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+EBUILD umbrello-19.12.2-r1.ebuild 1618 BLAKE2B 51f52a9a4478cada78d9966501aa4462f0e2f2f266a3aef4f8e7ad292d63fd9386b9102d44fd0aca4d69716e33af9325c9c65c55e42b5f06e2e35749b86bd812 SHA512 576d8c46f9c298915cd3f446199d4ef9e4814cc9ea696e8d6345e326aae6c71c353e7298d1deed196592d83740bfa58bca6effed1c50fd46c4948a419a73a9bb
+MISC metadata.xml 390 BLAKE2B c631566eb3c7fa8c1826b91e33c209ac431b66508b21e457166e291d15cdd6c5ca45203f148f011926625fb1a1daea875b696c2b7088b5d568e7292c63e74ac1 SHA512 cfce84a2844d675cbfd3a9546b1f95bc2aec863f2bef680d8c6fa8ef2323614d7e678e3ab411ed33d0b072e3820d44ef1e343d3570c4ebb0fd8e492dd82e4813
diff --git a/kde-apps/umbrello/metadata.xml b/kde-apps/umbrello/metadata.xml
index 2fdbf33d963d..c81c6f761d85 100644
--- a/kde-apps/umbrello/metadata.xml
+++ b/kde-apps/umbrello/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="php">Enable PHP import support using <pkg>dev-util/kdevelop</pkg> and <pkg>dev-util/kdevelop-pg-qt</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-apps/umbrello/umbrello-19.12.2.ebuild b/kde-apps/umbrello/umbrello-19.12.2-r1.ebuild
index 2d66709a4099..ee8fa5a72c4c 100644
--- a/kde-apps/umbrello/umbrello-19.12.2.ebuild
+++ b/kde-apps/umbrello/umbrello-19.12.2-r1.ebuild
@@ -17,7 +17,7 @@ https://umbrello.kde.org"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
+IUSE="php"
 
 RDEPEND="
 	>=kde-frameworks/karchive-${KFMIN}:5
@@ -43,6 +43,10 @@ RDEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
 	>=dev-qt/qtwebkit-5.212.0_pre20180120:5
+	php? (
+		dev-util/kdevelop:5=
+		dev-util/kdevelop-pg-qt
+	)
 "
 DEPEND="${RDEPEND}
 	>=kde-frameworks/kdelibs4support-${KFMIN}:5
@@ -51,6 +55,7 @@ DEPEND="${RDEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_KF5=ON
+		-DBUILD_PHP_IMPORT=$(usex php)
 		-DBUILD_unittests=$(usex test)
 	)
 	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON )