gentoo resync : 28.04.2019

4 files changed, 59 insertions, 58 deletions

diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index ed89d4d1697a..04ad9f8250a8 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,7 +1,7 @@
 AUX ktexteditor-5.54.0-allow-change-marker-size.patch 2381 BLAKE2B 527cce76a6386196c5ac5558be893418886e1ac051a25e7fd091f90aa13031ac7687edf49b1cbbc31ba415773f82053af68ef15cfcdf2a7565aa3c5248372d7c SHA512 a1b6a72ad99ec246fbf2d74e57e8537f44b5e4adc197bde5060a6c8b29da295d198483f93a326720efbf3e0940a627da5c1d5e164469cc905fc081f642a5db90
+AUX ktexteditor-5.57.0-shortcuts.patch 2231 BLAKE2B 2f63c8f09954fc36bc5bc333cdce2a6b672dada6f1287f2d137bfe2b71ca1c385e9b230c860dc3e42c2827ace3ab636088060a934ebc6a98ac9c06ef539b9a8a SHA512 f1dafd427d9c7c832943904587c6fb37612fd46808500137d814b6d6b960470271f9c61d6a2eb75fcd7909ae7691d7d6d3c49de8b55508e027a2575c07f4255f
 DIST ktexteditor-5.54.0.tar.xz 2264380 BLAKE2B 576176595c80b79f4bbe58e17304c7a9168be2723f01e7f1c51f67970bea9a9169084b074e754957c2e77c134df837226e85ff3b3a0a149005240520595de116 SHA512 8402fb036887ef853e455b4c80b3f4ff7fa6a65fc37e94d4fb2e94c09a59f2e49d7403dbf94aa3f2b2eb7ac6f43c5aede9aaa45ab5e9597a62b8a5d9b7ad0500
-DIST ktexteditor-5.56.0.tar.xz 2283112 BLAKE2B 48c8fa59b26f5b4cb7c0227f3c01a0ceb0a937b3940709f706743e455d92c312ae1636d7ae79cccc329bc9a5c3f26c3c4a80fbe1e107b4e814e2247b43b53761 SHA512 71c139f25823d70e1c359e1b4ac26dc756adb2404dfd3068059a915c9724d8c867e967e2aabae8ed50de085407f2af94ba1b852c546bba4ebd7a2fb9b1fe3069
+DIST ktexteditor-5.57.0.tar.xz 2294748 BLAKE2B f4c8ef5ab46e6505d3760ba4d40721579820244915c609b3b5148f7718d8649884c87ef7d6809e309dd75470eca70b98c1b93742d1ed2798a4b3150b33f8b555 SHA512 e5b1462eed712273e1b5bf6107f42da7bea79d06d160106bc1fb68825f062b898a15a231f864819b74103eeb8772c09adf591945cef8bd663389290daf785a82
 EBUILD ktexteditor-5.54.0-r1.ebuild 1456 BLAKE2B 8c4ab6b60152b7624492bd72f9aa2389b317ad7a57fad4ff4ee02d43c814d93e157b33fccade7ad80b5c9f89a8fe4d17415977a2c242a92bbacda1e71b9401a3 SHA512 485a9d4f9561afd9d6744a7e456c78adb2ac16fbe4f8fc326fcd1f049f46dad201fe6fbde12ab0b99b044b46c6b0fb04ff14b68d0b7f89155d8678bf0d984c59
-EBUILD ktexteditor-5.54.0.ebuild 1395 BLAKE2B 5312d70dfa9ff4807aea72342db176460b9b622082808a6bff3ff372aad8d2c8a3b58daa3a78b71d847a69b2d774ad6fdd40d3c34c865bf27571fd92c371e473 SHA512 50f3b031102a7d59a1a5d0f8914b8bb1bf3bfbe758eb4865c7adf63f0006fc0dec00be009b6e54f7ade014348aeaf67ad4d3565a0defc96ff0778a0fb2e31eff
-EBUILD ktexteditor-5.56.0.ebuild 1405 BLAKE2B 64dc1e7b0b371b6d43d8fa1c7b457ed3423f00a89906cc6c2c50e64df058ab6dbada60bb2378e767b76fb4e3ad7e8422ac8244885cb0dfa1dae2fe27e32364d6 SHA512 fb63fc8877d3d40ce989daa3e3e84d4b4f38be2b794dccc5d128e3a427b2b2e174c723f8889f2746acbd644e0880377fafe38a6600d7803345b2d0450673af06
+EBUILD ktexteditor-5.57.0-r1.ebuild 1453 BLAKE2B 472f1a092fe9a9eb6de3bdcdc116ca2f8a3e1a7534d0d41792f4aac36049ac673704922045350ae4d9f45a57f34ca3bace9f2d1ed0e56eff9431ad1809f4616b SHA512 d4484787bb95a2acfe261afbad4d89ca312dbb8dd493a62f7e295f0f1ff17ff7e545b555ff1c1d77c4d94c8b9bd1b18439410209a010f5796879f3e70dc339bc
 MISC metadata.xml 351 BLAKE2B 7e4b1aefcf41fd5e37bd68d4e2fdb057be4ba7f8efb18b3494fe551c1990eb5209e4692e9b9a5618c950875c03a05ba6a39e2ea8c7f63c9894dab23277b0a070 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.57.0-shortcuts.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.57.0-shortcuts.patch
new file mode 100644
index 000000000000..2f979d681227
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.57.0-shortcuts.patch
@@ -0,0 +1,54 @@
+From 9f2ffd36c5873f4d2645f07129ead7970871808c Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Sun, 14 Apr 2019 14:38:31 +0200
+Subject: avoid conflicting shortcuts for switching tabs
+
+Summary: use ALT + Home/End for top/bottom of view
+
+Subscribers: kwrite-devel, kde-frameworks-devel
+
+Tags: #kate, #frameworks
+
+Differential Revision: https://phabricator.kde.org/D20534
+---
+ src/view/kateview.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/view/kateview.cpp b/src/view/kateview.cpp
+index 7220d26..55457c7 100644
+--- a/src/view/kateview.cpp
++++ b/src/view/kateview.cpp
+@@ -1046,13 +1046,13 @@ void KTextEditor::ViewPrivate::setupEditActions()
+ 
+     a = ac->addAction(QStringLiteral("move_top_of_view"));
+     a->setText(i18n("Move to Top of View"));
+-    ac->setDefaultShortcut(a, QKeySequence(Qt::CTRL + Qt::Key_PageUp));
++    ac->setDefaultShortcut(a, QKeySequence(Qt::ALT + Qt::Key_Home));
+     connect(a, SIGNAL(triggered(bool)), SLOT(topOfView()));
+     m_editActions << a;
+ 
+     a = ac->addAction(QStringLiteral("select_top_of_view"));
+     a->setText(i18n("Select to Top of View"));
+-    ac->setDefaultShortcut(a, QKeySequence(Qt::CTRL + Qt::SHIFT +  Qt::Key_PageUp));
++    ac->setDefaultShortcut(a, QKeySequence(Qt::ALT + Qt::SHIFT + Qt::Key_Home));
+     connect(a, SIGNAL(triggered(bool)), SLOT(shiftTopOfView()));
+     m_editActions << a;
+ 
+@@ -1070,13 +1070,13 @@ void KTextEditor::ViewPrivate::setupEditActions()
+ 
+     a = ac->addAction(QStringLiteral("move_bottom_of_view"));
+     a->setText(i18n("Move to Bottom of View"));
+-    ac->setDefaultShortcut(a, QKeySequence(Qt::CTRL + Qt::Key_PageDown));
++    ac->setDefaultShortcut(a, QKeySequence(Qt::ALT + Qt::Key_End));
+     connect(a, SIGNAL(triggered(bool)), SLOT(bottomOfView()));
+     m_editActions << a;
+ 
+     a = ac->addAction(QStringLiteral("select_bottom_of_view"));
+     a->setText(i18n("Select to Bottom of View"));
+-    ac->setDefaultShortcut(a, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_PageDown));
++    ac->setDefaultShortcut(a, QKeySequence(Qt::ALT + Qt::SHIFT + Qt::Key_End));
+     connect(a, SIGNAL(triggered(bool)), SLOT(shiftBottomOfView()));
+     m_editActions << a;
+ 
+-- 
+cgit v1.1
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.54.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.54.0.ebuild
deleted file mode 100644
index 34ec8dadb4fe..000000000000
--- a/kde-frameworks/ktexteditor/ktexteditor-5.54.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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}
-	test? ( $(add_frameworks_dep kservice) )
-"
-
-RESTRICT+=" test"
-
-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.56.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.57.0-r1.ebuild
index 4413fff50646..550a3354398f 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.56.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.57.0-r1.ebuild
@@ -46,6 +46,8 @@ RDEPEND="${DEPEND}"
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-shortcuts.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package editorconfig EditorConfig)