gentoo resync : 18.11.2019

4 files changed, 60 insertions, 88 deletions

diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index badc4e8e6050..d3a63c7c0163 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,6 +1,5 @@
-AUX ktexteditor-5.63.0-crashfix.patch 1260 BLAKE2B 8e53de884ff50f12a68e849b35f84ff0c6ef3accb8132c268867fa3ec2937a138d2495779f85afd5019263f7cf3bec1c4f17c2c3ee2abb549b4d3507fbeea799 SHA512 306cf700d7ddbacb648536807fa34de7ba2aa7ae62182e7f1dd6530c9166785279bb621a43800f289f77131ea7596e85f1c889884ff3fbdd835ac78166f1bd13
 DIST ktexteditor-5.60.0.tar.xz 2321556 BLAKE2B 908443a648a402b73cf223e63f70165abf4b5c636a3c2b894ce3f3633383f12be1fb41e195d65a9703ab9d17d9ad6cccc058edbffec139db4934dc714de09d86 SHA512 16741e4f6aab274b856fdff42a578f936bd72d5452d88e52e1cf739d6462e461e330b51360f1583fa9c4c1f51998d2ea27d78f9456118bca2b381dda7e809272
-DIST ktexteditor-5.63.0.tar.xz 2350016 BLAKE2B 38cfe56fd769277d11b8c53acd2b20ef28757cc123ecf3e7f1ee392b6bf9eaaec122786e07a6a6bf3c7f57390d4eb180113a465f9c359ed9d44a42c347adab6a SHA512 e16a814b921febe08c5f506c4b882686f5d4ba70c24148bc6d0071b36ed768920b2acadf468588ff56b17fc912454907c830455d78c10240814eab4e288e4876
+DIST ktexteditor-5.64.0.tar.xz 2359280 BLAKE2B bef28882fc0f7b525eaaa3d29305c6a884af5030a2f319c3bb085c5fd74f81f14353c6685faa7e7d67fbe292fae5f56eb452dbdd4a86cab9c015b8cd1ae788c7 SHA512 6a8f1f86cf5cdc259673152a26c3feb952fc2e5a9227c7a78ae52a848acbe5b60d30583539363ebd59fa744fb428441acdf89581b2db44d54c1896248eb18e99
 EBUILD ktexteditor-5.60.0.ebuild 1402 BLAKE2B 2b57119583107c1e2293bcfb4dbeab4019b442205863034e0299d0b09cccbb30d6487d2abb4df9f346e5857f39aa73f1f8c637c373c6900fe7bf71b28507d4ea SHA512 5ec514329969cfbfab32a3274f9f2ede46a7807254ec712b63b889c65f55113de7f8b6ac73355736656e6bf9d700a26a2d2b96891954aef6ac4ef27455b31b77
-EBUILD ktexteditor-5.63.0-r1.ebuild 1452 BLAKE2B de8b45b623589e4773e81b04333347e569dca18b0a6c1ca6c76613692f954388222c99c3d6453864beac47efec7aa9aef497f655f924e17b33ebdb0f4cded2bf SHA512 ed6fcb2dbb2f5c0d56506da75e796f7b62c9044de4e158a11ce06f66976c3f1ce0bf5a6d76245b2e41aac663f9969bbf53cc807c63bac16c9f5ade6c55b92bcc
+EBUILD ktexteditor-5.64.0.ebuild 1595 BLAKE2B a4020dd8820f90ad8f5347275aab3e1b292f5294ef1dbcf21147b0ed0c4e84fd6ffe18fb1dd471d9b6f010a44447e0774a3e6739cf2911dcc785bb22132ff013 SHA512 cd816f82dadfcd5a5ce2dbf4c80da47ce75d006c15c84e55b99881ff4abca7a13ca9921959cdf1cafa63955a649e956a7a914a779ae4641817198e2346adce18
 MISC metadata.xml 351 BLAKE2B 7e4b1aefcf41fd5e37bd68d4e2fdb057be4ba7f8efb18b3494fe551c1990eb5209e4692e9b9a5618c950875c03a05ba6a39e2ea8c7f63c9894dab23277b0a070 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.63.0-crashfix.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.63.0-crashfix.patch
deleted file mode 100644
index f6c867cad656..000000000000
--- a/kde-frameworks/ktexteditor/files/ktexteditor-5.63.0-crashfix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f6e72a23052339253daa79095391625cf01c96f1 Mon Sep 17 00:00:00 2001
-From: Christoph Cullmann <cullmann@kde.org>
-Date: Mon, 28 Oct 2019 20:32:13 +0100
-Subject: fix crash
-
-BUG: 413474
----
- src/utils/katevariableexpansionhelpers.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/utils/katevariableexpansionhelpers.cpp b/src/utils/katevariableexpansionhelpers.cpp
-index db71d0f..89aab3d 100644
---- a/src/utils/katevariableexpansionhelpers.cpp
-+++ b/src/utils/katevariableexpansionhelpers.cpp
-@@ -278,7 +278,9 @@ KateVariableExpansionDialog::KateVariableExpansionDialog(QWidget *parent)
-     connect(m_listView, &QAbstractItemView::activated, [this, lblDescription, lblCurrentValue](const QModelIndex &index) {
-         if (index.isValid()) {
-             const auto &var = m_variables[m_filterModel->mapToSource(index).row()];
--            const auto name = QStringLiteral("%{") + var.name() + QLatin1Char('}');
-+
-+            // not auto, don't fall for string builder, see bug 413474
-+            const QString name = QStringLiteral("%{") + var.name() + QLatin1Char('}');
- 
-             if (parentWidget() && parentWidget()->window()) {
-                 auto currentWidget = parentWidget()->window()->focusWidget();
--- 
-cgit v1.1
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.63.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.63.0-r1.ebuild
deleted file mode 100644
index 371a1c9b8ec3..000000000000
--- a/kde-frameworks/ktexteditor/ktexteditor-5.63.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing a full text editor component"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="editorconfig git"
-
-BDEPEND="
-	test? ( $(add_frameworks_dep kservice) )
-"
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	editorconfig? ( app-text/editorconfig-core-c )
-	git? ( dev-libs/libgit2:= )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package editorconfig EditorConfig)
-		$(cmake-utils_use_find_package git LibGit2)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.64.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.64.0.ebuild
new file mode 100644
index 000000000000..6d43f24cc3fd
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.64.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing a full text editor component"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="editorconfig git"
+
+BDEPEND="
+	test? ( >=kde-frameworks/kservice-${PVCUT}:5 )
+"
+DEPEND="
+	>=kde-frameworks/karchive-${PVCUT}:5
+	>=kde-frameworks/kauth-${PVCUT}:5
+	>=kde-frameworks/kcodecs-${PVCUT}:5
+	>=kde-frameworks/kcompletion-${PVCUT}:5
+	>=kde-frameworks/kconfig-${PVCUT}:5
+	>=kde-frameworks/kconfigwidgets-${PVCUT}:5
+	>=kde-frameworks/kcoreaddons-${PVCUT}:5
+	>=kde-frameworks/kguiaddons-${PVCUT}:5
+	>=kde-frameworks/ki18n-${PVCUT}:5
+	>=kde-frameworks/kiconthemes-${PVCUT}:5
+	>=kde-frameworks/kio-${PVCUT}:5
+	>=kde-frameworks/kitemviews-${PVCUT}:5
+	>=kde-frameworks/kjobwidgets-${PVCUT}:5
+	>=kde-frameworks/kparts-${PVCUT}:5
+	>=kde-frameworks/ktextwidgets-${PVCUT}:5
+	>=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+	>=kde-frameworks/kxmlgui-${PVCUT}:5
+	>=kde-frameworks/sonnet-${PVCUT}:5
+	>=kde-frameworks/syntax-highlighting-${PVCUT}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	editorconfig? ( app-text/editorconfig-core-c )
+	git? ( dev-libs/libgit2:= )
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package editorconfig EditorConfig)
+		$(cmake-utils_use_find_package git LibGit2)
+	)
+
+	ecm_src_configure
+}