gentoo auto-resync : 15:08:2022 - 14:28:19

3 files changed, 2 insertions, 74 deletions

diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 18925e2b5581..030560782b2d 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,7 +1,6 @@
 AUX khtml-5.96.0-with_x11.patch 3371 BLAKE2B 4e4d8bcbdeb6d99b185400831a15fe77c81c54da98c82d5c922b194a8fd50b4a8eac2d814db9b61928bee553764a9e56a64550e0b3974a07e345c5b5f85ae3a0 SHA512 5ca257ec36652ba273afbb7baff2412357ef0bec047b3894152f18b4712ded3981f602cac4ed09229ba568fe9a24d6d5579a155bb636984015b5c465bf8a4953
 DIST khtml-5.96.0.tar.xz 1965056 BLAKE2B 857a338c9831a03989348ecd6d9c355d6538458311eb22ccc2ae1c631137a7dd411866c70632f941d2ae64bd54584283b90e9bb0cf6573f6504d6ceab0cb01f5 SHA512 7ccd0c8dbca62486b316f381c437568650696cc4fca0b2e382bf8d337435f9c7fc7fa4664e01bbe8db509bd293c23ebb4abaabc34719be38e91480ae0b1d4141
 DIST khtml-5.97.0.tar.xz 1965188 BLAKE2B 0a508b7d0de5969e020dc40ba89f2e4b1bd67c336ef97ba6e880c3a15dfbd45337e9120f173140027f3e37964eca7e0d96670d4f0704b399b5853fb78d49550e SHA512 746ee8f2ae8ae15ef1b2a67435fd6e57c6a6f8cb345eca3b0ab997ec8a9831e461d4eb9197436f7097a94945ab66116cce47c5baf58b4bbddcfc0fb00bd36ba1
-EBUILD khtml-5.96.0-r1.ebuild 1831 BLAKE2B f1bbb619ce02563d35dcd14db51a7ed99f2cf6cec064f819e95087ddd36bd5b345082fd9363fa16888ab6e4330ded8072715d0b0ada0de37f1fcea7fdc5ded6a SHA512 053e97f59d2848bd36b8b3ee975d32a8c0c19d5815c2a4f1d55cdbff1e7107fa6e71c30dbdd69a49e7f7257f96fcd7127658709e041dd2e5177e2cec4cd6af95
-EBUILD khtml-5.96.0.ebuild 1790 BLAKE2B 765c616050c5c7217c075108e4c7dc2fb5afa2ca31fd9a5e49363d035841f249d4eccebd3644f50c23f2571af6f9a8e9516da7d03c6259da486fb2d089282077 SHA512 3a77aa609b50c48560cd610da34189ced45385d72e6d5377410758e5997ff6d3c29acbe69eb6223b4b82769eba2390b8d752d113a8a69f8a74c731fb336464d4
+EBUILD khtml-5.96.0-r1.ebuild 1830 BLAKE2B de4f7699dea6c0d479ae17cfe63941635893d144c26f8d8779e2568f9e0ced4202e2c2df13eda3d2cf175aa9cc50f6d547cdc1c7b6c535deaafdc39d3fe3ee7d SHA512 e8539d33466e4c124dd755ed6ae6a140eb73f8c7714191050c6f18be068977d290f148cec22209e71b2deed5bf79979aff72b4ea22cd15460181dd19d250a41d
 EBUILD khtml-5.97.0.ebuild 1841 BLAKE2B 63e0fb2b401eb9dc8d91711da8c1959a2df1f750438dbbd874be0c775e09a3de2a589400f9c5114544bf0fcdad7bc30cf13dab6dc517335a94e3e1f1c0b07604 SHA512 1e46b83399eb2af505ed80f2dd89cc4061dcd323638af64ae9e599cd905f650743de7d66d4bc988294a1b7b5780e3a501b2271ff765816aa6969c49a51b941f0
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/khtml/khtml-5.96.0-r1.ebuild b/kde-frameworks/khtml/khtml-5.96.0-r1.ebuild
index 8d674aec5f24..fe5e4869c9eb 100644
--- a/kde-frameworks/khtml/khtml-5.96.0-r1.ebuild
+++ b/kde-frameworks/khtml/khtml-5.96.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 
 DESCRIPTION="KHTML web rendering engine"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/kde-frameworks/khtml/khtml-5.96.0.ebuild b/kde-frameworks/khtml/khtml-5.96.0.ebuild
deleted file mode 100644
index d2b74891701b..000000000000
--- a/kde-frameworks/khtml/khtml-5.96.0.ebuild
+++ /dev/null
@@ -1,71 +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.4
-VIRTUALX_REQUIRED="test"
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="KHTML web rendering engine"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="X"
-
-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/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/phonon-4.11.0
-	sys-libs/zlib
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	dev-lang/perl
-	dev-util/gperf
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}