gentoo resync : 25.08.2020

4 files changed, 121 insertions, 2 deletions

diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index a2b0e215b143..76d8d19e661c 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -8,6 +8,9 @@ AUX openexr-2.3.0-fix-build-system.patch 2381 BLAKE2B 37fd9c6ae5357ffb93fd473441
 AUX openexr-2.3.0-skip-bogus-tests.patch 1429 BLAKE2B fe9dcafb4ea5990cfcf36b16f377592dba1a6f9c31315e38596b67007b2cb67fa46a3217f335202b86b5aa8fb0498c5af5a0905a5a57b9af42b601da1bdae473 SHA512 ff13061b24f6477195e189c38e2bf855a46ab77461c8622dd2e2414a7d2103b260f5184735bb142275690e66fb469e6f6c1fbf626dd9c1c2afbc15b975eba78a
 AUX openexr-2.3.0-tests-32bits-2.patch 586 BLAKE2B 83d36040f751e07f30c5cc3be10f8ac43d62d91b87b87bc2735ecc22426401b3b671d0b397e6a9a1fba351ae66e022c9bb488f95d29a9fbcca479d3d70501eac SHA512 5ffc8bda7e476ce71ee103b519c76e630371e5cc005b04f99d2c054580e387cc2b3b9598cbe4442415c5dfe85b0de8ceedf87079c3f738b7ebb737ea23ea7729
 AUX openexr-2.3.0-tests-32bits.patch 1537 BLAKE2B 96cc98ef34a6c18102e5b96f4373f41b77d25aaf04f9a20d0d406eeae17988cc6f3eecf805f6bac1e42805b283f3123455ca1b069d7c0dc04628835ded2d8dec SHA512 58ad1d8f5dc28be60cdc290c7829d8b50708d26f3a769530e054c629170457f6b7e2b526455f6f86d2ee24931d8afdb61345ada99ae49897d926c0d50fb579f6
+AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236a339d6b35878c9a63a8468e7be6652447646fe0f2567223b20087b2d64d144c95ad71ee218a4542f61bf9c7a65ea8f0e10b02f75d85ee2d3e6b4addc8052 SHA512 6c9c10ab74a24e7213c565eb357683949193b45d0475c529f8cc24dc73deb9392db36f80d38757eee54eded1c260049339f575f96217c733243c4c6a863d5857
 DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
+DIST openexr-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
 EBUILD openexr-2.3.0.ebuild 2234 BLAKE2B 864ae2338edbf3b058bf5053598b93a251a87a97d351c6fbed658508e9136a965bcae2598182f509ff65b56d6975bb72be3d9286d92b101a7164cabbd42f023b SHA512 f0b6c1c79ea7b49cc6f5157d20bd7001d225bef2729bcef23badbd3e72c8ec4f7b0d2cd2329682f5914ca40ffbc31bfb5715e7f6615988a467e26d23e2b56382
-MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
+EBUILD openexr-2.5.2.ebuild 1655 BLAKE2B 397022527e39e521613088db67de65d259cde315d12aa7b435798d840a151c788bc65fd1ababefe984e1e4bdd795c92f2fe5a8a203732b275fc06b2f0d8ce68a SHA512 881039da4a7f8cb7d9a842536ff53b20221cb6a099bb0fa92ca4b8fdca4b862d512b20e18cd6bd1dbf652013fd50342c3b58c4c450653b1ff575c604b7a633b6
+MISC metadata.xml 666 BLAKE2B 0faed6c1a1dfecdea8436ef7890af82b565dc9dd1bcc93b5e961ab53939cf6b62d6903e7f9a15ed6e8891de8e6f429cf5811cd2a2126105d71c9fbcc4fdadb2c SHA512 f81d6266a7af651a1e76aa60e3d40107b940548f6a34f4a47b08bc32e37aad32cff31a85d7c58c414b01d54835d224c2ca387f9a0dd1025e1bd5ddc7207281f2
diff --git a/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch b/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch
new file mode 100644
index 000000000000..a77705cb5a7d
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch
@@ -0,0 +1,40 @@
+From 866442b28b53f773efbb3690b6252d2e75bee137 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Fri, 3 Jul 2020 15:34:47 +0200
+Subject: [PATCH] IlmImfTest/main.cpp: disable tests
+
+Disable testOptimizedInterleavePatterns and testDwaLookup, which
+are not working on x86.
+For testOptimizedInterleavePatterns, see
+https://github.com/AcademySoftwareFoundation/openexr/issues/67#issuecomment-21169748
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ IlmImfTest/main.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/IlmImfTest/main.cpp b/IlmImfTest/main.cpp
+index 3245fc4..4ab45b1 100644
+--- a/IlmImfTest/main.cpp
++++ b/IlmImfTest/main.cpp
+@@ -228,7 +228,7 @@ main (int argc, char *argv[])
+     TEST (testExistingStreams, "core");
+     TEST (testStandardAttributes, "core");
+     TEST (testOptimized, "basic");
+-    TEST (testOptimizedInterleavePatterns, "basic");
++//    TEST (testOptimizedInterleavePatterns, "basic");
+     TEST (testYca, "basic");
+     TEST (testTiledYa, "basic");
+     TEST (testNativeFormat, "basic");
+@@ -255,7 +255,7 @@ main (int argc, char *argv[])
+     TEST (testDwaCompressorSimd, "basic");
+     TEST (testRle, "core");
+     TEST (testB44ExpLogTable, "core");
+-    TEST (testDwaLookups, "core");
++//    TEST (testDwaLookups, "core");
+     
+ 
+     //#ifdef ENABLE_IMFHUGETEST
+-- 
+2.27.0
+
diff --git a/media-libs/openexr/metadata.xml b/media-libs/openexr/metadata.xml
index fc9e500d69e1..f72a455316a9 100644
--- a/media-libs/openexr/metadata.xml
+++ b/media-libs/openexr/metadata.xml
@@ -1,10 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>waebbl@gmail.com</email>
+		<name>Bernd Waibel</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>media-video@gentoo.org</email>
 	</maintainer>
+	<use>
+		<flag name="utils">
+			Build several utility binaries for verifying and manipulating EXR files.
+		</flag>
+	</use>
 	<upstream>
-		<remote-id type="github">openexr/openexr</remote-id>
+		<remote-id type="github">AcademySoftwareFoundation/openexr</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/openexr/openexr-2.5.2.ebuild b/media-libs/openexr/openexr-2.5.2.ebuild
new file mode 100644
index 000000000000..bfa5b4c19ffb
--- /dev/null
+++ b/media-libs/openexr/openexr-2.5.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 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"
+
+LICENSE="BSD"
+SLOT="0/25" # based on SONAME
+KEYWORDS="amd64 -arm arm64 ~hppa ~ia64 ~ppc ~ppc64 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:=
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${P}/OpenEXR"
+
+DOCS=( PATENTS README.md )
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/OpenEXRConfigInternal.h )
+
+src_prepare() {
+	cmake_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"
+
+	if use abi_x86_32 && use test; then
+		eapply "${FILESDIR}/${P}-0001-IlmImfTest-main.cpp-disable-tests.patch"
+	fi
+}
+
+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				# default
+	)
+
+	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
+}