gentoo resync : 09.07.2022

4 files changed, 2 insertions, 115 deletions

diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 026864244c8a..2d3278231515 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,13 +1,10 @@
 AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236a339d6b35878c9a63a8468e7be6652447646fe0f2567223b20087b2d64d144c95ad71ee218a4542f61bf9c7a65ea8f0e10b02f75d85ee2d3e6b4addc8052 SHA512 6c9c10ab74a24e7213c565eb357683949193b45d0475c529f8cc24dc73deb9392db36f80d38757eee54eded1c260049339f575f96217c733243c4c6a863d5857
-AUX openexr-2.5.7-0001-disable-testRgba-on-sparc.patch 937 BLAKE2B e2e432649100457a3273b50aa6725625ac50f48bf95bb04b85a2587a44d4c9e87662a36b68c3b7ac0c741068223e439fb51c1b69d5ae8f852794b0a7ee238d4a SHA512 8c640d67f2db6ed2789b8e25dd25e6ba8db6b3ed0ddb2138027ca579b3fe5db43b60d5bffc4de3f31ba60521c6479cf89f1ff7a8b2bbba97dd22c13279b92f81
 AUX openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch 687 BLAKE2B 49aaf9d5282ad878ec415413106540d4a92aecceebbc9a03e30a4289377ec1d8ec4e1bacf49e0cec80a44e75f7f345c885c4746092c4dc3d57b03b317631d4d5 SHA512 9bcb62eec3bdf05ba54dff037ccd71e5e1dcd37831246f95d7803f1710b7335d930292dd27b5a6ddd927c45e7734d61d3a42a637fdf7e83724830f21b3d3db9e
 AUX openexr-3.1.1-0003-disable-failing-test.patch 1193 BLAKE2B d4a40151e2c0b2278bfbec06b88d1a2b1a0caccb651a53aa4d54945524e3c79fb03d9031540ed0f423be4503fff0881b2185cc33b614a2508135cec3113f9384 SHA512 e07602d78d15ab0f1076d7b5d3f3d16912e9d0ad792703af1b1d3d8fcf472eef2e410efc2abed2da70e39a97f4dd9194a47c6de50484da799d49cf44e62c9167
-DIST openexr-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
 DIST openexr-2.5.8.tar.gz 27539605 BLAKE2B b54b72aa82c947fd7f252bf4d15b2727be2da7cdd257a9d96c6c2a3c892438ff850177549144e492617bfe5d260ddd14d21eac70a55f124784bbdf5f7077d1e9 SHA512 5b1ad99cfa639892292109a26c084868b3fe0acf572dd69750e951cec2127d63c78309241de92b0052f0abe50d86f2518e3185194121010db5f826d217e37f4f
 DIST openexr-3.1.4.tar.gz 20323658 BLAKE2B d3726023f920fa719b1832d3be2df36a95cac8c67fdd4b23a7166398a282fa01d5c07065afd92f7b28f178c47843f82eb7a0f2b77742725b359c8f275d2ef1d0 SHA512 612ab3467f9ccf2779e1592361cb07459571122e10c0a0b3020430cfa34fa3b91ca1d63cc12a5f85d5b53b277b3f7a88862e6477f0f3566a4196b8245f6bfe12
 DIST openexr-3.1.5.tar.gz 20327926 BLAKE2B 77ece3c62b34292d4714873149a5a54a47fe811e96f992f1082e7dca99ad7717649f937c2dd7b18011c4201f15056526fc4b706c4d2f1b7fa593b9f1ed6314bd SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c
-EBUILD openexr-2.5.7.ebuild 2171 BLAKE2B fb59902ef509b75d58b1df078d3bb7ef9bf866fc55ee5de8211721745fbf048d2431aba65d1627ed9748862e751c04f58c51b50355fa34f3d22f163fbdde2a14 SHA512 4a91fa4d593dfc94aba295d5572ed9f7c73e9ccdba52b4f38053a0431bd4a89e1b195aa50aed4f5297464838815d62dbe388b24f72ff29ff40bcb0396c8c6e09
-EBUILD openexr-2.5.8.ebuild 2142 BLAKE2B a37123b989ac0ea73137b2d8eebc852de686c00f4f398bf03d8b82e879b586473675e922128003c12a396503269107e12376f39c44177b6def0785e3bcfbdbc1 SHA512 79b3a52cb707d8ec2f4130b165f8db7dafb057320845adfb0c15d9465792671ea7f037e6f6fe328350677487ed1fc37e5a260e1923a30c026e5b8c873b78c67f
+EBUILD openexr-2.5.8.ebuild 2056 BLAKE2B e73f4da39cbadcae890ae51090dbed09704d866cdf9cb87a57aee45a427d917bc2bf839ecccdeb3414e3bd7e71fa0c84657138ba28ca474b8dffa513b10e9190 SHA512 da621c9f9497afbcb5ec57e4e0c2f9bef63db1645143c77a3692f147aea0ab36bad7dbfbf2fc74a44f34cb321cda6e40418e910dc0eaba8b65146ee81383ec81
 EBUILD openexr-3.1.4-r1.ebuild 1910 BLAKE2B 2eb8cad3ae2a3951a534b5d3173f0788ba8a3792eb0bf4462321fe073580b3b71c04b99669e1a2ab6d599c9e0ed2062ceeb9185d0b48fb8c307c670123272bcd SHA512 b65c849f91b3226cc751052511f517e10607ad2c64eb7f17f80ad4e0cb8b2e9b28767741057095ef661787c327815cae16b1d15dc49c330522203d3b38b41c21
 EBUILD openexr-3.1.5.ebuild 1803 BLAKE2B eb42d6fa4b88568e6133aecc6b41e6f0024e989f0520e1015142720f93e839d54cd5a4f7fc1eb9353451cce8fdc9bf0aaef7470c96fc69b28cc71a0d2fa21132 SHA512 2c7c8df67620d87eeb6c44aa257fdde1de9419a209ef07323a0249c432b80373e37239978dc7144a9e2a818565898a37df77b3ee5bf7d07c97e527551f9b5786
 MISC metadata.xml 797 BLAKE2B e9d8032b4c63b24e2e7b1874d46bbbcf4f31342c4540279d1ba243e69090c320e6d9caed29e15dee87f7fbfb4b806de3a1665b7a4385baa4107ea41a2ae74d32 SHA512 12f7cce7d5cee0a88e4c3f8babfa10f890d5b38c0131becafa46423dc642c2df03ac78b2e3bbcdb4846b929eeb7138e9b3d12cddbf1da984ac5446b6cc792dee
diff --git a/media-libs/openexr/files/openexr-2.5.7-0001-disable-testRgba-on-sparc.patch b/media-libs/openexr/files/openexr-2.5.7-0001-disable-testRgba-on-sparc.patch
deleted file mode 100644
index 368c9173d133..000000000000
--- a/media-libs/openexr/files/openexr-2.5.7-0001-disable-testRgba-on-sparc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Mon, 21 Jun 2021 12:03:02 +0200
-Subject: [PATCH] disable testRgba on sparc
-
-Fails on sparc, bug #656680 and issue
-https://github.com/openexr/openexr/issues/222
-
-Bug: https://bugs.gentoo.org/656680
-Bug: https://github.com/AcademySoftwareFoundation/openexr/issues/222
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- IlmImfTest/main.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/IlmImfTest/main.cpp b/IlmImfTest/main.cpp
-index 3245fc4..3ba3e60 100644
---- a/IlmImfTest/main.cpp
-+++ b/IlmImfTest/main.cpp
-@@ -206,7 +206,7 @@ main (int argc, char *argv[])
-     TEST (testXdr, "core");
-     TEST (testHuf, "core");
-     TEST (testWav, "core");
--    TEST (testRgba, "basic");
-+//    TEST (testRgba, "basic");
-     TEST (testLargeDataWindowOffsets, "basic");
-     TEST (testSharedFrameBuffer, "basic");
-     TEST (testRgbaThreading, "basic");
--- 
-2.32.0
-
diff --git a/media-libs/openexr/openexr-2.5.7.ebuild b/media-libs/openexr/openexr-2.5.7.ebuild
deleted file mode 100644
index 990a17843d0d..000000000000
--- a/media-libs/openexr/openexr-2.5.7.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}/OpenEXR"
-
-LICENSE="BSD"
-SLOT="0/25" # based on SONAME
-# -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~media-libs/ilmbase-${PV}:=[static-libs?,${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( PATENTS README.md )
-
-src_prepare() {
-	# Fix path for testsuite
-	sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests"
-
-	# disable failing tests on various arches
-	if use test; then
-		if use abi_x86_32; then
-			eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch"
-		fi
-
-		# Technically this doesn't disable anything, it just gives this test time to complete.
-		# Could probably be applied unconditionally but will leave this to the maintainers.
-		if use riscv; then
-			eapply "${FILESDIR}/${P}-0002-increase-IlmImfTest-timeout.patch"
-		fi
-
-		if use sparc; then
-			eapply "${FILESDIR}/${P}-0001-disable-testRgba-on-sparc.patch"
-		fi
-	fi
-
-	multilib_foreach_abi cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DINSTALL_OPENEXR_DOCS=$(usex doc)
-		-DINSTALL_OPENEXR_EXAMPLES=$(usex examples)
-		-DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
-		-DOPENEXR_BUILD_UTILS=$(usex utils)
-		-DOPENEXR_INSTALL_PKG_CONFIG=ON
-		-DOPENEXR_USE_CLANG_TIDY=OFF		# don't look for clang-tidy
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		DOCS+=( doc/*.pdf )
-	fi
-	einstalldocs
-
-	use examples && docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/media-libs/openexr/openexr-2.5.8.ebuild b/media-libs/openexr/openexr-2.5.8.ebuild
index 9040c83eabdb..e5e93f2625bb 100644
--- a/media-libs/openexr/openexr-2.5.8.ebuild
+++ b/media-libs/openexr/openexr-2.5.8.ebuild
@@ -40,11 +40,7 @@ src_prepare() {
 		# Technically this doesn't disable anything, it just gives this test time to complete.
 		# Could probably be applied unconditionally but will leave this to the maintainers.
 		if use riscv; then
-			eapply "${FILESDIR}/${P}-0002-increase-IlmImfTest-timeout.patch"
-		fi
-
-		if use sparc; then
-			eapply "${FILESDIR}/${P}-0001-disable-testRgba-on-sparc.patch"
+			eapply "${FILESDIR}/${PN}-2.5.7-0002-increase-IlmImfTest-timeout.patch"
 		fi
 	fi