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

[Andreas K. Hüttel]

commit:     96cd1a4085fc42499ed26cf2e4fc98c5bed3f577
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  4 02:50:51 2019 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jun  4 02:50:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96cd1a40

media-libs/openexr: Drop vulnerable versions, bug 620324

Bug: https://bugs.gentoo.org/620324
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 media-libs/openexr/Manifest                        |   2 -
 ....2.0-CVE-2017-9110-to-9116-security-fixes.patch |  98 ----
 .../openexr-2.2.0-Fix-typo-in-C-bindings.patch     |  26 -
 .../files/openexr-2.2.0-fix-build-system.patch     | 620 ---------------------
 ...openexr-2.2.0-use-ull-for-64-bit-literals.patch |  60 --
 media-libs/openexr/openexr-2.1.0.ebuild            |  46 --
 media-libs/openexr/openexr-2.2.0-r2.ebuild         |  67 ---
 7 files changed, 919 deletions(-)

diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 18de84406de..dc720965b72 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,3 +1 @@
-DIST openexr-2.1.0.tar.gz 13680816 BLAKE2B 2d3cb4e0419160b07f1efe9a853f1d5deeb0499da4f79da201fc5eb1f57102891da666e161b2d8ec43a6f0b6ff6f5c7b92c2baae51a808892691182290192992 SHA512 d69924331c3392b8063229391414bb90f16ce317c76cfffe5fe0fcbb25e576f6ace8320b51c2a9987fee912cedd8e69116d4b49ba716b4a5f011131a81815403
-DIST openexr-2.2.0.tar.gz 14489661 BLAKE2B fae3c5a255e8bf5121561687e9d704d7de3657eb38295ff96db6ddad240391379a6624483abbe619f80f0979fd9828992d236e55b5014916d4d39d6ff51d0815 SHA512 017abbeeb6b814508180721bc8e8940094965c4c55b135a198c6bcb109a04bf7f72e4aee81ee72cb2185fe818a41d892b383e8d2d59f40c673198948cb79279a
 DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123

diff --git a/media-libs/openexr/files/openexr-2.2.0-CVE-2017-9110-to-9116-security-fixes.patch b/media-libs/openexr/files/openexr-2.2.0-CVE-2017-9110-to-9116-security-fixes.patch
deleted file mode 100644
index 0a37ee9c2d9..00000000000
--- a/media-libs/openexr/files/openexr-2.2.0-CVE-2017-9110-to-9116-security-fixes.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From c2b32f21cbe2db7c7ef485d62ffe9bec8eaa5165 Mon Sep 17 00:00:00 2001
-From: Shawn Walker-Salas <shawn.walker@××××××.com>
-Date: Tue, 30 May 2017 19:07:52 -0700
-Subject: [PATCH] CVE-2017-{9110,9111,9112,9113,9114,9115,9116} fixes
-
----
- OpenEXR/IlmImf/ImfDwaCompressor.cpp |  7 ++++++-
- OpenEXR/IlmImf/ImfHuf.cpp           | 10 ++++++----
- OpenEXR/IlmImf/ImfPizCompressor.cpp |  6 ++++++
- 3 files changed, 18 insertions(+), 5 deletions(-)
-
-diff --git a/IlmImf/ImfDwaCompressor.cpp b/IlmImf/ImfDwaCompressor.cpp
-index 1c1bd45..2ef8878 100644
---- a/IlmImf/ImfDwaCompressor.cpp
-+++ b/IlmImf/ImfDwaCompressor.cpp
-@@ -2377,7 +2377,12 @@ DwaCompressor::uncompress
- 
-     const char *dataPtr            = inPtr + NUM_SIZES_SINGLE * sizeof(Int64);
- 
--    if (inSize < headerSize + compressedSize) 
-+    /* Both the sum and individual sizes are checked in case of overflow. */
-+    if (inSize < (headerSize + compressedSize) ||
-+        inSize < unknownCompressedSize ||
-+        inSize < acCompressedSize ||
-+        inSize < dcCompressedSize ||
-+        inSize < rleCompressedSize)
-     {
-         throw Iex::InputExc("Error uncompressing DWA data"
-                             "(truncated file).");
-diff --git a/IlmImf/ImfHuf.cpp b/IlmImf/ImfHuf.cpp
-index a375d05..97909a5 100644
---- a/IlmImf/ImfHuf.cpp
-+++ b/IlmImf/ImfHuf.cpp
-@@ -822,7 +822,7 @@ hufEncode				// return: output size (in bits)
- }
- 
- 
--#define getCode(po, rlc, c, lc, in, out, oe)	\
-+#define getCode(po, rlc, c, lc, in, out, ob, oe)\
- {						\
-     if (po == rlc)				\
-     {						\
-@@ -835,6 +835,8 @@ hufEncode				// return: output size (in bits)
- 						\
- 	if (out + cs > oe)			\
- 	    tooMuchData();			\
-+	else if (out - 1 < ob)			\
-+	    notEnoughData();			\
- 						\
- 	unsigned short s = out[-1];		\
- 						\
-@@ -895,7 +897,7 @@ hufDecode
- 		//
- 
- 		lc -= pl.len;
--		getCode (pl.lit, rlc, c, lc, in, out, oe);
-+		getCode (pl.lit, rlc, c, lc, in, out, outb, oe);
- 	    }
- 	    else
- 	    {
-@@ -925,7 +927,7 @@ hufDecode
- 			    //
- 
- 			    lc -= l;
--			    getCode (pl.p[j], rlc, c, lc, in, out, oe);
-+			    getCode (pl.p[j], rlc, c, lc, in, out, outb, oe);
- 			    break;
- 			}
- 		    }
-@@ -952,7 +954,7 @@ hufDecode
- 	if (pl.len)
- 	{
- 	    lc -= pl.len;
--	    getCode (pl.lit, rlc, c, lc, in, out, oe);
-+	    getCode (pl.lit, rlc, c, lc, in, out, outb, oe);
- 	}
- 	else
- 	{
-diff --git a/IlmImf/ImfPizCompressor.cpp b/IlmImf/ImfPizCompressor.cpp
-index 46c6fba..8b3ee38 100644
---- a/IlmImf/ImfPizCompressor.cpp
-+++ b/IlmImf/ImfPizCompressor.cpp
-@@ -573,6 +573,12 @@ PizCompressor::uncompress (const char *inPtr,
-     int length;
-     Xdr::read <CharPtrIO> (inPtr, length);
- 
-+    if (length > inSize)
-+    {
-+	throw InputExc ("Error in header for PIZ-compressed data "
-+			"(invalid array length).");
-+    }
-+
-     hufUncompress (inPtr, length, _tmpBuffer, tmpBufferEnd - _tmpBuffer);
- 
-     //
--- 
-2.14.1
-

diff --git a/media-libs/openexr/files/openexr-2.2.0-Fix-typo-in-C-bindings.patch b/media-libs/openexr/files/openexr-2.2.0-Fix-typo-in-C-bindings.patch
deleted file mode 100644
index 966e95e72c3..00000000000
--- a/media-libs/openexr/files/openexr-2.2.0-Fix-typo-in-C-bindings.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c229dfe63380f41dfae1e977b10dfc7c49c7efc7 Mon Sep 17 00:00:00 2001
-From: Edward Kmett <ekmett@×××××.com>
-Date: Wed, 9 Dec 2015 12:15:48 -0500
-Subject: [PATCH] Fix typo in C bindings (Close #140)
-
-IMF_RAMDOM_Y should be IMF_RANDOM_Y
----
- OpenEXR/IlmImf/ImfCRgbaFile.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/IlmImf/ImfCRgbaFile.h b/IlmImf/ImfCRgbaFile.h
-index 5ac2bf8..db58247 100644
---- a/IlmImf/ImfCRgbaFile.h
-+++ b/IlmImf/ImfCRgbaFile.h
-@@ -98,7 +98,7 @@ typedef struct ImfRgba ImfRgba;
- 
- #define IMF_INCREASING_Y	0
- #define IMF_DECREASING_Y	1
--#define IMF_RAMDOM_Y		2
-+#define IMF_RANDOM_Y		2
- 
- 
- /*
--- 
-2.14.1
-

diff --git a/media-libs/openexr/files/openexr-2.2.0-fix-build-system.patch b/media-libs/openexr/files/openexr-2.2.0-fix-build-system.patch
deleted file mode 100644
index 3ccfb1da7ac..00000000000
--- a/media-libs/openexr/files/openexr-2.2.0-fix-build-system.patch
+++ /dev/null
@@ -1,620 +0,0 @@
-* Fix completely broken build system
-* Change pdf+examples installation directory
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,6 +1,7 @@
- dnl Process this file with autoconf to produce a configure script.
- 
- AC_INIT(OpenEXR, 2.2.0)
-+AC_CONFIG_MACRO_DIR([m4])
- 
- AC_SUBST(OPENEXR_VERSION_MAJOR, 2)
- AC_SUBST(OPENEXR_VERSION_MINOR, 2)
-@@ -11,9 +12,8 @@
- 
- AC_CANONICAL_HOST
- AC_CONFIG_SRCDIR(IlmImfTest/main.cpp)
--AC_CONFIG_HEADER(config/OpenEXRConfig.h)
--AM_INIT_AUTOMAKE(1.6.3)  dnl Require automake 1.6.3 or better
--AM_MAINTAINER_MODE
-+AC_CONFIG_HEADERS([config/OpenEXRConfig.h])
-+AM_INIT_AUTOMAKE
- 
- 
- LIBTOOL_CURRENT=22
-@@ -27,46 +27,21 @@
- AC_PROG_INSTALL
- AC_PROG_CC
- AC_PROG_LN_S
--AC_PROG_LIBTOOL
-+LT_INIT
- AC_PROG_MAKE_SET
- 
- dnl
- dnl PKGCONFIG preparations
- dnl
--
--if test -z "${PKG_CONFIG_PATH}"; then
--	PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
--fi
--
--LIB64_IF_EXISTS=""
--if [[ -e /usr/lib64 ]]; then
--   LIB64_IF_EXISTS="-L/usr/lib64"
--fi         
--
--
--
--export PKG_CONFIG_PATH
--
--dnl
--dnl get ccflags and libs from openexr packages, then check 
--dnl whether test programs compile
--AM_PATH_PKGCONFIG(
--   [ILMBASE_CXXFLAGS],
--   [ILMBASE_LDFLAGS],
--   [ILMBASE_LIBS],
--   [IlmBase],
--   [OpenEXR],
--   [$LIB64_IF_EXISTS -L/usr/local/lib],
--   [-lImath -lHalf -lIex -lIlmThread -lpthread],
--   [ilmbase-prefix])
-+PKG_CHECK_MODULES([ILMBASE], [IlmBase])
- 
- 
- dnl Define the version string
--AC_DEFINE_UNQUOTED(OPENEXR_VERSION_STRING, "${VERSION}")
--AC_DEFINE_UNQUOTED(OPENEXR_PACKAGE_STRING, "${PACKAGE_STRING}")
--AC_DEFINE_UNQUOTED(OPENEXR_VERSION_MAJOR, ${OPENEXR_VERSION_MAJOR})
--AC_DEFINE_UNQUOTED(OPENEXR_VERSION_MINOR, ${OPENEXR_VERSION_MINOR})
--AC_DEFINE_UNQUOTED(OPENEXR_VERSION_PATCH, ${OPENEXR_VERSION_PATCH})
-+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])
- 
- 
- dnl --enable-threading
-@@ -75,19 +50,16 @@
-                              [enable multi-threading [[default=yes]]]),
-               [multithread="${enableval}"], [multithread=yes])
- 
--if test x$PKG_CONFIG == xno && test "x${multithread}" != xno ; then
--    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])])
--    AC_MSG_NOTICE([multithread true, LIBS = $LIBS, CC = $CC, CXXFLAGS = $CXXFLAGS])
--fi
-+AS_IF([test "x${multithread}" != xno], [
-+	AX_PTHREAD
-+
-+	AC_DEFINE([OPENEXR_IMF_HAVE_PTHREAD], [1], [Define if pthreads are available])
-+
-+	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
-+	CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}"
-+	LIBS="${LIBS} ${PTHREAD_CFLAGS}"
-+])
-+
- 
- dnl --enable-large-stack
- case "$host" in
-@@ -110,21 +82,25 @@
- esac
- 
- if test "x${large_stack}" != xno ; then
--    AC_DEFINE(OPENEXR_IMF_HAVE_LARGE_STACK)
-+    AC_DEFINE([OPENEXR_IMF_HAVE_LARGE_STACK], [1], [Define if large stack sizes are supported])
- fi
- 
--AM_COMPILELINKRUN(
--   [IlmBase],
--   [ilmbasetest],
--   [$ILMBASE_CXXFLAGS],
--   [$ILMBASE_LDFLAGS],
--   [$ILMBASE_LIBS],[[
--#include <stdlib.h>
--#include <ImathFun.h>
--]],
--   [[double d = IMATH_NAMESPACE::succd(.23); d+= .2;]],
--   AC_MSG_RESULT([Compiled and ran IlmBase test program.]), 
--   AC_MSG_ERROR([Could not compile IlmBase test program.]))
-+
-+
-+save_CXXFLAGS="${CXXFLAGS}"
-+save_LIBS="${LIBS}"
-+CXXFLAGS="${save_CXXFLAGS} ${ILMBASE_CFLAGS}"
-+LIBS="${save_LIBS} ${ILMBASE_LIBS}"
-+AC_LINK_IFELSE([
-+	AC_LANG_PROGRAM([[
-+		#include <stdlib.h>
-+		#include <ImathFun.h>
-+	]], [[
-+		double d = IMATH_NAMESPACE::succd(.23); d+= .2;
-+	]])
-+])
-+CXXFLAGS="${save_CXXFLAGS}"
-+LIBS="${save_LIBS}"
- 
- 
- dnl Checks for header files.
-@@ -137,74 +113,27 @@
- AC_TYPE_SIZE_T
- 
- dnl Checks for zlib
--AC_CHECK_LIB(z, compress,
--             [:],
--             [AC_MSG_ERROR([
--*** OpenEXR requires a recent version of zlib, which you don't appear to
--*** have.
--***
--*** This could be because the run-time linker is not finding zlib, or it
--*** is finding the wrong version.  In this case, you'll need to set your
--*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point
--*** to the proper version.  Also, make sure you have run ldconfig if
--*** that is required on your system.
--			   ])]
--)
-+PKG_CHECK_MODULES([ZLIB], [zlib])
-+
-+
-+dnl We use a modern toolchain, don't care
-+dnl about ancient broken stuff
-+AC_DEFINE([OPENEXR_IMF_HAVE_COMPLETE_IOMANIP], [1], [Define when std::right is available])
- 
--dnl Checks for std::right etc. in iomanip
--AC_MSG_CHECKING(for complete iomanip support in C++ standard library)
--complete_iomanip="no"
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
--AC_TRY_COMPILE([#include <iomanip>],[
--
--	std::right;
--],
--AC_DEFINE(OPENEXR_IMF_HAVE_COMPLETE_IOMANIP) complete_iomanip=yes)
--AC_MSG_RESULT($complete_iomanip)
--AC_LANG_RESTORE
--
--
--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_MSG_CHECKING(for AVX instructions in GCC style inline asm)
--gcc_inline_asm_avx="no"
--AC_COMPILE_IFELSE(
--    [
--        AC_LANG_PROGRAM([],
--        [
--             #if defined(__GNUC__) && defined(__SSE2__) 
--                 int n   = 0;
--                 int eax = 0;
--                 int edx = 0;
--                 __asm__(
--                     "xgetbv     \n"
--                     "vzeroupper  "
--                     : "=a"(eax), "=d"(edx) : "c"(n) : );
--             #else
--                 #error No GCC style inline asm supported for AVX instructions
--             #endif
--        ]) 
--   ],
--   [
--      gcc_inline_asm_avx="yes"
--   ],
--   [
--      gcc_inline_asm_avx="no"
--   ]
--)
--AC_MSG_RESULT([$gcc_inline_asm_avx])
--if test "x${gcc_inline_asm_avx}" == xyes ; then
--    AC_DEFINE(OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX)
--fi
-+AC_ARG_ENABLE([avx],
-+	AS_HELP_STRING([--enable-avx], [Enable avx optimization]))
-+
-+AS_IF([test "x$enable_avx" = "xyes"], [
-+	dnl Enable AVX
-+	gcc_inline_asm_avx="yes"
-+	AC_DEFINE([OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX], [1], [Define if AVX is available])
-+], [
-+	dnl Disable AVX
-+	gcc_inline_asm_avx="no"
-+])
-+
- 
- dnl Check if sysconf(_SC_NPROCESSORS_ONLN) can be used for CPU count
- AC_MSG_CHECKING([for sysconf(_SC_NPROCESSORS_ONLN)])
-@@ -221,16 +150,16 @@
- )
- AC_MSG_RESULT([$sysconf_nproc])
- if test "x${sysconf_nproc}" == xyes ; then
--    AC_DEFINE(OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN)
-+    AC_DEFINE([OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN], [1], [Define if sysconf(_SC_NPROCESSORS_ONLN) can be used for CPU count])
- fi
- 
- dnl Platform-specific stuff
- case "$host" in
- *linux*)
--  AC_DEFINE(OPENEXR_IMF_HAVE_LINUX_PROCFS)
-+  AC_DEFINE([OPENEXR_IMF_HAVE_LINUX_PROCFS], [1], [Define if procfs is available])
-   ;;
- *darwin*) 
--  AC_DEFINE(OPENEXR_IMF_HAVE_DARWIN) 
-+  AC_DEFINE([OPENEXR_IMF_HAVE_DARWIN], [1], [Define if on Darwin]) 
- 
-   dnl OS X universal binary support, requires --disable-dependency-tracking
-   AC_ARG_ENABLE(osx-universal-binaries,
-@@ -245,19 +174,13 @@
-   --disable-dependency-tracking --enable-osx-universal-binary
-   		  ])
-     fi
--    CXXFLAGS="$CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
-+    dnl CXXFLAGS="$CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
-     dnl LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
-   fi
- 
-   ;;
- esac
- 
--AM_CFLAGS="$EXTRA_OPT_CFLAGS"
--AM_CXXFLAGS="$EXTRA_OPT_CFLAGS"
--
--AC_SUBST(AM_CFLAGS)
--AC_SUBST(AM_CXXFLAGS)
--
- dnl build imfexamples example program?
- build_imfexamples="no"
- AC_ARG_ENABLE(imfexamples,
-@@ -286,7 +209,7 @@
- AM_CONDITIONAL(BUILD_IMFHUGETEST, test "x$build_imfhugetest" = xyes)
- 
- if test "x${build_imfhugetest}" != xno ; then
--    AC_DEFINE(OPENEXR_IMF_HUGETEST)
-+    AC_DEFINE([OPENEXR_IMF_HUGETEST], [1], [Define if IlmImf huge input resilience])
- fi
- 
- 
-@@ -307,19 +230,19 @@
- 
- lib_namespace="Imf"
- if test "x${library_namespace_versioning}" == xyes ; then
--    AC_DEFINE_UNQUOTED(OPENEXR_IMF_INTERNAL_NAMESPACE, Imf_${OPENEXR_VERSION_API})
--    AC_DEFINE(OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM)
-+    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
--    AC_DEFINE_UNQUOTED(OPENEXR_IMF_INTERNAL_NAMESPACE, Imf)
-+    AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [Imf], [OpenEXR])
- 
-     lib_namespace="Imf"
- else
--    AC_DEFINE_UNQUOTED(OPENEXR_IMF_INTERNAL_NAMESPACE, ${library_namespace_versioning} )
--    AC_DEFINE(OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM)
-+    AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [${library_namespace_versioning}], [OpenEXR])
-+    AC_DEFINE([OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM], [1], [OpenEXR])
- 
-     lib_namespace="${library_namespace_versioning}"
-     LIB_SUFFIX="${library_namespace_versioning}"
-@@ -349,14 +272,14 @@
- 
- 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)
-+    AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR])
-     usr_namespace="Imf"
- elif test "x${custom_usr_namespace}" == xno ; then
--    AC_DEFINE_UNQUOTED(OPENEXR_IMF_NAMESPACE, Imf)
-+    AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR])
-     usr_namespace="Imf"
- else
--    AC_DEFINE_UNQUOTED(OPENEXR_IMF_NAMESPACE, ${custom_usr_namespace})
--    AC_DEFINE(OPENEXR_IMF_NAMESPACE_CUSTOM)
-+    AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [${custom_usr_namespace}], [OpenEXR])
-+    AC_DEFINE([OPENEXR_IMF_NAMESPACE_CUSTOM], [1], [OpenEXR])
-     
-     usr_namespace=${custom_usr_namespace}
- fi
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -6,5 +6,4 @@
- 	InterpretingDeepPixels.pdf \
- 	TheoryDeepPixels.pdf
- 
--docdir=$(datadir)/doc/OpenEXR-@OPENEXR_VERSION@
- doc_DATA = $(EXTRA_DIST)
---- a/exrenvmap/Makefile.am
-+++ b/exrenvmap/Makefile.am
-@@ -4,11 +4,11 @@
- 
- INCLUDES = -I$(top_builddir) \
-            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
--	   @ILMBASE_CXXFLAGS@
-+           $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
--LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@\
-+LDADD = $(ILMBASE_LIBS) \
- 	$(top_builddir)/IlmImf/libIlmImf.la \
--	-lz
-+	$(ZLIB_LIBS)
- 
- exrenvmap_SOURCES = main.cpp EnvmapImage.cpp EnvmapImage.h \
- 		    readInputImage.cpp readInputImage.h \
---- a/exrheader/Makefile.am
-+++ b/exrheader/Makefile.am
-@@ -4,11 +4,11 @@
- 
- INCLUDES = -I$(top_builddir) \
-            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
--	   @ILMBASE_CXXFLAGS@
-+           $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
--LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
-+LDADD = $(ILMBASE_LIBS) \
- 	$(top_builddir)/IlmImf/libIlmImf.la \
--	-lz
-+	$(ZLIB_LIBS)
- 
- exrheader_SOURCES = main.cpp
- 
---- a/exrmakepreview/Makefile.am
-+++ b/exrmakepreview/Makefile.am
-@@ -4,11 +4,11 @@
- 
- INCLUDES = -I$(top_builddir) \
-            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
--	   @ILMBASE_CXXFLAGS@
-+           $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
--LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@\
-+LDADD = $(ILMBASE_LIBS) \
- 	$(top_builddir)/IlmImf/libIlmImf.la \
--	-lz
-+	$(ZLIB_LIBS)
- 
- exrmakepreview_SOURCES = main.cpp makePreview.cpp makePreview.h
- 
---- a/exrmaketiled/Makefile.am
-+++ b/exrmaketiled/Makefile.am
-@@ -4,11 +4,11 @@
- 
- INCLUDES = -I$(top_builddir) \
-            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
--	   @ILMBASE_CXXFLAGS@
-+           $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
--LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
-+LDADD = $(ILMBASE_LIBS) \
- 	$(top_builddir)/IlmImf/libIlmImf.la \
--	-lz
-+	$(ZLIB_LIBS)
- 
- exrmaketiled_SOURCES = main.cpp \
- 		       Image.h Image.cpp \
---- a/exrmultipart/Makefile.am
-+++ b/exrmultipart/Makefile.am
-@@ -4,11 +4,11 @@
- 
- INCLUDES = -I$(top_builddir) \
- -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
--@ILMBASE_CXXFLAGS@
-+$(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
--LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
--$(top_builddir)/IlmImf/libIlmImf.la \
---lz
-+LDADD = $(ILMBASE_LIBS) \
-+	$(top_builddir)/IlmImf/libIlmImf.la \
-+	$(ZLIB_LIBS)
- 
- exrmultipart_SOURCES = exrmultipart.cpp
- 
---- a/exrmultiview/Makefile.am
-+++ b/exrmultiview/Makefile.am
-@@ -4,11 +4,11 @@
- 
- INCLUDES = -I$(top_builddir) \
-            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
--	   @ILMBASE_CXXFLAGS@
-+           $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
--LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
-+LDADD = $(ILMBASE_LIBS) \
- 	$(top_builddir)/IlmImf/libIlmImf.la \
--	-lz
-+	$(ZLIB_LIBS)
- 
- exrmultiview_SOURCES = main.cpp  \
- 		       Image.h Image.cpp \
---- a/exrstdattr/Makefile.am
-+++ b/exrstdattr/Makefile.am
-@@ -4,11 +4,11 @@
- 
- INCLUDES = -I$(top_builddir) \
-            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
--	   @ILMBASE_CXXFLAGS@
-+           $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
--LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
-+LDADD = $(ILMBASE_LIBS) \
- 	$(top_builddir)/IlmImf/libIlmImf.la \
--	-lz
-+	$(ZLIB_LIBS)
- 
- exrstdattr_SOURCES = main.cpp CMakeLists.txt
- 
---- a/IlmImf/Makefile.am
-+++ b/IlmImf/Makefile.am
-@@ -93,7 +93,7 @@
- 	               ImfSystemSpecific.cpp ImfZip.h ImfZip.cpp
- 
- 
--libIlmImf_la_LDFLAGS = @ILMBASE_LDFLAGS@ -version-info @LIBTOOL_VERSION@ \
-+libIlmImf_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ \
- 			-no-undefined 
- 
- 
-@@ -102,7 +102,7 @@
- endif
- 
- 
--libIlmImf_la_LIBADD =  -lz @ILMBASE_LIBS@
-+libIlmImf_la_LIBADD = $(ZLIB_LIBS) $(ILMBASE_LIBS)
- 
- libIlmImfincludedir = $(includedir)/OpenEXR
- 
-@@ -188,20 +188,21 @@
- EXTRA_DIST = $(noinst_HEADERS) b44ExpLogTable.cpp b44ExpLogTable.h dwaLookups.cpp dwaLookups.h CMakeLists.txt
- 
- 
--INCLUDES = @ILMBASE_CXXFLAGS@ \
--	   -I$(top_builddir)  \
--	   -I$(top_srcdir)/config
-+INCLUDES = \
-+	   -I$(top_builddir) \
-+	   -I$(top_srcdir)/config \
-+	   $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
- CLEANFILES = b44ExpLogTable b44ExpLogTable.h dwaLookups dwaLookups.h
- 
- b44ExpLogTable_SOURCES = b44ExpLogTable.cpp
--b44ExpLogTable_LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@
-+b44ExpLogTable_LDADD = $(ILMBASE_LIBS)
- 
- b44ExpLogTable.h: b44ExpLogTable
- 	./b44ExpLogTable > b44ExpLogTable.h
- 
- dwaLookups_SOURCES = dwaLookups.cpp
--dwaLookups_LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@
-+dwaLookups_LDADD = $(ILMBASE_LIBS)
- 
- dwaLookups.h: dwaLookups
- 	./dwaLookups > dwaLookups.h
---- a/IlmImfExamples/Makefile.am
-+++ b/IlmImfExamples/Makefile.am
-@@ -6,11 +6,11 @@
- 
- INCLUDES = -I$(top_builddir) \
-            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
--	   @ILMBASE_CXXFLAGS@
-+           $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
- LDADD = -L$(top_builddir)/IlmImf \
--	@ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
--	-lIlmImf -lz
-+	$(ILMBASE_LIBS) \
-+	-lIlmImf $(ZLIB_CFLAGS)
- 
- imfexamples_SOURCES = main.cpp drawImage.cpp rgbaInterfaceExamples.cpp \
- 		      rgbaInterfaceTiledExamples.cpp \
-@@ -23,7 +23,7 @@
- 		      lowLevelIoExamples.h previewImageExamples.h \
- 		      namespaceAlias.h
- 
--examplesdir = $(datadir)/doc/OpenEXR-@OPENEXR_VERSION@/examples
-+examplesdir = $(docdir)/examples
- examples_DATA = $(imfexamples_SOURCES)
- 
- imfexamplesdir = $(examplesdir)
---- a/IlmImfFuzzTest/Makefile.am
-+++ b/IlmImfFuzzTest/Makefile.am
-@@ -14,11 +14,11 @@
- INCLUDES = -I$(top_builddir)  \
- 	   -I$(top_srcdir)/IlmImf \
- 	   -I$(top_srcdir)/config \
--	   @ILMBASE_CXXFLAGS@
-+	   $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
- LDADD = -L$(top_builddir)/IlmImf \
--	@ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
--	-lIlmImf -lz
-+	$(ILMBASE_LIBS) \
-+	-lIlmImf $(ZLIB_LIBS)
- 
- if BUILD_IMFFUZZTEST
- TESTS = IlmImfFuzzTest
---- a/IlmImfTest/Makefile.am
-+++ b/IlmImfTest/Makefile.am
-@@ -62,11 +62,11 @@
- INCLUDES = -I$(top_builddir)  \
- 	   -I$(top_srcdir)/IlmImf \
- 	   -I$(top_srcdir)/config \
--	   @ILMBASE_CXXFLAGS@
-+	   $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
- LDADD = -L$(top_builddir)/IlmImf \
--	@ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
--	-lIlmImf -lz
-+	$(ILMBASE_LIBS) \
-+	-lIlmImf $(ZLIB_LIBS)
- 
- TESTS = IlmImfTest
- 
---- a/IlmImfUtil/Makefile.am
-+++ b/IlmImfUtil/Makefile.am
-@@ -20,7 +20,7 @@
- 	ImfImageChannelRenaming.h
- 	
- 
--libIlmImfUtil_la_LDFLAGS = @ILMBASE_LDFLAGS@ -version-info @LIBTOOL_VERSION@ \
-+libIlmImfUtil_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ \
- 			-no-undefined 
- 
- 
-@@ -29,14 +29,15 @@
- endif
- 
- 
--libIlmImfUtil_la_LIBADD =  -L$(top_builddir)/IlmImf @ILMBASE_LIBS@ -lIlmImf
-+libIlmImfUtil_la_LIBADD =  -L$(top_builddir)/IlmImf $(ILMBASE_LIBS) -lIlmImf
- 
- libIlmImfUtilincludedir = $(includedir)/OpenEXR
- 
- EXTRA_DIST = CMakeLists.txt
- 
--INCLUDES = @ILMBASE_CXXFLAGS@ \
--	   -I$(top_builddir)  \
--	   -I$(top_srcdir)/IlmImf  \
--	   -I$(top_srcdir)/config
-+INCLUDES = \
-+	   -I$(top_builddir) \
-+	   -I$(top_srcdir)/IlmImf \
-+	   -I$(top_srcdir)/config \
-+	   $(ILMBASE_CFLAGS)
- 
---- a/IlmImfUtilTest/Makefile.am
-+++ b/IlmImfUtilTest/Makefile.am
-@@ -11,12 +11,12 @@
- 	   -I$(top_srcdir)/IlmImf \
- 	   -I$(top_srcdir)/IlmImfUtil \
- 	   -I$(top_srcdir)/config \
--	   @ILMBASE_CXXFLAGS@
-+	   $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
- 
- LDADD = -L$(top_builddir)/IlmImf \
- 	-L$(top_builddir)/IlmImfUtil \
--	@ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
--	-lIlmImfUtil -lIlmImf -lz
-+	$(ILMBASE_LIBS) \
-+	-lIlmImfUtil -lIlmImf $(ZLIB_LIBS)
- 
- TESTS = IlmImfUtilTest
- 

diff --git a/media-libs/openexr/files/openexr-2.2.0-use-ull-for-64-bit-literals.patch b/media-libs/openexr/files/openexr-2.2.0-use-ull-for-64-bit-literals.patch
deleted file mode 100644
index 6b107af2992..00000000000
--- a/media-libs/openexr/files/openexr-2.2.0-use-ull-for-64-bit-literals.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 57ecf581d053f5cacf2e8fc3c024490e0bbe536f Mon Sep 17 00:00:00 2001
-From: Brendan Bolles <brendan@×××××××××.com>
-Date: Wed, 13 Aug 2014 19:54:10 -0700
-Subject: [PATCH] Use ULL for 64-bit literals
-
-On a 32-bit architecture, these literals are too big for just a long,
-they need to be ULL, since Int64 is unsigned.
----
- IlmImf/ImfFastHuf.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/IlmImf/ImfFastHuf.cpp b/IlmImf/ImfFastHuf.cpp
-index 86c84dc..01edad4 100644
---- a/IlmImf/ImfFastHuf.cpp
-+++ b/IlmImf/ImfFastHuf.cpp
-@@ -107,7 +107,7 @@ FastHufDecoder::FastHufDecoder
-     for (int i = 0; i <= MAX_CODE_LEN; ++i)
-     {
-         codeCount[i] = 0;
--        base[i]      = 0xffffffffffffffffL;
-+        base[i]      = 0xffffffffffffffffULL;
-         offset[i]    = 0;
-     }
- 
-@@ -352,7 +352,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offset)
- 
-     for (int i = 0; i <= MAX_CODE_LEN; ++i)
-     {
--        if (base[i] != 0xffffffffffffffffL)
-+        if (base[i] != 0xffffffffffffffffULL)
-         {
-             _ljBase[i] = base[i] << (64 - i);
-         }
-@@ -362,7 +362,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offset)
-             // Unused code length - insert dummy values
-             //
- 
--            _ljBase[i] = 0xffffffffffffffffL;
-+            _ljBase[i] = 0xffffffffffffffffULL;
-         }
-     }
- 
-@@ -417,7 +417,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offset)
- 
-     int minIdx = TABLE_LOOKUP_BITS;
- 
--    while (minIdx > 0 && _ljBase[minIdx] == 0xffffffffffffffffL)
-+    while (minIdx > 0 && _ljBase[minIdx] == 0xffffffffffffffffULL)
-         minIdx--;
- 
-     if (minIdx < 0)
-@@ -427,7 +427,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offset)
-         // Set the min value such that the table is never tested.
-         //
- 
--        _tableMin = 0xffffffffffffffffL;
-+        _tableMin = 0xffffffffffffffffULL;
-     }
-     else
-     {

diff --git a/media-libs/openexr/openexr-2.1.0.ebuild b/media-libs/openexr/openexr-2.1.0.ebuild
deleted file mode 100644
index 14cc4d86d16..00000000000
--- a/media-libs/openexr/openexr-2.1.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-multilib
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/21" # 21 from SONAME
-KEYWORDS="amd64 -arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="examples static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	>=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	# Fix path for testsuite
-	sed -i -e "s:/var/tmp/:${T}:" IlmImfTest/tmpDir.h || die
-	autotools-multilib_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable examples imfexamples)
-	)
-	autotools-multilib_src_configure
-}
-
-src_install() {
-	autotools-multilib_src_install \
-		docdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
-		examplesdir="${EPREFIX}"/usr/share/doc/${PF}/examples
-
-	docompress -x /usr/share/doc/${PF}/examples
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-	fi
-}

diff --git a/media-libs/openexr/openexr-2.2.0-r2.ebuild b/media-libs/openexr/openexr-2.2.0-r2.ebuild
deleted file mode 100644
index 8f9775ff2e7..00000000000
--- a/media-libs/openexr/openexr-2.2.0-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic multilib-minimal
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/22" # based on SONAME
-KEYWORDS="amd64 -arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cpu_flags_x86_avx examples static-libs"
-
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	>=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	>=sys-devel/autoconf-archive-2016.09.16"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-cpuid-on-abi_x86_32.patch"
-	"${FILESDIR}/${P}-use-ull-for-64-bit-literals.patch"
-	"${FILESDIR}/${P}-fix-build-system.patch"
-	"${FILESDIR}/${P}-fix-config.h-collision.patch"
-	"${FILESDIR}/${P}-Fix-typo-in-C-bindings.patch"
-	"${FILESDIR}/${P}-Install-missing-header-files.patch"
-	"${FILESDIR}/${P}-CVE-2017-9110-to-9116-security-fixes.patch"
-)
-
-src_prepare() {
-	default
-	# Fix path for testsuite
-	sed -i -e "s:/var/tmp/:${T}:" IlmImfTest/tmpDir.h || die
-
-	# delete stray config files causing havoc
-	rm -f config*/OpenEXRConfig.h* || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Fails to build with lto, https://bugs.gentoo.org/650876
-	filter-flags -flto*
-
-	ECONF_SOURCE="${S}" econf \
-		--enable-threading \
-		$(use_enable cpu_flags_x86_avx avx) \
-		$(use_enable static-libs static) \
-		$(use_enable examples imfexamples)
-}
-
-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
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}