gentoo resync : 25.11.2020

7 files changed, 277 insertions, 84 deletions

diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 69eb25fb515a..fbcb2365555a 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,5 +1,7 @@
-DIST umbrello-20.04.3.tar.xz 5546160 BLAKE2B 4ca97a12b066235f8910a1fb91cebe809a6a621f60fa6b988fa90e77970ed21a4dc958d08a425431bd947cff6b9142b53310aacdc7e4e4122ea3fe48b7723594 SHA512 dd85330578a8c9a9568ce40758d76848fee76fa4ac16a44faeeb064480910038d734876ef9e2475e01e75a13f3d0b8d444fbf78542c9648ee6a8f59b4dc9b83c
-DIST umbrello-20.08.1.tar.xz 5554240 BLAKE2B fe5263b7f4c8af15b185152c9a2ed74abe85d9d2690ed44fcbac70f658649176a816b85d5a5c3f3cf3d7a0fc4ed4629d8f0957f751d20e01d670598a4abcdef8 SHA512 42ddc364bcccee88cd210183148e0a246c0efd2ebe2c5bca0a77260e772738ef0d74d8745133d45daa94e839cf3fe6ac46e65fced23cd8382cc7218689259710
-EBUILD umbrello-20.04.3.ebuild 1847 BLAKE2B be0828b9e4f54b28d2f3f7c5b2fdfdb917a806502899e9cdb67138172a085308a36f530d13e096f8341368db0a6a5b3557a7a5d25a71988f97a497da9658b7ca SHA512 e743685f52434521e544434a571e352457259525d77a12fefe3bab859975dd369a300c12c9dfea3f531e4b59d79b3e208cd27b6e74dab69762cfa10842cf4b00
-EBUILD umbrello-20.08.1.ebuild 1850 BLAKE2B 999fd4b8adcd0674580f89489093339d848e49c82fe2d8f10e381451e2db9d59574e07d8580a45e5fc994c61f53b616e933c0fc163fc7dbf1fc701fb099aa36a SHA512 9c06285fec37147376b74d16f8bce1d76dfeeccba81aaa5509c00da40d4bdb5185b0f725f1d0c292d5106a56b821d9fcc5b46b5049168a4a1b2f586a5d872dfe
+AUX umbrello-20.08.3-gentoo-docbundledir.patch 1990 BLAKE2B c629fa51a4d701576e2c5bc870d8368851773687b93309a02986f2cd3140089c435a2964edafd1be930796906295bc8ef1477ba8c9837f560f986ed07ae19358 SHA512 9635b33d0aa612eebbbed37f82812b5f1ea8edcc6bfd0a8749e667cbc718d3ed56568397a6db43838a84f04085682dcd5c3a8a272b92bd9ee9a84de30a2f2d40
+AUX umbrello-20.08.3-no-qtwebkit.patch 3168 BLAKE2B f3908ac2755b70b611182b9b92bf8d08124d11bc0bc690d2c49bb40fd498ab9a0cdb55b0dbac54d0a355c322ac65ba611c48d4a11a27d498ede1f3f3f251ca43 SHA512 6437226d9d3970f6ac8e9b0a53546470e2235021a3e1d4d3339202ba1107259f26ef817760635f40a4cf3ff581f301f49a665c22ef1f070236885ef25bfb24a0
+AUX umbrello-20.08.3-unbundle-kdevelop-php.patch 2791 BLAKE2B 45720ff9807504dfe85c23bf3a5db57212d77e8f6dfec3fc3fe7c99cab656ddf27c40fcae6853ce43282bf499a0b0418c73028a86aa55186188123630a4b594e SHA512 504fc9bffd1b5ebeb9c65349027de25bf0f54fe9e85a4a145784464a4b463a1082f67e5561d156e9a96715330c5d8a414d8e20f3e6d3d1b52097a2ddf9705010
+AUX umbrello-20.08.3-unused-qtwebkit.patch 900 BLAKE2B 6457e81527e8fad652bc9d41f190806c5aae0ac047975d7ecd0309190ece1ac10980179362dd0703822786da1c809535d14a9ecc9f164caba0b1e9ed2ee721b4 SHA512 1194a66b427fdbd85e50d8c658c150b06253f89f6aded75a627db7c259621496b0021ee18d792b528a28e8ce2e2782b9bd06e4c49f721761a10fff853e81164f
+DIST umbrello-20.08.3.tar.xz 5555108 BLAKE2B c8ccc39d43f061d78889776e6adc6d1a07a67608b8cbfc8c18e8f94a3d1608b3764c15d496538bb76db2672cd6bdfa8158b30a24f38f3c40e8b18dfe72262155 SHA512 541d637cd892f5b162fa88e3380c9ed4c9c175d5479bb1947b415b8fa59a419fd90eac2e47d939ec3d9b7b43b14fbf6777683f884b7ff10e7dee85eccb59f813
+EBUILD umbrello-20.08.3.ebuild 2045 BLAKE2B 17a42a5774c26b6dc11c52fb2abcc5586a6a375a56d65eaa5ff23b071cf84cb55763c8779c0b795c226ffd09d8ee5f494c1031087068f4918cc91c8a9580d3ba SHA512 c58721830bd401e991d61314f68b5b1241bae8b9d42cd368f649752f1b42efcbc8de925ce1e9af6ca9100940d6b3727e0bfaf7de86db6ed7a7ed89806fe3026e
 MISC metadata.xml 390 BLAKE2B c631566eb3c7fa8c1826b91e33c209ac431b66508b21e457166e291d15cdd6c5ca45203f148f011926625fb1a1daea875b696c2b7088b5d568e7292c63e74ac1 SHA512 cfce84a2844d675cbfd3a9546b1f95bc2aec863f2bef680d8c6fa8ef2323614d7e678e3ab411ed33d0b072e3820d44ef1e343d3570c4ebb0fd8e492dd82e4813
diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-gentoo-docbundledir.patch b/kde-apps/umbrello/files/umbrello-20.08.3-gentoo-docbundledir.patch
new file mode 100644
index 000000000000..e3915379be2a
--- /dev/null
+++ b/kde-apps/umbrello/files/umbrello-20.08.3-gentoo-docbundledir.patch
@@ -0,0 +1,41 @@
+From 29186bb3c1c3e4de89d77340db966c660789cdab Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 5 Nov 2020 14:39:51 +0100
+Subject: [PATCH] Fix hardcoded docbook install paths for Gentoo
+
+Gentoo sets KDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help".
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ umbrello/umlappprivate.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/umbrello/umlappprivate.cpp b/umbrello/umlappprivate.cpp
+index d8bae2cfe..8c1c58a02 100644
+--- a/umbrello/umlappprivate.cpp
++++ b/umbrello/umlappprivate.cpp
+@@ -36,17 +36,17 @@ QString UMLAppPrivate::findWelcomeFile()
+ 
+     // from custom install
+     foreach(const QString &lang, langList) {
+-        dirList.append(QCoreApplication::applicationDirPath() + QString(QLatin1String("/../share/doc/HTML/%1/umbrello/apphelp")).arg(lang));
++        dirList.append(QCoreApplication::applicationDirPath() + QString(QLatin1String("/../share/help/%1/umbrello/apphelp")).arg(lang));
+     }
+-    dirList.append(QCoreApplication::applicationDirPath() + QLatin1String("/../share/doc/HTML/en/umbrello/apphelp"));
++    dirList.append(QCoreApplication::applicationDirPath() + QLatin1String("/../share/help/en/umbrello/apphelp"));
+ 
+     QStringList locations = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
+     // from real installation
+     foreach(const QString &location, locations) {
+         foreach(const QString &lang, langList) {
+-            dirList.append(QString(QLatin1String("%1/doc/HTML/%2/umbrello/apphelp")).arg(location).arg(lang));
++            dirList.append(QString(QLatin1String("%1/help/%2/umbrello/apphelp")).arg(location).arg(lang));
+         }
+-        dirList.append(QString(QLatin1String("%1/doc/HTML/en/umbrello/apphelp")).arg(location));
++        dirList.append(QString(QLatin1String("%1/help/en/umbrello/apphelp")).arg(location));
+     }
+ #else
+     KLocale *local = KGlobal::locale();
+-- 
+2.29.2
+
diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch b/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch
new file mode 100644
index 000000000000..bf41c2d40980
--- /dev/null
+++ b/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch
@@ -0,0 +1,99 @@
+From eb753a7eb0f49c6ac5b349f81387ca4b4c64342b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 12 Oct 2020 11:46:24 +0200
+Subject: [PATCH] Make QtWebKit usage in WelcomePage optional, with
+ QTextBrowser fallback
+
+Thanks-to: Ralf Habacker <ralf.habacker@freenet.de> for QTextBrowser fallback code.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt                    |  7 ++++++-
+ umbrello/CMakeLists.txt           |  4 +++-
+ umbrello/umlappprivate.h          | 13 +++++++++++++
+ 3 files changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 398415f09..7144f0990 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -95,9 +95,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
+     Test
+     Widgets
+     Xml
+-    WebKitWidgets
+ )
+ 
++find_package(Qt5WebKitWidgets ${QT_MIN_VERSION})
++if(Qt5WebKitWidgets_FOUND)
++    add_definitions(-DWEBKIT_WELCOMEPAGE)
++    set(WEBKIT_WELCOMEPAGE 1)
++endif()
++
+ # search packages used by KDE
+ find_package(KF5 REQUIRED COMPONENTS
+     Archive
+diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt
+index 264b25fde..f3286ae46 100644
+--- a/umbrello/CMakeLists.txt
++++ b/umbrello/CMakeLists.txt
+@@ -549,7 +551,6 @@ else()
+         Qt5::Xml
+         Qt5::PrintSupport
+         Qt5::Svg
+-        Qt5::WebKitWidgets
+         KF5::Archive
+         KF5::Completion
+         KF5::CoreAddons
+@@ -565,6 +566,9 @@ else()
+         ${LIBXML2_LIBRARIES}
+         codeimport
+     )
++    if(WEBKIT_WELCOMEPAGE)
++        target_link_libraries(libumbrello Qt5::WebKitWidgets)
++    endif()
+     ecm_add_app_icon(umbrello_SRCS
+         ICONS
+         ${CMAKE_CURRENT_SOURCE_DIR}/pics/global/16-apps-umbrello.png
+diff --git a/umbrello/umlappprivate.h b/umbrello/umlappprivate.h
+index a85de1f22..a7212cc8d 100644
+--- a/umbrello/umlappprivate.h
++++ b/umbrello/umlappprivate.h
+@@ -42,7 +42,11 @@
+ #include <QFileInfo>
+ #include <QListWidget>
+ #include <QObject>
++#ifdef WEBKIT_WELCOMEPAGE
+ #include <QWebView>
++#else
++#include <QTextBrowser>
++#endif
+ 
+ class QWidget;
+ 
+@@ -160,6 +164,7 @@ public slots:
+         // qDebug() << html;
+         welcomeWindow = new QDockWidget(i18n("Welcome"), parent);
+         welcomeWindow->setObjectName(QLatin1String("WelcomeDock"));
++#ifdef WEBKIT_WELCOMEPAGE
+         QWebView *view = new QWebView;
+         view->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
+         view->setContextMenuPolicy(Qt::NoContextMenu);
+@@ -167,6 +172,14 @@ public slots:
+         view->setHtml(html);
+         view->show();
+         welcomeWindow->setWidget(view);
++#else
++        QTextBrowser *tb = new QTextBrowser(dynamic_cast<QWidget*>(this));
++        tb->setOpenExternalLinks(true);
++        tb->setOpenLinks(false);
++        tb->setHtml(html);
++        connect(tb, SIGNAL(anchorClicked(const QUrl)), this, SLOT(slotWelcomeWindowLinkClicked(const QUrl)));
++        welcomeWindow->setWidget(tb);
++#endif
+         parent->addDockWidget(Qt::RightDockWidgetArea, welcomeWindow);
+ 
+         viewWelcomeWindow = parent->actionCollection()->add<KToggleAction>(QLatin1String("view_show_welcome"));
+-- 
+2.29.2
+
diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch b/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch
new file mode 100644
index 000000000000..cce395a837ff
--- /dev/null
+++ b/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch
@@ -0,0 +1,92 @@
+From 57fef3b1d54959d5b719469c7c67e1d3e7be49dc Mon Sep 17 00:00:00 2001
+From: Ralf Habacker <ralf.habacker@freenet.de>
+Date: Fri, 30 Oct 2020 08:32:41 +0100
+Subject: [PATCH] Add support to use external KDevPHP packaga
+
+If no external development package has been found fallback to embedded
+version.
+
+This commit adds an additional optional dependency for the KDevPHP package, which
+named e.g. on openSUSE 'kdevelop5-plugin-php-devel'.
+
+BUG:428460
+FIXED-IN:2.32.80 (KDE releases 20.11.80)
+---
+ CMakeLists.txt                    | 20 ++++++++++++++------
+ umbrello/codeimport/phpimport.cpp | 19 +++++++++++--------
+ 2 files changed, 25 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 221c04e31..398415f09 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -129,18 +129,26 @@ if(KDEVPGQT_FOUND AND KDEVPLATFORM_FOUND)
+     include_directories(
+         ${KDEVPGQT_INCLUDE_DIR}
+         ${KDEVPLATFORM_INCLUDE_DIR}
+-        ${CMAKE_SOURCE_DIR}/${KDEV_SOURCE_DIR}/parser
+-        ${CMAKE_BINARY_DIR}/${KDEV_SOURCE_DIR}/parser
+     )
+-    set(NO_INSTALL 1)
+-    set(BUILD_PARSER_ONLY 1)
+     set(BUILD_PHP_IMPORT 1)
+     add_definitions(
+-        -DKDEVPHPPARSER_EXPORT=
+         -DENABLE_PHP_IMPORT
+     )
+     add_subdirectory(lib/kdevplatform)
+-    add_subdirectory(${KDEV_SOURCE_DIR})
++    find_package(KDevPHP)
++    if(NOT KDevPHP_FOUND)
++        set(NO_INSTALL 1)
++        set(BUILD_PARSER_ONLY 1)
++        set(BUILD_PHP_IMPORT 1)
++        add_definitions(
++            -DKDEVPHPPARSER_EXPORT=
++        )
++        include_directories(
++            ${CMAKE_SOURCE_DIR}/${KDEV_SOURCE_DIR}
++            ${CMAKE_BINARY_DIR}/${KDEV_SOURCE_DIR}
++        )
++        add_subdirectory(${KDEV_SOURCE_DIR})
++    endif()
+ else()
+     set(BUILD_PHP_IMPORT 0)
+ endif()
+diff --git a/umbrello/codeimport/phpimport.cpp b/umbrello/codeimport/phpimport.cpp
+index f45f1416f..f714dcbad 100644
+--- a/umbrello/codeimport/phpimport.cpp
++++ b/umbrello/codeimport/phpimport.cpp
+@@ -39,18 +39,21 @@ QTextStream qout(stdout);
+ QTextStream qerr(stderr);
+ QTextStream qin(stdin);
+ 
+-#include "parsesession.h"
+-#include "phplexer.h"
+-#include "phpparser.h"
+-#include "phpdebugvisitor.h"
+-#include "phpast.h"
+-#include "tokenstream.h"
+-#include "phptokentext.h"
+-
++// kdevphp
++#include <parser/parsesession.h>
++#include <parser/phplexer.h>
++#include <parser/phpparser.h>
++#include <parser/phpdebugvisitor.h>
++#include <parser/phpast.h>
++#include <parser/tokenstream.h>
++#include <parser/phptokentext.h>
++
++// kdevplatform
+ #include <tests/autotestshell.h>
+ #include <language/duchain/duchain.h>
+ #include <language/duchain/problem.h>
+ #include <language/codegen/coderepresentation.h>
++#include <language/editor/documentrange.h>
+ #include <tests/testcore.h>
+ 
+ namespace Php {
+-- 
+GitLab
+
diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-unused-qtwebkit.patch b/kde-apps/umbrello/files/umbrello-20.08.3-unused-qtwebkit.patch
new file mode 100644
index 000000000000..bb1fde2878e6
--- /dev/null
+++ b/kde-apps/umbrello/files/umbrello-20.08.3-unused-qtwebkit.patch
@@ -0,0 +1,25 @@
+From 5263f4e391c50c72e000da6c2bcf1123c28192e5 Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
+Date: Wed, 21 Jun 2017 14:05:28 +0200
+Subject: [PATCH] Remove finding WebKitWidgets, not used
+
+---
+ lib/kdev5-php/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/kdev5-php/CMakeLists.txt b/lib/kdev5-php/CMakeLists.txt
+index 2a40b48ae..6ef58b0c9 100644
+--- a/lib/kdev5-php/CMakeLists.txt
++++ b/lib/kdev5-php/CMakeLists.txt
+@@ -28,7 +28,7 @@ include(KDECMakeSettings)
+ include(GenerateExportHeader)
+ include(FeatureSummary)
+ 
+-find_package(Qt5 REQUIRED Core Widgets Test WebKitWidgets)
++find_package(Qt5 REQUIRED Core Widgets Test)
+ find_package(KF5 REQUIRED COMPONENTS Archive ThreadWeaver TextEditor I18n ItemModels KCMUtils)
+ find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED)
+ find_package(KDevelop-PG-Qt REQUIRED)
+-- 
+2.28.0
+
diff --git a/kde-apps/umbrello/umbrello-20.08.1.ebuild b/kde-apps/umbrello/umbrello-20.08.1.ebuild
deleted file mode 100644
index 574a19707ac2..000000000000
--- a/kde-apps/umbrello/umbrello-20.08.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_QTHELP="false" # TODO: figure out install error
-ECM_TEST="forceoptional"
-KFMIN=5.72.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE UML Modeller"
-HOMEPAGE="https://kde.org/applications/development/org.kde.umbrello
-https://umbrello.kde.org"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="php"
-
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${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/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	php? (
-		dev-util/kdevelop:5=
-		dev-util/kdevelop-pg-qt
-	)
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON # broken, re-enable w/ ECM_QTHELP
-		-DBUILD_APIDOC=OFF
-		-DBUILD_KF5=ON
-		-DBUILD_PHP_IMPORT=$(usex php)
-		-DBUILD_unittests=$(usex test)
-	)
-	use test && mycmakeargs+=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Clang=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_CLANG=ON
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/umbrello/umbrello-20.04.3.ebuild b/kde-apps/umbrello/umbrello-20.08.3.ebuild
index 5276fc179934..ac0fd86af5da 100644
--- a/kde-apps/umbrello/umbrello-20.04.3.ebuild
+++ b/kde-apps/umbrello/umbrello-20.08.3.ebuild
@@ -6,14 +6,13 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_QTHELP="false" # TODO: figure out install error
 ECM_TEST="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="KDE UML Modeller"
-HOMEPAGE="https://kde.org/applications/development/org.kde.umbrello
-https://umbrello.kde.org"
+HOMEPAGE="https://apps.kde.org/en/umbrello https://umbrello.kde.org"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
@@ -26,7 +25,6 @@ RDEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtprintsupport-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwebkit-5.212.0_pre20180120:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-frameworks/karchive-${KFMIN}:5
@@ -35,6 +33,7 @@ RDEPEND="
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
@@ -46,16 +45,22 @@ RDEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	php? (
 		dev-util/kdevelop:5=
-		dev-util/kdevelop-pg-qt
+		dev-util/kdevelop-pg-qt:5
+		dev-util/kdevelop-php:5
 	)
 "
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-{no,unused}-qtwebkit.patch
+	"${FILESDIR}"/${P}-gentoo-docbundledir.patch # downstream fix hardcoded path
+	"${FILESDIR}"/${P}-unbundle-kdevelop-php.patch
+)
 
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON # broken, re-enable w/ ECM_QTHELP
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
 		-DBUILD_APIDOC=OFF
 		-DBUILD_KF5=ON
 		-DBUILD_PHP_IMPORT=$(usex php)