gentoo resync : 25.08.2020

5 files changed, 2 insertions, 122 deletions

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index ac552de062dc..ec463784219c 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,8 +1,4 @@
-AUX kdiff3-1.8.2-crash-w-o-clipboard.patch 950 BLAKE2B a075e1e8a06958e5f849b024d65f7d709be49a7facda5b4bd2a223374735a80b19a94ee983c9d1245733fed6c46f6d4c70cf631d32c2c2aa5f345b999e437674 SHA512 43d0c4898841fb822571502257a0d7acd359deaa7e906a0a80fb9d2f9cb8b61008a6b96d08acf74d5a76534b519fc6f3435e08034651aa4572c637817be4e025
 AUX kdiff3-1.8.3-hidpi.patch 5069 BLAKE2B 3b62e3e06a5704e1bf2b49472ffa5b4bdcc985733cf0ea3ca77e62ffd90bb9a9c17a0997a81b91c376bcd9a967ffc3458a26951f4381e8d16d0330fa62bf3ff6 SHA512 207767a8375b3ccffdfb0c222992e2556e8fd1449b2bca8f6ec771d6c83bea296973b0c76085ec4b8333527c7c9f4ddb50f6dbb016206a3bf139232d21784389
-DIST kdiff3-1.8.2.tar.xz 1039304 BLAKE2B de4052117bdade42fc489cf35ed9f4af4dfe8c1704dea36f2fa36ee8b14b4dd355052d0e9cdc0f32de9dde81e74862d1c10f7fcdde12db8f5e68d4e377e6f5f1 SHA512 c52dea38b8fa483344a840fb0f6eab04fdeb2dfc5f2a554f9fc095ed175c45f4c355fe7f04dceca4446ac483a1e97db2a296b947fb99315fc388a45e6298d7f0
 DIST kdiff3-1.8.3.tar.xz 1038904 BLAKE2B 43fccb146a2220661d5f7e1e836de06b00afe54b9bccbd37b76eaf1dc660eb81dae781b08071f581c5a3bd123b7b829c4339b72348c65829c4f977a61771e69e SHA512 5cadd1cfe7e85a1dfb81c4f1cb685f988b0155b581ffa38653d4df30172b6a1ee4ed4269869285b5add3ca163eae88645d702e6fc84380229ac09ea14dd20a4d
-EBUILD kdiff3-1.8.2-r1.ebuild 1092 BLAKE2B 9e32869ac25e4341b2604e001a6e7079ea02487d5a5349756fb7931e1554327814a22295978448a0bc164abd56cbcfa0991d4886b5cded7c19a8d8880207d06c SHA512 624c8c8d282bdcf5d0797b795decc55fbe558a590e240586967f064623281444a8f722c1a0d66db8eca3de22a058288bd14601d686afec33068c20aa29399e15
-EBUILD kdiff3-1.8.3-r1.ebuild 1080 BLAKE2B cb676ecd233a5473b29354aea91f257858a2ac36b4df798357542f19793f5f9147f524a265f4ab822e64a12f0b047b971dae78bf1a486907d67b063dcbd2c1da SHA512 f79079f1ab3976b09cac4414cf4da5c2b57c48573fd025b15378cfa0a3269d78fc6a7269fa51d2a52d439e1d79366c2c51dcc1966252d1d7f9237076d0db1dcb
-EBUILD kdiff3-1.8.3.ebuild 1036 BLAKE2B 8c6d9b36f5eb10d6c2f5af8075ec1e4b08c28377b6c9e4cfab49ed2a4dcbc51a5ae40320e840559f897c4de0eb59b1b14458131c20296d71b3888ee5d43f6e07 SHA512 54a845c025f3c771e8d1eebec160d94dcc86c82958c0b5d9755ac5868d5f765ca94607178857d3a9dce88d121793e11ac46138e42d63e30372f81a3a6bd70962
+EBUILD kdiff3-1.8.3-r1.ebuild 1078 BLAKE2B fefd53a09e26ab9c0c699ad7f939ba456d55e2497220159a6c3b06497d79f1c8e2de6f3c00e7aabf85fdc861af7bc1ff709b81d9ffa71ea84745b5bc7b3ed258 SHA512 59142b7b8b835121f61c7013f8f678bea635e03440041abdfe11da3d9fe6d62c6acee158f05197dc92c9ca45362035f4a5a504acfb664319d6060c994963da5e
 MISC metadata.xml 362 BLAKE2B 45686f239bfb936fe11982d8bd2b51380cdfef94c11e5a6fb224c030154bda8b27190052b1705e010fd22305dd2830b8f8b385b47fc647f7c80b2ec01a1f579a SHA512 1fb8f10c3632c0007e65be57dbeb2492ad0e90a79f0403ce4a350a6ea0e1764dd1ee5038b0381049a6715bab2d7c38fc83c0b8f338ea7958bb34df499f355100
diff --git a/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch b/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch
deleted file mode 100644
index b1d00a12f47d..000000000000
--- a/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 643edc26bcc8f8e083a97e87c2686f62ffd01f31 Mon Sep 17 00:00:00 2001
-From: Christoph Feck <cfeck@kde.org>
-Date: Thu, 30 Apr 2020 18:27:58 -0400
-Subject: Fix crash when clipboard is not available
-
-Summary:
-QClipboard::mimeData() can be nullptr according to documentation.
-
-BUG: 419722
-FIXED-IN: 1.8.3
-
-Reviewers: mreeves
-
-Reviewed By: mreeves
-
-Differential Revision: https://phabricator.kde.org/D29248
----
- src/pdiff.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/pdiff.cpp b/src/pdiff.cpp
-index f3f2284..3588e3e 100644
---- a/src/pdiff.cpp
-+++ b/src/pdiff.cpp
-@@ -1577,7 +1577,7 @@ void KDiff3App::slotClipboardChanged()
- {
-     const QClipboard* clipboard = QApplication::clipboard();
-     const QMimeData* mimeData = clipboard->mimeData();
--    if(mimeData->hasText())
-+    if(mimeData && mimeData->hasText())
-     {
-         QString s = clipboard->text();
-         editPaste->setEnabled(!s.isEmpty());
--- 
-cgit v1.1
-
diff --git a/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild b/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild
deleted file mode 100644
index 0659672ef390..000000000000
--- a/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 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="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/development/org.kde.kdiff3
-https://userbase.kde.org/KDiff3"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	sys-apps/diffutils
-"
-
-PATCHES=( "${FILESDIR}/${P}-crash-w-o-clipboard.patch" )
diff --git a/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild b/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
index 9611b4dd9139..678e2ab4e74a 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-misc/kdiff3/kdiff3-1.8.3.ebuild b/kde-misc/kdiff3/kdiff3-1.8.3.ebuild
deleted file mode 100644
index 50728ca4d608..000000000000
--- a/kde-misc/kdiff3/kdiff3-1.8.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 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="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/development/org.kde.kdiff3
-https://userbase.kde.org/KDiff3"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	sys-apps/diffutils
-"