gentoo resync : 13.06.2020

3 files changed, 2 insertions, 76 deletions

diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 3b0879cbd49f..cd1e9aa06da0 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,5 +1,3 @@
-DIST khtml-5.67.0.tar.xz 2085332 BLAKE2B c55e674b02612a2269aa92e790327629ea99af5e9a9796322ebda2b3ee49cd654a400a0c47aecb3aa185ab81179a2b817ba2e14fce3043e4eef9d9c30a57dad5 SHA512 c49dd43e345e3599ed6c3e076895732a30b553ef0db6da0512b6577ebca842529e497964bf71e64d962c9b7456c0ecdb8716792ad163aada1d5444d00d080145
 DIST khtml-5.70.0.tar.xz 2083356 BLAKE2B 2290b16cba1b03af16c85fbd0f295f11e41acbb2947c1fd7873d6d8a1670f8b5de75dade9010abeed6eafa32254e9719a1cb1c3c3aef3f277dade68d10587f50 SHA512 9ac0918beb35cce20dcdfc788654e6a56a3fa780ef1967c12ee694074cf1b823d9c505cc7dac30b25cd36240d2efe322dff903267810e856eba75a808fa7c1e5
-EBUILD khtml-5.67.0.ebuild 1809 BLAKE2B f284ca85a83ad2492e5e72803a005e8ff3773b2ff26dfc468b65e987ec508fa235a112e01042b839466a82bc8a0b48685677d36b5fd66601f6fbd32f947a131e SHA512 110d4e0534c78306d2cf3f697a9ddbf482ab4815be204a4d068465fd251c4ee0395d0654aa8d42cae2a31951e39200d6b8b27a35b4059b41c0d0ce01b7529420
-EBUILD khtml-5.70.0.ebuild 1812 BLAKE2B 0c1ff68659350ca33c65a1b606b1256843d8bdae88d57952f06df5e4505947622f337129fa6f66c64f05475713aadd965b02648ea96295f9603341b75501c804 SHA512 472a7ce3a7ac02f46aec1c9e47a2f3611d49af6fb7634c524aa74f56ef0a17c3a0d9518fd96daf70bce460e70d4ac846d417408bb6d38aa2353cd9d5634a35b2
+EBUILD khtml-5.70.0.ebuild 1809 BLAKE2B f284ca85a83ad2492e5e72803a005e8ff3773b2ff26dfc468b65e987ec508fa235a112e01042b839466a82bc8a0b48685677d36b5fd66601f6fbd32f947a131e SHA512 110d4e0534c78306d2cf3f697a9ddbf482ab4815be204a4d068465fd251c4ee0395d0654aa8d42cae2a31951e39200d6b8b27a35b4059b41c0d0ce01b7529420
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/khtml/khtml-5.67.0.ebuild b/kde-frameworks/khtml/khtml-5.67.0.ebuild
deleted file mode 100644
index 9ec95d83b890..000000000000
--- a/kde-frameworks/khtml/khtml-5.67.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KHTML web rendering engine"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="libressl X"
-
-BDEPEND="
-	dev-lang/perl
-	dev-util/gperf
-"
-RDEPEND="
-	=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
-	>=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
-	media-libs/giflib:=
-	media-libs/libpng:0=
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	virtual/jpeg:0
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/khtml/khtml-5.70.0.ebuild b/kde-frameworks/khtml/khtml-5.70.0.ebuild
index 1c807a5c5bfa..9ec95d83b890 100644
--- a/kde-frameworks/khtml/khtml-5.70.0.ebuild
+++ b/kde-frameworks/khtml/khtml-5.70.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="KHTML web rendering engine"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="libressl X"
 
 BDEPEND="