gentoo resync : 12.05.2022

4 files changed, 2 insertions, 120 deletions

diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 787792dc1941..9259bf5d38ea 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,8 +1,5 @@
-AUX khtml-5.90.0-fix-crash-in-wayland.patch 1249 BLAKE2B 0b66fd470e0da8b52c88866d817f306cad197694e458b2a015ad5ced133c51e8f72b936be14e05cb663b4e830dd23f315e0aa49d855ea13d9a1f2a866d493e90 SHA512 11281fff2de04a5c177e161bb16994a769601cf6c35360e0049fab1c19325539eb00ce8f7538285c59120b22908d4d95c26d4c23da5c3801380be238eff86f1c
-DIST khtml-5.90.0.tar.xz 2093520 BLAKE2B dbab7070371c4b426ea5027b69cc928f76b7c52a40c4373c576f568dbf69752914793445cc51b8f73c46fe625c39f9e283cd17551bb72b3266acc6cc552d3b02 SHA512 0292a7497c51a576ae9603cfa3bf49031d9bd2a5ee493be08935bcedf67d75d9a41b06d0a0829e1f08391aafb60c7145859e596885dbd3d40017d1181ee2969d
 DIST khtml-5.92.0.tar.xz 2093568 BLAKE2B 1c94b1ee041fe69d173798ade211feada3c9f123fd9a6f6775cf3453ab677f8001053f7785dd492acb81c6908286bebb592eded670771c2dab42a8a9aa58c300 SHA512 270d3ba357ed5c031b41564a56e0d91df87702cd05ea810434a8e2cafd87fbdc0be8984ed535745edf592c318107464f0aaada0c2ef42fbde7a6f87228edfcef
 DIST khtml-5.93.0.tar.xz 2094172 BLAKE2B bed3869f2918f27d8bff52eeefba70fd4032296a1ec1c1008749ae73ba4bb3ff5edd53b0693b8590d0c1600d11c99b4bfc933bfa38f70bfa6e187e9d9f120b95 SHA512 019946343bb17d8c9021e6e05632f4f0576cb6e1d1f29c0a8364129e323e6b8283199b21a63e5afcdd09f40a9ad1d396fef4868331745dc310df48484d990bf6
-EBUILD khtml-5.90.0-r1.ebuild 1819 BLAKE2B 52cc98839d5a2b5b333e01512c7535a2edc2da5ae30215965289d56aa30231dbfb4fe29c4392954d1a224108237af451979138424feec3db0e7e540a8ce0253c SHA512 8dae8a27a17ed9f2d32f8e69f3bdf24e9212e2260a253d16bce21f30d4a0c7ddf5c8346fc18be2afc07d061f4a74828cec23e03ae8158af7483c6f8e35b3624d
-EBUILD khtml-5.92.0.ebuild 1763 BLAKE2B 7e1b7d59c06d7a451ecd45ead7b7c54e8f2d8c44c2d3e2462adfb2273362dff954438694b876efbbc559f7168850a43f2780b3c942480c101fd45a3c9d89e193 SHA512 20af814de1fd75955b3d3d9041a3b2c8a2983b5d1d4eaca1ccc0811fb9d68716f935a063ae01834f842e0d39c2ab9b08f8dfd8908e0e0bf8ad592a106ea31793
+EBUILD khtml-5.92.0.ebuild 1760 BLAKE2B 47b708acdf2d2ff1741766b9722ca919e07d7ef599249338a3746d2f7e540a63dd986b5b2659373e17b9cc7fd92fa2ad96f73b7797e60f5cad048642be1a8b08 SHA512 4cb28a80ebe665343d3d3eec94b22fecc90bcc8242b74e12b871ba91c1d4bc2fef8924fc900fa53d8137825ba275e55cf5a2d59f20ff8ff8252ce1e0d4059244
 EBUILD khtml-5.93.0.ebuild 1763 BLAKE2B 7e1b7d59c06d7a451ecd45ead7b7c54e8f2d8c44c2d3e2462adfb2273362dff954438694b876efbbc559f7168850a43f2780b3c942480c101fd45a3c9d89e193 SHA512 20af814de1fd75955b3d3d9041a3b2c8a2983b5d1d4eaca1ccc0811fb9d68716f935a063ae01834f842e0d39c2ab9b08f8dfd8908e0e0bf8ad592a106ea31793
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/khtml/files/khtml-5.90.0-fix-crash-in-wayland.patch b/kde-frameworks/khtml/files/khtml-5.90.0-fix-crash-in-wayland.patch
deleted file mode 100644
index c6ed34998037..000000000000
--- a/kde-frameworks/khtml/files/khtml-5.90.0-fix-crash-in-wayland.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 04aa1739d06d3ff7d16a3296fd27fa392d8ba318 Mon Sep 17 00:00:00 2001
-From: Christoph Cullmann <cullmann@kde.org>
-Date: Sat, 1 Jan 2022 23:42:16 +0100
-Subject: [PATCH] fix khtml crash in wayland session
-
----
- src/khtmlview.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/khtmlview.cpp b/src/khtmlview.cpp
-index 79f0d7c..75df959 100644
---- a/src/khtmlview.cpp
-+++ b/src/khtmlview.cpp
-@@ -69,6 +69,7 @@
- #include <kstringhandler.h>
- #include <kconfiggroup.h>
- #include <ksharedconfig.h>
-+#include <KWindowSystem>
- 
- #include <QBitmap>
- #include <QDialog>
-@@ -1530,7 +1531,8 @@ void KHTMLView::mouseMoveEvent(QMouseEvent *_mouse)
- 
-     if (linkCursor != LINK_NORMAL && isVisible() && hasFocus()) {
- #if HAVE_X11
--
-+    // ensure we don't trigger this code paths if we run in a Wayland session
-+    if (KWindowSystem::isPlatformX11()) {
-         if (!d->cursorIconWidget) {
- #if HAVE_X11
-             d->cursorIconWidget = new QLabel(nullptr, Qt::X11BypassWindowManagerHint);
-@@ -1572,6 +1574,7 @@ void KHTMLView::mouseMoveEvent(QMouseEvent *_mouse)
-         //TODO?
- #endif
-         d->cursorIconWidget->show();
-+      }
- #endif
-     } else if (d->cursorIconWidget) {
-         d->cursorIconWidget->hide();
--- 
-GitLab
-
diff --git a/kde-frameworks/khtml/khtml-5.90.0-r1.ebuild b/kde-frameworks/khtml/khtml-5.90.0-r1.ebuild
deleted file mode 100644
index 783d1f0dab39..000000000000
--- a/kde-frameworks/khtml/khtml-5.90.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KHTML web rendering engine"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="X"
-
-BDEPEND="
-	dev-lang/perl
-	dev-util/gperf
-"
-RDEPEND="
-	dev-libs/openssl:0
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/kjs-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kparts-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwallet-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/sonnet-${PVCUT}*:5
-	media-libs/giflib:=
-	media-libs/libpng:0=
-	>=media-libs/phonon-4.11.0
-	sys-libs/zlib
-	virtual/jpeg:0
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-crash-in-wayland.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/khtml/khtml-5.92.0.ebuild b/kde-frameworks/khtml/khtml-5.92.0.ebuild
index 91278423475f..5d433e5c6279 100644
--- a/kde-frameworks/khtml/khtml-5.92.0.ebuild
+++ b/kde-frameworks/khtml/khtml-5.92.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="KHTML web rendering engine"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="X"
 
 BDEPEND="