gentoo resync : 12.05.2022

3 files changed, 2 insertions, 43 deletions

diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index b8dcbce7eddf..85462f898ba3 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,7 +1,5 @@
-DIST kimageformats-5.90.0.tar.xz 1223124 BLAKE2B 64a4eea197f1164ff3c46c7c6fac54df1308571f12aae048ddd14922d6131ca418b792970291c33fbea255d06d80fb7369964c3f5afe16fe03eb73afa5300665 SHA512 2a7cc433f26174c89363a39a367eb38e2214667154c6badb078bc5e46f492a04d1e9aefb8ef52fd065ba24a354ddb3f5ec8876e33a522cc1cd74708a1b44789d
 DIST kimageformats-5.92.0.tar.xz 1223892 BLAKE2B e7ac90e29715560237d0458946f1b135b84c9b8869ca3003e80b7655d7c5c9c872400e4e102015f054a26423babc7fa334b237012b88c4771f95bc7aeaa24f80 SHA512 e07521fa2b566df38baeaad2ab213c683c4fb36b5218dc63302d8e9b52ce7e0d4341b59339b3181d6b1157fda1060e645e0f043d2a187d0662f8f8a43a2e7447
 DIST kimageformats-5.93.0.tar.xz 1228820 BLAKE2B e773069328ed334f24b08d9c3783108c71a3fdc6d908ec5f78c46362f1c7d807896daca2d5b759c5dd6488ad6aaca1867c1d8be28acdc21e2b697616a3f1ed6e SHA512 b10fc976b90b2eb01e73917639e292c8d3a0236acca716b32fc131cd81ee8c26ff6922e02390cdf2ac00ee686c3b97ff07aa2e61dd284e3424d9dc8b463dc274
-EBUILD kimageformats-5.90.0-r1.ebuild 980 BLAKE2B 8d337645f4eb50c1d3a63801b71b9b4fbcb7daa31ecb869807af33f133fe7e00f6dc958c8fec776338387154e0418552428afafa839901f1c6b83adddee0eabf SHA512 6f063cde97e13783413ce5f8d7009c94890325c1409880dfb1a875a73ee5bf84acd791a91a1dfaf4fe56a091852898ad2354b2ca9fc59433651d69de3972d95e
-EBUILD kimageformats-5.92.0-r2.ebuild 1000 BLAKE2B 0da325930128d7a9b4694a7a800df2cdd1564d1f3c929c460e6220b8e1f3a4062fe55eb007d12a679546f4a73308a00de6a4c239f13740cb341c86212b5b3a1d SHA512 6c8bf5134c2645bd4c35b55a31b5ca7406bf935379e2565407471aec41207e86a5a73faf5353e5f6698d0d11faaa487e68dbdca7dfaaa2cf85e0514283b99f9c
+EBUILD kimageformats-5.92.0-r2.ebuild 997 BLAKE2B 7a8100737ec39152b982747c0fd8af52a7e0661abee11ab7d206b6d4aa36bc178c6e70187844f6542a3f03ee48f868688e3dcf74b0d8cdf32688e8b83a98cbf6 SHA512 c62a13db352f70ce60a069bfe3e1e0df1fd4918d27a989ae6ff50000505dfe21ff19dc364f6c37f73a711b04e27c6f220e9acf8f4fb334d9c4f93b652069541c
 EBUILD kimageformats-5.93.0.ebuild 1000 BLAKE2B 0da325930128d7a9b4694a7a800df2cdd1564d1f3c929c460e6220b8e1f3a4062fe55eb007d12a679546f4a73308a00de6a4c239f13740cb341c86212b5b3a1d SHA512 6c8bf5134c2645bd4c35b55a31b5ca7406bf935379e2565407471aec41207e86a5a73faf5353e5f6698d0d11faaa487e68dbdca7dfaaa2cf85e0514283b99f9c
 MISC metadata.xml 714 BLAKE2B 2b4fd4b370285820e2c7966aa910cf57ec94ae4c7daa7f44d9421554d57149d696e751db8020b128321494027d1e4142b42b1b9ce1538d3c8cf93a6e72c93892 SHA512 0a44aa8d3dd4cc2fe1d73938792daec37af80c72d70da0a3ec8a1d6f610a54f5fea85008dcb9187b0a77671467eef52547e8bdb61bcfcfb4742df61f9da921d3
diff --git a/kde-frameworks/kimageformats/kimageformats-5.90.0-r1.ebuild b/kde-frameworks/kimageformats/kimageformats-5.90.0-r1.ebuild
deleted file mode 100644
index f8126062f91b..000000000000
--- a/kde-frameworks/kimageformats/kimageformats-5.90.0-r1.ebuild
+++ /dev/null
@@ -1,39 +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="Framework providing additional format plugins for Qt's image I/O system"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="avif eps heif openexr"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	avif? ( >=media-libs/libavif-0.8.2:= )
-	eps? ( >=dev-qt/qtprintsupport-${QTMIN}:5 )
-	heif? ( >=media-libs/libheif-1.10.0:= )
-	openexr? ( >=media-libs/openexr-3:= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( src/imageformats/AUTHORS )
-
-src_configure() {
-	local mycmakeargs=(
-		-DKIMAGEFORMATS_JXL=OFF # TODO: libjxl not packaged yet
-		$(cmake_use_find_package avif libavif)
-		$(cmake_use_find_package eps Qt5PrintSupport)
-		-DKIMAGEFORMATS_HEIF=$(usex heif)
-		$(cmake_use_find_package openexr OpenEXR)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kimageformats/kimageformats-5.92.0-r2.ebuild b/kde-frameworks/kimageformats/kimageformats-5.92.0-r2.ebuild
index 04d0a1080d08..4082b0b4bfca 100644
--- a/kde-frameworks/kimageformats/kimageformats-5.92.0-r2.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-5.92.0-r2.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="avif eps heif jpegxl openexr"
 
 DEPEND="