gentoo resync : 25.08.2018

3 files changed, 140 insertions, 2 deletions

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 18dceb8d93b8..c3262e506fd2 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,3 +1,5 @@
 DIST kdevelop-5.2.3.tar.xz 6643364 BLAKE2B a08d5cc786a603b3e23d1d9bf9d362a35f2280436072df239ff6becbd9f0ecc370b35a8e95d3443475218eb5a27e044d76f3d34cd41f082fc65650ce05c499f7 SHA512 5a7f514f24725ab1dbb33d63fd365159c3a8831c400aeef4f1e463acc60d81e9db1a23d320b5be215597884fbf0cc6ec8aed4f69e1fd60f68328b5a052b39c3d
-EBUILD kdevelop-5.2.3.ebuild 3801 BLAKE2B a7f01ea69e0652bd2f92819a829b29a20d29da1b9c43abee542a8550fc4aeb89245a7be9b7dc0cc42a26c0d899f8307ad796f955300b84488de6c9a2641efecf SHA512 e85d654094752e2b1fd9a348bf9374447681df93dee668464304b91cdc2aae962847535aa0138afe11b63ea8a5fdf3120213dd340b92e6e80845b6c1a0efd2a2
+DIST kdevelop-5.2.4.tar.xz 6647172 BLAKE2B c3dc301cf16bdef95000aa6cb3ebe615054f49ad29bc67870c31d329cf7bd4df81dad330eb26dd28c19627b2040f62522d755afa4450bb125872350d1f8039e1 SHA512 1c64b4f56452e8c926c5bcea5a9d8368fa62926d1ec507d289d8cb47275d478898d56fdf083fc24e291aaf4738cc5b7ddfd239e6993848e862bc4d83e270558b
+EBUILD kdevelop-5.2.3.ebuild 3882 BLAKE2B dbf9df8aecef1077e2d9e5c6f466e5313da26cbc76e69f958a7d5f555ae4086f8e9c9c850fd9a124e24a70f52223e3e0e3232c56f2be30fed422786139bf35a3 SHA512 88b0714d803633c796cc643d2731a90e45b9065cd0ac57813c6a31c298a4580141ca33dbd491ba2f4b604ffc2497c734a6ab87b92fd3856c4ff1798aa4156b20
+EBUILD kdevelop-5.2.4.ebuild 3858 BLAKE2B 9f0082d4c036dcdb6c9656f3238df1cec85f0b2c47f9dda1858d74da54d45c05bac366fd22a11d4bf3a0bd9995c8842159d90b51c4dee0545e19af60c9695c87 SHA512 f76f6cd3e1a3db04bbd33244cf19c590542f8476130a79fa99c3adcf2d9e07b59f9986c078a5d3f4cd5b63ec121d6cb6c03124214273c43bbc2fd56c6e0b0572
 MISC metadata.xml 794 BLAKE2B 5436f574309cfb4c014322f1d4c37edd68a6a7e77bfe5ea81e189f1440c4cced6310e01bc65923bb144d62d32349b2f862af18b307b621e347b3a076dc8a8862 SHA512 fdc3da939f866f065c7811ea70ac8a005a01455bd60db64f5f3107276de49d2d5e28c60650ad530636fb5e4a51a3acd69ef30ea5f1c895e9ddf410b5eb287f6a
diff --git a/dev-util/kdevelop/kdevelop-5.2.3.ebuild b/dev-util/kdevelop/kdevelop-5.2.3.ebuild
index c8c5c9567be5..0fbf50234984 100644
--- a/dev-util/kdevelop/kdevelop-5.2.3.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.2.3.ebuild
@@ -107,12 +107,14 @@ src_configure() {
 		$(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 KDEExperimentalPurpose)
+		$(cmake-utils_use_find_package reviewboard KF5Purpose)
 		$(cmake-utils_use_find_package subversion SubversionLibrary)
 		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
 		$(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
 	)
 
+	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
+
 	kde5_src_configure
 }
 
diff --git a/dev-util/kdevelop/kdevelop-5.2.4.ebuild b/dev-util/kdevelop/kdevelop-5.2.4.ebuild
new file mode 100644
index 000000000000..361ca0737b8f
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-5.2.4.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="5.2"
+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="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit +welcomepage"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="test? ( welcomepage )"
+
+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)
+	$(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') )
+	welcomepage? ( $(add_qt_dep qtdeclarative '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]
+	cvs? ( dev-vcs/cvs )
+	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
+	!dev-util/kdevelop:4
+	!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=(
+		-DBUILD_cvs=$(usex cvs)
+		$(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)
+		$(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
+	)
+
+	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
+}