gentoo resync : 19.03.2019

4 files changed, 10 insertions, 170 deletions

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 5ab2a1d39099..2d7b47067da1 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,7 +1,5 @@
-AUX kdevelop-5.3.1-typo-in-QtCreator-theme.patch 931 BLAKE2B bb06c705213d6d714cab9bffe93e61d1809cbe8f2a5bc4a35bdf5f4563bab69ac1420382f7cf41cbe766d3c37d8ab729ddd2ff2364660fdab9937e1af4e47c66 SHA512 84738c0cdad91c2596e20e894ef8ab201dc1f38c9647ac3c7a7965b5efb6f41ebcc978101c54383d43990a491bc5895d8829ead0848ce613a3a9aacaafa12c75
 DIST kdevelop-5.2.4.tar.xz 6647172 BLAKE2B c3dc301cf16bdef95000aa6cb3ebe615054f49ad29bc67870c31d329cf7bd4df81dad330eb26dd28c19627b2040f62522d755afa4450bb125872350d1f8039e1 SHA512 1c64b4f56452e8c926c5bcea5a9d8368fa62926d1ec507d289d8cb47275d478898d56fdf083fc24e291aaf4738cc5b7ddfd239e6993848e862bc4d83e270558b
-DIST kdevelop-5.3.1.tar.xz 6671416 BLAKE2B ac09bb2f9254279af662d472ddc712e09892509a7eae0dc0df8fa7fc1b36ec0b90c381503699f7844141cef644e33d70c8a3ca77267958e46bc56fe55f4c5c2c SHA512 3b8c9d839a0fab48a2ecb63cb3dddb96c096c6d244f95baaefcbeca5beb91557769773da367a02f1ad8bd33ec44d14157a988989576062894a081a4073928a0a
+DIST kdevelop-5.3.2.tar.xz 6851944 BLAKE2B b918cd0cb9b915227a442641a110db27387fd2e946c0411e40206a4a68990a9268a6c47c7f1da8a8f8a5c2690a1577c75fbbbb353d69ddfeed419e2c561aac4a SHA512 f0a8354a596a13dab0c5560d8308097918f5540b02d9a66a63155af00aa024aae9c01b455290ecafe705784a9c25afd24f7d936d1f817af1fb5b52d96e6dc596
 EBUILD kdevelop-5.2.4.ebuild 3694 BLAKE2B 7f0e35fe10187cbd8085b16d966340eb13a6df533816169e2a75fb1ad1cd21e1fea14c3bba1a169eebb42b345894bcf0a3ad3e223208279f03334fd2709daf8a SHA512 8961f2ba12d2c1b4a961c1fe93eb366bcad5663960122edd640a40e7e12b21d74763f31b18173612de41bc82f4091b560f9bc605ab60706eb2d36b37e24c1c57
-EBUILD kdevelop-5.3.1-r1.ebuild 3812 BLAKE2B 7a9efa508de1b2a8a83ba7cce6b0434cb17d05c438cd1f5b696feaa2c208d377231c350a3463efe40bebcd428679f8730869ef3455819c36b6ee5069304c0351 SHA512 62f067530d70179c0d3ed48970faf7edc079aa41fac16ea98ce294a3d760fd080594ec41c275b27324ed942eb2e830bdeee5a5756387e52aa42b0b9dfab43d5e
-EBUILD kdevelop-5.3.1.ebuild 3749 BLAKE2B 2f6d0b890acf4e5d6bf90df72cb5fa964c3790367d578d6cc4c976f6b7018d94f5672feecdac678601a151430b8f7c17bea85bf6b21f22b349d56b3450ea7f12 SHA512 6f9ea985cd3b23f994a9d04f1db853f03bb822d97f2dd3e9c1eba01977334504a197763e4a358c11674c33ce622909aaff5b3c2f763264ad60ab7d027f0b47e9
+EBUILD kdevelop-5.3.2.ebuild 3831 BLAKE2B 6ddc23cf95ddf9fe4226e60ea5d462d3fe85fef6099f3687445acdb0d1ac4d02c9955e02fca0d1d771d7e9f6647d4bca3d006db1650413c6ceaec3c90e389e7b SHA512 cb55d0422b19db8d58efb22e55bcf3ed33bdcc1a7a1ea37ae122fcf91461c77ad68ea433cd4576d1ce1ff07c58af55c76b288841026955e0640957be5a0bdb00
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/files/kdevelop-5.3.1-typo-in-QtCreator-theme.patch b/dev-util/kdevelop/files/kdevelop-5.3.1-typo-in-QtCreator-theme.patch
deleted file mode 100644
index 97a0b660760c..000000000000
--- a/dev-util/kdevelop/files/kdevelop-5.3.1-typo-in-QtCreator-theme.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8ceab1ea06ea846acf1d75955b0e0e725fc8b2fa Mon Sep 17 00:00:00 2001
-From: Maciej Mrozowski <reavertm@gmail.com>
-Date: Fri, 18 Jan 2019 00:59:28 +0100
-Subject: [PATCH] Fix typo in move cursor left action in QtCreator shortcuts
- theme
-
----
- shortcuts/QtCreator | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/shortcuts/QtCreator b/shortcuts/QtCreator
-index bd1334742e..b74aba9b54 100644
---- a/shortcuts/QtCreator
-+++ b/shortcuts/QtCreator
-@@ -38,7 +38,7 @@
-     <Action shortcut="Down" name="move_line_down"/>
-     <Action shortcut="Up" name="move_line_up"/>
-     <Action shortcut="Right" name="move_cursor_right"/>
--    <Action shortcut="Left" name="move_cusor_left"/>
-+    <Action shortcut="Left" name="move_cursor_left"/>
-     <Action shortcut="Shift+Down" name="select_line_down"/>
-     <Action shortcut="PgUp" name="scroll_page_up"/>
-     <Action shortcut="Shift+PgUp" name="select_page_up"/>
--- 
-2.19.2
-
diff --git a/dev-util/kdevelop/kdevelop-5.3.1.ebuild b/dev-util/kdevelop/kdevelop-5.3.1.ebuild
deleted file mode 100644
index 53e691a99ab1..000000000000
--- a/dev-util/kdevelop/kdevelop-5.3.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.3"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-LICENSE="GPL-2 LGPL-2"
-IUSE="+gdbui hex +plasma +qmake reviewboard subversion webkit"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(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 kdeclarative)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep threadweaver)
-	$(add_kdeapps_dep libkomparediff2)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qthelp)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	>=sys-devel/clang-3.8.0:=
-	x11-misc/shared-mime-info
-	gdbui? ( $(add_plasma_dep libksysguard) )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		$(add_frameworks_dep krunner)
-		$(add_frameworks_dep plasma)
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	reviewboard? ( $(add_frameworks_dep purpose) )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-	webkit? ( $(add_qt_dep qtwebkit) )
-	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kio-extras)
-	dev-util/ninja
-	>=sys-devel/gdb-7.0[python]
-	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
-	!dev-util/kdevelop-clang
-	!dev-util/kdevelop-cppcheck
-	!dev-util/kdevelop-qmake
-	!dev-util/kdevelop-qmljs
-	!dev-util/kdevplatform
-"
-
-RESTRICT+=" test"
-# see bug 366471
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package gdbui KF5SysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake-utils_use_find_package plasma KF5Plasma)
-		$(cmake-utils_use_find_package hex OktetaKastenControllers)
-		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake-utils_use_find_package reviewboard KF5Purpose)
-		$(cmake-utils_use_find_package subversion SubversionLibrary)
-		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
-	)
-
-	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-apps/konsole" ; then
-		elog "For konsole view, please install kde-apps/konsole"
-	fi
-
-	if ! has_version "dev-util/cppcheck" ; then
-		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
-	fi
-
-	if ! has_version "dev-util/heaptrack[qt5]" ; then
-		elog "For heap memory profiling support, please install dev-util/heaptrack"
-	fi
-
-	if ! has_version "dev-util/clazy" ; then
-		elog "For static C++ Qt code analysis support, please install dev-util/clazy"
-	fi
-}
diff --git a/dev-util/kdevelop/kdevelop-5.3.1-r1.ebuild b/dev-util/kdevelop/kdevelop-5.3.2.ebuild
index ca7b83fd34ac..099fede3aacd 100644
--- a/dev-util/kdevelop/kdevelop-5.3.1-r1.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.3.2.ebuild
@@ -1,19 +1,23 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_BRANCH="5.3"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 VIRTUALDBUS_TEST="true"
 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"
+fi
+
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
+HOMEPAGE="https://www.kdevelop.org/"
 LICENSE="GPL-2 LGPL-2"
 IUSE="+gdbui hex +plasma +qmake reviewboard subversion webkit"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
@@ -56,7 +60,6 @@ COMMON_DEPEND="
 	$(add_qt_dep qtxml)
 	dev-libs/grantlee:5
 	>=sys-devel/clang-3.8.0:=
-	x11-misc/shared-mime-info
 	gdbui? ( $(add_plasma_dep libksysguard) )
 	hex? ( app-editors/okteta:5 )
 	plasma? (
@@ -70,7 +73,7 @@ COMMON_DEPEND="
 		dev-libs/apr-util:1
 		dev-vcs/subversion
 	)
-	webkit? ( $(add_qt_dep qtwebkit) )
+	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
 	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
 "
 DEPEND="${COMMON_DEPEND}
@@ -93,10 +96,6 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT+=" test"
 # see bug 366471
 
-PATCHES=(
-	"${FILESDIR}/${P}-typo-in-QtCreator-theme.patch"
-)
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package gdbui KF5SysGuard)