gentoo resync : 15.12.2019

6 files changed, 118 insertions, 115 deletions

diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index 18174f309af6..b507edf745ef 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,6 +1,5 @@
-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.3.tar.xz 5844532 BLAKE2B 34aaceab92783a869de616be9290887f75eba5ef6198e93d90a71d62b441a907a7893916c72ac85c46d6156330322d5297c60c8c9b43cbcd615c05b51cdd0000 SHA512 0a0b33858bd4856bdf29d354603d33541b2c0aab134025db3014aa31cf3231fa2bcc244252872c0b51c28b7cd715556966d9049ce85a8ad614e1f552479c1bc8
-EBUILD kate-19.04.3.ebuild 2207 BLAKE2B 85e88a4f1bf8dbbe5ee8f8d7022c11717adf606ca1823cf6484727cec6a6849336aeeb2959652837301f27daef00a00baef2fce8f4c0063cb893379b40c4ad73 SHA512 d77b0801ae672d44d563efe4be19338ceb924214049875361a92e336e43eedf79a2aec64d272e7eab0fe493c565c5d76fe71b0901761b3db84a9ab5ca0cd6f36
-EBUILD kate-19.08.3.ebuild 2572 BLAKE2B 96654bd2480fd4a44227561b71fff162bf351a62848aa8a6c058caf7227e8ea18ae5844caadf825ef0cdfccc972ac4653ed33595304b6b50b6a400f7559108c6 SHA512 746844e5753f530bd27556a2125d9b2738000723086724b207b567456142eade759e0ad48f79802d2a00a79ddac39600d5a2c91df82969da5deb07fda4a9e15b
-MISC metadata.xml 438 BLAKE2B 73e26b12116384010c313f77322143b111d10f1f90b8c4762edbf4e12de9d864b626de3c60781f00c098053ce4a71243c034352cd3178c5c77be78a0c5e2bf88 SHA512 a6e3518490973483bbf1a04394601c0d0b68a0869f3026f2aa96e31e74356effeeb53f0eb1d29ea914a614a52807ad04cdf6ba28ce4bc35553af4b6dee4f30c2
+DIST kate-19.12.0.tar.xz 5695096 BLAKE2B 8b783c86879ccf49d8d028b02eb5ff89e85ff061605e1fd46e0d5952611455a1832a20fba2158eff61617617f95207a158a6e36975602fb4ff0dcd7147928f8a SHA512 37106b3db09c302d69922cb81a425b2a74bc7bac8cc7d767d6efa59d60b5e80b4f1d2e20dc1e87a2cc57b534fdaefd58b40ce463894f58b56d8ec9a229487db8
+EBUILD kate-19.08.3.ebuild 2569 BLAKE2B 6c7ac0169c419424009524ccea13b952fc07519c76b7b61771f079e9fcc2d71bf977d00c96c1f4c181f84cb548d2d5b13ea732f8e689f0c2ab47c137f0777a9c SHA512 50b7abc71b9a693df6c9a9c9455070779a66bf974aa2df794f67ccc9c1de9a48d18ade9eb647f9c11392dd94894c7c9f347cf1ab5c6afc864c3c19f43b183ad4
+EBUILD kate-19.12.0.ebuild 2903 BLAKE2B fb06f0e5344721b12f8b789921e2322862af70756c1596f047b16dc06329531fa184080d7380c89559545789a1ed48c685083c590eaf9f573f012c430b190576 SHA512 cda9f88c4f77bf52cef3d1a654fe85b91a90c62a5d58aa9b7c53293ed5beb2f790710087ccc7c3cd8e42a8e4057e8d9442f48bbc3f51e0a9bde35a2671fc6518
+MISC metadata.xml 928 BLAKE2B 82f8586f3a4473f33f28880a33c6e5949b38f72186838923066dc9c109d6c58101912e4ef9b374e9b6ddec962635e421e0385ac8a6c07e4dc2785006073849f6 SHA512 69c8bcd624acd1cf9260abf1408351450caaff184275126a0a988848e565fbd81602f6b61b858a0f36fe6bba4e96d7af1911600bfe4d9c0cbf32263aab530df8
diff --git a/kde-apps/kate/files/kate-19.04.3-qt-5.12.4-missing-header.patch b/kde-apps/kate/files/kate-19.04.3-qt-5.12.4-missing-header.patch
deleted file mode 100644
index 3fd4147bd0f6..000000000000
--- a/kde-apps/kate/files/kate-19.04.3-qt-5.12.4-missing-header.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From fce700be7740704929c8bd64549ddf80774e4bda Mon Sep 17 00:00:00 2001
-From: Christoph Cullmann <cullmann@kde.org>
-Date: Thu, 18 Jul 2019 22:10:05 +0200
-Subject: add missing header
-
----
- kate/katemdi.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/kate/katemdi.cpp b/kate/katemdi.cpp
-index 495d1a5..8173ebe 100644
---- a/kate/katemdi.cpp
-+++ b/kate/katemdi.cpp
-@@ -43,6 +43,7 @@
- #include <QSizePolicy>
- #include <QStyle>
- #include <QDomDocument>
-+#include <QVBoxLayout>
- 
- namespace KateMDI
- {
--- 
-cgit v1.1
diff --git a/kde-apps/kate/kate-19.04.3.ebuild b/kde-apps/kate/kate-19.04.3.ebuild
deleted file mode 100644
index b47fc1d5b383..000000000000
--- a/kde-apps/kate/kate-19.04.3.ebuild
+++ /dev/null
@@ -1,86 +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="Kate is an advanced text editor"
-HOMEPAGE="https://kde.org/applications/utilities/kate https://kate-editor.org/"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+addons"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(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)
-	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
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.12.4-missing-header.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-	# test hangs
-	sed -e "/session_manager_test/d" -i kate/autotests/CMakeLists.txt || die
-	# 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=(
-		-DBUILD_addons=$(usex addons)
-		-DBUILD_kwrite=FALSE
-	)
-
-	kde5_src_configure
-}
-
-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
index 35b405cb6c81..50f033411a0a 100644
--- a/kde-apps/kate/kate-19.08.3.ebuild
+++ b/kde-apps/kate/kate-19.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Multi-document editor with network transparency, Plasma integration
 HOMEPAGE="https://kde.org/applications/utilities/kate https://kate-editor.org/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="activities +addons"
 
 DEPEND="
diff --git a/kde-apps/kate/kate-19.12.0.ebuild b/kde-apps/kate/kate-19.12.0.ebuild
new file mode 100644
index 000000000000..568126824f0e
--- /dev/null
+++ b/kde-apps/kate/kate-19.12.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.63.0
+QTMIN=5.12.3
+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 ~x86"
+IUSE="activities +filebrowser lspclient +projects plasma +snippets sql"
+
+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/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 )
+	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? (
+		>=kde-frameworks/kwallet-${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_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
+	)
+
+	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/kmarkdownwebview"
+		elog "  media-gfx/kgraphviewer"
+	fi
+}
diff --git a/kde-apps/kate/metadata.xml b/kde-apps/kate/metadata.xml
index cc30415dbac5..0a6b46015bed 100644
--- a/kde-apps/kate/metadata.xml
+++ b/kde-apps/kate/metadata.xml
@@ -8,5 +8,11 @@
 	<use>
 		<flag name="activities">Enable Plasma Activities support via <pkg>kde-frameworks/kactivities</pkg></flag>
 		<flag name="addons">Build and install additional plugins</flag>
+		<flag name="filebrowser">Enable File System browser tool view</flag>
+		<flag name="lspclient">Enable LSP (Language Server Protocol) client plugin</flag>
+		<flag name="plasma">Enable Session Applet addon for KDE Plasma</flag>
+		<flag name="projects">Enable Project plugin for executing queries on SQL DBs</flag>
+		<flag name="snippets">Enable Snippets Tool View plugin to manage or download code snippets</flag>
+		<flag name="sql">Enable SQL plugin for executing queries on SQL DBs</flag>
 	</use>
 </pkgmetadata>