gentoo resync : 18.11.2019

3 files changed, 99 insertions, 95 deletions

diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index 5a2a58d42043..18174f309af6 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,6 +1,6 @@
 AUX kate-19.04.3-qt-5.12.4-missing-header.patch 516 BLAKE2B c28523203705b0e1536a992506bffbbfe2ed9381410a986a578676a6e9185c2655708c1e3621bb356f5946c903424b8ce913df5e4b73c653fdd632e5f98eaecd SHA512 b2d248a973fb1470ec63b7b2da8da82998d374c817e67a5bcb70ff00b7d4eb1567a4c126dfa4709d1d116bc911fc29d714b6dff6b6d46e69a73040203e39b17f
 DIST kate-19.04.3.tar.xz 5790932 BLAKE2B a6eb6b73a671cff1c5ba7b4f46e790fbfbabbc7d97322983fa524ddbd8b0d12f528275b9d90210c66332081edea3c10968933f151894a3048d9a815d28c3f82b SHA512 57ea4a527307dd45818b7e3f1b59ac346f5e82090b01fb010d4e3e31d00eda9c1b8e554ab203c3320fa073fbd65e775e27375f254f05f2dee512a32ef09bc218
-DIST kate-19.08.2.tar.xz 5846748 BLAKE2B 74e15971a8d5b80be1f4831238074559b8b22142516d2487d5814bdbd20c27069337cf4eee4d709e7f6e55551ca3d964a52b9640ae1d228cff3eaf4d474268b6 SHA512 3e1608843a749af75f12011e929bec0cd18e28b73e6b531b885855b07aec343007deb3def2de1215ff134f84052ecf956d834029267d790cc99ddd76d36a212a
+DIST kate-19.08.3.tar.xz 5844532 BLAKE2B 34aaceab92783a869de616be9290887f75eba5ef6198e93d90a71d62b441a907a7893916c72ac85c46d6156330322d5297c60c8c9b43cbcd615c05b51cdd0000 SHA512 0a0b33858bd4856bdf29d354603d33541b2c0aab134025db3014aa31cf3231fa2bcc244252872c0b51c28b7cd715556966d9049ce85a8ad614e1f552479c1bc8
 EBUILD kate-19.04.3.ebuild 2207 BLAKE2B 85e88a4f1bf8dbbe5ee8f8d7022c11717adf606ca1823cf6484727cec6a6849336aeeb2959652837301f27daef00a00baef2fce8f4c0063cb893379b40c4ad73 SHA512 d77b0801ae672d44d563efe4be19338ceb924214049875361a92e336e43eedf79a2aec64d272e7eab0fe493c565c5d76fe71b0901761b3db84a9ab5ca0cd6f36
-EBUILD kate-19.08.2.ebuild 2312 BLAKE2B f97907722fbc0e267e51eb7c36b992a80842d8cfbb22cebf85c88f0b00c7301d35e90da4246e49f6c0658007e5fe836a35fec6d68744673e7c07b15d3afb3720 SHA512 0f19ac4bdc0022c1e0261b287fb4fa791dc71285445706bbad0bd2d4f4c9d66df7d60a5dd2ce40dfafb8b7220f8a23423df320a3213567ffc78823b8f8eb258c
+EBUILD kate-19.08.3.ebuild 2572 BLAKE2B 96654bd2480fd4a44227561b71fff162bf351a62848aa8a6c058caf7227e8ea18ae5844caadf825ef0cdfccc972ac4653ed33595304b6b50b6a400f7559108c6 SHA512 746844e5753f530bd27556a2125d9b2738000723086724b207b567456142eade759e0ad48f79802d2a00a79ddac39600d5a2c91df82969da5deb07fda4a9e15b
 MISC metadata.xml 438 BLAKE2B 73e26b12116384010c313f77322143b111d10f1f90b8c4762edbf4e12de9d864b626de3c60781f00c098053ce4a71243c034352cd3178c5c77be78a0c5e2bf88 SHA512 a6e3518490973483bbf1a04394601c0d0b68a0869f3026f2aa96e31e74356effeeb53f0eb1d29ea914a614a52807ad04cdf6ba28ce4bc35553af4b6dee4f30c2
diff --git a/kde-apps/kate/kate-19.08.2.ebuild b/kde-apps/kate/kate-19.08.2.ebuild
deleted file mode 100644
index dbed47d30d72..000000000000
--- a/kde-apps/kate/kate-19.08.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Multi-document editor with network transparency, Plasma integration and more"
-HOMEPAGE="https://kde.org/applications/utilities/kate https://kate-editor.org/"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="activities +addons"
-
-DEPEND="
-	$(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 kdbusaddons)
-	$(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 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_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	activities? ( $(add_frameworks_dep kactivities) )
-	addons? (
-		$(add_frameworks_dep kbookmarks)
-		$(add_frameworks_dep knewstuff)
-		$(add_frameworks_dep kwallet)
-		$(add_frameworks_dep plasma)
-		$(add_frameworks_dep threadweaver)
-		$(add_qt_dep qtsql)
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-misc/ktexteditorpreviewplugin
-"
-
-src_prepare() {
-	kde5_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-utils_use_find_package activities KF5Activities)
-		-DBUILD_addons=$(usex addons)
-		-DBUILD_kwrite=FALSE
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# tests hang
-	local myctestargs=(
-		-E "(session_manager_test|sessions_action_test)"
-	)
-
-	kde5_src_test
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] && use addons; then
-		elog "The functionality of ktexteditorpreview plugin can be extended with:"
-		elog "  kde-misc/kmarkdownwebview"
-		elog "  media-gfx/kgraphviewer"
-	fi
-}
diff --git a/kde-apps/kate/kate-19.08.3.ebuild b/kde-apps/kate/kate-19.08.3.ebuild
new file mode 100644
index 000000000000..35b405cb6c81
--- /dev/null
+++ b/kde-apps/kate/kate-19.08.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+VIRTUALX_REQUIRED="test"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Multi-document editor with network transparency, Plasma integration and more"
+HOMEPAGE="https://kde.org/applications/utilities/kate https://kate-editor.org/"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="activities +addons"
+
+DEPEND="
+	>=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/kitemmodels-${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
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+	addons? (
+		>=kde-frameworks/kbookmarks-${KFMIN}:5
+		>=kde-frameworks/knewstuff-${KFMIN}:5
+		>=kde-frameworks/kwallet-${KFMIN}:5
+		>=kde-frameworks/plasma-${KFMIN}:5
+		>=kde-frameworks/threadweaver-${KFMIN}:5
+		>=dev-qt/qtsql-${QTMIN}:5
+	)
+"
+RDEPEND="${DEPEND}
+	!kde-misc/ktexteditorpreviewplugin
+"
+
+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-utils_use_find_package activities KF5Activities)
+		-DBUILD_addons=$(usex addons)
+		-DBUILD_kwrite=FALSE
+	)
+
+	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}" ]] && use addons; then
+		elog "The functionality of ktexteditorpreview plugin can be extended with:"
+		elog "  kde-misc/kmarkdownwebview"
+		elog "  media-gfx/kgraphviewer"
+	fi
+}