gentoo resync : 05.04.2019

4 files changed, 2 insertions, 93 deletions

diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index a5875c9e49fb..117f8486d194 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,7 +1,4 @@
-AUX konsole-18.08.3-desktop.patch 821 BLAKE2B 3b86d8c03bbc23e991ad2e84172f64591ccca3cf5877c3b1812593df8e817adaaf5a34c72d34ba57af09adb7f64eaa9e78732f724de8adfec523c17ee65d1e5d SHA512 0a6b36edff6067c18312b44d5b7fbe6f4c8659dd34ddda5edd5b483bea462fc4abe4c07710530997adf83be1dfc77c3fd72a74f60398ccdae8f8bdb84f3822ee
 AUX konsole-18.12.3-cursor.patch 2516 BLAKE2B 88591b1e8fb83328ead280c41740db2004bbc445c569e61022b1813d3e308bfcb39266cd64412a3e07866def901f97839a7227d16de04fdffe4ca93834cc4d7a SHA512 2be1001499e67f41c92c6f1dc147f05b5f3ef8e14aef53afbcf353cf31e3736da29dbc06b7e8c033d2921b8ff2755952ef0ad976244228293018bb739ee7fc0b
-DIST konsole-18.08.3.tar.xz 1077100 BLAKE2B 76ffc17c72ef6ccfc9618fd7ae59aeac00f8d686dcbe8fa61ef57248ba494d5dde94bc7f320c373f119e2ae60530d49640be7914aba7868b69e36c3673211f83 SHA512 3dcc5111e7a7fa389dda862b4a895379ffdb7a39d6568b3b958bf36631e3b3424a6abf2b9166f8567fcdf2d2d6f305a2e13f7575ce63549b0ebb4ebc27b33a82
 DIST konsole-18.12.3.tar.xz 1098092 BLAKE2B 672a0d8ca3572437893cff90fd56f13773d4100778a0620e68bce9c6e59bd1cf49bda62269106e3de136ceac03afe29e7d9e5cd3dd99887b8c6d4cae26b6a917 SHA512 9fecd316a9bc7adaca9a3fac38a57d293286b6328e88d96ac1cf8967fcb67ef8e9a5b085e185c4373599eafd0eaa18f0d73df70df16b98a1badd9efb689e1f7c
-EBUILD konsole-18.08.3-r1.ebuild 1463 BLAKE2B d8b66938939c560a9a8152e1a3cac2187156e725f80ee1ca1bacc8bdc5e8a2f13de4b287aa049180423feda04a9854fda2835ba23c8e21ec8deae74f34f942a2 SHA512 0114d8802c1863cd68b559c7be971436fd99585e804c84919bcd494d6156967b249e950742a33a4b3f884d5cbfc4da90231310012b5299d5bcae731a0f2d707f
-EBUILD konsole-18.12.3.ebuild 1484 BLAKE2B 1f5dc191ae99baaded1da4844ee51f7a7c11bff6559df3682bc325d6a8edbf106fd3783976b5e89773ec3243c7d691e5a59f25e35a1e02d53c1e7be2d2fe69ce SHA512 41cc04e44d980f7fd9643de0248c8bcb49b2756570f6a898618f9319191347496cace6c8c478de04829094e2ccad7171a6ac41a2fdc80b6242ce568607f49db1
+EBUILD konsole-18.12.3.ebuild 1482 BLAKE2B 2beffcb1ce6f35357bf6c8375c18c2e0e2e5991fbe334067c0fccab074dbb02c84b0ab46d7bf9f751c0898bddb7e0680fe8b91abb7b7787ca57d9cfe32deb8d0 SHA512 e0c20c0b4291a95e2a5a69e3928e85652022e684514acd87cc0021ce002f00118a4a9079d81a8da59db4d6d54908e2676673194c9eb4af7cdb9680752e97cb94
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/files/konsole-18.08.3-desktop.patch b/kde-apps/konsole/files/konsole-18.08.3-desktop.patch
deleted file mode 100644
index 8c204fe2bd24..000000000000
--- a/kde-apps/konsole/files/konsole-18.08.3-desktop.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1506ecdfd0f91d4b8b39c01bad1fe301193d6e82 Mon Sep 17 00:00:00 2001
-From: David Hallas <david@davidhallas.dk>
-Date: Sun, 11 Nov 2018 10:26:31 -0500
-Subject: Add StartupWMClass to .desktop file
-
-The org.kde.konsole.desktop file is missing a StartupWMClass setting.
-
-BUG: 372441
-FIXED-IN: 18.12
-
-Differential Revision: https://phabricator.kde.org/D16546
----
- desktop/org.kde.konsole.desktop | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/desktop/org.kde.konsole.desktop b/desktop/org.kde.konsole.desktop
-index adc472c..86c2160 100755
---- a/desktop/org.kde.konsole.desktop
-+++ b/desktop/org.kde.konsole.desktop
-@@ -10,6 +10,7 @@ X-DocPath=konsole/index.html
- X-DBUS-StartupType=Unique
- StartupNotify=true
- X-KDE-AuthorizeAction=shell_access
-+StartupWMClass=konsole
- 
- Name=Konsole
- Name[af]=Konsole
--- 
-cgit v0.11.2
diff --git a/kde-apps/konsole/konsole-18.08.3-r1.ebuild b/kde-apps/konsole/konsole-18.08.3-r1.ebuild
deleted file mode 100644
index a3f626b9bcf2..000000000000
--- a/kde-apps/konsole/konsole-18.08.3-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 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}"
-
-PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/konsole/konsole-18.12.3.ebuild b/kde-apps/konsole/konsole-18.12.3.ebuild
index 65dd4d2ac6cb..8b0c4a06739b 100644
--- a/kde-apps/konsole/konsole-18.12.3.ebuild
+++ b/kde-apps/konsole/konsole-18.12.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="KDE's terminal emulator"
 HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
 
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="X"
 
 DEPEND="