--- openimageio-2.2.18.0-r1.ebuild	2021-10-06 22:39:10.812239065 +0200
+++ openimageio-2.2.18.0-r2.ebuild	2021-10-10 10:02:45.106707043 +0200
@@ -39,17 +39,19 @@
 		dev-texlive/texlive-latexextra
 	)
 "
+#	>=media-libs/ilmbase-2.2.0-r1:=
+#	>=media-libs/openexr-2.2.0-r2:0=
 RDEPEND="
-	>=dev-libs/boost-1.62:=
 	dev-cpp/robin-map
+	>=dev-libs/boost-1.62:=
+	dev-libs/imath:=
 	dev-libs/libfmt:=
 	dev-libs/pugixml:=
-	>=media-libs/ilmbase-2.2.0-r1:=
 	>=media-libs/libheif-1.7.0:=
 	media-libs/libpng:0=
 	>=media-libs/libwebp-0.2.1:=
 	media-libs/opencolorio:=
-	>=media-libs/openexr-2.2.0-r2:0=
+	media-libs/openexr:3=
 	media-libs/tiff:0=
 	sys-libs/zlib:=
 	virtual/jpeg:0
@@ -97,6 +99,18 @@
 src_prepare() {
 	cmake_src_prepare
 	cmake_comment_add_subdirectory src/fonts
+	sed -e 's|Imath/|Imath-3/|' \
+		-i src/include/OpenImageIO/Imath.h.in \
+		-i src/libOpenImageIO/imagebufalgo_xform.cpp \
+		-i src/libutil/fmath_test.cpp \
+		-i src/libutil/typedesc_test.cpp \
+		-i src/field3d.imageio/field3dinput.cpp \
+		-i src/field3d.imageio/field3d_pvt.h || die
+	sed -e 's|OpenEXR/|OpenEXR-3/|' \
+		-i src/dpx.imageio/dpxinput.cpp \
+		-i src/openexr.imageio/exrinput.cpp \
+		-i src/openexr.imageio/exroutput.cpp \
+		-i src/oiiotool/oiiotool.cpp || die
 }
 
 src_configure() {
@@ -116,6 +130,7 @@
 		-DINSTALL_FONTS=OFF
 		-DBUILD_DOCS=$(usex doc)
 		-DINSTALL_DOCS=$(usex doc)
+		-DOpenEXR_ROOT="${ESYSROOT}"/usr/$(get_libdir)/cmake/OpenEXR-3
 		-DSTOP_ON_WARNING=OFF
 		-DUSE_CCACHE=OFF
 		-DUSE_DCMTK=$(usex dicom)
@@ -136,8 +151,17 @@
 		-DUSE_FREETYPE=$(usex truetype)
 		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
 	)
+
+	if use openvdb && has_version ">=media-gfx/openvdb-8"; then
+		# OpenVDB-8+ needs C++14 or later
+		mycmakeargs+=( -DCMAKE_CXX_STANDARD=14 )
+	fi
+
 	if use python; then
-		mycmakeargs+=( -DPYTHON_SITE_DIR=$(python_get_sitedir) )
+		mycmakeargs+=(
+			-DPython_EXECUTABLE="${PYTHON}"
+			-DPYTHON_SITE_DIR=$(python_get_sitedir)
+		)
 	fi
 
 	cmake_src_configure