[gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/files/, media-libs/openexr/

[Joonas Niilola]

commit:     58d2ffc5446d020cde8d473c32485ad5f2e4c6f1
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Mar 26 16:46:35 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Mar 31 06:29:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d2ffc5

media-libs/openexr: drop 2.3.0

Security cleanup

Bug: https://bugs.gentoo.org/770229
Bug: https://bugs.gentoo.org/762862
Bug: https://bugs.gentoo.org/746794
Bug: https://bugs.gentoo.org/717474
Bug: https://bugs.gentoo.org/656680
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-libs/openexr/Manifest                        |   1 -
 ...penexr-2.2.0-Install-missing-header-files.patch |  60 -----------
 .../openexr-2.2.0-fix-config.h-collision.patch     |  43 --------
 .../openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch    |  75 -------------
 .../openexr/files/openexr-2.3.0-bigendian.patch    |  71 -------------
 .../openexr/files/openexr-2.3.0-bigendian2.patch   |  17 ---
 .../openexr/files/openexr-2.3.0-fix-bashisms.patch | 117 ---------------------
 .../files/openexr-2.3.0-fix-build-system.patch     |  68 ------------
 .../files/openexr-2.3.0-skip-bogus-tests.patch     |  31 ------
 .../files/openexr-2.3.0-tests-32bits-2.patch       |  17 ---
 .../openexr/files/openexr-2.3.0-tests-32bits.patch |  36 -------
 media-libs/openexr/openexr-2.3.0.ebuild            |  79 --------------
 12 files changed, 615 deletions(-)

diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 44ef0c20a7c..bdbd8277f8a 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,2 +1 @@
-DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
 DIST openexr-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf

diff --git a/media-libs/openexr/files/openexr-2.2.0-Install-missing-header-files.patch b/media-libs/openexr/files/openexr-2.2.0-Install-missing-header-files.patch
deleted file mode 100644
index 1075cd9a30f..00000000000
--- a/media-libs/openexr/files/openexr-2.2.0-Install-missing-header-files.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From a018f82655402421a995565dd4a5192259cbc207 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@×××××.com>
-Date: Sat, 23 Sep 2017 10:36:40 +0100
-Subject: [PATCH] OpenEXR: Install missing header files
-
-Some header files are not installed via Autotools, but are with
-CMake which breaks compatibility with certain programs. This patch
-enables Autotools to install these header files.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@×××××.com>
----
- OpenEXR/IlmImf/Makefile.am     |  3 ++-
- OpenEXR/IlmImfUtil/Makefile.am | 17 +++++++++++++++++
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/IlmImf/Makefile.am b/IlmImf/Makefile.am
-index a7c219c..b7b96ac 100644
---- a/IlmImf/Makefile.am
-+++ b/IlmImf/Makefile.am
-@@ -162,7 +162,8 @@ libIlmImfinclude_HEADERS = ImfForward.h ImfAttribute.h ImfBoxAttribute.h \
- 			   ImfMisc.h          \
- 			   ImfPartHelper.h \
- 			   ImfDeepImageState.h \
--			   ImfDeepImageStateAttribute.h
-+			   ImfDeepImageStateAttribute.h \
-+			   ImfFloatVectorAttribute.h
- 
- noinst_HEADERS = ImfCompressor.h    \
- 		 ImfRleCompressor.h \
-diff --git a/IlmImfUtil/Makefile.am b/IlmImfUtil/Makefile.am
-index 8005ee1..e1d3674 100644
---- a/IlmImfUtil/Makefile.am
-+++ b/IlmImfUtil/Makefile.am
-@@ -33,6 +33,23 @@ libIlmImfUtil_la_LIBADD =  -L$(top_builddir)/IlmImf $(ILMBASE_LIBS) -lIlmImf
- 
- libIlmImfUtilincludedir = $(includedir)/OpenEXR
- 
-+libIlmImfUtilinclude_HEADERS = ImfFlatImage.h \
-+			       ImfDeepImage.h \
-+			       ImfDeepImageChannel.h \
-+			       ImfImageLevel.h \
-+			       ImfDeepImageLevel.h \
-+			       ImfDeepImageIO.h \
-+			       ImfImageChannelRenaming.h \
-+			       ImfImageIO.h \
-+			       ImfFlatImageChannel.h \
-+			       ImfImage.h \
-+			       ImfFlatImageLevel.h \
-+			       ImfImageDataWindow.h \
-+			       ImfSampleCountChannel.h \
-+			       ImfFlatImageIO.h \
-+			       ImfImageChannel.h
-+
-+
- EXTRA_DIST = CMakeLists.txt
- 
- INCLUDES = \
--- 
-2.14.1
-

diff --git a/media-libs/openexr/files/openexr-2.2.0-fix-config.h-collision.patch b/media-libs/openexr/files/openexr-2.2.0-fix-config.h-collision.patch
deleted file mode 100644
index 53421194c2d..00000000000
--- a/media-libs/openexr/files/openexr-2.2.0-fix-config.h-collision.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Rename enum from VERSION to MYVERSION due to
-collision with VERSION from autoheader.
-
---- a/IlmImf/ImfDwaCompressor.cpp
-+++ b/IlmImf/ImfDwaCompressor.cpp
-@@ -1944,7 +1944,7 @@
- 
-     #define OBIDX(x) (Int64 *)&_outBuffer[x * sizeof (Int64)]
- 
--    Int64 *version                 = OBIDX (VERSION);
-+    Int64 *version                 = OBIDX (MYVERSION);
-     Int64 *unknownUncompressedSize = OBIDX (UNKNOWN_UNCOMPRESSED_SIZE);
-     Int64 *unknownCompressedSize   = OBIDX (UNKNOWN_COMPRESSED_SIZE);
-     Int64 *acCompressedSize        = OBIDX (AC_COMPRESSED_SIZE);
-@@ -2356,7 +2356,7 @@
- 
-     const Int64 *inPtr64 = (const Int64*) inPtr;
- 
--    Int64 version                  = *(inPtr64 + VERSION);
-+    Int64 version                  = *(inPtr64 + MYVERSION);
-     Int64 unknownUncompressedSize  = *(inPtr64 + UNKNOWN_UNCOMPRESSED_SIZE);
-     Int64 unknownCompressedSize    = *(inPtr64 + UNKNOWN_COMPRESSED_SIZE);
-     Int64 acCompressedSize         = *(inPtr64 + AC_COMPRESSED_SIZE);
-@@ -3142,7 +3142,7 @@
- 
- 
- //
--// Setup channel classification rules when reading files with VERSION < 2
-+// Setup channel classification rules when reading files with MYVERSION < 2
- //
- 
- void
---- a/IlmImf/ImfDwaCompressor.h
-+++ b/IlmImf/ImfDwaCompressor.h
-@@ -124,7 +124,7 @@
- 
-     enum DataSizesSingle 
-     {
--        VERSION = 0,                  // Version number:
-+        MYVERSION = 0,                // Version number:
-                                       //   0: classic
-                                       //   1: adds "end of block" to the AC RLE
- 

diff --git a/media-libs/openexr/files/openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch b/media-libs/openexr/files/openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch
deleted file mode 100644
index 1dc13c72407..00000000000
--- a/media-libs/openexr/files/openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-IlmImf_ImfSystemSpecific.cpp,v 1.2 2014/08/19 13:34:42 joerg Exp $
-
-Rework cpuid function to use gnuc __get_cpuid (requiring at least gcc 4.3)
-This get's over issues such as encountered with PIC builds.
-Upstream issue : https://github.com/openexr/openexr/issues/128
-
-https://raw.githubusercontent.com/jsonn/pkgsrc/trunk/graphics/openexr/patches/patch-IlmImf_ImfSystemSpecific.cpp
-https://github.com/jsonn/pkgsrc/commit/5158af44e65b6d7b9f1a8aca2eb24cb87d003724
-https://bugs.gentoo.org/show_bug.cgi?id=626760
-
---- a/IlmImf/ImfSystemSpecific.cpp.orig	2014-08-10 04:23:57.000000000 +0000
-+++ b/IlmImf/ImfSystemSpecific.cpp
-@@ -40,21 +40,30 @@ OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_EN
- 
- namespace {
- #if defined(IMF_HAVE_SSE2) &&  defined(__GNUC__)
--
-     // Helper functions for gcc + SSE enabled
--    void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx)
-+    void cpuid(unsigned int n, unsigned int &eax, unsigned int &ebx,
-+					unsigned int &ecx, unsigned int &edx)
-     {
-+#ifdef __i386__
-+        __asm__ __volatile__ (
-+            "pushl %%ebx; cpuid; movl %%ebx, %0; popl %%ebx"
-+            : /* Output  */ "=m"(ebx), "=a"(eax), "=c"(ecx), "=d"(edx) 
-+            : /* Input   */ "a"(n)
-+            : /* Clobber */);
-+#else
-         __asm__ __volatile__ (
-             "cpuid"
-             : /* Output  */ "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx) 
-             : /* Input   */ "a"(n)
-             : /* Clobber */);
-+#endif
-     }
- 
- #else // IMF_HAVE_SSE2 && __GNUC__
- 
-     // Helper functions for generic compiler - all disabled
--    void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx)
-+    void cpuid(unsigned int n, unsigned int &eax, unsigned int &ebx,
-+					unsigned int &ecx, unsigned int &edx)
-     {
-         eax = ebx = ecx = edx = 0;
-     }
-@@ -64,7 +73,7 @@ namespace {
- 
- #ifdef OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX
- 
--    void xgetbv(int n, int &eax, int &edx)
-+    void xgetbv(unsigned int n, unsigned int &eax, unsigned int &edx)
-     {
-         __asm__ __volatile__ (
-             "xgetbv"
-@@ -75,7 +84,7 @@ namespace {
- 
- #else //  OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX
- 
--    void xgetbv(int n, int &eax, int &edx)
-+    void xgetbv(unsigned int n, unsigned int &eax, unsigned int &edx)
-     {
-         eax = edx = 0;
-     }
-@@ -94,8 +103,8 @@ CpuId::CpuId():
-     f16c(false)
- {
-     bool osxsave = false;
--    int  max     = 0;
--    int  eax, ebx, ecx, edx;
-+    unsigned int  max     = 0;
-+    unsigned int  eax, ebx, ecx, edx;
- 
-     cpuid(0, max, ebx, ecx, edx);
-     if (max > 0)

diff --git a/media-libs/openexr/files/openexr-2.3.0-bigendian.patch b/media-libs/openexr/files/openexr-2.3.0-bigendian.patch
deleted file mode 100644
index 0851fe95735..00000000000
--- a/media-libs/openexr/files/openexr-2.3.0-bigendian.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Description: Fix test-suite on some big-endian archs
-Author: Dennis Gilmore <dennis@×××××.us>
-Bug-Debian: https://bugs.debian.org/793040
-Origin: vendor, https://github.com/openexr/openexr/issues/81
-Reviewed-by: Mathieu Malaterre <malat@××××××.org>
-
-Index: openexr/IlmImfTest/testFutureProofing.cpp
-===================================================================
---- openexr.orig/IlmImfTest/testFutureProofing.cpp
-+++ openexr/IlmImfTest/testFutureProofing.cpp
-@@ -40,6 +40,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <assert.h>
-+#include <byteswap.h>
- 
- #include "tmpDir.h"
- #include "testFutureProofing.h"
-@@ -64,6 +65,7 @@
- #include <ImfNamespace.h>
- #include <ImathNamespace.h>
- #include <IlmThreadNamespace.h>
-+#include <ImfSystemSpecific.h>
- 
- namespace IMF = OPENEXR_IMF_NAMESPACE;
- using namespace IMF;
-@@ -1234,6 +1236,12 @@ modifyType (bool modify_version)
-             
-             //length of attribute
-             fread(&length,4,1,f);
-+            if (!GLOBAL_SYSTEM_LITTLE_ENDIAN)
-+            {
-+                int tmp = bswap_32(length);
-+        	length = tmp;
-+            }
-+
-             if(!modify_version && attrib_name=="type")
-             {
-                 // modify the type of part 1 to be 'X<whatevever>'
-Index: openexr/IlmImfTest/testMultiPartFileMixingBasic.cpp
-===================================================================
---- openexr.orig/IlmImfTest/testMultiPartFileMixingBasic.cpp
-+++ openexr/IlmImfTest/testMultiPartFileMixingBasic.cpp
-@@ -40,6 +40,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <assert.h>
-+#include <byteswap.h>
- 
- #include "tmpDir.h"
- #include "testMultiPartFileMixingBasic.h"
-@@ -59,6 +60,7 @@
- #include <ImfDeepScanLineInputPart.h>
- #include <ImfPartType.h>
- #include <ImfMisc.h>
-+#include <ImfSystemSpecific.h>
- 
- namespace IMF = OPENEXR_IMF_NAMESPACE;
- using namespace IMF;
-@@ -1383,6 +1385,11 @@ killOffsetTables (const std::string & fn
-             
-             //length of attribute
-             fread(&length,4,1,f);
-+    	    if (!GLOBAL_SYSTEM_LITTLE_ENDIAN)
-+    	    {
-+    		int tmp = bswap_32(length);
-+    		length = tmp;
-+    	    }
-             
-             //value of attribute
-             for(int i=0;i<length;i++) 

diff --git a/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch b/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch
deleted file mode 100644
index cf1ad7b0902..00000000000
--- a/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Upstream is not interested in big endian arch
- Seems to only affect the test suite.
-Author: Mathieu Malaterre <malat@××××××.org>
-
-Index: openexr/IlmImfTest/main.cpp
-===================================================================
---- openexr.orig/IlmImfTest/main.cpp
-+++ openexr/IlmImfTest/main.cpp
-@@ -153,7 +153,7 @@ main (int argc, char *argv[])
-     TEST (testHuf, "core");
-     TEST (testWav, "core");
-     TEST (testRgba, "basic");
--    TEST (testSharedFrameBuffer, "basic");
-+    //TEST (testSharedFrameBuffer, "basic");
-     TEST (testRgbaThreading, "basic");
-     TEST (testChannels, "basic");
-     TEST (testAttributes, "core");

diff --git a/media-libs/openexr/files/openexr-2.3.0-fix-bashisms.patch b/media-libs/openexr/files/openexr-2.3.0-fix-bashisms.patch
deleted file mode 100644
index f633eb0e49f..00000000000
--- a/media-libs/openexr/files/openexr-2.3.0-fix-bashisms.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From ba329cba788d4f320e6fc455919233222c27a0dd Mon Sep 17 00:00:00 2001
-From: Kimball Thurston <kdt3rd@×××××.com>
-Date: Sun, 21 Jul 2019 23:07:01 +1200
-Subject: [PATCH] Fixes #139
-
-Removes bash-isms from the autoconf bootstrap / configure.ac files
-
-Signed-off-by: Kimball Thurston <kdt3rd@×××××.com>
----
- IlmBase/bootstrap            |  4 ++--
- IlmBase/configure.ac         | 22 ++++++++++------------
- OpenEXR/bootstrap            |  4 ++--
- OpenEXR/configure.ac         | 26 +++++++++++++-------------
- OpenEXR_Viewers/bootstrap    |  4 ++--
- OpenEXR_Viewers/configure.ac | 15 +++++++--------
- PyIlmBase/bootstrap          |  4 ++--
- PyIlmBase/configure.ac       | 15 +++++++--------
- 8 files changed, 45 insertions(+), 49 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,30 +76,30 @@ AC_ARG_ENABLE(cxxstd,
-                              [enable ISO c++ standard 11/14 [[default=auto]]]),
-               [cxxstd="${enableval}"], [cxxstd=14])
- 
--if test "${cxxstd}" == 17 ; then
-+if test "${cxxstd}" = 17 ; then
-     AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
- 	CXXFLAGS="$CXXFLAGS -std=c++17"
- else
--  if test "${cxxstd}" == 14 ; then
-+  if test "${cxxstd}" = 14 ; then
-       AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory])
-   	CXXFLAGS="$CXXFLAGS -std=c++14"
-   else
--    if test "${cxxstd}" == 11 ; then
-+    if test "${cxxstd}" = 11 ; then
-       AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
-       CXXFLAGS="$CXXFLAGS -std=c++11"
-     else
--      if test "${cxxstd}" == 03 ; then
-+      if test "${cxxstd}" = 03 ; then
-         CXXFLAGS="$CXXFLAGS -std=c++03"
-       else
-         dnl automatically determine...
-         AX_CXX_COMPILE_STDCXX([11], [noext], [optional])
-         AX_CXX_COMPILE_STDCXX([14], [noext], [optional])
-         AX_CXX_COMPILE_STDCXX([17], [noext], [optional])
--        if test "$HAVE_CXX14" == 1 ; then
-+        if test "$HAVE_CXX14" = 1 ; then
-   	      CXXFLAGS="$CXXFLAGS -std=c++14"
-           cxxstd = 14
-         else
--          if test "$HAVE_CXX11" == 1 ; then
-+          if test "$HAVE_CXX11" = 1 ; then
-   	        CXXFLAGS="$CXXFLAGS -std=c++11"
-             cxxstd = 11
-           fi
-@@ -216,7 +216,7 @@ AC_COMPILE_IFELSE(
-    [sysconf_nproc="no"]
- )
- AC_MSG_RESULT([$sysconf_nproc])
--if test "x${sysconf_nproc}" == xyes ; then
-+if test "x${sysconf_nproc}" = xyes ; then
-     AC_DEFINE([OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN], [1], [Define if sysconf(_SC_NPROCESSORS_ONLN) can be used for CPU count])
- fi
- 
-@@ -297,14 +297,14 @@ LIB_SUFFIX=""
- lib_suffix_valid="no"
- 
- lib_namespace="Imf"
--if test "x${library_namespace_versioning}" == xyes ; then
-+if test "x${library_namespace_versioning}" = xyes ; then
-     AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [Imf_${OPENEXR_VERSION_API}], [OpenEXR])
-     AC_DEFINE([OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM], [1], [OpenEXR])
- 
-     lib_namespace="Imf_${OPENEXR_VERSION_API}"
-     LIB_SUFFIX="${OPENEXR_VERSION_API}"
-     lib_suffix_valid="yes"
--elif test "x${library_namespace_versioning}" == xno ; then
-+elif test "x${library_namespace_versioning}" = xno ; then
-     AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [Imf], [OpenEXR])
- 
-     lib_namespace="Imf"
-@@ -318,7 +318,7 @@ else
- fi
- AC_SUBST(LIB_SUFFIX)
- 
--if test "x${lib_suffix_valid}" == xyes ; then
-+if test "x${lib_suffix_valid}" = xyes ; then
- AC_SUBST(LIB_SUFFIX_DASH,"-${LIB_SUFFIX}")
- AM_CONDITIONAL(LIB_SUFFIX_EXISTS,true)
- else
-@@ -338,11 +338,11 @@ AC_ARG_ENABLE(customusernamespace,
-         [custom_usr_namespace="${enableval}"], 
-         [custom_usr_namespace=no])
- 
--if test "x${custom_usr_namespace}" == xyes ; then
-+if test "x${custom_usr_namespace}" = xyes ; then
-     AC_MSG_WARN([Enabling 'custom user namespace' requires an additional argument, reverting to 'Imf'])
-     AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR])
-     usr_namespace="Imf"
--elif test "x${custom_usr_namespace}" == xno ; then
-+elif test "x${custom_usr_namespace}" = xno ; then
-     AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR])
-     usr_namespace="Imf"
- else
-@@ -386,7 +386,7 @@ enable large stack optimizations                $large_stack
- internal library namespace                      $lib_namespace
- user-client namespace                           $usr_namespace])
- 
--if test "x$build_osxuniversal" == xyes; then
-+if test "x$build_osxuniversal" = xyes; then
- AC_MSG_RESULT([
- build OS X universal binaries                   $build_osxuniversal])
- fi

diff --git a/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch b/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch
deleted file mode 100644
index 811a7af3875..00000000000
--- a/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 067f9d0..fdbe2f8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -13,8 +13,7 @@ AC_SUBST(OPENEXR_VERSION_API, ${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR})
- AC_CANONICAL_HOST
- AC_CONFIG_SRCDIR(IlmImfTest/main.cpp)
- AC_CONFIG_HEADERS([config/OpenEXRConfig.h])
--AM_INIT_AUTOMAKE(1.6.3)  dnl Require automake 1.6.3 or better
--AM_MAINTAINER_MODE
-+AM_INIT_AUTOMAKE
- 
- 
- LIBTOOL_CURRENT=24
-@@ -28,7 +27,7 @@ AC_PROG_CXX
- AC_PROG_INSTALL
- AC_PROG_CC
- AC_PROG_LN_S
--AC_PROG_LIBTOOL
-+LT_INIT
- AC_PROG_MAKE_SET
- 
- dnl
-@@ -58,8 +57,8 @@ AM_PATH_PKGCONFIG(
-     [ILMBASE])
- 
- dnl Define the version string
--AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], "${VERSION}", [OpenEXR version string])
--AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], "${PACKAGE_STRING}", [OpenEXR version string])
-+AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], ["${VERSION}"], [OpenEXR version string])
-+AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], ["${PACKAGE_STRING}"], [OpenEXR version string])
- AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MAJOR], [${OPENEXR_VERSION_MAJOR}], [OpenEXR version string])
- AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MINOR], [${OPENEXR_VERSION_MINOR}], [OpenEXR version string])
- AC_DEFINE_UNQUOTED([OPENEXR_VERSION_PATCH], [${OPENEXR_VERSION_PATCH}], [OpenEXR version string])
-@@ -110,16 +109,7 @@ AC_ARG_ENABLE(threading,
-               [multithread="${enableval}"], [multithread=yes])
- 
- AS_IF([test "x${multithread}" != xno], [
--	ACX_PTHREAD(
--    [
--      AC_DEFINE(OPENEXR_IMF_HAVE_PTHREAD)
--      ILMBASE_LIBS="$PTHREAD_LIBS $ILMBASE_LIBS"
--      ILMBASE_CXXFLAGS="$ILMBASE_CXXFLAGS $PTHREAD_CFLAGS"
--      CC="$PTHREAD_CC"
--
--      AM_POSIX_SEM()
--    ],
--    [AC_MSG_ERROR([POSIX thread support required])])
-+	AX_PTHREAD
- 
- 	AC_DEFINE([OPENEXR_IMF_HAVE_PTHREAD], [1], [Define if pthreads are available])
- 
-@@ -195,15 +185,6 @@ dnl AC_MSG_RESULT($complete_iomanip)
- dnl AC_LANG_RESTORE
- AC_DEFINE([OPENEXR_IMF_HAVE_COMPLETE_IOMANIP], [1], [Define when std::right is available])
- 
--AC_MSG_CHECKING(for gcc optimization flags)
--old_cflags=$CFLAGS
--CFLAGS="$CFLAGS -pipe"
--AC_TRY_COMPILE([#include <stdio.h>],
--[ printf ("hello, world"); ],
--[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""])
--CFLAGS=$old_cflags
--AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
--
- 
- dnl Check to see if the toolset supports AVX instructions in inline asm
- AC_ARG_ENABLE([avx],

diff --git a/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch b/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch
deleted file mode 100644
index 360b9609b2d..00000000000
--- a/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Remove bogus test from suite
-Author: Mathieu Malaterre <malat@××××××.org>
-Bug-Debian: https://bugs.debian.org/790495
-Forwarded: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790495#15
-
---- openexr-2.2.0.orig/IlmImfTest/testSampleImages.cpp
-+++ openexr-2.2.0/IlmImfTest/testSampleImages.cpp
-@@ -162,15 +162,15 @@ testSampleImages (const std::string&)
- 	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_b44.exr",
- 		       ILM_IMF_TEST_IMAGEDIR "comp_b44_piz.exr");
- 
--	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v1.exr",
--		       ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
--	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v2.exr",
--		       ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
-+//	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v1.exr",
-+//		       ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
-+//	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v2.exr",
-+//		       ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
- 
--	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v1.exr",
--		       ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
--	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v2.exr",
--		       ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
-+//	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v1.exr",
-+//		       ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
-+//	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v2.exr",
-+//		       ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
- 
- 
- 	cout << "ok\n" << endl;

diff --git a/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch b/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch
deleted file mode 100644
index bb3917d7996..00000000000
--- a/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Usual double rounding issue with x87
-Author: Mathieu Malaterre <malat@××××××.org>
-Bug-Debian: https://bugs.debian.org/909865
-Forwarded: https://github.com/openexr/openexr/issues/346
-Last-Update: 2018-12-19
-
---- openexr-2.3.0.orig/IlmImfTest/Makefile.am
-+++ openexr-2.3.0/IlmImfTest/Makefile.am
-@@ -54,6 +54,8 @@ IlmImfTest_SOURCES = main.cpp tmpDir.h t
- 
- AM_CPPFLAGS = -DILM_IMF_TEST_IMAGEDIR=\"$(srcdir)/\"
- 
-+AM_CPPFLAGS += -ffloat-store
-+
- if BUILD_IMFHUGETEST
- IlmImfTest_SOURCES += testDeepScanLineHuge.cpp testDeepScanLineHuge.h
- AM_CPPFLAGS += -DENABLE_IMFHUGETEST

diff --git a/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch b/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch
deleted file mode 100644
index 430bb20bcfa..00000000000
--- a/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fix test-suite on some 32bits archs
-Author: Mathieu Malaterre <malat@××××××.org>
-Bug-Debian: https://bugs.debian.org/791478
-
-Index: openexr/IlmImfTest/Makefile.am
-===================================================================
---- openexr.orig/IlmImfTest/Makefile.am
-+++ openexr/IlmImfTest/Makefile.am
-@@ -44,7 +44,6 @@ IlmImfTest_SOURCES = main.cpp tmpDir.h t
- 		     testDeepScanLineMultipleRead.h testDeepScanLineMultipleRead.cpp  \
- 		     testPartHelper.h testPartHelper.cpp \
- 		     testOptimized.cpp testOptimized.h \
--		     testOptimizedInterleavePatterns.cpp testOptimizedInterleavePatterns.h \
- 		     testBadTypeAttributes.cpp testBadTypeAttributes.h \
- 		     testFutureProofing.cpp testFutureProofing.h \
- 	             compareDwa.cpp compareDwa.h \
-Index: openexr/IlmImfTest/main.cpp
-===================================================================
---- openexr.orig/IlmImfTest/main.cpp
-+++ openexr/IlmImfTest/main.cpp
-@@ -82,7 +82,6 @@
- #include "testCopyMultiPartFile.h"
- #include "testPartHelper.h"
- #include "testOptimized.h"
--#include "testOptimizedInterleavePatterns.h"
- #include "testBadTypeAttributes.h"
- #include "testFutureProofing.h"
- #include "testPartHelper.h"
-@@ -174,7 +173,6 @@ main (int argc, char *argv[])
-     TEST (testExistingStreams, "core");
-     TEST (testStandardAttributes, "core");
-     TEST (testOptimized, "basic");
--    TEST (testOptimizedInterleavePatterns, "basic");
-     TEST (testYca, "basic");
-     TEST (testTiledYa, "basic");
-     TEST (testNativeFormat, "basic");

diff --git a/media-libs/openexr/openexr-2.3.0.ebuild b/media-libs/openexr/openexr-2.3.0.ebuild
deleted file mode 100644
index 69309c6d201..00000000000
--- a/media-libs/openexr/openexr-2.3.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic toolchain-funcs multilib-minimal
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/24" # 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 examples static-libs"
-
-RDEPEND="
-	>=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2016.09.16
-	virtual/pkgconfig
-"
-
-RESTRICT="test" # Tests broken upstream doesn't really care about them, bug #656680
-
-DOCS=( AUTHORS ChangeLog NEWS README.md )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/OpenEXRConfig.h )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.0-fix-cpuid-on-abi_x86_32.patch"
-	"${FILESDIR}/${PN}-2.2.0-fix-config.h-collision.patch"
-	"${FILESDIR}/${PN}-2.2.0-Install-missing-header-files.patch"
-	"${FILESDIR}/${P}-fix-build-system.patch"
-	"${FILESDIR}/${P}-fix-bashisms.patch"
-	# From Debian
-	"${FILESDIR}/${PN}-2.3.0-tests-32bits.patch"
-	"${FILESDIR}/${PN}-2.3.0-skip-bogus-tests.patch"
-	"${FILESDIR}/${PN}-2.3.0-bigendian.patch"
-	"${FILESDIR}/${PN}-2.3.0-bigendian2.patch"
-	"${FILESDIR}/${PN}-2.3.0-tests-32bits-2.patch"
-)
-
-src_prepare() {
-	default
-	# Fix path for testsuite
-	sed -i -e "s:/var/tmp/:${T}:" IlmImfTest/tmpDir.h || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-imffuzztest
-		--disable-imfhugetest
-		--enable-threading
-		$(use_enable cpu_flags_x86_avx avx)
-		$(use_enable examples imfexamples)
-		$(use_enable static-libs static)
-	)
-
-	# TODO: check if this still applies on updates!
-	# internal tool dwaLookup fails to run when linked with gold linker
-	tc-ld-disable-gold
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-		rm -rf "${ED%/}"/usr/share/doc/${PF}/examples || die
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-}