media-gfx/openvdb: Add python 3.9 support for openvdb 7.1.0

Openvdb 7.1.0 also supports python 3.9.

We also fix BDEPEND up: pkgconfig, the doc dependencies,
cppunit and cmake (where needed) have been moved into BDEPEND.

Signed-off-by: Adrian Grigo <agrigo2001@yahoo.com.au>
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam@gentoo.org>

7 files changed, 78 insertions, 31 deletions

diff --git a/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch b/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch
index c3999e54f9cf..dd0b83540aa3 100644
--- a/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch
+++ b/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch
@@ -1,3 +1,11 @@
+This patch is an updated version of the patch created in dracwyrm's
+patchset for openvdb 4.0.2 which uses PkgConfig to ensure that the
+correct IlmBase and OpenEXR dependencies are found.
+
+In subsequent versions this functionality is taken over by
+altering the directory the header files are searched for in
+multilib-header-source patch by Bernd Waibel
+
 diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
 --- a/openvdb/CMakeLists.txt	2018-08-28 12:20:33.000000000 +0100
 +++ b/openvdb/CMakeLists.txt	2018-08-28 12:25:19.807755722 +0100
diff --git a/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch b/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch
index c6e2bae5dfae..e8cfac755d3e 100644
--- a/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch
+++ b/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch
@@ -1,3 +1,12 @@
+This patch changes the default location that the header files look for
+IlmBaseConfig.h as in Gentoo the version containg the ILMBASE_VERSION_MAJOR
+and ILMBASE_VERSION_MINOR is stored under /usr/include/chost.
+
+Without this patch, compilation fails as it is unable to identify the
+required IlmBase version.
+
+Based on the fix multilib header patch for 7.1.0 by Bernd Waibel
+
 diff -Naur a/cmake/FindIlmBase.cmake b/cmake/FindIlmBase.cmake
 --- a/cmake/FindIlmBase.cmake	2020-02-02 01:03:55.000000000 +0800
 +++ b/cmake/FindIlmBase.cmake	2020-02-02 01:09:05.000000000 +0800
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
index 0b960e209682..08c8438f0282 100644
--- a/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
@@ -38,13 +38,18 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-libs/boost:=[python?,${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-libs/boost:=[python?,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
 		')
-	)"
+	)
+"
 
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-cpp/tbb
+"
+
+BDEPEND="
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
@@ -54,7 +59,8 @@ DEPEND="${RDEPEND}
 		dev-texlive/texlive-latex
 		dev-texlive/texlive-latexextra
 	)
-	test? ( dev-util/cppunit )"
+	test? ( dev-util/cppunit )
+"
 
 PATCHES=(
 	"${WORKDIR}/${P}-patchset-02/0001-use-gnuinstalldirs.patch"
diff --git a/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
index 2cfbd5d329f1..a5f10d91edb8 100644
--- a/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
@@ -36,13 +36,18 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-libs/boost:=[python?,${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-libs/boost:=[python?,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
 		')
-	)"
+	)
+"
 
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-cpp/tbb
+"
+
+BDEPEND="
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
@@ -52,7 +57,8 @@ DEPEND="${RDEPEND}
 		dev-texlive/texlive-latex
 		dev-texlive/texlive-latexextra
 	)
-	test? ( dev-util/cppunit )"
+	test? ( dev-util/cppunit )
+"
 
 PATCHES=(
 	"${FILESDIR}/${P}-use-gnuinstalldirs.patch"
diff --git a/media-gfx/openvdb/openvdb-6.2.1.ebuild b/media-gfx/openvdb/openvdb-6.2.1.ebuild
index 28f00b1922dc..03fcecce642f 100644
--- a/media-gfx/openvdb/openvdb-6.2.1.ebuild
+++ b/media-gfx/openvdb/openvdb-6.2.1.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9} )
-CMAKE_MAKEFILE_GENERATOR="emake"
 
 inherit cmake flag-o-matic python-single-r1
 
@@ -38,14 +37,18 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-libs/boost:=[python?,${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-libs/boost:=[python?,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
 		')
 	)"
 
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-3.16.2-r1
+DEPEND="
+	${RDEPEND}
 	dev-cpp/tbb
+"
+
+BDEPEND="
+	>=dev-util/cmake-3.16.2-r1
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
@@ -55,7 +58,8 @@ DEPEND="${RDEPEND}
 		dev-texlive/texlive-latex
 		dev-texlive/texlive-latexextra
 	)
-	test? ( dev-util/cppunit )"
+	test? ( dev-util/cppunit )
+"
 
 PATCHES=(
 	"${FILESDIR}/${P}-fix-multilib-header-source.patch"
diff --git a/media-gfx/openvdb/openvdb-7.0.0.ebuild b/media-gfx/openvdb/openvdb-7.0.0.ebuild
index ccd8415c2865..c6d6c15d1bf7 100644
--- a/media-gfx/openvdb/openvdb-7.0.0.ebuild
+++ b/media-gfx/openvdb/openvdb-7.0.0.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_MAKEFILE_GENERATOR="emake"
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit cmake flag-o-matic python-single-r1
@@ -39,8 +38,8 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-libs/boost:=[numpy?,python?,${PYTHON_MULTI_USEDEP}]
-			numpy? ( dev-python/numpy[${PYTHON_MULTI_USEDEP}] )
+			dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}]
+			numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
 		')
 	)
 "
@@ -48,6 +47,9 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dev-cpp/tbb
+"
+
+BDEPEND="
 	>=dev-util/cmake-3.16.2-r1
 	virtual/pkgconfig
 	doc? (
@@ -89,7 +91,6 @@ src_configure() {
 		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
 		-DOPENVDB_ABI_VERSION_NUMBER="${version}"
 		-DOPENVDB_BUILD_DOCS=$(usex doc)
-		-DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
 		-DOPENVDB_BUILD_UNITTESTS=$(usex test)
 		-DOPENVDB_BUILD_VDB_LOD=$(usex !utils)
 		-DOPENVDB_BUILD_VDB_RENDER=$(usex !utils)
@@ -101,11 +102,17 @@ src_configure() {
 		-DUSE_COLORED_OUTPUT=ON
 		-DUSE_EXR=ON
 		-DUSE_LOG4CPLUS=ON
-		-DUSE_NUMPY=$(usex numpy)
-		-DPYOPENVDB_INSTALL_DIRECTORY="${python_get_sitedir}"
-		-DPython_EXECUTABLE="${PYTHON}"
 	)
 
+	if use python; then
+		mycmakeargs+=(
+			-DOPENVDB_BUILD_PYTHON_MODULE=ON
+			-DUSE_NUMPY=$(usex numpy)
+			-DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
+			-DPython_EXECUTABLE="${EPYTHON}"
+		)
+	fi
+
 	if use cpu_flags_x86_avx; then
 		mycmakeargs+=( -DOPENVDB_SIMD=AVX )
 	elif use cpu_flags_x86_sse4_2; then
diff --git a/media-gfx/openvdb/openvdb-7.1.0.ebuild b/media-gfx/openvdb/openvdb-7.1.0.ebuild
index 90ec1ad79ad4..a61b6f125ccc 100644
--- a/media-gfx/openvdb/openvdb-7.1.0.ebuild
+++ b/media-gfx/openvdb/openvdb-7.1.0.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit cmake flag-o-matic python-single-r1
 
@@ -39,8 +38,8 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-libs/boost:=[numpy?,python?,${PYTHON_MULTI_USEDEP}]
-			numpy? ( dev-python/numpy[${PYTHON_MULTI_USEDEP}] )
+			dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}]
+			numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
 		')
 	)
 "
@@ -48,6 +47,9 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dev-cpp/tbb
+"
+
+BDEPEND="
 	>=dev-util/cmake-3.16.2-r1
 	virtual/pkgconfig
 	doc? (
@@ -87,7 +89,6 @@ src_configure() {
 		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
 		-DOPENVDB_ABI_VERSION_NUMBER="${version}"
 		-DOPENVDB_BUILD_DOCS=$(usex doc)
-		-DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
 		-DOPENVDB_BUILD_UNITTESTS=$(usex test)
 		-DOPENVDB_BUILD_VDB_LOD=$(usex !utils)
 		-DOPENVDB_BUILD_VDB_RENDER=$(usex !utils)
@@ -99,11 +100,17 @@ src_configure() {
 		-DUSE_COLORED_OUTPUT=ON
 		-DUSE_EXR=ON
 		-DUSE_LOG4CPLUS=ON
-		-DUSE_NUMPY=$(usex numpy)
-		-DPYOPENVDB_INSTALL_DIRECTORY="${python_get_sitedir}"
-		-DPython_EXECUTABLE="${PYTHON}"
 	)
 
+	if use python; then
+		mycmakeargs+=(
+			-DOPENVDB_BUILD_PYTHON_MODULE=ON
+			-DUSE_NUMPY=$(usex numpy)
+			-DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
+			-DPython_EXECUTABLE="${EPYTHON}"
+		)
+	fi
+
 	if use cpu_flags_x86_avx; then
 		mycmakeargs+=( -DOPENVDB_SIMD=AVX )
 	elif use cpu_flags_x86_sse4_2; then