gentoo resync : 25.11.2020

3 files changed, 10 insertions, 122 deletions

diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index 1b05e12ece63..d0423192f6c2 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,5 +1,3 @@
-DIST kate-20.04.3.tar.xz 5813840 BLAKE2B bc078ddb20edb282f3779f3f989cfc1e00444484667e80ab8b93d02a488ffa2308196243df44cc3738300ad6e8ecbf09d58d373c81c484ee3250e90ae617c622 SHA512 b2c850a94f8d07d4df29156c710d492422a021a75dceae53c9452fc2f569534b627646c39141dc39182d2d8c1d13691240f2c586220f6aa1ba7d1605903f04f9
-DIST kate-20.08.1.tar.xz 5848940 BLAKE2B 70a8848202d73ffe60a22a1565f9e96583d6a523da5ef55da178ba4a29fd188a103ba2d55fd37abae89a93b5022e48838d9e3299f226dae9292f4cbf0b428b4f SHA512 63d1c2d8371047abbdc3b1ea2e96b94a6f85ccec05ff5addc19f19d593e2b1760c91b4d87145d329516bd40e0bed740a94306df7760d1a2936edf09c87f6982a
-EBUILD kate-20.04.3.ebuild 3043 BLAKE2B adf1b3adadb353804a5b653ddbcf2f00d7e9c1e8a603d1865b78167d6725281127f2cd80eb7ee237bf62bb0896c017b5ae824da242b37e29efff9e14c85030ea SHA512 62d509a8a1ada4b22d7fb61f576fcfa3573c3823d4b7688ab6ca0cbd3b3954a3b9d00ed53e36eb36dc68bad1270ed50606845b7f26d8e6557755adbf898515e7
-EBUILD kate-20.08.1.ebuild 3071 BLAKE2B 8098569c9e02b620479ebea574799abe73cd7907684bc8a252d154e6a976395a54427f7d22bb2cb5f24b3ea2ae038053447ccbf5da4c0de65b2f1e233b0694ee SHA512 ec4be556dba21f01a2e726e3cf9f2c25176dddb375a2a1a287982edd762086b5bc3ed0a70f45688005c8ca228680597cba1103a95664c523e56d221c5eb98b24
+DIST kate-20.08.3.tar.xz 5853216 BLAKE2B 8ad6f14e98e44355731497dd3363dab51e3f1658feadc398ba03629c13acb648f1a84e573bb200040008c0f3226f0ec1b6414a0975cf1ccc2cd1bfcebce1e125 SHA512 bb514f92a65ce7ff4e3552f16a400d10b30703340f779a1318403035900f32b2fd5c1da2ca0714632d49ad35da15e0f7e05a17bc008cd039388e89ab4fac3bd2
+EBUILD kate-20.08.3.ebuild 3077 BLAKE2B 02140c18c2741b458dd55fdbe313ea2e7ef237b80802f6b692fc2338ffaf1f990e405bbe2e7f1215b3a7bf79a2e71edfbdcec948cd921aaf5f412c6cc1a5b389 SHA512 b4d624769c39808a115dcc21b236ea4f6ed7744b2c6ba2eaeb1177986885dfac5a5779544dc1a3e7b005ed6a8e1ec3789874ef8079579a7af13753192c6aa6d6
 MISC metadata.xml 862 BLAKE2B 9b27a2dc759d83a85b1be9a5afc2dedc77caab98255575d493f4af6961d9b5bb19699eb69858082e1bc05dd8ff14f5c0c9212e5e146ff13ec1a3685008fd837d SHA512 d1a90d55277f25dbbad445d8d591da5fa5ddf3bb65aa0ae2d70ba6626abe7deebb56cbcb8a3718c43ad136da2de1b06a017c9740493504b446f33fbeac2734a7
diff --git a/kde-apps/kate/kate-20.08.1.ebuild b/kde-apps/kate/kate-20.08.1.ebuild
deleted file mode 100644
index 28abd04ca358..000000000000
--- a/kde-apps/kate/kate-20.08.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.72.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Multi-document editor with network transparency, Plasma integration and more"
-HOMEPAGE="https://kate-editor.org/
-https://kde.org/applications/utilities/org.kde.kate"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry"
-
-# only addons/externaltools depends on kiconthemes, too small for USE
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}: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/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${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
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	filebrowser? ( >=kde-frameworks/kbookmarks-${KFMIN}:5 )
-	lspclient? ( >=kde-frameworks/kitemmodels-${KFMIN}:5 )
-	plasma? ( >=kde-frameworks/plasma-${KFMIN}:5 )
-	projects? (
-		>=kde-frameworks/knewstuff-${KFMIN}:5
-		>=kde-frameworks/threadweaver-${KFMIN}:5
-	)
-	snippets? ( >=kde-frameworks/knewstuff-${KFMIN}:5 )
-	sql? (
-		>=dev-qt/qtsql-${QTMIN}:5
-		>=kde-frameworks/kwallet-${KFMIN}:5
-	)
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# delete colliding kwrite translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -name "kwrite*" -delete || die
-		rm -rf po/*/docs/kwrite || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		-DBUILD_filebrowser=$(usex filebrowser)
-		-DBUILD_lspclient=$(usex lspclient)
-		-DBUILD_sessionapplet=$(usex plasma)
-		-DBUILD_project=$(usex projects)
-		-DBUILD_snippets=$(usex snippets)
-		-DBUILD_katesql=$(usex sql)
-		-DBUILD_kwrite=FALSE
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# tests hang
-	local myctestargs=(
-		-E "(session_manager_test|sessions_action_test)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "The functionality of ktexteditorpreview plugin can be extended with:"
-		elog "  kde-misc/markdownpart or kde-misc/kmarkdownwebview"
-		elog "  media-gfx/kgraphviewer"
-	fi
-}
diff --git a/kde-apps/kate/kate-20.04.3.ebuild b/kde-apps/kate/kate-20.08.3.ebuild
index 3e907e5a01cc..5c8f7359242c 100644
--- a/kde-apps/kate/kate-20.04.3.ebuild
+++ b/kde-apps/kate/kate-20.08.3.ebuild
@@ -5,14 +5,13 @@ EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.70.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+inherit ecm kde.org optfeature
 
 DESCRIPTION="Multi-document editor with network transparency, Plasma integration and more"
-HOMEPAGE="https://kate-editor.org/
-https://kde.org/applications/utilities/org.kde.kate"
+HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/en/kate"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
@@ -98,11 +97,10 @@ src_test() {
 }
 
 pkg_postinst() {
-	ecm_pkg_postinst
-
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "The functionality of ktexteditorpreview plugin can be extended with:"
-		elog "  kde-misc/kmarkdownwebview"
-		elog "  media-gfx/kgraphviewer"
+		elog "Optional dependencies:"
+		optfeature "Markdown text previews" kde-misc/markdownpart:${SLOT} kde-misc/kmarkdownwebview:${SLOT}
+		optfeature "DOT graph file previews" media-gfx/kgraphviewer
 	fi
+	ecm_pkg_postinst
 }