gentoo resync : 02.08.2019

4 files changed, 2 insertions, 148 deletions

diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index a1dc024a140e..86cbc6aa40bc 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,6 +1,3 @@
-AUX konsole-18.12.3-cursor.patch 2516 BLAKE2B 88591b1e8fb83328ead280c41740db2004bbc445c569e61022b1813d3e308bfcb39266cd64412a3e07866def901f97839a7227d16de04fdffe4ca93834cc4d7a SHA512 2be1001499e67f41c92c6f1dc147f05b5f3ef8e14aef53afbcf353cf31e3736da29dbc06b7e8c033d2921b8ff2755952ef0ad976244228293018bb739ee7fc0b
-DIST konsole-18.12.3.tar.xz 1098092 BLAKE2B 672a0d8ca3572437893cff90fd56f13773d4100778a0620e68bce9c6e59bd1cf49bda62269106e3de136ceac03afe29e7d9e5cd3dd99887b8c6d4cae26b6a917 SHA512 9fecd316a9bc7adaca9a3fac38a57d293286b6328e88d96ac1cf8967fcb67ef8e9a5b085e185c4373599eafd0eaa18f0d73df70df16b98a1badd9efb689e1f7c
 DIST konsole-19.04.3.tar.xz 1117408 BLAKE2B c5b0bf8800f24d464c4fd0c24203fe6df95f293959d3c2357c97323980c58bf034586ea9eee1c9bde784b754110d3520ebb3fb60d9b7815405a9d65570b06dbc SHA512 20ec8ae12268110f00999b9f1197aff667ee2af7d7c2747b4d142c9db48fceaca7c01ab8f12fbc541cfc79eaebcbd704e166610f263c46083ad9fefb3c5da848
-EBUILD konsole-18.12.3.ebuild 1482 BLAKE2B 2beffcb1ce6f35357bf6c8375c18c2e0e2e5991fbe334067c0fccab074dbb02c84b0ab46d7bf9f751c0898bddb7e0680fe8b91abb7b7787ca57d9cfe32deb8d0 SHA512 e0c20c0b4291a95e2a5a69e3928e85652022e684514acd87cc0021ce002f00118a4a9079d81a8da59db4d6d54908e2676673194c9eb4af7cdb9680752e97cb94
-EBUILD konsole-19.04.3.ebuild 1422 BLAKE2B 227d1d1f91d4bafe82f8c7f9b583eacc5815352906f6a03a6224f6eb4d1ab4da406ff16352fa5a9368a46871448cbb561dab83e493bc597b93d15c0b64159687 SHA512 8f2b683d030c682f2ed471298bbd11a20a50a525e6059384909652339ee09d99234987b935857a6be7d8546f6566fdf2f1d451a928f524172edf7d898b5570b5
+EBUILD konsole-19.04.3.ebuild 1419 BLAKE2B 765b1104d279359f6b9622159fcfca9d53a32bf068439af214d34beb01b4e27ef6d4fab3a4193efeaffc1696b2dc36926fbba19f9708094441e73aca3e70401c SHA512 5f0dc638cf96a5cb27584446f79314cd06cf251a59be79494110e821ec02894aa518dd67cf400e610ca1affdcef0067955f0927965a1056b0bf4e4c243050e2a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/files/konsole-18.12.3-cursor.patch b/kde-apps/konsole/files/konsole-18.12.3-cursor.patch
deleted file mode 100644
index f9960340b906..000000000000
--- a/kde-apps/konsole/files/konsole-18.12.3-cursor.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From eccfb1f62bbf67ebffee11e241bd05757b826ff1 Mon Sep 17 00:00:00 2001
-From: Wolfgang Bauer <wbauer@tmo.at>
-Date: Mon, 4 Mar 2019 09:59:45 -0500
-Subject: Fix ibeam and underline cursor rendering
-
-Summary:
-Since anti-aliasing was enabled in the painter, coordinates need to
-be shifted half a pixel so that they align with the pixel grid,
-otherwise the result gets "blurred" due to the anti-aliasing.
-And as parts of the blurred shape leak outside the cursor rectangle,
-this also leaves artifacts when the cursor moves or blinks as these
-parts are not cleared.
-
-This is basically the same as commit
-e7085310d6d594823d0ed491fa8bdbd99dec4932 for the
-standard block cursor.
-
-BUG: 402589
-
-Test Plan:
-- Switch cursor shape to "I-Beam" or "Underline" in the "Advanced"
-profile settings
-
-The cursors are a single line again now, before they were blurred by
-anti-aliasing.
-
-Screenshots:
-Before:
-{F6656366}
-{F6656370}
-
-After:
-{F6656371}
-{F6656373}
-
-Also, there are no more artifacts when the cursor is moved or
-cursor blinking is enabled.
-
-Reviewers: #konsole, hindenburg
-
-Reviewed By: #konsole, hindenburg
-
-Subscribers: hindenburg, konsole-devel
-
-Tags: #konsole
-
-Differential Revision: https://phabricator.kde.org/D19513
----
- src/TerminalDisplay.cpp | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
-index 543b897..397422c 100644
---- a/src/TerminalDisplay.cpp
-+++ b/src/TerminalDisplay.cpp
-@@ -716,16 +716,18 @@ void TerminalDisplay::drawCursor(QPainter& painter,
-             }
-         }
-     } else if (_cursorShape == Enum::UnderlineCursor) {
--        painter.drawLine(cursorRect.left(),
--                         cursorRect.bottom(),
--                         cursorRect.right(),
--                         cursorRect.bottom());
-+        QLineF line(cursorRect.left() + 0.5,
-+                    cursorRect.bottom() - 0.5,
-+                    cursorRect.right() - 0.5,
-+                    cursorRect.bottom() - 0.5);
-+        painter.drawLine(line);
- 
-     } else if (_cursorShape == Enum::IBeamCursor) {
--        painter.drawLine(cursorRect.left(),
--                         cursorRect.top(),
--                         cursorRect.left(),
--                         cursorRect.bottom());
-+        QLineF line(cursorRect.left() + 0.5,
-+                    cursorRect.top() + 0.5,
-+                    cursorRect.left() + 0.5,
-+                    cursorRect.bottom() - 0.5);
-+        painter.drawLine(line);
-     }
- }
- 
--- 
-cgit v1.1
diff --git a/kde-apps/konsole/konsole-18.12.3.ebuild b/kde-apps/konsole/konsole-18.12.3.ebuild
deleted file mode 100644
index 8b0c4a06739b..000000000000
--- a/kde-apps/konsole/konsole-18.12.3.ebuild
+++ /dev/null
@@ -1,59 +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="KDE's terminal emulator"
-HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
-
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(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 kjobwidgets)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	$(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 qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
-
-PATCHES=( "${FILESDIR}/${P}-cursor.patch" ) # bug 673766
diff --git a/kde-apps/konsole/konsole-19.04.3.ebuild b/kde-apps/konsole/konsole-19.04.3.ebuild
index 260b1d755126..149525ca79fb 100644
--- a/kde-apps/konsole/konsole-19.04.3.ebuild
+++ b/kde-apps/konsole/konsole-19.04.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="KDE's terminal emulator"
 HOMEPAGE="https://kde.org/applications/system/konsole https://konsole.kde.org"
 
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="X"
 
 DEPEND="