gentoo resync : 20.03.2022

4 files changed, 47 insertions, 9 deletions

diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index fe9daa9bb0c2..71dce8b92a6c 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,5 +1,6 @@
-DIST kimageformats-5.88.0.tar.xz 590940 BLAKE2B 53c1627e096ee88d0422bc0256ec696c713b911abb16959874b94c3bd4cb54bc81c1aa112e66741165bf74554d1f3e7fc216e319a81e0dfc227798efbe0eb7e5 SHA512 5702d9a5aba65d3d3a64ea7fa9cd64b48fb5a01666d6d31737e94f7bdde5a6d89c34930bb57ac8abc807f7f2e1cbafeadac3f786a48130225ad0c9ea97836ec5
 DIST kimageformats-5.90.0.tar.xz 1223124 BLAKE2B 64a4eea197f1164ff3c46c7c6fac54df1308571f12aae048ddd14922d6131ca418b792970291c33fbea255d06d80fb7369964c3f5afe16fe03eb73afa5300665 SHA512 2a7cc433f26174c89363a39a367eb38e2214667154c6badb078bc5e46f492a04d1e9aefb8ef52fd065ba24a354ddb3f5ec8876e33a522cc1cd74708a1b44789d
-EBUILD kimageformats-5.88.0.ebuild 944 BLAKE2B 0ab05dbff7cd4fc7716d4558e16baf9a40898075f52bcde43c9b6a75a5d33c54766de747144412f585da0efa8a062f70181ded19cd390adbf0ddde1b8f17e012 SHA512 a4e2a63f0141a4649785ff9a4f1bd4fb83069d4e18dd89eb03251916146d29df5f81ff3f6d7df650abbd4f933a73499dbe09b9afec71851a4ca4fcc27a749a1b
-EBUILD kimageformats-5.90.0.ebuild 980 BLAKE2B c1810718444500e2dcf80659c4a7540472fcf3f6fad9e25b292a9808cae168a5ef65e1c3d65a7a0ad66516cc2c9ea67ebb3043a63fa977cda2f1ac59b9ab2c4f SHA512 4c44dfb91baa7c88dfa3fb7d5bc4e8c7ba315b207fcddbf3fbb7999220bd2e851dff5bfbaf26af6c6a2d97e1bd64e845d87ae8200f9c01e01494680a0ec81184
+DIST kimageformats-5.92.0.tar.xz 1223892 BLAKE2B e7ac90e29715560237d0458946f1b135b84c9b8869ca3003e80b7655d7c5c9c872400e4e102015f054a26423babc7fa334b237012b88c4771f95bc7aeaa24f80 SHA512 e07521fa2b566df38baeaad2ab213c683c4fb36b5218dc63302d8e9b52ce7e0d4341b59339b3181d6b1157fda1060e645e0f043d2a187d0662f8f8a43a2e7447
+EBUILD kimageformats-5.90.0-r1.ebuild 980 BLAKE2B 8d337645f4eb50c1d3a63801b71b9b4fbcb7daa31ecb869807af33f133fe7e00f6dc958c8fec776338387154e0418552428afafa839901f1c6b83adddee0eabf SHA512 6f063cde97e13783413ce5f8d7009c94890325c1409880dfb1a875a73ee5bf84acd791a91a1dfaf4fe56a091852898ad2354b2ca9fc59433651d69de3972d95e
+EBUILD kimageformats-5.90.0.ebuild 977 BLAKE2B 64ca4c60bdf65ebf97cb8be7aada841669a37ea88d3e77e151c76f156a80344ec2cb6620bec54f74e0c2c0d29149428ef9a61f86b7cd9b26ce5f638de65cdb9f SHA512 846323cf4ba1c0c87786f836b9488c8d5421e79c68f055919b66bfc1dc6af380f0a003650c7e89b064cc4583fc164746659fba4a3a32dcd4dffea831392ec161
+EBUILD kimageformats-5.92.0.ebuild 983 BLAKE2B eb7db1cc08ce266c224c34e0f2440eb485fce355674889f578370a6d39b223bf4ff1b20fd0a25528e28118f64e84d99679fd7abcec2ec2be4ab8d14ebbbd509a SHA512 9b82dd4898cce906752834836238d9c74c793d61c228b7cee18bc6f602bd61d442a83df00f2bbd868915f4255de43869d626a5b903ed2520e7bacc04df0866a6
 MISC metadata.xml 652 BLAKE2B d9d29bd39e9338e0db873b7981b4e2625a73ca8baf5a4afcf0b04b16d680622f54188b8718df0396cee54325e4b9946ff2c5c8a557cd6e930e4d2f2ba7fe10ed SHA512 1f430d9ce273518093f1d75e9d7d509df23db68a72654581afa98a51b502261c88cc88916c5acfa37226108641592b9d635fd1b796d4b30f5bd69f6f5d5b57db
diff --git a/kde-frameworks/kimageformats/kimageformats-5.88.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.90.0-r1.ebuild
index db44b89521fb..f8126062f91b 100644
--- a/kde-frameworks/kimageformats/kimageformats-5.88.0.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-5.90.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,10 +20,7 @@ DEPEND="
 	avif? ( >=media-libs/libavif-0.8.2:= )
 	eps? ( >=dev-qt/qtprintsupport-${QTMIN}:5 )
 	heif? ( >=media-libs/libheif-1.10.0:= )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
+	openexr? ( >=media-libs/openexr-3:= )
 "
 RDEPEND="${DEPEND}"
 
@@ -31,6 +28,7 @@ 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)
diff --git a/kde-frameworks/kimageformats/kimageformats-5.90.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.90.0.ebuild
index da9a377f96e5..eb80c2046adc 100644
--- a/kde-frameworks/kimageformats/kimageformats-5.90.0.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-5.90.0.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 openexr"
 
 DEPEND="
diff --git a/kde-frameworks/kimageformats/kimageformats-5.92.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.92.0.ebuild
new file mode 100644
index 000000000000..fd202de9c9be
--- /dev/null
+++ b/kde-frameworks/kimageformats/kimageformats-5.92.0.ebuild
@@ -0,0 +1,39 @@
+# 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
+}