gentoo resync : 15.01.2020

4 files changed, 20 insertions, 158 deletions

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 8d068a02348b..492f2f77c565 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,7 +1,5 @@
-DIST kdevelop-5.4.2.tar.xz 7006096 BLAKE2B 105f7377e960f6012e9e976a14475b67e15038cb376c6ec499ef33f17c59ff1e068866deafb24aa1392bf0a3c833cdffeac122262dd38dc45eeca8fea69f0df8 SHA512 de25d70f2e82f61ef95ce2c6289146c52c368e93a3d23b17a2b95d14e64b599b64af32c2de2501c236f2954d981709c168fecddb4dbcf5425014d6a6e938d53b
-DIST kdevelop-5.4.4.tar.xz 7011276 BLAKE2B c033f8990ed13a2eeb516965d0d7486901b7263410f6f2e7525bf12d1878355898306ff1e90fd1f4c847b9bea90e2c474aa1bbaeab5076a83b40e31a043ab51d SHA512 e2f2cf20b9be3be94344f38fd781be2c847c466adf2dad5504283770326e3dfe35902281cd4bf8cda2854449ea5f73f8026abd0c1811fd5b97e2fa3568585fcf
 DIST kdevelop-5.4.5.tar.xz 7011816 BLAKE2B d067b0b034014b2f3ef7e177b59bde7c86672e8718d6860c5945ad8c8df7531cb427bed1f96b8a8d470da5a51e32134c389df53386a5c4a635825e6892cb060d SHA512 9c795402e10fceda63d0847260018f73d0318ea23a8b67db5c369259b79906a0877f1c43cdaccd5d6a456fef6bc06157dddc99bddc0b742c686057690656d5f5
-EBUILD kdevelop-5.4.2.ebuild 3864 BLAKE2B fbba8860992a4f9835e3265f87158b596c900a46439b4e548dfca78d32f81efb27911e7b917ea91acc9d46d457af3808dfde351ef21694e4eb05cab59a930096 SHA512 825ef6759a5b84447102204e3882762d2cb0d3a3bd0e189b0eff56c65f416c628ae739d07919e08cc0bcc3c78c304a69c2fb422e5d8df339bf9aff65b35b151b
-EBUILD kdevelop-5.4.4.ebuild 4250 BLAKE2B 7cfca1f14d3364c3fac7190bdd108e6677d8a1523d4218ee6f55930e6b92b979b4c458b2133459ea89d46cecf0d4866020698b82712f23471d4df471a7bf7752 SHA512 5fd682331c0c878812d68bff913ebb8b1604fb18cb146740526f87086abd149280a0d21c6d5adfe4e3e55898eff35e759785ceb5e1b21a71b088e30c2d8be7b9
-EBUILD kdevelop-5.4.5.ebuild 4250 BLAKE2B 7cfca1f14d3364c3fac7190bdd108e6677d8a1523d4218ee6f55930e6b92b979b4c458b2133459ea89d46cecf0d4866020698b82712f23471d4df471a7bf7752 SHA512 5fd682331c0c878812d68bff913ebb8b1604fb18cb146740526f87086abd149280a0d21c6d5adfe4e3e55898eff35e759785ceb5e1b21a71b088e30c2d8be7b9
+DIST kdevelop-5.4.6.tar.xz 7011868 BLAKE2B f8dc80e88592aaff6c2cc90667006a235cb4930aa6249558ee69feee8180b012b3ca6ad39bf553743a3b35bdd2c40754dd1f6081d3630566cad1d71ec75e42f2 SHA512 bcc7ee982f48982c63dbe8ac3dcfc9bdb4dda855d0d8b82740e12a616eaca71fe9e2f4a39626d70ce28d09c5f805a462ade06829f04db682fde72a2594ea4234
+EBUILD kdevelop-5.4.5.ebuild 4206 BLAKE2B 9ebbdfe406c2c7dd9543b9ca59c117dd070fa1b8043dcc3d924c4539e93b9bc7947b9c80e37982c1588e8069b9472edb8bbc18a16f958d6f94af17ee40736592 SHA512 269a12d204a1a3090ad1fd0812472e3b420f5153deb0cda68aa0bb5be60ce44dba35f938655d66d922def5e385eb16e07ffe2c44252f2adddee2f87e75ff6871
+EBUILD kdevelop-5.4.6.ebuild 4208 BLAKE2B f584a1f7d51b64d779ca1637fce0444e143b7dc019b647452a8bbbc0646bbc01edd849abea187e97f1a43614e424addc588b3c3bb4be61aff21f23c6fcfc5db9 SHA512 6dd6e298ff879fd5fe0783528f03e8462856dcc6f39ffb678f5cfcce6b416049bb0c99e85899c5309c8250d1fbe3639963674a10fbf87cc1194edff6cb761f17
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/kdevelop-5.4.2.ebuild b/dev-util/kdevelop/kdevelop-5.4.2.ebuild
deleted file mode 100644
index 4fe926d9971e..000000000000
--- a/dev-util/kdevelop/kdevelop-5.4.2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	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="
-	$(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
-	>=dev-util/astyle-3.1:=
-	>=sys-devel/clang-3.8.0:=
-	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? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-	!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)
-	$(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
-
-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.4.5.ebuild b/dev-util/kdevelop/kdevelop-5.4.5.ebuild
index 8467cba14272..e431aec2acbc 100644
--- a/dev-util/kdevelop/kdevelop-5.4.5.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 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"
@@ -103,14 +103,14 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package gdbui KF5SysGuard)
+		$(cmake_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_use_find_package plasma KF5Plasma)
+		$(cmake_use_find_package hex OktetaKastenControllers)
+		$(cmake_use_find_package qmake KDevelop-PG-Qt)
+		$(cmake_use_find_package reviewboard KF5Purpose)
+		$(cmake_use_find_package subversion SubversionLibrary)
+		$(cmake_use_find_package !webkit Qt5WebEngineWidgets)
 	)
 
 	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
diff --git a/dev-util/kdevelop/kdevelop-5.4.4.ebuild b/dev-util/kdevelop/kdevelop-5.4.6.ebuild
index 8467cba14272..5590f33b0143 100644
--- a/dev-util/kdevelop/kdevelop-5.4.4.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -103,14 +103,14 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package gdbui KF5SysGuard)
+		$(cmake_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_use_find_package plasma KF5Plasma)
+		$(cmake_use_find_package hex OktetaKastenControllers)
+		$(cmake_use_find_package qmake KDevelop-PG-Qt)
+		$(cmake_use_find_package reviewboard KF5Purpose)
+		$(cmake_use_find_package subversion SubversionLibrary)
+		$(cmake_use_find_package !webkit Qt5WebEngineWidgets)
 	)
 
 	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )