gentoo resync : 22.12.2021

4 files changed, 50 insertions, 9 deletions

diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index 78d52756c0bb..638e0024edcf 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,5 +1,6 @@
-DIST kimageformats-5.85.0.tar.xz 590844 BLAKE2B 39102bcb685a35146871201604d220a0f439531ab65b1d78b6045bb9c45651c7b54967c8c82a100dfb5da028fef1c845c8711a632dcfffa9fbd752a2884e42bd SHA512 7f72ee1d0d56638c1aa8ab0b61f18e69517921f25a64424ab848177da13506ed917eb17661f5a1069f5e56578f6a5271c9fbe665d8cfdbd284e28747e6bfc321
 DIST kimageformats-5.88.0.tar.xz 590940 BLAKE2B 53c1627e096ee88d0422bc0256ec696c713b911abb16959874b94c3bd4cb54bc81c1aa112e66741165bf74554d1f3e7fc216e319a81e0dfc227798efbe0eb7e5 SHA512 5702d9a5aba65d3d3a64ea7fa9cd64b48fb5a01666d6d31737e94f7bdde5a6d89c34930bb57ac8abc807f7f2e1cbafeadac3f786a48130225ad0c9ea97836ec5
-EBUILD kimageformats-5.85.0-r1.ebuild 946 BLAKE2B 77b3956fd0beac49ecc8fc87e8012a9e133744f022ce4d653cbf623cee966dea4f8fe1fa604f8954bc7c045033b00d79a2adb75ba41dce7f9f014cb754430c4b SHA512 e35c0805edb862ce5b574941845ecc448f69109c852c5d6f97121de2f883679c8880b3f602733541204c3aa4ca64e023af79f9bb0dc03cc83ef25b820efb3dec
-EBUILD kimageformats-5.88.0.ebuild 947 BLAKE2B 939482c0e4864afc8fb1175dea65e2b28b455cb90e3654e54ebc8e9b7e38a9977f9172e0e184f1ebc739bf71682d30f92a245933e94c69c61e9488d07b8df932 SHA512 6a066cd4d0d54c2f671d1d3343802c0809808cf4fefa9daafa74a47a0fd58e23a5137dc932a35d8e8dd9630b83d80d1f8b812546967a427fcc73bea38c48a8a4
+DIST kimageformats-5.89.0.tar.xz 1223344 BLAKE2B 07cdcfb5b4103ae7820a914971062d56020d94856c87cfd3ea14bd7c1e648fd5a0fe481cef1ad14f94a595e4eeb0bceb953a8bd34e799a99a7a1e188df8287ee SHA512 693517ce6c0c0547c7622ea5cd61dbba262db25d8ebc5c2446cdf0f120fdc2622fea08311cd4deff4ead61c61cf31a49ab7acae96a6ece1d63f0c6ddaa1b7874
+EBUILD kimageformats-5.88.0.ebuild 944 BLAKE2B 0ab05dbff7cd4fc7716d4558e16baf9a40898075f52bcde43c9b6a75a5d33c54766de747144412f585da0efa8a062f70181ded19cd390adbf0ddde1b8f17e012 SHA512 a4e2a63f0141a4649785ff9a4f1bd4fb83069d4e18dd89eb03251916146d29df5f81ff3f6d7df650abbd4f933a73499dbe09b9afec71851a4ca4fcc27a749a1b
+EBUILD kimageformats-5.89.0-r1.ebuild 973 BLAKE2B 89463119839a82f0d54394433a4f6bcde45121da6d772fb92f11f62830c7510e6d0c95cad2c01678479afda83aede239396e4f4450b7b5395a09933eb9ba41f3 SHA512 590149d56ddffa51dd1a742f5119af355bd9bf307a2cd175cb9393b556650e908bfe8a16ecad472f6b9cd9aad15f90a621e7e4315eb0308ebe48c14da3378db8
+EBUILD kimageformats-5.89.0.ebuild 1005 BLAKE2B 4c4f499d224cf56c06384d60656c9e7ca79580038d472fe1680b86f446349923c7e83e2e205356e4a138d71dc83b5cc8c708f82750e6d357e57c522df5594a3b SHA512 6ac1edabe50b8f269f8617f42c63b1781816ad1d521546fe1afda27c7d3a94e055d6b97f35c7c680e15f4f149e1fd19ac505f488ff476f71faefcf6b34f1e73a
 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.88.0.ebuild
index 2053f22177ee..db44b89521fb 100644
--- a/kde-frameworks/kimageformats/kimageformats-5.88.0.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-5.88.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.85.0-r1.ebuild b/kde-frameworks/kimageformats/kimageformats-5.89.0-r1.ebuild
index cd2ec534707f..a3b11c3c6cfc 100644
--- a/kde-frameworks/kimageformats/kimageformats-5.85.0-r1.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-5.89.0-r1.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 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="avif eps heif openexr"
 
 DEPEND="
@@ -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:0=
-		<media-libs/openexr-3.0.0:0=
-	)
+	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.89.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.89.0.ebuild
new file mode 100644
index 000000000000..d916266d5450
--- /dev/null
+++ b/kde-frameworks/kimageformats/kimageformats-5.89.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 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/ilmbase:=
+		media-libs/openexr:=
+	)
+"
+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
+}