gentoo resync : 18.11.2019

2 files changed, 60 insertions, 57 deletions

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 921d6ad224e2..ad38ab4fbe46 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,5 @@
 DIST kdevelop-5.4.2.tar.xz 7006096 BLAKE2B 105f7377e960f6012e9e976a14475b67e15038cb376c6ec499ef33f17c59ff1e068866deafb24aa1392bf0a3c833cdffeac122262dd38dc45eeca8fea69f0df8 SHA512 de25d70f2e82f61ef95ce2c6289146c52c368e93a3d23b17a2b95d14e64b599b64af32c2de2501c236f2954d981709c168fecddb4dbcf5425014d6a6e938d53b
-DIST kdevelop-5.4.3.tar.xz 7010496 BLAKE2B 2f6aa0073321ad1e6c6eb905879c628717927957e60c26b353b691560438afdbd42c7803c227e8de8ada0fca6da38ef02664afa0fc3e9d372d53b2d879b64665 SHA512 f21f282ca772fea6a4bf8f000ddd71386c98c17956c151d71b824a5a9b30223530015e3a73979856580dc318caa9da7bae6b3cf914ffa8aa7ea56cacded1c524
+DIST kdevelop-5.4.4.tar.xz 7011276 BLAKE2B c033f8990ed13a2eeb516965d0d7486901b7263410f6f2e7525bf12d1878355898306ff1e90fd1f4c847b9bea90e2c474aa1bbaeab5076a83b40e31a043ab51d SHA512 e2f2cf20b9be3be94344f38fd781be2c847c466adf2dad5504283770326e3dfe35902281cd4bf8cda2854449ea5f73f8026abd0c1811fd5b97e2fa3568585fcf
 EBUILD kdevelop-5.4.2.ebuild 3864 BLAKE2B fbba8860992a4f9835e3265f87158b596c900a46439b4e548dfca78d32f81efb27911e7b917ea91acc9d46d457af3808dfde351ef21694e4eb05cab59a930096 SHA512 825ef6759a5b84447102204e3882762d2cb0d3a3bd0e189b0eff56c65f416c628ae739d07919e08cc0bcc3c78c304a69c2fb422e5d8df339bf9aff65b35b151b
-EBUILD kdevelop-5.4.3.ebuild 3866 BLAKE2B b23ea12b86f92c955f5fb3f7f716cf3a5ac1546eee6a94aaa201ef5cea3020359e4db7c9f07169954bbe45a4312527f1d7d87339f54ac05bd5d5ca4e95369feb SHA512 fcbc57247d26f97a2e5032cc66052e8e34864fee77db9b7e8f21cc68395c485a601207c7f45aa2130f50537ceb21abe5d6ca79e856a4f4895bf782162a864d0d
+EBUILD kdevelop-5.4.4.ebuild 4250 BLAKE2B 7cfca1f14d3364c3fac7190bdd108e6677d8a1523d4218ee6f55930e6b92b979b4c458b2133459ea89d46cecf0d4866020698b82712f23471d4df471a7bf7752 SHA512 5fd682331c0c878812d68bff913ebb8b1604fb18cb146740526f87086abd149280a0d21c6d5adfe4e3e55898eff35e759785ceb5e1b21a71b088e30c2d8be7b9
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/kdevelop-5.4.3.ebuild b/dev-util/kdevelop/kdevelop-5.4.4.ebuild
index 5ed1e8f93f5d..8467cba14272 100644
--- a/dev-util/kdevelop/kdevelop-5.4.3.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.4.4.ebuild
@@ -3,11 +3,14 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KDE_APPS_MINIMAL=19.04.3
+KFMIN=5.60.0
+QTMIN=5.12.3
 VIRTUALDBUS_TEST="true"
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	KEYWORDS="~amd64 ~x86"
@@ -21,76 +24,76 @@ 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)
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${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/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${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
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+	>=kde-apps/libkomparediff2-${KDE_APPS_MINIMAL}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qthelp-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qttest-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
 	dev-libs/grantlee:5
 	>=dev-util/astyle-3.1:=
 	>=sys-devel/clang-3.8.0:=
-	gdbui? ( $(add_plasma_dep libksysguard) )
+	gdbui? ( >=kde-plasma/libksysguard-5.16.5:5 )
 	hex? ( app-editors/okteta:5 )
 	plasma? (
-		$(add_frameworks_dep krunner)
-		$(add_frameworks_dep plasma)
+		>=kde-frameworks/krunner-${KFMIN}:5
+		>=kde-frameworks/plasma-${KFMIN}:5
 	)
 	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	reviewboard? ( $(add_frameworks_dep purpose) )
+	reviewboard? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 	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') )
+	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
-	$(add_qt_dep qtconcurrent)
+	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
 RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kio-extras)
-	$(add_qt_dep qdbus)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtquickcontrols2)
+	>=kde-apps/kapptemplate-${KDE_APPS_MINIMAL}:5
+	>=kde-apps/kio-extras-${KDE_APPS_MINIMAL}:5
+	>=dev-qt/qdbus-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	dev-util/ninja
 	>=sys-devel/gdb-7.0[python]
-	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
+	reviewboard? ( >=kde-apps/ktp-accounts-kcm-${KDE_APPS_MINIMAL}:5 )
 	!dev-util/kdevelop-clang-tidy
 	!dev-util/kdevplatform
 "
@@ -112,11 +115,11 @@ src_configure() {
 
 	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 
 	if ! has_version "kde-apps/konsole" ; then
 		elog "For konsole view, please install kde-apps/konsole"