gentoo resync : 19.10.2017

3 files changed, 92 insertions, 0 deletions

diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index be12e2fb15de..cf324a4f2441 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,6 +1,8 @@
+AUX ktexteditor-5.39.0-indents.patch 1159 SHA256 a87ef171d67e2dca50a1ec979d316c58e540a46cb135ffd9480ea9237b419b69 SHA512 0ffae497093583e1cae3a0d65750fc9d687b799d40fe0dd1f27a464ab1b4862fd265cb7ba0d9367e9dcd5d80c324f8453cf928ace619d1e68b3a43f9f3e7d01b WHIRLPOOL d1c1be628660d2248dbe486aaefe6e58e91cda46e53c93854518b5c4c5d3818191a5368c8e9cce17802be810afc296ce5e8a16d59d8a78266374e5b9b24986f5
 DIST ktexteditor-5.37.0.tar.xz 2285796 SHA256 7ae65ca215a53dc4e35877069004c748d8a8b504aecbeaa3b916b8c96dd00478 SHA512 02b2ba273845deb11d9be69f4e212618d62319f30c5e5b999473d1392ee8c402d104aad0856a168b845abaf529d6d0a30e090f70e69d133bfa847ae3f6bb6b27 WHIRLPOOL be157a336f0fb49f1db22245a7d2dea008f8638aa5ab3247b65a8e04ae2d56c7de33a6a37d1cf489e124997f5420230404bde1a1587f79371b31e5bcf8b30543
 DIST ktexteditor-5.39.0.tar.xz 2288920 SHA256 c5d9c67532ab6f3abee8ae2623ff21e6ca5280d5ea9ca5d23bdb55f937e565ae SHA512 a76828be990bd32275f7de2448e337750aa1766eed669aa7a8c199d3d7db002c9d2193d09cac789c73d7cee783b9b85a21f50563e5beff30fac484f414145f6f WHIRLPOOL 691161b943d569eb634c9c4464e4019e6391caa37b9998a4c1bc46f9fd15e0a87dc118e7b2ecf186a789c138fd18b8a4b057cfaa5823520d52a11c6d2f8d7f82
 EBUILD ktexteditor-5.37.0.ebuild 1420 SHA256 1082a12b0fc4b96a5f89a018e84d1e3b2cf948a33d8a266d53b2e5a60fb2e697 SHA512 ef59eaf8fa5ccadc5203cd001cac39524d55dad4c8984af027ab153c93afa07be775223dbe158f82a61804695ee2e5ef740a3b0d50fe62374996bfad367bcede WHIRLPOOL 64b6d7d14e145ed46c5da566ffbe66c20ea4ba3d1c005eafed9ee31bdb644b476028ef2ba1bda2b5ac34b4c68bd2e256d6f47a3029ea79be2e10a395b29b2f0c
+EBUILD ktexteditor-5.39.0-r1.ebuild 1473 SHA256 735fc00512ca9c957a6fa753ee9b9c29353641d0d579846b0562b3b5769f7500 SHA512 250e0fa009323911bf80e3e55f3c91bb0bde9ae56f6941a85af4a1e39cbb3562ae29a9e3e761b2ebf84db5f8ec56334a194a9bd10db8ebca22debad90ba75116 WHIRLPOOL 8ddb4af8c9a6c23cb02619a24a83f76c5426db99e8be0347ca3aa53760e6c28022b33c011308404f57c362612249143470b92de69df1fc4735269d65d4601fd2
 EBUILD ktexteditor-5.39.0.ebuild 1427 SHA256 009c31ce11608b51e9a2e16ecbcee076b28c2bff54b9a2e1580b635701504151 SHA512 083135bc4e4dfaa5b9acc2ea2a854a4400e89fd087191e98bd4379fe613f3d0b24f289bbc9635ca5eaefca0c2ff2ae58ef79fe6d1107fdd58680146fdc624d02 WHIRLPOOL 23dcbc6c26542fafb0e528de0f2fa8c26e6bad039c5e514cd0be72394aa035d2084629a8109ead90a632f86d6aebc1de687a2079585670fdb1abdfe628593bea
 MISC ChangeLog 10114 SHA256 0586b579e155663504df1b27ecf6ce2f2a68975bccba42da9a746907a3b95640 SHA512 efd826e1c2a57e20912681a6af2987501e1317ca6923141392eeeefcc3b63e93b3d655ccd5328b947c91e0a75c44b3aff0ddc52a341edc48d03d8cbb52f09286 WHIRLPOOL 0efd04b8cc659d0ded525f99fcbf8dcb40b5ef2c7c03576a5214f636600179cd9b3136c9d8072992538fba013a9b7e79dbb1cab19dc626621cae32df201abcd7
 MISC ChangeLog-2015 2515 SHA256 b3a2f5199138502c8ecfb5650140b6675321573df702d7e6faf09d82a299dd69 SHA512 6a5f4253fb25609548ebe3562372a8d139974306018cad052a6ac800178f8d565353081fe3c8b42bf33b959f07e0922503685f43e392dc31bf47ae4574d27df1 WHIRLPOOL 9ea0b7ef0baa2d8aba454ba9b2fd1f9e36fa1b875944a67655dbb15d71516be75124cfbea846759eec4cc02e641c74c2f327f607038b544056d370f6f7f32d18
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.39.0-indents.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.39.0-indents.patch
new file mode 100644
index 000000000000..fc5d9d9d3639
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.39.0-indents.patch
@@ -0,0 +1,32 @@
+From aeebeadb5f5955995c17de56cf83ba7166a132dd Mon Sep 17 00:00:00 2001
+From: Sven Brauch <mail@svenbrauch.de>
+Date: Mon, 16 Oct 2017 18:35:50 +0200
+Subject: fix some indenters from indenting on random characters
+
+If triggerCharacters was not set, toString() would return "undefined",
+making indenters trigger on u, n, d, e, f, i and n.
+
+Differential Revision: https://phabricator.kde.org/D8333
+---
+ src/script/kateindentscript.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/script/kateindentscript.cpp b/src/script/kateindentscript.cpp
+index 15ce387..380bd45 100644
+--- a/src/script/kateindentscript.cpp
++++ b/src/script/kateindentscript.cpp
+@@ -46,7 +46,10 @@ const QString &KateIndentScript::triggerCharacters()
+ 
+     m_triggerCharactersSet = true;
+ 
+-    m_triggerCharacters = global(QStringLiteral("triggerCharacters")).toString();
++    auto triggerCharacters = global(QStringLiteral("triggerCharacters"));
++    if ( !triggerCharacters.isUndefined() ) {
++        m_triggerCharacters = triggerCharacters.toString();
++    }
+ 
+     //qCDebug(LOG_KTE) << "trigger chars: '" << m_triggerCharacters << "'";
+ 
+-- 
+cgit v0.11.2
+
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.39.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.39.0-r1.ebuild
new file mode 100644
index 000000000000..4b9342f69187
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.39.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a full text editor component"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="editorconfig git"
+
+RDEPEND="
+	$(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:= )
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtxmlpatterns)
+	test? ( $(add_frameworks_dep kservice) )
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-indents.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package editorconfig EditorConfig)
+		$(cmake-utils_use_find_package git LibGit2)
+	)
+
+	kde5_src_configure
+}