gentoo auto-resync : 17:03:2024 - 18:49:32

2 files changed, 54 insertions, 43 deletions

diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index b7684f09ec46..fe836758305d 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -9,11 +9,11 @@ DIST openexr-3.1.11.tar.gz 20539852 BLAKE2B 9d57362c656a646a5b909063ff57eccfacbc
 DIST openexr-3.1.12.tar.gz 20540857 BLAKE2B 94a78e4e45f892b56f9a05cabad5cea999ff1844ff8569995f1f301e8599e0be1c214477f501f351c248eea141db22508eb764c1c91508399e69932026361c04 SHA512 0fce6a1322d74354a29ece9f9afeca1c4874c4d55079ec720f3ef21ab2ab950ec333f793f1ffad6634f57b40c4276af578b31ac8bc3e11856d7b903d5475e5eb
 DIST openexr-3.1.5.tar.gz 20327926 BLAKE2B 77ece3c62b34292d4714873149a5a54a47fe811e96f992f1082e7dca99ad7717649f937c2dd7b18011c4201f15056526fc4b706c4d2f1b7fa593b9f1ed6314bd SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c
 DIST openexr-3.1.7.tar.gz 20494812 BLAKE2B 2cc03ed8da77f4a9523b7a0f55c78e78ab55f8f6de67cb68f1b2b4ad4b512448d80f39d60a0cc9eab451da35539027a573a0c6d6900e7f81b39f90703909b5af SHA512 f72f5e728f10c06fca0172c9b4c1df752225c3aed7384b4eaa502f92f8547bb1df93fe96d4d132a81eb32b729cb9fd615be825aa6c5de78481d3038c0d47c4d5
-DIST openexr-3.2.2.tar.gz 18825996 BLAKE2B 535d7798263ee63cbb79981bfd5b8edf4805acd672b7f98457876b7017840263bd6f1491dc63afcd3a66751a73fbb8463764c85ba06c18d59839d9f25a6769db SHA512 b6537a8218686bfad7e6d29ae087d0548624cce81308d31581d99b4b741de3223b22fb8748fe9223e4e3609761815bef5e1bcc55e06302aeaf25d9d9a6134bab
+DIST openexr-3.2.3.tar.gz 18855303 BLAKE2B 4f5dbd9033031e988e973ef039b67632ac92e1272cc1d3e4540992f09f6b275c3ecb4c8f690cd98620519993099d132b43bb4bb40bb0d11caa06db868404015a SHA512 6e0a6fdcfae57c6e8b060d9aeed57140d96d39bffe5e40edd6ea5beb06e569323833d07906316ffca05f48e8409d0ea4174e2cd84d554404a4ee432e07d7b5e6
 DIST openexr-images-1.0.tar.gz 252222962 BLAKE2B d57c458dfbd1b08c964429022b6e08a3309bf11cbd43c64e271ebc620dae6dbe70636e5221f47dabd7fe2aa0806f2cf3f3c9b3f55fd7f45b0a34f3e62b6029e7 SHA512 c1c83a26cd326d0fcda824daccb0044abad46f29e1bd2ceb1c38bc62b3e71f0aeef126dddc4517eb1cb9f7c9d0fe234276a48a754bdb7c7823e9aee459d8670a
 EBUILD openexr-3.1.11.ebuild 1880 BLAKE2B dd7d09c4fd911b7f7a2738636e507f3cec991b6dc1f8484b6be081f25eb4dbac92c2ef5a8de957172d43e732a9e1ad0fa6ab3e751d822178c20d3073c927f152 SHA512 fa177bdc3a9550420927dd9e6002df468520e76cbd0ce07c9038b7336e40067c1b699def09f05ccc12a7c0e24484c809ec6e3ac7dcff6b53cefb65346de73334
 EBUILD openexr-3.1.12.ebuild 1882 BLAKE2B 2f3cdb3ab5d11f88bb9d761e1b7c76bfb2466549679ee42fd7d0581f303dc01a7d014b39626677aaa2882feb01340845db9b3e1e7971baee62b028d4c5133c03 SHA512 aa1ff62a47fc6a6119d9f3d39fa122b7c3753a0f07384eba6c969ebd67e423b50716add203390a27c00af237c0407aa22b73bc36ab734a48265b26a5c7fae0d4
 EBUILD openexr-3.1.5-r1.ebuild 2067 BLAKE2B 5def6ac36362ea8d8810bd2056df16ca57e658e83eb2a0ae6846cc322ae0be41f8c76dad1498947ed8b44fad9fac46a598e1cf173395c1a9946719f2359743b2 SHA512 9b7f62c74c723fe18766db36e4f75623818c8d2697d23f24c742061280a373fef973cc5478bd8a27492aa82249f189bdcc4c395854199d910e54d91033755174
 EBUILD openexr-3.1.7.ebuild 1924 BLAKE2B 1ae6aeb5a4693d21d798b6260fb2b485044dcfa33820f328f81993f7d3fa6a7ba98c12f183dda3b58fc8d99c3785c5e5d15acdab03d6fe2c9b19bbe76905e5cc SHA512 df60600d657768a811a5b62cb3f77c0fca177ea595b2895c7e62d797fc147f8ef0551512b67ef80d0b0ece156de143bf36e7dd20dbc88f276f879d95fb8e58e8
-EBUILD openexr-3.2.2.ebuild 3269 BLAKE2B 99fc517503ed85900a3bec3eabe51c9077b2405314bb5471524411f2781b0a7991bf1f5a4fb9cebe5960993c69f56e203dc23b02167ae438827f6678ab34d90a SHA512 da2f3f5e0b9a7bedad5ed9dc82426cfecc9488a0b2b4cf9d37eb2e293041f8ffae0c3e4fd54e87f6c5622472c4b166e957df9ebe0f4f226f0a5712418161f57f
+EBUILD openexr-3.2.3.ebuild 3474 BLAKE2B 34d75a1edaa44d9e501e1800351789afb8740a5de603f5489db4b6806dfda7ed15ef73134ec9b07de5a5c016cfd2419e9b168f52ddf1d4704ced89c190f4202b SHA512 85c637445b2c2d08ea78b0555430b8b7304cbb37ea54624661f8512e0d160fb355dd5db1a468118012b46cf118e20fb606f5c85d8134e4147b1cac67ea9360cd
 MISC metadata.xml 798 BLAKE2B d780a0ead28144e6031fedeed720d1cd79bfa8ab54a1f9d2a99324ac6db4948cf25ebf73abd630d7e697b8578ef5b6442679ce05d1949784fb8a17ed2a6fb9a1 SHA512 5c9d837a72b41c0d8463ffadd639fde0c9dc620abf4b51ef7718efed5d94a12a336d85f10d65e2fbffd3d4c59fe12a09e71f42f68d081917f4d7f1aba24de893
diff --git a/media-libs/openexr/openexr-3.2.2.ebuild b/media-libs/openexr/openexr-3.2.3.ebuild
index 71b9a4937dcb..29c1e2625355 100644
--- a/media-libs/openexr/openexr-3.2.2.ebuild
+++ b/media-libs/openexr/openexr-3.2.3.ebuild
@@ -25,18 +25,18 @@ SLOT="0/31" # based on SONAME
 KEYWORDS="~amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
+REQUIRED_USE="doc? ( utils )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	app-arch/libdeflate
+	app-arch/libdeflate[zlib]
 	>=dev-libs/imath-3.1.6:=
-	doc? (
-		sys-apps/help2man
-		dev-python/sphinx-press-theme
-	)
 "
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( sys-apps/help2man )
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.2.1-bintests-iff-utils.patch"
@@ -52,40 +52,34 @@ src_prepare() {
 	sed -e "s:if(INSTALL_DOCS):if(OPENEXR_INSTALL_DOCS):" \
 		-i docs/CMakeLists.txt || die
 
-	if use x86; then
-		eapply "${FILESDIR}/${PN}-3.1.5-drop-failing-testDwaLookups.patch"
-	fi
-
 	cmake_src_prepare
 
-	if use test; then
-		if use utils; then
-			IMAGES=(
-				Beachball/multipart.0001.exr
-				Beachball/singlepart.0001.exr
-				Chromaticities/Rec709.exr
-				Chromaticities/Rec709_YC.exr
-				Chromaticities/XYZ.exr
-				Chromaticities/XYZ_YC.exr
-				LuminanceChroma/Flowers.exr
-				LuminanceChroma/Garden.exr
-				MultiResolution/ColorCodedLevels.exr
-				MultiResolution/WavyLinesCube.exr
-				MultiResolution/WavyLinesLatLong.exr
-				MultiView/Adjuster.exr
-				TestImages/GammaChart.exr
-				TestImages/GrayRampsHorizontal.exr
-				v2/LeftView/Balls.exr
-				v2/Stereo/Trunks.exr
-			)
-
-			mkdir -p "${BUILD_DIR}/src/test/bin" || die
-
-			for image in "${IMAGES[@]}"; do
-				mkdir -p "${BUILD_DIR}/src/test/bin/$(dirname "${image}")" || die
-				cp -a "${WORKDIR}/openexr-images-1.0/${image}" "${BUILD_DIR}/src/test/bin/$(dirname "${image}")/" || die
-			done
-		fi
+	if use test && use utils; then
+		IMAGES=(
+			Beachball/multipart.0001.exr
+			Beachball/singlepart.0001.exr
+			Chromaticities/Rec709.exr
+			Chromaticities/Rec709_YC.exr
+			Chromaticities/XYZ.exr
+			Chromaticities/XYZ_YC.exr
+			LuminanceChroma/Flowers.exr
+			LuminanceChroma/Garden.exr
+			MultiResolution/ColorCodedLevels.exr
+			MultiResolution/WavyLinesCube.exr
+			MultiResolution/WavyLinesLatLong.exr
+			MultiView/Adjuster.exr
+			TestImages/GammaChart.exr
+			TestImages/GrayRampsHorizontal.exr
+			v2/LeftView/Balls.exr
+			v2/Stereo/Trunks.exr
+		)
+
+		mkdir -p "${BUILD_DIR}/src/test/bin" || die
+
+		for image in "${IMAGES[@]}"; do
+			mkdir -p "${BUILD_DIR}/src/test/bin/$(dirname "${image}")" || die
+			cp -a "${WORKDIR}/openexr-images-1.0/${image}" "${BUILD_DIR}/src/test/bin/${image}" || die
+		done
 	fi
 
 }
@@ -102,14 +96,14 @@ src_configure() {
 		-DBUILD_TESTING="$(usex test)"
 		-DBUILD_WEBSITE="no"
 
+		-DOPENEXR_BUILD_EXAMPLES="$(usex examples)"
 		-DOPENEXR_BUILD_PYTHON="no"
 		-DOPENEXR_BUILD_TOOLS="$(usex utils)"
 		-DOPENEXR_ENABLE_LARGE_STACK="$(usex large-stack)"
 		-DOPENEXR_ENABLE_THREADING="$(usex threads)"
 
 		-DOPENEXR_INSTALL="yes"
-		-DOPENEXR_INSTALL_DOCS="$(usex doc "$(usex utils)")"
-		-DOPENEXR_INSTALL_EXAMPLES="$(usex examples)"
+		-DOPENEXR_INSTALL_DOCS="$(usex doc)"
 		-DOPENEXR_INSTALL_PKG_CONFIG="yes"
 		-DOPENEXR_INSTALL_TOOLS="$(usex utils)"
 
@@ -117,12 +111,29 @@ src_configure() {
 
 		-DOPENEXR_FORCE_INTERNAL_DEFLATE="no"
 		-DOPENEXR_FORCE_INTERNAL_IMATH="no"
-		-DOPENEXR_RUN_FUZZ_TESTS="$(usex test)" # NOTE expensive
 	)
+	if use test; then
+		# OPENEXR_RUN_FUZZ_TESTS depends on BUILD_TESTING, see
+		#   - https://bugs.gentoo.org/925128
+		#   - https://openexr.com/en/latest/install.html#component-options
+
+		# NOTE: the fuzz tests are very slow
+		mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS="ON" )
+	fi
 
 	cmake_src_configure
 }
 
+src_test() {
+    local CMAKE_SKIP_TESTS=()
+
+    use x86 && CMAKE_SKIP_TESTS+=(
+        '^OpenEXR.testDwaLookups$'
+    )
+
+    cmake_src_test
+}
+
 src_install() {
 	use examples && docompress -x "/usr/share/doc/${PF}/examples"