gentoo Easter resync : 12.04.2020

4 files changed, 3 insertions, 70 deletions

diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index 353fac2314a6..22b22ca14cb2 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,6 +1,3 @@
-AUX kcharselect-19.08.3-qt-5.14.patch 883 BLAKE2B e36b8ed12dc80512080e3025376b2421fc016381a736271ada23a4b3f27aef19720045fc8eec306e3b73a73133690389b285ec410707ab20f9ed28a7137e7de6 SHA512 e5116469f91135842c4cbe18a20a63c58fe83faf1d0972f54761ea1de6fcdccae3a96cefeca40cc00d3782691ecca04eca731a60610d58261d2340262efcf3b8
-DIST kcharselect-19.08.3.tar.xz 334588 BLAKE2B a402cb308f97aa80f1eee4c82ae07b45241cc446c4c49fdd45b895fbd15696a2b8606a10ee7cdf6ad037c2e7faa58ad862475a114269b388d2d0e6d9c09acb64 SHA512 55c20dc0cacd01f27ea047cf8845c47c93d973b954f3a7481f7949417066b56b031c5bacbf39356f92b785f6ad7113aacec391ec81fafafba6a49dd44366855c
-DIST kcharselect-19.12.2.tar.xz 335312 BLAKE2B 489854b093b1c34b7abb1b704bbb1c3c751bf4eb2495fa7c8cae6a84cf066b46aed0970d0d8691ca9ed28b0996d8ceccd4ae9bf9c3dacccf7910a10afe372512 SHA512 474e1c488388ec993915c2b1e0afb5738608fcfbc322c9d6139c43e9e02bda5f659038bb133baea017bdc25365c7aaeae8dcb90bfc69352abda4551333669946
-EBUILD kcharselect-19.08.3.ebuild 829 BLAKE2B cd1555b8a83789a141702249772d5524b7b8a3a4fb9a5eb41a04f621ffc0d854ab88cf38446c91c3bedd118ee9f0eac82857f23b64a0393582458f6a6b34a24a SHA512 d489c2b878c1395f47b8f5a18de15429cd8dc02d066ae6ec8e606ddb3db5e7653a8ba363bb49ebfc5c553769d40b8866d7e4602d7147737444558289c9ee0bda
-EBUILD kcharselect-19.12.2.ebuild 802 BLAKE2B ef19a1dd341f0893e593ef75bbc097b343a5a1023147b8ec0a96c990fa6862772411d68161991771410d89310ea6a10ecc7f647b2145a730a53e603074b8cf27 SHA512 bb03d8f13f6e54e05f8dbb6798b73e3fe76cf8b456862da9bec7a5b8ef9df0ff309e9db622bc6ad1c8b9a5d231a0aac0eddd8ae537f520fc37df4c91122bfe8e
+DIST kcharselect-19.12.3.tar.xz 334996 BLAKE2B 894618ae1e3837169247a3ad4a79b9f74ef7771a19ad0d3615c52039b0f2821e7e21175dd4b9a64a7eba852b0228324b93eb51273902326da53e8891a28f55c8 SHA512 85851910deb6c9eab2b02ce7d18fa703c78175f029469500f064e4af86d58b914287da33aeab9372db8919da7a509137849a3038e29e0d03bc125cfae9745006
+EBUILD kcharselect-19.12.3.ebuild 799 BLAKE2B 9e0a7bd44b22b170d8b2f0d7c8f3b58b3891c9b4f93d6181228a1b86608d6eed023ffca3b09047e51181f4f0361486b2a0cdb1100b4729839581a403dcdeec94 SHA512 c84b5885133679e38b23eeacb2fde03349e0a6ec33e9a9d08728eeb0ed931ef7dfce402df498281fca0d8222a02b18cbf66da793f090d17e61bed3933e0ebd7c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcharselect/files/kcharselect-19.08.3-qt-5.14.patch b/kde-apps/kcharselect/files/kcharselect-19.08.3-qt-5.14.patch
deleted file mode 100644
index 884ed6a79628..000000000000
--- a/kde-apps/kcharselect/files/kcharselect-19.08.3-qt-5.14.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 956b63170b2606fb274f0bd90399dac0ae9dbcd4 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Tue, 17 Sep 2019 13:41:01 +0200
-Subject: Make it compiles against qt5.14
-
----
- kcharselectdia.cc | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/kcharselectdia.cc b/kcharselectdia.cc
-index f1790b5..116cba4 100644
---- a/kcharselectdia.cc
-+++ b/kcharselectdia.cc
-@@ -265,7 +265,6 @@ void KCharSelectDia::toClipHTML()
-   QClipboard *cb = QApplication::clipboard();
-   QString input;
-   QString html;
--  QString tempstring;
-   QChar   tempchar;
-   int i = 0;
- 
-@@ -282,7 +281,7 @@ void KCharSelectDia::toClipHTML()
-         }
-       else
-         {
--          html.append(tempstring.sprintf("&#x%x;", tempchar.unicode()));
-+          html.append(QString::asprintf("&#x%x;", tempchar.unicode()));
-         }
-     }
-   cb->setText(html);
--- 
-cgit v1.1
diff --git a/kde-apps/kcharselect/kcharselect-19.08.3.ebuild b/kde-apps/kcharselect/kcharselect-19.08.3.ebuild
deleted file mode 100644
index 6b131d719c69..000000000000
--- a/kde-apps/kcharselect/kcharselect-19.08.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE character selection utility"
-HOMEPAGE="https://kde.org/applications/utilities/kcharselect
-https://utils.kde.org/projects/kcharselect/"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-qt-5.14.patch )
diff --git a/kde-apps/kcharselect/kcharselect-19.12.2.ebuild b/kde-apps/kcharselect/kcharselect-19.12.3.ebuild
index e5b076f801fe..6fa2b8ba9e1c 100644
--- a/kde-apps/kcharselect/kcharselect-19.12.2.ebuild
+++ b/kde-apps/kcharselect/kcharselect-19.12.3.ebuild
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/kcharselect/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="