gentoo resync : 14.05.2020

2 files changed, 22 insertions, 19 deletions

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 96f520107a0a..f60df6fa7ee9 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,5 @@
 DIST kdevelop-5.4.6.tar.xz 7011868 BLAKE2B f8dc80e88592aaff6c2cc90667006a235cb4930aa6249558ee69feee8180b012b3ca6ad39bf553743a3b35bdd2c40754dd1f6081d3630566cad1d71ec75e42f2 SHA512 bcc7ee982f48982c63dbe8ac3dcfc9bdb4dda855d0d8b82740e12a616eaca71fe9e2f4a39626d70ce28d09c5f805a462ade06829f04db682fde72a2594ea4234
-DIST kdevelop-5.5.0.tar.xz 7018184 BLAKE2B 165c54ffe021c420cb688180c44a856b620248180611356429e6a98523afef3d3ea5d7edaed10cee232e614bdb470246f3c9e7b46d3bfbb288efb9e04f6258fd SHA512 6dcce4c9b124fffbd278279e6b5b9f90dff8b2f90faacd8208256951dcf7ac1ab5ae21610347ab508d3e5df49df3096a6c049271f30b1ed84b0f8401e760380f
+DIST kdevelop-5.5.1.tar.xz 7055180 BLAKE2B 1060ca3ecec61afdcbe421e1ae8f1e1ec21727a467154f51ec17fa36e70ad46eaf315743ad5e59011ec821e5459ef86dcee30a1da7673bae6d0531af2f7d5b1e SHA512 5255365280d0a27b998f5f7b850ee11995b03585409c152c27572a169f5b3d0f60b3d694f6e7009ebd7a2abc17e7f8e3ae1faad9d41f437be574ffa1953d530e
 EBUILD kdevelop-5.4.6.ebuild 4182 BLAKE2B 62d749e681d2ae1c04696116c07eb61febb5a8ba5037a940922ddd7af14152d286d975941adfca671e403ab6bc443c9c35e7f5a289095feeea414f9454c7b64a SHA512 805bc1f19cc1f7e83fcba44599a6c785a3dd6fdf2f283501f44e37e39643c649a3d82c35142d3108db428219cfe388966e60534b52062c82960734901f55ed85
-EBUILD kdevelop-5.5.0.ebuild 4353 BLAKE2B 4bb792442105fb21353d106e186d3c984156e378a50fa52e9b292d5e2df4462e5f62701d5c446f4fd13daf8dd5bd97d7932e74f948d889fcfe07949303c57da3 SHA512 5cf9cc4b26714eba6a095d2a149070b3b71451ef697ee77ab885424ef2e2d0c8dfeea685458fb0d63645addf20fed8848b52bcd33af69404724808bbd1264d77
+EBUILD kdevelop-5.5.1.ebuild 4370 BLAKE2B d56ca83e4142f558dd38315d8ef7ae70e38c60c590ec8f0e4853bc7a8a24e8628d3390e8f1eed674389c302495e8c788eda8478f33266296d0cc302c7f4788f6 SHA512 f4b63c880279f2b5b766ffe41b690539ed4fcc9cb06a326cf2dd314d0e8f3e9822e0129df752875763186d8a7cb28757c556b7d63dba41e70aba258f6e162254
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/kdevelop-5.5.0.ebuild b/dev-util/kdevelop/kdevelop-5.5.1.ebuild
index 0355a681dc46..8a1b38d4f27b 100644
--- a/dev-util/kdevelop/kdevelop-5.5.0.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.5.1.ebuild
@@ -5,7 +5,6 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-KDE_APPS_MINIMAL=19.04.3
 KFMIN=5.60.0
 QTMIN=5.12.3
 VIRTUALDBUS_TEST="true"
@@ -24,6 +23,16 @@ SLOT="5/55" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
 IUSE="+gdbui hex +plasma +qmake reviewboard subversion webkit"
 
 COMMON_DEPEND="
+	dev-libs/grantlee: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-util/astyle-3.1:=
 	>=kde-frameworks/karchive-${KFMIN}:5
 	>=kde-frameworks/kbookmarks-${KFMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
@@ -53,19 +62,9 @@ COMMON_DEPEND="
 	>=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? ( >=kde-plasma/libksysguard-5.16.5:5 )
+	kde-apps/libkomparediff2:5
+	>=sys-devel/clang-6.0:=
+	gdbui? ( >=kde-plasma/libksysguard-5.16.5:5= )
 	hex? ( app-editors/okteta:5 )
 	plasma? (
 		>=kde-frameworks/krunner-${KFMIN}:5
@@ -86,14 +85,14 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
 RDEPEND="${COMMON_DEPEND}
-	>=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
+	kde-apps/kapptemplate:5
+	kde-apps/kio-extras:5
 	>=sys-devel/gdb-7.0[python]
-	reviewboard? ( >=kde-apps/ktp-accounts-kcm-${KDE_APPS_MINIMAL}:5 )
+	reviewboard? ( kde-apps/ktp-accounts-kcm:5 )
 	!dev-util/kdevelop-clang-tidy
 "
 
@@ -139,4 +138,8 @@ pkg_postinst() {
 	if ! has_version "dev-util/clazy" ; then
 		elog "For static C++ Qt code analysis support, please install dev-util/clazy"
 	fi
+
+	if ! has_version ">=dev-util/meson-0.51" ; then
+		elog "For the Meson Project manager plugin, please install dev-util/meson"
+	fi
 }