gentoo resync : 02.08.2019

4 files changed, 2 insertions, 117 deletions

diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 4713520493ff..484c6be52412 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,6 +1,3 @@
-AUX ktexteditor-5.57.0-shortcuts.patch 2231 BLAKE2B 2f63c8f09954fc36bc5bc333cdce2a6b672dada6f1287f2d137bfe2b71ca1c385e9b230c860dc3e42c2827ace3ab636088060a934ebc6a98ac9c06ef539b9a8a SHA512 f1dafd427d9c7c832943904587c6fb37612fd46808500137d814b6d6b960470271f9c61d6a2eb75fcd7909ae7691d7d6d3c49de8b55508e027a2575c07f4255f
-DIST ktexteditor-5.57.0.tar.xz 2294748 BLAKE2B f4c8ef5ab46e6505d3760ba4d40721579820244915c609b3b5148f7718d8649884c87ef7d6809e309dd75470eca70b98c1b93742d1ed2798a4b3150b33f8b555 SHA512 e5b1462eed712273e1b5bf6107f42da7bea79d06d160106bc1fb68825f062b898a15a231f864819b74103eeb8772c09adf591945cef8bd663389290daf785a82
 DIST ktexteditor-5.60.0.tar.xz 2321556 BLAKE2B 908443a648a402b73cf223e63f70165abf4b5c636a3c2b894ce3f3633383f12be1fb41e195d65a9703ab9d17d9ad6cccc058edbffec139db4934dc714de09d86 SHA512 16741e4f6aab274b856fdff42a578f936bd72d5452d88e52e1cf739d6462e461e330b51360f1583fa9c4c1f51998d2ea27d78f9456118bca2b381dda7e809272
-EBUILD ktexteditor-5.57.0-r1.ebuild 1450 BLAKE2B 6b7acd84271f000d53344a400d3672a8510a7c3f93d86aab68199dc33bfa52d43a020388fe91b13a2307fbaf779ef4d180650e6cf9dbefc20b517cfaa09deb8e SHA512 47655d9e47fab847f12ceb44ae99df93a5155047b31fd594bfb10898cdc65dddd2f91cbc12877be59be0f14eef0fa6c23603180b2c6daf0d238e73c21c3836ae
-EBUILD ktexteditor-5.60.0.ebuild 1405 BLAKE2B 64dc1e7b0b371b6d43d8fa1c7b457ed3423f00a89906cc6c2c50e64df058ab6dbada60bb2378e767b76fb4e3ad7e8422ac8244885cb0dfa1dae2fe27e32364d6 SHA512 fb63fc8877d3d40ce989daa3e3e84d4b4f38be2b794dccc5d128e3a427b2b2e174c723f8889f2746acbd644e0880377fafe38a6600d7803345b2d0450673af06
+EBUILD ktexteditor-5.60.0.ebuild 1402 BLAKE2B 2b57119583107c1e2293bcfb4dbeab4019b442205863034e0299d0b09cccbb30d6487d2abb4df9f346e5857f39aa73f1f8c637c373c6900fe7bf71b28507d4ea SHA512 5ec514329969cfbfab32a3274f9f2ede46a7807254ec712b63b889c65f55113de7f8b6ac73355736656e6bf9d700a26a2d2b96891954aef6ac4ef27455b31b77
 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
deleted file mode 100644
index 2f979d681227..000000000000
--- a/kde-frameworks/ktexteditor/files/ktexteditor-5.57.0-shortcuts.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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.57.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.57.0-r1.ebuild
deleted file mode 100644
index 7f626414d3ad..000000000000
--- a/kde-frameworks/ktexteditor/ktexteditor-5.57.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}-shortcuts.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.60.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.60.0.ebuild
index 4413fff50646..b41a090b6971 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.60.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.60.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing a full text editor component"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="editorconfig git"
 
 BDEPEND="