media-gfx/openvdb: 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>

4 files changed, 5 insertions, 33 deletions

diff --git a/media-gfx/openvdb/files/openvdb-8.2.0-openexr-3-imath.patch b/media-gfx/openvdb/files/openvdb-8.2.0-openexr-3-imath.patch
deleted file mode 100644
index 0a9dfe541f79..000000000000
--- a/media-gfx/openvdb/files/openvdb-8.2.0-openexr-3-imath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/openvdb/openvdb/Types.h b/openvdb/openvdb/Types.h
-index a1d6a9f..f6ecb19 100644
---- a/openvdb/openvdb/Types.h
-+++ b/openvdb/openvdb/Types.h
-@@ -10,9 +10,9 @@
- 
- #ifdef OPENVDB_USE_IMATH_HALF
- #ifdef OPENVDB_IMATH_VERSION
--#include <Imath/half.h>
-+#include <Imath-3/half.h>
- #else
--#include <OpenEXR/half.h>
-+#include <OpenEXR-3/half.h>
- #endif
- namespace openvdb {
- OPENVDB_USE_VERSION_NAMESPACE
diff --git a/media-gfx/openvdb/openvdb-8.2.0-r1.ebuild b/media-gfx/openvdb/openvdb-8.2.0-r3.ebuild
index 1a4d9c0e36e9..c77a66b4a5b2 100644
--- a/media-gfx/openvdb/openvdb-8.2.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-8.2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,8 +22,6 @@ REQUIRED_USE="
 	^^ ( abi6-compat abi7-compat abi8-compat )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
-# 8.2.0 should support OpenEXR 3 / imath but it's going to cause issues with Blender AFAIK
-# so let's avoid it for now.
 RDEPEND="
 	dev-cpp/tbb:=
 	dev-libs/boost:=
@@ -46,7 +44,7 @@ RDEPEND="
 	)
 	utils? (
 		media-libs/ilmbase:=
-		media-libs/openexr:0=
+		media-libs/openexr:=
 	)
 	zlib? ( sys-libs/zlib )
 "
@@ -106,7 +104,6 @@ src_configure() {
 		-DUSE_ZLIB=$(usex zlib)
 		-DUSE_CCACHE=OFF
 		-DUSE_COLORED_OUTPUT=ON
-		# Off for now until 9.0.0 for OpenEXR 3 support
 		-DUSE_IMATH_HALF=OFF
 		-DUSE_LOG4CPLUS=ON
 	)
diff --git a/media-gfx/openvdb/openvdb-8.2.0-r2.ebuild b/media-gfx/openvdb/openvdb-8.2.0-r4.ebuild
index ceb0d37949a9..edc5a635adc6 100644
--- a/media-gfx/openvdb/openvdb-8.2.0-r2.ebuild
+++ b/media-gfx/openvdb/openvdb-8.2.0-r4.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
 	)
 	utils? (
 		dev-libs/imath:=
-		media-libs/openexr:3=
+		media-libs/openexr:=
 	)
 	zlib? ( sys-libs/zlib )
 "
@@ -72,7 +72,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch"
 	"${FILESDIR}/${PN}-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch"
 	"${FILESDIR}/${PN}-8.2.0-unconditionally-search-Python-interpreter.patch"
-	"${FILESDIR}/${PN}-8.2.0-openexr-3-imath.patch"
 )
 
 pkg_setup() {
diff --git a/media-gfx/openvdb/openvdb-9.0.0.ebuild b/media-gfx/openvdb/openvdb-9.0.0-r1.ebuild
index e40833eff061..f7aaf0b3943e 100644
--- a/media-gfx/openvdb/openvdb-9.0.0.ebuild
+++ b/media-gfx/openvdb/openvdb-9.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-libs/imath:=
 	media-libs/glfw
 	media-libs/glu
-	media-libs/openexr:3=
+	media-libs/openexr:=
 	sys-libs/zlib:=
 	x11-libs/libXcursor
 	x11-libs/libXi
@@ -72,14 +72,6 @@ pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
-src_prepare() {
-	# Make sure we find our renamed Imath headers
-	# bug #820929
-	sed -i -e 's:#include <Imath/half.h>:#include <Imath-3/half.h>:' openvdb/openvdb/Types.h || die
-
-	cmake_src_prepare
-}
-
 src_configure() {
 	local myprefix="${EPREFIX}/usr/"