gentoo resync : 14.05.2020

4 files changed, 4 insertions, 72 deletions

diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index afa335f9e421..4444eb952808 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -3,7 +3,6 @@ AUX konsole-19.12.3-kf5bookmarks-5.69.patch 4409 BLAKE2B a10546cf5708b4e47d23707
 AUX konsole-19.12.3-no-ccache.patch 1784 BLAKE2B 39b0a9e6406a614dd49434ab0f872f9956d2f3f54e3a9fb1693f2db6aefa779ad83d8cacea0503ed3459edcfec230588f14e747fb973678c41518630f9d0ca4c SHA512 83c99ca0c6b3b3562691c5d77746c85f3ef6a736cfa573420c716cefe806138dde5737e94132488e8b2d9938f7b5052ed63ace674cef82a8a668548033b60ec7
 DIST konsole-19.12.3.tar.xz 1160780 BLAKE2B b4a6c794951081ff9354c68c1177836b8462c0e2ec19b39b08c6e90f8837b58109e5559ab93cd1f7520a6ffbbd651d0d92bcc3c359815e7264744fcfbde02cb0 SHA512 980a7eab4efb219acdda8873318980ba14cf7d3fc4f78ac171f8ed1e11400b3028150140aac192820771a0ac8e596fc0f6497c4a44d74bbd1c421f72a39da289
 DIST konsole-20.04.0.tar.xz 1165700 BLAKE2B a9bc9d914da8e780fca19787723e8e97d3875908dea132a982fb6a07902af8e6733cde50d4b3d0c76c5be9837cc0e68d4fcc8672f0189e16209bd7a6c29576a7 SHA512 eb260752cf62c418349a8a2ee91e5a9a8f0450190f6d8ffe3c6ac4d7131e858e84f0f520c447588f60143564eaac9b5f340d90562fe507ec27846a82d0bc73f4
-EBUILD konsole-19.12.3-r1.ebuild 1900 BLAKE2B 5b824c82204d3daf16c82a8b97a61a690566a72f209c81ff6fb0d7f0be1d5233dcca32319f27aa28d973268debafcf2446b1dd4274e7632de8cf61a930444592 SHA512 35f7907c04db82a73eacc94b384cadd09b3c0ce3fac38e9119330189e4ebb559ff26dca41d23f0ad40e988c53c971498df8c25a711ab629cc954a0427f3b77db
-EBUILD konsole-19.12.3.ebuild 1779 BLAKE2B 9ec486214a5937bfdaaf10fa071f2a6912e95c3e153ea41fd2cccc60e289dcc31ddb6f6108b8c3451a1b0d95539f058121fb2fc11e8358077f3c45c6e0aeecbe SHA512 a37d4007bd1ceed603fec0f10c3f90994a873844101bf472008dc893812c5a4d48563d1ac8a6494ddcbccfdc7237bd372d2cb6d437e1bb8eefc4724988ebcea8
-EBUILD konsole-20.04.0.ebuild 1664 BLAKE2B e69a84561d0e7bc86fa4dbc4100bd3c69e5f94e56ef3ac8636d258f8cf0b7a4f7860313606ac0a66e61ff1d6f957e7697931d8920ea2cc9033a6e681da1420b8 SHA512 9238b5e586b662e31e8ec8a62b3d7d712feed14d37e3cd6673ba4953772c1dd854e6e7bc057a393272962d865167c924afc1467f6a8d88c3a12e6c1af9b89005
+EBUILD konsole-19.12.3-r1.ebuild 1897 BLAKE2B a11f6ccdfee28af3dcd7ed941ef9fce07cbc8792a167b7145abf2147d39bc470a7981fac8e2274204ce52859c07a9a9d48b25e94b9eebc566cdf59b3e675ec8f SHA512 c314087217a721d51d22d7c3360ef1c773086b20c38a0fd4ce6710aa1006a3cef07ca64d37debe3fdfdeef2d8c37b4780d13fbff600f67f315019d5a4958a177
+EBUILD konsole-20.04.0.ebuild 1676 BLAKE2B d74888a502eed85541a767731a78d7328af07d6f648f0ad59019fc6fc82cb66da271d71343561c107814f4dc11449f78603247c2313432809fa8f0318d6dbadd SHA512 a04e496002377aa3e9ed496c5f44379da1a746dd2cfa977913252e3e2ba04cf95976e5b55d89182c998118cf26b40ca419867739be6ee5c0df8a4c9b60c93253
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/konsole-19.12.3-r1.ebuild b/kde-apps/konsole/konsole-19.12.3-r1.ebuild
index d3f4cb95ef1e..26ddf0f38920 100644
--- a/kde-apps/konsole/konsole-19.12.3-r1.ebuild
+++ b/kde-apps/konsole/konsole-19.12.3-r1.ebuild
@@ -16,7 +16,7 @@ https://konsole.kde.org"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="X"
 
 # drop kbookmarks subslot operator when KFMIN >= 5.69.0
diff --git a/kde-apps/konsole/konsole-19.12.3.ebuild b/kde-apps/konsole/konsole-19.12.3.ebuild
deleted file mode 100644
index a0cd125f570a..000000000000
--- a/kde-apps/konsole/konsole-19.12.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://kde.org/applications/system/org.kde.konsole
-https://konsole.kde.org"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="X"
-
-DEPEND="
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-19.12.2-darkbackground-detect.patch"
-	"${FILESDIR}/${P}-no-ccache.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/konsole/konsole-20.04.0.ebuild b/kde-apps/konsole/konsole-20.04.0.ebuild
index 1cad6a566fec..e5d41bd62578 100644
--- a/kde-apps/konsole/konsole-20.04.0.ebuild
+++ b/kde-apps/konsole/konsole-20.04.0.ebuild
@@ -16,7 +16,7 @@ https://konsole.kde.org"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="X"
 
 DEPEND="