gentoo resync : 20.03.2022

6 files changed, 220 insertions, 29 deletions

diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 84314810fb10..827e467c3070 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -5,6 +5,7 @@ AUX openvdb-8.0.1-glfw-libdir.patch 495 BLAKE2B 6a47bd300b3cd2186be8b749abd1e1fc
 AUX openvdb-8.1.0-glfw-libdir.patch 742 BLAKE2B 2ab1de05da49480584e373dba0f4a8504f6116ee22c46247f72802a9d412df43603b79b9620d0be2efe9745c30d962d1404325f3b09cae4ac9fe1e3bc0052d42 SHA512 beebad98890dc05c7c34594155fcdb163353b3a92c1571c7b017481b1fa167735ec54df019ed5d154e7d0973d3c1d9fd779508d2360f3306eefa6e45d3240d0b
 AUX openvdb-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch 1351 BLAKE2B 0a63f9c2c3fd44cfe8013e2c73c3f311d92fee2b6828801175969a0f7123401c21ad11325788ba8b38716a6d21ccf9bd0e685e0c3bb51d6c3f0a0bd3fcdb409b SHA512 5443a3204c9f8b6b8ae9e533ee8c18d6e82463cb3c5be1e3664ab2067a7ba2c9d99f17263204d6be940db3dcd1d8721b359ac0de698f760d23ba05a68e03f1e9
 AUX openvdb-8.2.0-unconditionally-search-Python-interpreter.patch 1390 BLAKE2B 58e1ed82abe0e2a50ba7861188d65baa48e6c6273bcdbacccf92923de88359d6b08fa52eb6bc8d0b4f144b360680f52a94c696abcfcbb3e1c9045ba830c03646 SHA512 ddedfeae9a68c57c4de14ffdf05f952611fe72fd089320fba5f432d5562a09c661750eca4d0e256be1a3f0ac3e141b26db8d738df5b3a2ddb58a747331c90729
+AUX openvdb-9.0.0-fix-atomic.patch 1548 BLAKE2B 718d9eb0511ea50733d7f11b6720a90fd052452f049afbeceecedb2612963f8dfa53d81030671dd426acb1b8d9280e780bfe39030660152b933c80c21c5e1fbd SHA512 316eb3253d53f7fda43f90e3e6f432aa8e5a687c535cefee04c5af682ede05e744513394f16569c50b4cb2baf142750ed19ae815141738d25babad41699e8a46
 AUX openvdb-9.0.0-numpy.patch 6113 BLAKE2B 4424e930ddaa3863245fc8f32954b5732aaba84792f930cc25f8598cbe0282c68540eaf7f2721959841ec3f40bbe5ed1f770c5c90425389a3a0646ebe3b75c9d SHA512 23b53db3895f1b44605e002e1b3649fe1101844f1ac864cf6083c19fdb4ab40701ee20177d7095c7a8e683e01a3e4fad1fa5087207580dd64e6f5adf4f14fdbc
 AUX openvdb-9.0.0-unconditionally-search-Python-interpreter.patch 1471 BLAKE2B e13ad11bfcb13a763bc73f2a26dbc11d1967098942d6f685cbd9fa2de467ac64c71d093e267db1d2d15e40ac3ab25d9b3995e40cc58d069109ded5abdd8ecb3f SHA512 137f96d8d906f2ea321670823c6fb80256b98179e7d4e044e78e62417d7489eae464f9596f13e80fd2dcafbcd946cf94e192965de48d900e061418f39f16c39c
 DIST openvdb-7.0.0.tar.gz 1872744 BLAKE2B e3a8c8d51f77e115d3d397abde0860a6322d56eb6c4795c1ba39539a23aab6cf37602ce7122965fbc3098b15b118b25010263f567e8003363b78c9b7d9d5dfd8 SHA512 f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7
@@ -17,6 +18,7 @@ EBUILD openvdb-7.0.0-r4.ebuild 2923 BLAKE2B 789ef9fe451697a42848047a72a7dec59ba3
 EBUILD openvdb-7.1.0-r5.ebuild 2936 BLAKE2B 08764ebb2337dc453144526e5beb5c022eb2bfd2a68f752ccfb847057c53795ea3bd157f1527f6612bfbdc6faf927304f6dcd460901d4aff302c77a4613a24a6 SHA512 bc9bfbbb770fbafe7611d2df5d432db2d738c1f2118e922c921967328191954ed631a590411350ab15f50924b0b2f00d1501969e77a7c89e0f147e163e65d76c
 EBUILD openvdb-8.0.1-r4.ebuild 3034 BLAKE2B ef40d732555b406d4e81c7ad4500033073c10f5b8d81a0c7032d0c02369879fcadbfcbbb0fa4f344ca251fee47ceebe938acd47c70c2a3db2bca405da9cd2526 SHA512 5df7e6f71b8306ec28278839e7dee2ff09b8a7d1555f88a0c0f6ca7f9b5be20f1e572a0b0df6689817fb5fb378b5fc2d1a9729247aa6caf51c942e06fef1d0c6
 EBUILD openvdb-8.1.0.ebuild 3209 BLAKE2B 0db931c94e28135dd1819758f4459588c14498c2bc3121b7d61d223ddb6fb32873f22bf269f1b2afb15a3c1a612cb151b515a54eca2d6e73e56e6406b3df635c SHA512 840c7aac5df4a6cd6edde07c79702cdfb49f70e0b09dd023842884ccd62745202f0e956697ced9fe58cdffc345eba1330c0c006e6b248e60020d5b3193992faf
-EBUILD openvdb-8.2.0-r1.ebuild 3474 BLAKE2B 650cde4a8f46ef313025bbaba7f7f9698c1f0fa8347fa6aa1e2e3afb05904da49974d695e6578d2ce39c6bb8d2a331a3a7188837d85a3f090690c98797469527 SHA512 be60e550c9a334a05092bc95090ee5044f07d777484cc6efef050237c9b5f337182b4e1b1219b3290bc4d214a37fc83cb9baca3b2bb7872c3a0efe13bc968810
-EBUILD openvdb-9.0.0.ebuild 3347 BLAKE2B e2bf412d66dfd7b8b4fdaa356a61381bcad5311d759902e007d8d66dbe7f5bfc3ae878f7a93983c592ffccc54db6f3f8378ddab2c2fa5f31a8a08c7427bc7e85 SHA512 5ce547ff60fe80d650dcb7674b2c42e457f56203208e1fc521ce3c475b08e7e5c202575a0d730528c6b3d1ef5596434fc921a4943b34bd44dc7857d049153c4f
-MISC metadata.xml 1646 BLAKE2B 9e25b791388076b419596924e5860d79b1e96503dc8d6e2e6894182919590c9688728636f08162f6cc63a75343c34cab88d62046b573e554d6321444b9ea1be0 SHA512 39c3c0a8f7c94081dba88317ecc11cbdce2fa192373daf2ae62867204d6928ed69687935df05bbd033dc643f01168aec98230909d3c69021eedc489a9f007fbc
+EBUILD openvdb-8.2.0-r3.ebuild 3303 BLAKE2B 696e71570894dbb83167c0dbf2edd4db5b06f410fb7af254718ff2d3f7f0cbb44ed4b3279e3c486b3d442e13614aab4f80ec0251e8e5653fd9ad3fd0b6e383f9 SHA512 912bb5c4e2a3214d71985440d695a14e333c52fa4828d687dfcbbaf13aa1e5d377081c7f8889a080a17c79096bbc766ecd587bbe58b89489024f08f6d79e6085
+EBUILD openvdb-8.2.0-r7.ebuild 3242 BLAKE2B 7c1f9ebebb936493a76380f42a4e2d1dc006e67b2f1c89283a09346e2a4400bd834e03dd6b06ea78a417bc09b537a8dbd62db89ad44aba4fb611446c7c1a2a7b SHA512 cbcb0b469f762ae4126d1bf048adc3126a84d246e9cc236bd2e494ae12064130ab4229770bd589a177d0b4ad1eb298682578cf1ff2ec47d1f4e4966d9e6df0cd
+EBUILD openvdb-9.0.0-r4.ebuild 3361 BLAKE2B 57f6d1dc9940a02082bb67a6b8279f953ee7a3575b3cbe19223567095dc1b47000079f8323033efef779ed02cc1f80bf61cc78ce6b22dd80f71bab044cc583c8 SHA512 63b82acf0c48176475238afa751c046db5d21463b1a1c23b5e7f77c6de336a29436fb097e52302a20cdaef27a35b615197101c150bcfb4a25b5b3e9015477de7
+MISC metadata.xml 1956 BLAKE2B ac18ef2565209cbf43a84ddb7abacd711946799fa1f02fc1d336ed785f8ffed4cc207eaa88b1b57c9c8f3687776ae6dbf00fe316e096246ac9f41367ae8c9ac5 SHA512 cb2026ba7cf516a7cc2254090484e49fbd1fea99a81d4c0f17151a8c84d471c32c1026ca3f53531e85d875465f3ab3125ebe4abd5d17a36f63d75fbc0e230a4a
diff --git a/media-gfx/openvdb/files/openvdb-9.0.0-fix-atomic.patch b/media-gfx/openvdb/files/openvdb-9.0.0-fix-atomic.patch
new file mode 100644
index 000000000000..3885bb4ca453
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-9.0.0-fix-atomic.patch
@@ -0,0 +1,47 @@
+From 7ca53e00b5f85b8842a2a846f0026d63791498cc Mon Sep 17 00:00:00 2001
+From: Yixun Lan <dlan@gentoo.org>
+Date: Wed, 16 Feb 2022 22:24:16 +0800
+Subject: [PATCH] openvdb: fix missing atomic lib
+
+explicitly pass -pthread to work around pthread builtin since glibc-2.34,
+as we need -pthread to pull in libatomic for machines like riscv
+
+Bug: https://bugs.gentoo.org/833372
+Original-from: Alex Fan <alex.fan.q@gmail.com>
+Signed-off-by: Yixun Lan <dlan@gentoo.org>
+---
+ nanovdb/nanovdb/CMakeLists.txt | 3 +++
+ openvdb/openvdb/CMakeLists.txt | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/nanovdb/nanovdb/CMakeLists.txt b/nanovdb/nanovdb/CMakeLists.txt
+index 296dbb0..afc4f0c 100644
+--- a/nanovdb/nanovdb/CMakeLists.txt
++++ b/nanovdb/nanovdb/CMakeLists.txt
+@@ -69,6 +69,9 @@ if(UNIX)
+   # forces the compiler -pthread flag vs -lpthread
+   set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+   find_package(Threads REQUIRED)
++  if(CMAKE_USE_PTHREADS_INIT)
++    target_link_libraries(Threads::Threads INTERFACE -pthread)
++  endif()
+ endif()
+ 
+ if(NANOVDB_BUILD_UNITTESTS OR NANOVDB_BUILD_BENCHMARK)
+diff --git a/openvdb/openvdb/CMakeLists.txt b/openvdb/openvdb/CMakeLists.txt
+index 1d5b75f..22988b7 100644
+--- a/openvdb/openvdb/CMakeLists.txt
++++ b/openvdb/openvdb/CMakeLists.txt
+@@ -202,6 +202,9 @@ endif()
+ 
+ if(UNIX)
+   find_package(Threads REQUIRED)
++  if(CMAKE_USE_PTHREADS_INIT)
++    target_link_libraries(Threads::Threads INTERFACE -pthread)
++  endif()
+ endif()
+ 
+ # Set deps. Note that the order here is important. If we're building against
+-- 
+2.35.1
+
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index a4302c6004d8..50b4f6e0bbd9 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -18,6 +18,12 @@
 		<flag name="blosc">
 			Allow using blosc compression via <pkg>dev-libs/c-blosc</pkg>
 		</flag>
+		<flag name="cuda">
+			Enable support for CUDA in NanoVDB.
+		</flag>
+		<flag name="nanovdb">
+			A lightweight, header only, and GPU friendly version of VDB.
+		</flag>
 		<flag restrict="&gt;=media-gfx/openvdb-7.0.0" name="numpy">
 			Build pyopenvdb with support for <pkg>dev-python/numpy</pkg>
 		</flag>
@@ -33,6 +39,9 @@
 		<flag restrict="&gt;=media-gfx/openvdb-8.0.0" name="abi8-compat">
 			Disables newer features to maintain compatibility with ABI8.
 		</flag>
+		<flag restrict="&gt;=media-gfx/openvdb-9.0.0" name="abi9-compat">
+			Disables newer features to maintain compatibility with ABI9.
+		</flag>
 		<flag restrict="&gt;=media-gfx/openvdb-7.0.0" name="utils">
 			Build utility binaries
 		</flag>
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-r7.ebuild b/media-gfx/openvdb/openvdb-8.2.0-r7.ebuild
new file mode 100644
index 000000000000..93f4d80c9ce0
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-8.2.0-r7.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Library for the efficient manipulation of volumetric data"
+HOMEPAGE="https://www.openvdb.org"
+SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0/8"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 +blosc doc numpy python static-libs test +zlib abi6-compat abi7-compat +abi8-compat"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	blosc? ( zlib )
+	numpy? ( python )
+	^^ ( abi6-compat abi7-compat abi8-compat )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-cpp/tbb:=
+	dev-libs/boost:=
+	dev-libs/jemalloc:=
+	dev-libs/log4cplus:=
+	>=dev-libs/imath-3.1.4-r2:=
+	media-libs/glfw
+	media-libs/glu
+	>=media-libs/openexr-3:=
+	sys-libs/zlib:=
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	blosc? ( dev-libs/c-blosc:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}]
+			numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+		')
+	)
+	zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	test? ( dev-util/cppunit dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch"
+	"${FILESDIR}/${PN}-8.0.1-add-consistency-for-NumPy-find_package-call.patch"
+	"${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"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myprefix="${EPREFIX}"/usr/
+
+	local version
+	if use abi6-compat; then
+		version=6
+	elif use abi7-compat; then
+		version=7
+	elif use abi8-compat; then
+		version=8
+	else
+		die "OpenVDB ABI version is not compatible"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
+		-DOPENVDB_ABI_VERSION_NUMBER="${version}"
+		-DOPENVDB_BUILD_BINARIES=ON
+		-DOPENVDB_BUILD_DOCS=$(usex doc)
+		-DOPENVDB_BUILD_UNITTESTS=$(usex test)
+		-DOPENVDB_CORE_SHARED=ON
+		-DOPENVDB_CORE_STATIC=$(usex static-libs)
+		-DOPENVDB_ENABLE_RPATH=OFF
+		-DUSE_BLOSC=$(usex blosc)
+		-DUSE_ZLIB=$(usex zlib)
+		-DUSE_CCACHE=OFF
+		-DUSE_COLORED_OUTPUT=ON
+		-DUSE_IMATH_HALF=ON
+		-DUSE_LOG4CPLUS=ON
+	)
+
+	if use python; then
+		mycmakeargs+=(
+			-DOPENVDB_BUILD_PYTHON_MODULE=ON
+			-DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test)
+			-DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
+			-DPython_EXECUTABLE="${PYTHON}"
+			-DPython_INCLUDE_DIR="$(python_get_includedir)"
+			-DUSE_NUMPY=$(usex numpy)
+		)
+	fi
+
+	mycmakeargs+=(
+		-DOPENVDB_BUILD_VDB_LOD=ON
+		-DOPENVDB_BUILD_VDB_RENDER=ON
+		-DOPENVDB_BUILD_VDB_VIEW=ON
+	)
+
+	if use cpu_flags_x86_avx; then
+		mycmakeargs+=( -DOPENVDB_SIMD=AVX )
+	elif use cpu_flags_x86_sse4_2; then
+		mycmakeargs+=( -DOPENVDB_SIMD=SSE42 )
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-gfx/openvdb/openvdb-9.0.0.ebuild b/media-gfx/openvdb/openvdb-9.0.0-r4.ebuild
index e40833eff061..8ec379c61a6d 100644
--- a/media-gfx/openvdb/openvdb-9.0.0.ebuild
+++ b/media-gfx/openvdb/openvdb-9.0.0-r4.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
@@ -13,30 +13,32 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.g
 
 LICENSE="MPL-2.0"
 SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 +blosc doc numpy python static-libs test utils zlib abi6-compat abi7-compat +abi8-compat"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 +blosc cuda doc +nanovdb numpy python static-libs test utils +zlib abi6-compat abi7-compat abi8-compat +abi9-compat"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="
+REQUIRED_USE="blosc? ( zlib )
 	numpy? ( python )
-	^^ ( abi6-compat abi7-compat abi8-compat )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
+	cuda? ( nanovdb )
+	^^ ( abi6-compat abi7-compat abi8-compat abi9-compat )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
 RDEPEND="
-	>=dev-cpp/tbb-2021.4.0:=
+	>=dev-cpp/tbb-2020.3:=
 	dev-libs/boost:=
 	dev-libs/jemalloc:=
 	dev-libs/log4cplus:=
-	dev-libs/imath:=
+	>=dev-libs/imath-3.1.4-r2:=
 	media-libs/glfw
 	media-libs/glu
-	media-libs/openexr:3=
+	>=media-libs/openexr-3:=
 	sys-libs/zlib:=
 	x11-libs/libXcursor
 	x11-libs/libXi
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	blosc? ( dev-libs/c-blosc:= )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-11 )
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
@@ -62,8 +64,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch"
 	"${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch"
+	"${FILESDIR}/${PN}-9.0.0-fix-atomic.patch"
 	"${FILESDIR}/${PN}-9.0.0-numpy.patch"
 	"${FILESDIR}/${PN}-9.0.0-unconditionally-search-Python-interpreter.patch"
 )
@@ -72,14 +74,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/"
 
@@ -90,12 +84,12 @@ src_configure() {
 		version=7
 	elif use abi8-compat; then
 		version=8
+	elif use abi9-compat; then
+		version=9
 	else
 		die "OpenVDB ABI version is not compatible"
 	fi
 
-	# TODO: add NanoVDB?
-	# https://academysoftwarefoundation.github.io/openvdb/NanoVDB_HowToBuild.html
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
 		-DOPENVDB_ABI_VERSION_NUMBER="${version}"
@@ -113,8 +107,16 @@ src_configure() {
 		-DUSE_COLORED_OUTPUT=ON
 		-DUSE_IMATH_HALF=ON
 		-DUSE_LOG4CPLUS=ON
+		-DUSE_NANOVDB=$(usex nanovdb)
 	)
 
+	if use nanovdb; then
+		mycmakeargs+=(
+			-DNANOVDB_BUILD_UNITTESTS=$(usex test)
+			-DNANOVDB_USE_CUDA=$(usex cuda)
+		)
+	fi
+
 	if use python; then
 		mycmakeargs+=(
 			-DOPENVDB_BUILD_PYTHON_MODULE=ON