media-libs/osl: adjust to unslotted OpenEXR

Bug: https://bugs.gentoo.org/833158
Bug: https://bugs.gentoo.org/831357
Bug: https://bugs.gentoo.org/832862
Bug: https://bugs.gentoo.org/821247
Signed-off-by: Sam James <sam@gentoo.org>

3 files changed, 1 insertions, 257 deletions

diff --git a/media-libs/osl/files/osl-1.11.16.0-openexr-3-imath.patch b/media-libs/osl/files/osl-1.11.16.0-openexr-3-imath.patch
deleted file mode 100644
index 10bb23fffa0e..000000000000
--- a/media-libs/osl/files/osl-1.11.16.0-openexr-3-imath.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff --git a/src/include/OSL/oslconfig.h.in b/src/include/OSL/oslconfig.h.in
-index f735b0f..8063f68 100644
---- a/src/include/OSL/oslconfig.h.in
-+++ b/src/include/OSL/oslconfig.h.in
-@@ -13,9 +13,9 @@
- // All the things we need from Imath.
- #define OSL_USING_IMATH @OSL_USING_IMATH@
- #if OSL_USING_IMATH >= 3
--#   include <Imath/ImathVec.h>
--#   include <Imath/ImathMatrix.h>
--#   include <Imath/ImathColor.h>
-+#   include <Imath-3/ImathVec.h>
-+#   include <Imath-3/ImathMatrix.h>
-+#   include <Imath-3/ImathColor.h>
- #else
-     // OpenEXR 2.x lacks the Cuda decorators we need, so we replicated some
-     // Imath files in OSL/Imathx, adding the decorations needed for them to
-diff --git a/src/liboslquery/py_osl.h b/src/liboslquery/py_osl.h
-index ee8284f..4988b44 100644
---- a/src/liboslquery/py_osl.h
-+++ b/src/liboslquery/py_osl.h
-@@ -26,7 +26,7 @@
- #include <OSL/oslquery.h>
- 
- #if OSL_USING_IMATH >= 3
--#    include <Imath/half.h>
-+#    include <Imath-3/half.h>
- #else
- #    include <OpenEXR/half.h>
- #endif
-diff --git a/src/include/OSL/Imathx/ImathColor.h b/src/include/OSL/Imathx/ImathColor.h
-index d0b035f..1cbb28f 100644
---- a/src/include/OSL/Imathx/ImathColor.h
-+++ b/src/include/OSL/Imathx/ImathColor.h
-@@ -44,7 +44,7 @@
- //----------------------------------------------------
- 
- #include "ImathVec.h"
--#include <OpenEXR/ImathNamespace.h>
-+#include <OpenEXR-3/ImathNamespace.h>
- // #include "half.h"
- 
- #ifndef IMATH_HOSTDEVICE
-diff --git a/src/include/OSL/Imathx/ImathFun.h b/src/include/OSL/Imathx/ImathFun.h
-index 1413c48..576b588 100644
---- a/src/include/OSL/Imathx/ImathFun.h
-+++ b/src/include/OSL/Imathx/ImathFun.h
-@@ -43,10 +43,10 @@
- //
- //-----------------------------------------------------------------------------
- 
--#include <OpenEXR/ImathExport.h>
-+#include <OpenEXR-3/ImathExport.h>
- #include "ImathLimits.h"
--#include <OpenEXR/ImathInt64.h>
--#include <OpenEXR/ImathNamespace.h>
-+#include <OpenEXR-3/ImathInt64.h>
-+#include <OpenEXR-3/ImathNamespace.h>
- 
- IMATH_INTERNAL_NAMESPACE_HEADER_ENTER
- 
-diff --git a/src/include/OSL/Imathx/ImathLimits.h b/src/include/OSL/Imathx/ImathLimits.h
-index 09fa419..ed19eaa 100644
---- a/src/include/OSL/Imathx/ImathLimits.h
-+++ b/src/include/OSL/Imathx/ImathLimits.h
-@@ -43,7 +43,7 @@
- //
- //----------------------------------------------------------------
- 
--#include <OpenEXR/ImathNamespace.h>
-+#include <OpenEXR-3/ImathNamespace.h>
- #include <float.h>
- #include <limits.h>
- 
-diff --git a/src/include/OSL/Imathx/ImathMatrix.h b/src/include/OSL/Imathx/ImathMatrix.h
-index 65f386b..f2b10cc 100644
---- a/src/include/OSL/Imathx/ImathMatrix.h
-+++ b/src/include/OSL/Imathx/ImathMatrix.h
-@@ -43,12 +43,12 @@
- //
- //----------------------------------------------------------------
- 
--#include <OpenEXR/ImathPlatform.h>
-+#include <OpenEXR-3/ImathPlatform.h>
- #include "ImathFun.h"
--#include <OpenEXR/ImathExc.h>
-+#include <OpenEXR-3/ImathExc.h>
- #include "ImathVec.h"
--#include <OpenEXR/ImathShear.h>
--#include <OpenEXR/ImathNamespace.h>
-+#include <OpenEXR-3/ImathShear.h>
-+#include <OpenEXR-3/ImathNamespace.h>
- 
- #include <cstring>
- #include <iostream>
-diff --git a/src/include/OSL/Imathx/ImathVec.h b/src/include/OSL/Imathx/ImathVec.h
-index e52af61..4cd696b 100644
---- a/src/include/OSL/Imathx/ImathVec.h
-+++ b/src/include/OSL/Imathx/ImathVec.h
-@@ -43,10 +43,10 @@
- //
- //----------------------------------------------------
- 
--#include <OpenEXR/ImathExc.h>
-+#include <OpenEXR-3/ImathExc.h>
- #include "ImathLimits.h"
--#include <OpenEXR/ImathMath.h>
--#include <OpenEXR/ImathNamespace.h>
-+#include <OpenEXR-3/ImathMath.h>
-+#include <OpenEXR-3/ImathNamespace.h>
- 
- #include <iostream>
- #include <limits>
-diff --git a/src/liboslexec/shadingsys.cpp b/src/liboslexec/shadingsys.cpp
-index 1d36ff1..6fc9d38 100644
---- a/src/liboslexec/shadingsys.cpp
-+++ b/src/liboslexec/shadingsys.cpp
-@@ -27,7 +27,7 @@
- using namespace OSL;
- using namespace OSL::pvt;
- 
--#include <OpenEXR/ImfChannelList.h>  // Just for OPENEXR_VERSION_STRING
-+#include <OpenEXR-3/ImfChannelList.h>  // Just for OPENEXR_VERSION_STRING
- 
- // avoid naming conflicts with MSVC macros
- #ifdef _MSC_VER
diff --git a/media-libs/osl/files/osl-1.12.4.1-openexr-3-imath.patch b/media-libs/osl/files/osl-1.12.4.1-openexr-3-imath.patch
deleted file mode 100644
index ffee5d8a543d..000000000000
--- a/media-libs/osl/files/osl-1.12.4.1-openexr-3-imath.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff --git a/src/include/OSL/oslconfig.h.in b/src/include/OSL/oslconfig.h.in
-index 29abe88..b9de57c 100644
---- a/src/include/OSL/oslconfig.h.in
-+++ b/src/include/OSL/oslconfig.h.in
-@@ -12,9 +12,9 @@
- // All the things we need from Imath.
- #define OSL_USING_IMATH @OSL_USING_IMATH@
- #if OSL_USING_IMATH >= 3
--#   include <Imath/ImathVec.h>
--#   include <Imath/ImathMatrix.h>
--#   include <Imath/ImathColor.h>
-+#   include <Imath-3/ImathVec.h>
-+#   include <Imath-3/ImathMatrix.h>
-+#   include <Imath-3/ImathColor.h>
- #else
-     // OpenEXR 2.x lacks the Cuda decorators we need, so we replicated some
-     // Imath files in OSL/Imathx, adding the decorations needed for them to
-diff --git a/src/include/OSL/Imathx/ImathColor.h b/src/include/OSL/Imathx/ImathColor.h
-index d0b035f..1cbb28f 100644
---- a/src/include/OSL/Imathx/ImathColor.h
-+++ b/src/include/OSL/Imathx/ImathColor.h
-@@ -44,7 +44,7 @@
- //----------------------------------------------------
- 
- #include "ImathVec.h"
--#include <OpenEXR/ImathNamespace.h>
-+#include <OpenEXR-3/ImathNamespace.h>
- // #include "half.h"
- 
- #ifndef IMATH_HOSTDEVICE
-diff --git a/src/include/OSL/Imathx/ImathFun.h b/src/include/OSL/Imathx/ImathFun.h
-index 1413c48..576b588 100644
---- a/src/include/OSL/Imathx/ImathFun.h
-+++ b/src/include/OSL/Imathx/ImathFun.h
-@@ -43,10 +43,10 @@
- //
- //-----------------------------------------------------------------------------
- 
--#include <OpenEXR/ImathExport.h>
-+#include <OpenEXR-3/ImathExport.h>
- #include "ImathLimits.h"
--#include <OpenEXR/ImathInt64.h>
--#include <OpenEXR/ImathNamespace.h>
-+#include <OpenEXR-3/ImathInt64.h>
-+#include <OpenEXR-3/ImathNamespace.h>
- 
- IMATH_INTERNAL_NAMESPACE_HEADER_ENTER
- 
-diff --git a/src/include/OSL/Imathx/ImathLimits.h b/src/include/OSL/Imathx/ImathLimits.h
-index 09fa419..ed19eaa 100644
---- a/src/include/OSL/Imathx/ImathLimits.h
-+++ b/src/include/OSL/Imathx/ImathLimits.h
-@@ -43,7 +43,7 @@
- //
- //----------------------------------------------------------------
- 
--#include <OpenEXR/ImathNamespace.h>
-+#include <OpenEXR-3/ImathNamespace.h>
- #include <float.h>
- #include <limits.h>
- 
-diff --git a/src/include/OSL/Imathx/ImathMatrix.h b/src/include/OSL/Imathx/ImathMatrix.h
-index a4063dd..678f970 100644
---- a/src/include/OSL/Imathx/ImathMatrix.h
-+++ b/src/include/OSL/Imathx/ImathMatrix.h
-@@ -43,12 +43,12 @@
- //
- //----------------------------------------------------------------
- 
--#include <OpenEXR/ImathPlatform.h>
-+#include <OpenEXR-3/ImathPlatform.h>
- #include "ImathFun.h"
--#include <OpenEXR/ImathExc.h>
-+#include <OpenEXR-3/ImathExc.h>
- #include "ImathVec.h"
--#include <OpenEXR/ImathShear.h>
--#include <OpenEXR/ImathNamespace.h>
-+#include <OpenEXR-3/ImathShear.h>
-+#include <OpenEXR-3/ImathNamespace.h>
- 
- #include <cstring>
- #include <iostream>
-diff --git a/src/include/OSL/Imathx/ImathVec.h b/src/include/OSL/Imathx/ImathVec.h
-index e52af61..4cd696b 100644
---- a/src/include/OSL/Imathx/ImathVec.h
-+++ b/src/include/OSL/Imathx/ImathVec.h
-@@ -43,10 +43,10 @@
- //
- //----------------------------------------------------
- 
--#include <OpenEXR/ImathExc.h>
-+#include <OpenEXR-3/ImathExc.h>
- #include "ImathLimits.h"
--#include <OpenEXR/ImathMath.h>
--#include <OpenEXR/ImathNamespace.h>
-+#include <OpenEXR-3/ImathMath.h>
-+#include <OpenEXR-3/ImathNamespace.h>
- 
- #include <iostream>
- #include <limits>
-diff --git a/src/liboslexec/shadingsys.cpp b/src/liboslexec/shadingsys.cpp
-index 74dc557..74762ab 100644
---- a/src/liboslexec/shadingsys.cpp
-+++ b/src/liboslexec/shadingsys.cpp
-@@ -30,7 +30,7 @@
- using namespace OSL;
- using namespace OSL::pvt;
- 
--#include <OpenEXR/ImfChannelList.h>  // Just for OPENEXR_VERSION_STRING
-+#include <OpenEXR-3/ImfChannelList.h>  // Just for OPENEXR_VERSION_STRING
- 
- // avoid naming conflicts with MSVC macros
- #ifdef _MSC_VER
-diff --git a/src/liboslquery/py_osl.h b/src/liboslquery/py_osl.h
-index ee8284f..4988b44 100644
---- a/src/liboslquery/py_osl.h
-+++ b/src/liboslquery/py_osl.h
-@@ -26,7 +26,7 @@
- #include <OSL/oslquery.h>
- 
- #if OSL_USING_IMATH >= 3
--#    include <Imath/half.h>
-+#    include <Imath-3/half.h>
- #else
- #    include <OpenEXR/half.h>
- #endif
diff --git a/media-libs/osl/osl-1.11.17.0-r1.ebuild b/media-libs/osl/osl-1.11.17.0-r2.ebuild
index 31e118f6baa9..8b62492f3cd0 100644
--- a/media-libs/osl/osl-1.11.17.0-r1.ebuild
+++ b/media-libs/osl/osl-1.11.17.0-r2.ebuild
@@ -34,7 +34,7 @@ IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
 RDEPEND="
 	dev-libs/boost:=
 	dev-libs/pugixml
-	media-libs/openexr:3=
+	media-libs/openexr:=
 	dev-libs/imath:=
 	>=media-libs/openimageio-2.3.12.0:=
 	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
@@ -64,10 +64,6 @@ RESTRICT="test"
 
 S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.11.16.0-openexr-3-imath.patch
-)
-
 llvm_check_deps() {
 	has_version -r "sys-devel/clang:${LLVM_SLOT}"
 }