gentoo resync : 08.10.2021

4 files changed, 2 insertions, 72 deletions

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index f8fd48849518..3ffaa37acc24 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,6 +1,3 @@
-AUX kdiff3-1.9.0-gcc11.patch 559 BLAKE2B 6596e7f41fb5dfaeac08cfe3871f67ade513a0d89ec6801af4b688107e18e6bacb5d94199187f8be9a732e6ecb4f6fe81ff8b4124a205654714da303fe5a1786 SHA512 25e88b616e706d4a6a19849647650bd4763684ca7dc518ace7aa8aebeafb49477182f1b78143ae1554e823f547a4caacb6ba08e8c4f367a7de63b518a3c84309
-DIST kdiff3-1.9.2.tar.xz 1053404 BLAKE2B 96d499a243921aed7fe51292cb8f88b9236949297a5ca9c271735ff2d80c70a8b6d864ed1bab6b55a52da34e2c8bd819cb9738694531f183ddce442c1edd1511 SHA512 3e233cd934d1e21ac1492f928c1d9517c913b1163812e80c5f6f10c4387a82ad18edf5a2153513edf7136358571169735b55fa13ea3512113b22d750156af6a8
 DIST kdiff3-1.9.3.tar.xz 1056920 BLAKE2B d32e60cbc8d41339dff9a91fe5a2c739a38dc856a0adc575fa0e777c921d40effb1f27b34d7a127a4aff95b10436ddafd7f3db63912c2def85307e1e46ea9964 SHA512 9d806efa5d92375bc0dd2014492e924a7f26c12fde0e89bb58f076a249dba83fd316253cfd53235eaaae26f29d37c730c5728de1c7de869532fc9c38190412d5
-EBUILD kdiff3-1.9.2.ebuild 1119 BLAKE2B a527ffa09c821a31331814eed29199eede95e7e63d9792edf8ea728e894627ab15b16b7c580b0f50672691a209b502f54aa53ac312c510dd3383100707c7bf06 SHA512 47c7266b9be2ebeb45e0b7ca39da2617846a1fc0713f2b34efe1a872b10378df5875f0b6c28531ab744496d68b66dc5828119208bbeefb09ad78d768f685f5ae
-EBUILD kdiff3-1.9.3.ebuild 1045 BLAKE2B 76254da34eb9478edfb6bd27efd5e2237dc809c7ac86f508440ad7ff81129a3eb09736c945274bbdcdaf037f2fcc29a0f5fa71fde9c6274170dc0d6724514e3b SHA512 16122d1440ff6d78b7f79f4d8f16d571fb7b84de0a01f66e5b3a59958c0f0e5108b91fb885bced5de83330c888ce952f6447c69cd8b144877036259b45de2eb0
+EBUILD kdiff3-1.9.3.ebuild 1043 BLAKE2B 7bfe779e5bce02578e7d15101840c4f55aa710c992aa0a6ffa16fd3e6ec6274a115610f3fd80b2c881395610058131a069d325bda79fd8113032714f0e6465e8 SHA512 9d890e20d196a937b5e6ec574480f1b125b7ae723df2eaa2a6062275a18e9a344d78d9c0cb2bc0df33c185874e5cbfb7738fcdf12b685b58e28bec18dffbd796
 MISC metadata.xml 431 BLAKE2B 6848facdd79d1805d96f6b9c8b8fadd673ac7884eb14b31c854e7043d8474ef2702ca0b43b6ddb235ea70a25b41b5ad93a2616d5ce2b87a53a53bcd4c42839e1 SHA512 7f2f61311bf3f8f926d2f6538e3f693ffbc059068062e6c5313d4b48c0ad4e8155f9ccda52f79e65ffdcd529002c9b29f84dcf6b612e3984db9444177509bd0c
diff --git a/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch b/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch
deleted file mode 100644
index 581b487503ea..000000000000
--- a/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0476b1daa73159aec411c7f10da6f313294f0e38 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
-Date: Tue, 4 May 2021 19:21:46 +0200
-Subject: [PATCH] Explicitly include <limits> for compatibility with gcc-11
-
----
- src/TypeUtils.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/TypeUtils.h b/src/TypeUtils.h
-index c072681..f0ab9c2 100644
---- a/src/TypeUtils.h
-+++ b/src/TypeUtils.h
-@@ -9,6 +9,7 @@
- 
- #include <stdlib.h>
- #include <type_traits>
-+#include <limits>
- 
- #include <QtGlobal>
- 
--- 
-GitLab
-
diff --git a/kde-misc/kdiff3/kdiff3-1.9.2.ebuild b/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
deleted file mode 100644
index 82515f73d04b..000000000000
--- a/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-KFMIN=5.74.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/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=""
-
-COMMON_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/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/diffutils
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.9.0-gcc11.patch" ) # bug 788058, git master
diff --git a/kde-misc/kdiff3/kdiff3-1.9.3.ebuild b/kde-misc/kdiff3/kdiff3-1.9.3.ebuild
index d7f3785a058e..c9768a871e94 100644
--- a/kde-misc/kdiff3/kdiff3-1.9.3.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.9.3.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=""
 
 COMMON_DEPEND="