gentoo resync : 25.11.2020

4 files changed, 16 insertions, 176 deletions

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 6857e2fb60d9..9d812a333b9d 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,3 @@
-DIST kdevelop-5.5.2.tar.xz 7049088 BLAKE2B 93df5c982b8e141a5027b5eeddce55a4c4b915fa5f6b36b71c0125820ffb6692db1dfe3243b4b0333be01658f0d44a0767d9e63ad549a6bc54b0e19c42c215fc SHA512 d4e0b3369ed4762beea18e43275c75b801fa4efd8265734a6b676e579f17408dc5ace4aae1b8f7eccbc70e88f6d80ecaecfc4d2c633f77f80ad0b9d066995ca2
 DIST kdevelop-5.6.0.tar.xz 7116544 BLAKE2B c548c695dab41c93aef31549bd479f1ca832a3fac9cde044523bf590d536473f36a87521ac678d37008ff451c091b843f65ccce154d9b1ca59efac2b48a81515 SHA512 c96a79d92972d606778d76f74f9dfddb9a0da9f41b462ada1a52842aa14306ad3cb183cda8103a9a3cf56d0dd5c1f18d5fad6b65cd8ae42f2fc407aaa6dc88f7
-EBUILD kdevelop-5.5.2.ebuild 4359 BLAKE2B 966aa4775d2bc00c8bdd88b90fce198ebc72b2b5d13f043739d71f7b602dca401686b14f251528fe03c76f6e80fd190242c3629bd30324cfd71f1bef9ee394dc SHA512 e105de2cd8514c35ccf551a6dccbeb10cd72b4e46892b9f8fc6ff534cd850914d3fde9a5b428e02b0185d160e4e5000c6258bb6a63bf9c42e3fb89de60812cf9
-EBUILD kdevelop-5.6.0.ebuild 4333 BLAKE2B c652afd42d3c24b1c2eb93c69b8407104e10a1bc362cd5b909d33b79eb5506c93c0d044133924b446222b960fe16a73f193ba814890b07a43feede53ca467fac SHA512 fa09c51affe9acfd57bd59b56a18e5c26da2fd2f2355132fcc8db751eb49e5d7a73c2d9baf8b8296edf66380899f1cc5cfb6c0bb0b57d056670e6f334081a541
-MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
+EBUILD kdevelop-5.6.0-r1.ebuild 4068 BLAKE2B 321d5d5dc48e2213b26a6d68d2910fe33004435a2f948d9c59e2d5b388d5680476a73d62bda5010007cfd77ab939b8604e4417768ad15b83f9c0aab3c51742a7 SHA512 f56ee8296e0b90aa33f3fd523e7b72147e8cdba68e13811ced1949a857617f13495976275c135c82c1aebf6ce106e725f2949d5398ba6f682f9be3011d13e2b5
+MISC metadata.xml 554 BLAKE2B 4e34566d1ec19cb7589766d89dafabfb0b50698afdcffd9c217108cb0f5940d27c367f44cf1f6be491814f3874c67e96ebf9cbf517670091e6fa36f3a8471bd9 SHA512 33f889291d1c2b4ddf7ad8fdd33d74758090e401b093d3f7691bfe6569ab068720811747380275db58b2160fd1b301126576721d0c2c61f04e917560af2c33ac
diff --git a/dev-util/kdevelop/kdevelop-5.5.2.ebuild b/dev-util/kdevelop/kdevelop-5.5.2.ebuild
deleted file mode 100644
index 18f5ab2c9edd..000000000000
--- a/dev-util/kdevelop/kdevelop-5.5.2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-HOMEPAGE="https://www.kdevelop.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2"
-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-apps/libkomparediff2:5
-	>=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
-	>=sys-devel/clang-6.0:=
-	gdbui? ( kde-plasma/libksysguard:5= )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		>=kde-frameworks/krunner-${KFMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	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? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=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:5 )
-	!dev-util/kdevelop-clang-tidy
-"
-
-RESTRICT+=" test"
-# see bug 366471
-
-src_configure() {
-	local clang_version=$(best_version sys-devel/clang)
-	local llvm_root="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
-
-	local mycmakeargs=(
-		-DLLVM_ROOT=${llvm_root}
-		$(cmake_use_find_package gdbui KF5SysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(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 )
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_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
-
-	if ! has_version ">=dev-util/meson-0.51" ; then
-		elog "For the Meson Project manager plugin, please install dev-util/meson"
-	fi
-}
diff --git a/dev-util/kdevelop/kdevelop-5.6.0.ebuild b/dev-util/kdevelop/kdevelop-5.6.0-r1.ebuild
index 5a3edac39a3b..78c011af5798 100644
--- a/dev-util/kdevelop/kdevelop-5.6.0.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.6.0-r1.ebuild
@@ -6,21 +6,21 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 KDE_ORG_CATEGORY="kdevelop"
-KFMIN=5.70.0
-QTMIN=5.12.3
+KFMIN=5.74.0
+QTMIN=5.15.1
 VIRTUALDBUS_TEST="true"
 VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+inherit ecm kde.org optfeature
 
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-HOMEPAGE="https://www.kdevelop.org/"
+HOMEPAGE="https://kdevelop.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="GPL-2 LGPL-2"
-SLOT="5/55" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
+SLOT="5/56" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
 IUSE="+gdbui hex +plasma +qmake reviewboard subversion"
 
 COMMON_DEPEND="
@@ -121,25 +121,13 @@ src_configure() {
 }
 
 pkg_postinst() {
-	ecm_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
-
-	if ! has_version ">=dev-util/meson-0.51" ; then
-		elog "For the Meson Project manager plugin, please install dev-util/meson"
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "konsole view" kde-apps/konsole
+		optfeature "Static C++ Qt code analysis" dev-util/clazy
+		optfeature "Static C/C++ code analysis" dev-util/cppcheck
+		optfeature "Heap memory profiling" dev-util/heaptrack[qt5]
+		optfeature "Meson Project manager plugin" dev-util/meson
 	fi
+	ecm_pkg_postinst
 }
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index b3d54d197519..f1d816c7dad8 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -10,6 +10,5 @@
 		<flag name="hex">Enable hex editor plugin via <pkg>app-editors/okteta</pkg></flag>
 		<flag name="qmake">Enable support for QMake build system</flag>
 		<flag name="reviewboard">Enable reviewboard support</flag>
-		<flag name="webkit">Enable deprecated <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg> for integrated documentation</flag>
 	</use>
 </pkgmetadata>