gentoo resync : 03.11.2019

4 files changed, 11 insertions, 34 deletions

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index f5b53fca1759..921d6ad224e2 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,6 +1,5 @@
-AUX kdevelop-5.3.3-missing-header.patch 752 BLAKE2B 1932cc385d7de6f45160215e243e978248dd07abfcf6b4ff162b4cc056713d40c6f80b84b2582cd0600100444e006b0b378bba8d93d3190d5d28a010e982d227 SHA512 d511f6d393c5189fdd2e980f8ad1be96e8b6ce7d19e4f51bf8a85ce79d9bdbe1a0e9f8bcd5ca8609b907344bcaded083851a1bd5ed1fe96782091d94d6df89d0
-DIST kdevelop-5.3.3.tar.xz 6977420 BLAKE2B 8cccce2b7473551dc4ee9b9b06e8777e7f98869870ed7ee797b0e3a7c27f68d75b7af0f030dc9b0302a44ff246f69ec9125994cd72e6020e2778ac55f6d593fb SHA512 a089763045f02ef3167fab1f663503cc7a6e29cd8a42d3caa8b3a71fc1b2150162504bf4404ea070f73b3786a7389b6ee5af9ff922515445b57a0041b07e7d5d
 DIST kdevelop-5.4.2.tar.xz 7006096 BLAKE2B 105f7377e960f6012e9e976a14475b67e15038cb376c6ec499ef33f17c59ff1e068866deafb24aa1392bf0a3c833cdffeac122262dd38dc45eeca8fea69f0df8 SHA512 de25d70f2e82f61ef95ce2c6289146c52c368e93a3d23b17a2b95d14e64b599b64af32c2de2501c236f2954d981709c168fecddb4dbcf5425014d6a6e938d53b
-EBUILD kdevelop-5.3.3.ebuild 3796 BLAKE2B f0dd1488afb9408bcf6f44f1dcb0c948ad69e2f6c89e2328a9fc00c43295acef256d1d9527a0e576d8141ad32d99502e26944dd1d2d4942b1753e404b2a38455 SHA512 98fbd77a30b1e1623116c36f0098527126119cf27e982ea02c3bc9d4cd1e9a344eeb8e01853ce4cb9fb468dcf087ffa92b6c15afec38eecadb6385aefe9a24dc
-EBUILD kdevelop-5.4.2.ebuild 3866 BLAKE2B b23ea12b86f92c955f5fb3f7f716cf3a5ac1546eee6a94aaa201ef5cea3020359e4db7c9f07169954bbe45a4312527f1d7d87339f54ac05bd5d5ca4e95369feb SHA512 fcbc57247d26f97a2e5032cc66052e8e34864fee77db9b7e8f21cc68395c485a601207c7f45aa2130f50537ceb21abe5d6ca79e856a4f4895bf782162a864d0d
+DIST kdevelop-5.4.3.tar.xz 7010496 BLAKE2B 2f6aa0073321ad1e6c6eb905879c628717927957e60c26b353b691560438afdbd42c7803c227e8de8ada0fca6da38ef02664afa0fc3e9d372d53b2d879b64665 SHA512 f21f282ca772fea6a4bf8f000ddd71386c98c17956c151d71b824a5a9b30223530015e3a73979856580dc318caa9da7bae6b3cf914ffa8aa7ea56cacded1c524
+EBUILD kdevelop-5.4.2.ebuild 3864 BLAKE2B fbba8860992a4f9835e3265f87158b596c900a46439b4e548dfca78d32f81efb27911e7b917ea91acc9d46d457af3808dfde351ef21694e4eb05cab59a930096 SHA512 825ef6759a5b84447102204e3882762d2cb0d3a3bd0e189b0eff56c65f416c628ae739d07919e08cc0bcc3c78c304a69c2fb422e5d8df339bf9aff65b35b151b
+EBUILD kdevelop-5.4.3.ebuild 3866 BLAKE2B b23ea12b86f92c955f5fb3f7f716cf3a5ac1546eee6a94aaa201ef5cea3020359e4db7c9f07169954bbe45a4312527f1d7d87339f54ac05bd5d5ca4e95369feb SHA512 fcbc57247d26f97a2e5032cc66052e8e34864fee77db9b7e8f21cc68395c485a601207c7f45aa2130f50537ceb21abe5d6ca79e856a4f4895bf782162a864d0d
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/files/kdevelop-5.3.3-missing-header.patch b/dev-util/kdevelop/files/kdevelop-5.3.3-missing-header.patch
deleted file mode 100644
index 39b1122f7189..000000000000
--- a/dev-util/kdevelop/files/kdevelop-5.3.3-missing-header.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 125259eab4ddc525e816a9479d93038bffb73353 Mon Sep 17 00:00:00 2001
-From: Tomaz Canabrava <tcanabrava@kde.org>
-Date: Thu, 18 Jul 2019 18:07:39 +0200
-Subject: Add missing include
-
-(cherry picked from commit 8a3d8936fc4fce7eee1bcd62c0eb473ef908268d)
----
- kdevplatform/shell/mainwindow_p.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kdevplatform/shell/mainwindow_p.h b/kdevplatform/shell/mainwindow_p.h
-index 3020957..1e915a0 100644
---- a/kdevplatform/shell/mainwindow_p.h
-+++ b/kdevplatform/shell/mainwindow_p.h
-@@ -25,7 +25,7 @@ Boston, MA 02110-1301, USA.
- #include <QObject>
- #include <QPointer>
- #include <QWidget>
--
-+#include <QMap>
- #include <KXMLGUIClient>
- 
- #include <language/util/navigationtooltip.h>
--- 
-cgit v1.1
diff --git a/dev-util/kdevelop/kdevelop-5.4.2.ebuild b/dev-util/kdevelop/kdevelop-5.4.2.ebuild
index 5ed1e8f93f5d..4fe926d9971e 100644
--- a/dev-util/kdevelop/kdevelop-5.4.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.4.2.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
diff --git a/dev-util/kdevelop/kdevelop-5.3.3.ebuild b/dev-util/kdevelop/kdevelop-5.4.3.ebuild
index 0e818dc362fa..5ed1e8f93f5d 100644
--- a/dev-util/kdevelop/kdevelop-5.3.3.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.4.3.ebuild
@@ -10,13 +10,14 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
 HOMEPAGE="https://www.kdevelop.org/"
+
 LICENSE="GPL-2 LGPL-2"
+SLOT="5/54" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
 IUSE="+gdbui hex +plasma +qmake reviewboard subversion webkit"
 
 COMMON_DEPEND="
@@ -59,6 +60,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	dev-libs/grantlee:5
+	>=dev-util/astyle-3.1:=
 	>=sys-devel/clang-3.8.0:=
 	gdbui? ( $(add_plasma_dep libksysguard) )
 	hex? ( app-editors/okteta:5 )
@@ -84,17 +86,18 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep kapptemplate)
 	$(add_kdeapps_dep kio-extras)
 	$(add_qt_dep qdbus)
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtquickcontrols2)
 	dev-util/ninja
 	>=sys-devel/gdb-7.0[python]
 	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
+	!dev-util/kdevelop-clang-tidy
 	!dev-util/kdevplatform
 "
 
 RESTRICT+=" test"
 # see bug 366471
 
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package gdbui KF5SysGuard)