[gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/, media-gfx/openvdb/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     88522689ee0e092ed546dabecc58ab21dccd1af6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  1 18:42:20 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 19:26:40 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88522689

media-gfx/openvdb: drop 8.2.0-r7, 9.0.0-r4

Closes: https://bugs.gentoo.org/886971
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/openvdb/Manifest                         |   2 -
 ...vdb-7.1.0-0001-Fix-multilib-header-source.patch |  75 ----------
 ...d-consistency-for-NumPy-find_package-call.patch |  21 ---
 ...lmbase-if-imath-and-ilmbase-are-installed.patch |  37 -----
 ...unconditionally-search-Python-interpreter.patch |  34 -----
 media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch  | 151 ---------------------
 ...unconditionally-search-Python-interpreter.patch |  35 -----
 .../openvdb-9.1.0-disable-failing-tests.patch      | 111 ---------------
 media-gfx/openvdb/metadata.xml                     |   6 -
 media-gfx/openvdb/openvdb-8.2.0-r7.ebuild          | 134 ------------------
 media-gfx/openvdb/openvdb-9.0.0-r4.ebuild          | 144 --------------------
 11 files changed, 750 deletions(-)

diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index dcf7ed71278e..4ddf7d7dbf21 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,3 +1 @@
 DIST openvdb-10.0.1.tar.gz 3461352 BLAKE2B 506168a4bb29bab2a3a3cb37002858517000dc1682f04d95387fd1e250b61c61d92d2ffdf9b679d83ef1ce270909693ebd46224b732ce264685004d1e47b3027 SHA512 361cef8932b69b19ee94c47fe78f665a1acabfabc3f45ff9f490e830f73ff092c42f56ce698677476a8ccf062c89e3e4dc6d4c550aa6842438cbd4d404ee83bb
-DIST openvdb-8.2.0.tar.gz 2656278 BLAKE2B b381459fb770800bb03bc8a6b3122c6684ab508f11be024e0eb3951bfbcef14e626e2d4468e91ea17fd6792f23810eafe8b05e19d46eb0e6200c73ccf296116a SHA512 aed6b5884a9cfd42f72357ad090c5dcf7829b0e5672ab61e31206e889c085ce5a7bcb89476ceac552a837d394011951528e2b3cffc77baadc491a2e7a31d5e86
-DIST openvdb-9.0.0.tar.gz 2945040 BLAKE2B c47a8088ba30d3cbecff04dbfd2d48b39a254e54149d8692c3a7157a99a1c555ef9747b77aeab6f8709b61c348d496765f2cfcbb0975e21f533072871f3fa422 SHA512 1410b7b04b03fb09d6775ebe7b95e7c0a484d5f29c84203530ed30ccb7c061470be1abb93189010617342e57f3fecdd66a115c6d222024e68e2384a7fb196194

diff --git a/media-gfx/openvdb/files/openvdb-7.1.0-0001-Fix-multilib-header-source.patch b/media-gfx/openvdb/files/openvdb-7.1.0-0001-Fix-multilib-header-source.patch
deleted file mode 100644
index 13d0f45fabf4..000000000000
--- a/media-gfx/openvdb/files/openvdb-7.1.0-0001-Fix-multilib-header-source.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 7558089b3dae599ffc80329da3a5c1decf882ca7 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Fri, 28 Feb 2020 17:01:25 +0100
-Subject: [PATCH] Fix multilib header source
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- cmake/FindIlmBase.cmake | 10 ++++++++--
- cmake/FindOpenEXR.cmake | 10 ++++++++--
- 2 files changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/FindIlmBase.cmake b/cmake/FindIlmBase.cmake
-index f20f803..bb85019 100644
---- a/cmake/FindIlmBase.cmake
-+++ b/cmake/FindIlmBase.cmake
-@@ -168,9 +168,15 @@ find_path(IlmBase_INCLUDE_DIR IlmBaseConfig.h
-   PATH_SUFFIXES include/OpenEXR OpenEXR
- )
- 
-+if(EXISTS "/usr/include/${CHOST}/OpenEXR/IlmBaseConfig.h")
-+  set(_ILMBASE_HEADERS "/usr/include/${CHOST}/OpenEXR")
-+else()
-+  set(_ILMBASE_HEADERS ${IlmBase_INCLUDE_DIR})
-+endif()
-+
- if(EXISTS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h")
-   # Get the ILMBASE version information from the config header
--  file(STRINGS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h"
-+  file(STRINGS "${_ILMBASE_HEADERS}/IlmBaseConfig.h"
-     _ilmbase_version_major_string REGEX "#define ILMBASE_VERSION_MAJOR "
-   )
-   string(REGEX REPLACE "#define ILMBASE_VERSION_MAJOR" ""
-@@ -178,7 +184,7 @@ if(EXISTS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h")
-   )
-   string(STRIP "${_ilmbase_version_major_string}" IlmBase_VERSION_MAJOR)
- 
--  file(STRINGS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h"
-+  file(STRINGS "${_ILMBASE_HEADERS}/IlmBaseConfig.h"
-      _ilmbase_version_minor_string REGEX "#define ILMBASE_VERSION_MINOR "
-   )
-   string(REGEX REPLACE "#define ILMBASE_VERSION_MINOR" ""
-diff --git a/cmake/FindOpenEXR.cmake b/cmake/FindOpenEXR.cmake
-index d0d356f..0c5dd7b 100644
---- a/cmake/FindOpenEXR.cmake
-+++ b/cmake/FindOpenEXR.cmake
-@@ -161,9 +161,15 @@ find_path(OpenEXR_INCLUDE_DIR OpenEXRConfig.h
-   PATH_SUFFIXES  include/OpenEXR OpenEXR
- )
- 
-+if(EXISTS "/usr/include/${CHOST}/OpenEXR/OpenEXRConfig.h")
-+	set(_OPENEXR_HEADERS "/usr/include/${CHOST}/OpenEXR")
-+else()
-+	set(_OPENEXR_HEADERS "${OpenEXR_INCLUDE_DIR}")
-+endif()
-+
- if(EXISTS "${OpenEXR_INCLUDE_DIR}/OpenEXRConfig.h")
-   # Get the EXR version information from the config header
--  file(STRINGS "${OpenEXR_INCLUDE_DIR}/OpenEXRConfig.h"
-+  file(STRINGS "${_OPENEXR_HEADERS}/OpenEXRConfig.h"
-     _openexr_version_major_string REGEX "#define OPENEXR_VERSION_MAJOR "
-   )
-   string(REGEX REPLACE "#define OPENEXR_VERSION_MAJOR" ""
-@@ -171,7 +177,7 @@ if(EXISTS "${OpenEXR_INCLUDE_DIR}/OpenEXRConfig.h")
-   )
-   string(STRIP "${_openexr_version_major_string}" OpenEXR_VERSION_MAJOR)
- 
--  file(STRINGS "${OpenEXR_INCLUDE_DIR}/OpenEXRConfig.h"
-+  file(STRINGS "${_OPENEXR_HEADERS}/OpenEXRConfig.h"
-      _openexr_version_minor_string REGEX "#define OPENEXR_VERSION_MINOR "
-   )
-   string(REGEX REPLACE "#define OPENEXR_VERSION_MINOR" ""
--- 
-2.25.1
-
-

diff --git a/media-gfx/openvdb/files/openvdb-8.0.1-add-consistency-for-NumPy-find_package-call.patch b/media-gfx/openvdb/files/openvdb-8.0.1-add-consistency-for-NumPy-find_package-call.patch
deleted file mode 100644
index 87d1d24755b4..000000000000
--- a/media-gfx/openvdb/files/openvdb-8.0.1-add-consistency-for-NumPy-find_package-call.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Thu, 28 Oct 2021 11:34:16 +0200
-Subject: [PATCH] add consistency for NumPy find_package call
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
-
-diff --git a/openvdb/openvdb/python/CMakeLists.txt b/openvdb/openvdb/python/CMakeLists.txt
-index b473beb..b468d4f 100644
---- a/openvdb/openvdb/python/CMakeLists.txt
-+++ b/openvdb/openvdb/python/CMakeLists.txt
-@@ -94,7 +94,7 @@ else()
-   OPENVDB_CHECK_PYTHON_VERSION(${Python_VERSION} ${Python_INCLUDE_DIRS})
- 
-   if(USE_NUMPY)
--    find_package(Python QUIET COMPONENTS NumPy)
-+    find_package(Python QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS} NumPy)
-     if(NOT TARGET Python::NumPy)
-         message(FATAL_ERROR "Could NOT find NumPy (Required is at least version "
-           "\"${MINIMUM_NUMPY_VERSION}\")"
--- 
-2.33.1

diff --git a/media-gfx/openvdb/files/openvdb-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch b/media-gfx/openvdb/files/openvdb-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch
deleted file mode 100644
index 88752e9fa0eb..000000000000
--- a/media-gfx/openvdb/files/openvdb-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 4 Dec 2021 20:16:42 +0100
-Subject: [PATCH] fix finding ilmbase if imath and ilmbase are installed
-
-If both, ilmbase-2.5 and imath-3 are installed, the configuration fails
-if OPENVDB_BUILD_BINARIES and OPENVDB_BUILD_RENDER are set.
-The patch adds an additional guard based on the USE_IMATH_HALF option
-being set and thus decide whether to search for and use imath or ilmbase.
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/openvdb/openvdb/cmd/CMakeLists.txt
-+++ b/openvdb/openvdb/cmd/CMakeLists.txt
-@@ -81,12 +81,17 @@ endif()
- #### vdb_render
- 
- if(OPENVDB_BUILD_VDB_RENDER)
--  find_package(Imath CONFIG)
--  if (NOT TARGET Imath::Imath)
-+  if(USE_IMATH_HALF)
-+    find_package(Imath CONFIG)
-+    if (NOT TARGET Imath::Imath)
-+      find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath)
-+      find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf)
-+    else()
-+      find_package(OpenEXR CONFIG)
-+    endif()
-+  else()
-     find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath)
-     find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf)
--  else()
--    find_package(OpenEXR CONFIG)
-   endif()
- 
-   set(VDB_RENDER_SOURCE_FILES openvdb_render.cc)
--- 
-2.34.1
-

diff --git a/media-gfx/openvdb/files/openvdb-8.2.0-unconditionally-search-Python-interpreter.patch b/media-gfx/openvdb/files/openvdb-8.2.0-unconditionally-search-Python-interpreter.patch
deleted file mode 100644
index 933d2965b2bc..000000000000
--- a/media-gfx/openvdb/files/openvdb-8.2.0-unconditionally-search-Python-interpreter.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 4 Dec 2021 20:45:49 +0100
-Subject: [PATCH] unconditionally search Python interpreter
-
-When setting PYOPENVDB_INSTALL_DIRECTORY, CMake would fail with:
-```
--- Could NOT find Python (missing: Python_LIBRARIES Development Development.Module Development.Embed) (found version "3.9.9")
-CMake Error at openvdb/openvdb/python/CMakeLists.txt:65 (message):
-  Could NOT find Python::Module (Required is at least version "2.7")
-Call Stack (most recent call first):
-  openvdb/openvdb/python/CMakeLists.txt:112 (openvdb_check_python_version)
-  ```
-
-It seems like we always need to search for the interpreter.
-
-Bug: https://bugs.gentoo.org/790350
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/openvdb/openvdb/python/CMakeLists.txt
-+++ b/openvdb/openvdb/python/CMakeLists.txt
-@@ -73,10 +73,7 @@ endfunction()
- #   target but this was only added in CMake 3.15. See:
- #      https://github.com/AcademySoftwareFoundation/openvdb/issues/886
- set(OPENVDB_PYTHON_DEPS)
--set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development)
--if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY)
--    list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter)
--endif()
-+set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development Interpreter)
- 
- if(${CMAKE_VERSION} VERSION_LESS 3.14)
-   find_package(Python QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS})
--- 
-2.34.1
-

diff --git a/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch b/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch
deleted file mode 100644
index 5fa90a7b6524..000000000000
--- a/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-Grabbed relevant parts from upstream PR for 9.x; it's a variant
-of https://github.com/gentoo/gentoo/pull/22738 which was for earlier versions.
-
-https://github.com/AcademySoftwareFoundation/openvdb/pull/1237
-
-From 3c5f69efeacca762406a80d74b39b970c7023bd6 Mon Sep 17 00:00:00 2001
-From: Nick Avramoussis <4256455+Idclip@users.noreply.github.com>
-Date: Thu, 28 Oct 2021 16:54:10 +0100
-Subject: [PATCH 1/3] Improvements to find_package Python usage. Primarily
- fixes an issues where NumPy needs to be specified along with the Development
- and Interpreter components in a single call
-
-Signed-off-by: Nick Avramoussis <4256455+Idclip@users.noreply.github.com>
----
- openvdb/openvdb/python/CMakeLists.txt | 97 +++++++++++++--------------
- 1 file changed, 46 insertions(+), 51 deletions(-)
-
-diff --git a/openvdb/openvdb/python/CMakeLists.txt b/openvdb/openvdb/python/CMakeLists.txt
-index 7b36379f9..5e9141e8c 100644
---- a/openvdb/openvdb/python/CMakeLists.txt
-+++ b/openvdb/openvdb/python/CMakeLists.txt
-@@ -55,25 +55,39 @@ endif()
- # be provided to find_package(Python) with differing major versions. e.g.
- # calls to find_package(Python 2.7) fails if python3 is found on the system.
- function(OPENVDB_CHECK_PYTHON_VERSION)
--  set(_PY_VERSION ${ARGV0})
--  set(_PY_PATH ${ARGV1})
--  if(NOT _PY_VERSION)
--    message(FATAL_ERROR "Could NOT find Python (Required is at least version "
--      "\"${MINIMUM_PYTHON_VERSION}\")"
--    )
--  elseif(_PY_VERSION VERSION_LESS MINIMUM_PYTHON_VERSION)
--    message(FATAL_ERROR "Could NOT find Python: Found unsuitable version \"${_PY_VERSION}\""
--      "but required is at least \"${MINIMUM_PYTHON_VERSION}\" (found ${_PY_PATH})"
--    )
--  else()
--    message(STATUS "Found Python: ${_PY_PATH}) (found suitable version \"${_PY_VERSION}\", "
--      "minimum required is \"${MINIMUM_PYTHON_VERSION}\")"
-+  set(PY_TARGET ${ARGV0})
-+  set(PY_TARGET_VERSION ${ARGV1})
-+  set(PY_TARGET_INCLUDES ${ARGV2})
-+  set(MIN_VERSION ${ARGV3})
-+  set(FUTURE_MIN_VERSION ${ARGV4})
-+
-+  if(NOT TARGET ${PY_TARGET})
-+    message(FATAL_ERROR "Could NOT find ${PY_TARGET} (Required is at least version "
-+      "\"${MIN_VERSION}\")"
-     )
-   endif()
-+
-+  if(PY_TARGET_VERSION AND MIN_VERSION)
-+    if(PY_TARGET_VERSION VERSION_LESS MIN_VERSION)
-+      message(FATAL_ERROR "Could NOT find ${PY_TARGET}: Found unsuitable version "
-+        "\"${PY_TARGET_VERSION}\" but required is at least \"${MIN_VERSION}\" (found ${PY_TARGET_INCLUDES})"
-+      )
-+    endif()
-+  endif()
-+
-+  message(STATUS "Found ${PY_TARGET}: ${PY_TARGET_INCLUDES}) (found suitable "
-+    "version \"${PY_TARGET_VERSION}\", minimum required is \"${MIN_VERSION}\")"
-+  )
-+
-+  if(OPENVDB_FUTURE_DEPRECATION AND PY_TARGET_VERSION AND FUTURE_MIN_VERSION)
-+    if(PY_TARGET_VERSION VERSION_LESS FUTURE_MIN_VERSION)
-+      message(DEPRECATION "Support for ${PY_TARGET} versions < ${FUTURE_MIN_VERSION} "
-+        "is deprecated and will be removed.")
-+    endif()
-+  endif()
- endfunction()
- 
- # Configure Python and Numpy. Note that:
--#  - find_package(Python NumPy) requires CMake >= 3.14
- #  - find_package(Python Development) target Python::Module requires CMake >= 3.15
- #  - find_package(Python Development.Module) requires CMake >= 3.18
- # To ensure consistent versions between components Interpreter, Compiler,
-@@ -85,38 +99,30 @@ endfunction()
- set(OPENVDB_PYTHON_DEPS)
- set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development)
- if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY)
--    list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter)
-+  list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter)
- endif()
- 
--find_package(Python QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS})
--OPENVDB_CHECK_PYTHON_VERSION(${Python_VERSION} ${Python_INCLUDE_DIRS})
--
- if(USE_NUMPY)
--  find_package(Python QUIET COMPONENTS NumPy)
--  if(NOT TARGET Python::NumPy)
--      message(FATAL_ERROR "Could NOT find NumPy (Required is at least version "
--        "\"${MINIMUM_NUMPY_VERSION}\")"
--      )
--  elseif(Python_NumPy_VERSION VERSION_LESS MINIMUM_NUMPY_VERSION)
--    message(FATAL_ERROR "Could NOT find NumPy: Found unsuitable version \"${Python_NumPy_VERSION}\""
--      "but required is at least \"${MINIMUM_NUMPY_VERSION}\" (found ${Python_NumPy_INCLUDE_DIRS})"
--    )
--  else()
--    message(STATUS "Found NumPy: ${Python_NumPy_INCLUDE_DIRS} (found suitable "
--      "version \"${Python_NumPy_VERSION}\", minimum required is "
--      "\"${MINIMUM_NUMPY_VERSION}\")"
--    )
--  endif()
--  list(APPEND OPENVDB_PYTHON_DEPS Python::NumPy)
-+  list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS NumPy)
- endif()
- 
-+# Make sure find_package(Python) is only ever invoked once with all required components
-+find_package(Python COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS})
-+
-+openvdb_check_python_version(Python::Module
-+  "${Python_VERSION}"
-+  "${Python_INCLUDE_DIRS}"
-+  "${MINIMUM_PYTHON_VERSION}"
-+  "${FUTURE_MINIMUM_PYTHON_VERSION}")
-+list(APPEND OPENVDB_PYTHON_DEPS Python::Module)
-+
- if(USE_NUMPY)
--  if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_NUMPY_VERSION)
--    if(Python_NumPy_VERSION VERSION_LESS FUTURE_MINIMUM_NUMPY_VERSION)
--      message(DEPRECATION "Support for NumPy versions < ${FUTURE_MINIMUM_NUMPY_VERSION} "
--        "is deprecated and will be removed.")
--    endif()
--  endif()
-+  openvdb_check_python_version(Python::NumPy
-+    "${Python_NumPy_VERSION}"
-+    "${Python_NumPy_INCLUDE_DIRS}"
-+    "${MINIMUM_NUMPY_VERSION}"
-+    "${FUTURE_MINIMUM_NUMPY_VERSION}")
-+  list(APPEND OPENVDB_PYTHON_DEPS Python::NumPy)
- endif()
- 
- if(TARGET openvdb_shared AND NOT Boost_USE_STATIC_LIBS)
-@@ -230,17 +236,6 @@ elseif(WIN32)
-   set_target_properties(pyopenvdb PROPERTIES SUFFIX ".pyd") # .pyd on windows
- endif()
- 
--if(TARGET Python::Module)
--  list(APPEND OPENVDB_PYTHON_DEPS Python::Module)
--else()
--  if(APPLE)
--    target_include_directories(pyopenvdb SYSTEM PUBLIC ${Python_INCLUDE_DIRS})
--    target_link_options(pyopenvdb PUBLIC -undefined dynamic_lookup)
--  else()
--    list(APPEND OPENVDB_PYTHON_DEPS Python::Python)
--  endif()
--endif()
--
- target_link_libraries(pyopenvdb PUBLIC
-   ${OPENVDB_LIB}
-   ${OPENVDB_PYTHON_DEPS}
-

diff --git a/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch b/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch
deleted file mode 100644
index 1a24f4c535c3..000000000000
--- a/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/790350
-https://github.com/AcademySoftwareFoundation/openvdb/pull/1275
-
-From 86cbe16b5f8bf9df2c3825d7d7d90c58bc0d3391 Mon Sep 17 00:00:00 2001
-From: Nick Avramoussis <4256455+Idclip@users.noreply.github.com>
-Date: Wed, 8 Dec 2021 16:57:58 +0000
-Subject: [PATCH] Fixed an issue with find_python and cmake 3.18
-
-Signed-off-by: Nick Avramoussis <4256455+Idclip@users.noreply.github.com>
----
- openvdb/openvdb/python/CMakeLists.txt | 10 +++++++++-
- pendingchanges/cmake_python.txt       |  2 ++
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/openvdb/openvdb/python/CMakeLists.txt b/openvdb/openvdb/python/CMakeLists.txt
-index 2821efb5d..179c0c57d 100644
---- a/openvdb/openvdb/python/CMakeLists.txt
-+++ b/openvdb/openvdb/python/CMakeLists.txt
-@@ -97,7 +97,15 @@ endfunction()
- #   target but this was only added in CMake 3.15. See:
- #      https://github.com/AcademySoftwareFoundation/openvdb/issues/886
- set(OPENVDB_PYTHON_DEPS)
--set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development)
-+
-+# @note  explicitly only search for Development.Module from 3.18 as searching
-+#   Development.Embed can cause issues on linux systems where it doesn't exist
-+if(${CMAKE_VERSION} VERSION_LESS 3.18)
-+  set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development)
-+else()
-+  set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development.Module)
-+endif()
-+
- if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY)
-   list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter)
- endif()

diff --git a/media-gfx/openvdb/files/openvdb-9.1.0-disable-failing-tests.patch b/media-gfx/openvdb/files/openvdb-9.1.0-disable-failing-tests.patch
deleted file mode 100644
index d60007981e59..000000000000
--- a/media-gfx/openvdb/files/openvdb-9.1.0-disable-failing-tests.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 6ce3296bbace317844688747ba90b5713477a719 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Wed, 14 Sep 2022 08:33:09 +0200
-Subject: [PATCH] disable failing tests
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- openvdb/openvdb/unittest/TestLinearInterp.cc              | 2 +-
- openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc     | 8 ++++----
- openvdb_ax/openvdb_ax/test/integration/TestAssign.cc      | 2 +-
- openvdb_ax/openvdb_ax/test/integration/TestBinary.cc      | 2 +-
- .../openvdb_ax/test/integration/TestStandardFunctions.cc  | 6 +++---
- 5 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/openvdb/openvdb/unittest/TestLinearInterp.cc b/openvdb/openvdb/unittest/TestLinearInterp.cc
-index 944f0ef..4ba4e51 100644
---- a/openvdb/openvdb/unittest/TestLinearInterp.cc
-+++ b/openvdb/openvdb/unittest/TestLinearInterp.cc
-@@ -1032,5 +1032,5 @@ TestLinearInterp::testStencilsMatch()
-         EXPECT_EQ(val1, val2);
-     }
- }
--TEST_F(TestLinearInterp, testStencilsMatchFloat) { testStencilsMatch<openvdb::FloatGrid>(); }
-+//TEST_F(TestLinearInterp, testStencilsMatchFloat) { testStencilsMatch<openvdb::FloatGrid>(); }
- TEST_F(TestLinearInterp, testStencilsMatchDouble) { testStencilsMatch<openvdb::DoubleGrid>(); }
-diff --git a/openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc b/openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc
-index ba9627b..b80c41e 100644
---- a/openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc
-+++ b/openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc
-@@ -222,8 +222,8 @@ TEST_F(TestPointRasterizeFrustum, testScaleByVoxelVolume)
-     EXPECT_EQ(Coord(0,0,0), iterV.getCoord());
-     auto scaledSumV = (scale * velocities[0] + scale * velocities[1] +
-         scale * velocities[2] + scale * velocities[4]) / voxelVolume;
--    EXPECT_NEAR(scaledSumV[0], (*iterV)[0], tolerance);
--    EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance);
-+//    EXPECT_NEAR(scaledSumV[0], (*iterV)[0], tolerance);
-+//    EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance);
-     EXPECT_NEAR(scaledSumV[2], (*iterV)[2], tolerance);
- #endif
- 
-@@ -603,7 +603,7 @@ TEST_F(TestPointRasterizeFrustum, testPointRasterization)
-     auto scaledSumV = (scale * velocities[0] + scale * velocities[1] +
-         scale * velocities[2] + scale * velocities[4]);
-     EXPECT_NEAR(scaledSumV[0], (*iterV)[0], tolerance);
--    EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance);
-+//    EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance);
-     EXPECT_NEAR(scaledSumV[2], (*iterV)[2], tolerance);
- 
-     // explicitly specify Vec3f grid
-@@ -627,7 +627,7 @@ TEST_F(TestPointRasterizeFrustum, testPointRasterization)
-     iterV = velocity->tree().cbeginLeaf()->cbeginValueOn();
-     EXPECT_EQ(Coord(0,0,0), iter.getCoord());
-     EXPECT_NEAR(scaledSumV[0], (*iterV)[0], tolerance);
--    EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance);
-+//    EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance);
-     EXPECT_NEAR(scaledSumV[2], (*iterV)[2], tolerance);
- 
-     // rasterize float attribute into double grid
-diff --git a/openvdb_ax/openvdb_ax/test/integration/TestAssign.cc b/openvdb_ax/openvdb_ax/test/integration/TestAssign.cc
-index 1f5aed6..7ff6f01 100644
---- a/openvdb_ax/openvdb_ax/test/integration/TestAssign.cc
-+++ b/openvdb_ax/openvdb_ax/test/integration/TestAssign.cc
-@@ -79,7 +79,7 @@ public:
-     CPPUNIT_TEST(compoundIntegralAssignment);
-     CPPUNIT_TEST(compoundFloatingAssignment);
-     CPPUNIT_TEST(compoundVectorAssignment);
--    CPPUNIT_TEST(compoundMatrixAssignment);
-+//    CPPUNIT_TEST(compoundMatrixAssignment);
-     CPPUNIT_TEST(compoundStringAssignment);
-     CPPUNIT_TEST(implicitScalarAssignment);
-     CPPUNIT_TEST(implicitContainerAssignment);
-diff --git a/openvdb_ax/openvdb_ax/test/integration/TestBinary.cc b/openvdb_ax/openvdb_ax/test/integration/TestBinary.cc
-index 483af60..9824782 100644
---- a/openvdb_ax/openvdb_ax/test/integration/TestBinary.cc
-+++ b/openvdb_ax/openvdb_ax/test/integration/TestBinary.cc
-@@ -73,7 +73,7 @@ public:
-     CPPUNIT_TEST_SUITE(TestBinary);
-     CPPUNIT_TEST(plus);
-     CPPUNIT_TEST(minus);
--    CPPUNIT_TEST(mult);
-+//    CPPUNIT_TEST(mult);
-     CPPUNIT_TEST(div);
-     CPPUNIT_TEST(mod);
-     CPPUNIT_TEST(btand);
-diff --git a/openvdb_ax/openvdb_ax/test/integration/TestStandardFunctions.cc b/openvdb_ax/openvdb_ax/test/integration/TestStandardFunctions.cc
-index 68f6eff..829780f 100644
---- a/openvdb_ax/openvdb_ax/test/integration/TestStandardFunctions.cc
-+++ b/openvdb_ax/openvdb_ax/test/integration/TestStandardFunctions.cc
-@@ -48,7 +48,7 @@ public:
-     CPPUNIT_TEST(clamp);
-     CPPUNIT_TEST(cofactor);
-     CPPUNIT_TEST(cosh);
--    CPPUNIT_TEST(cross);
-+//    CPPUNIT_TEST(cross);
-     CPPUNIT_TEST(curlsimplexnoise);
-     CPPUNIT_TEST(degrees);
-     CPPUNIT_TEST(determinant);
-@@ -67,8 +67,8 @@ public:
-     CPPUNIT_TEST(isfinite);
-     CPPUNIT_TEST(isinf);
-     CPPUNIT_TEST(isnan);
--    CPPUNIT_TEST(length);
--    CPPUNIT_TEST(lengthsq);
-+//    CPPUNIT_TEST(length);
-+//    CPPUNIT_TEST(lengthsq);
-     CPPUNIT_TEST(lerp);
-     CPPUNIT_TEST(max);
-     CPPUNIT_TEST(min);
--- 
-2.37.3
-

diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index 8870bee20b73..888390378264 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -18,12 +18,6 @@
 		<flag name="abi10-compat">
 			Disables newer features to maintain compatibility with ABI10
 		</flag>
-		<flag name="abi6-compat">
-			Disables newer features to maintain compatibility with ABI6
-		</flag>
-		<flag name="abi7-compat">
-			Disables newer features to maintain compatibility with ABI7
-		</flag>
 		<flag name="abi8-compat">
 			Disables newer features to maintain compatibility with ABI8
 		</flag>

diff --git a/media-gfx/openvdb/openvdb-8.2.0-r7.ebuild b/media-gfx/openvdb/openvdb-8.2.0-r7.ebuild
deleted file mode 100644
index e993e5e2f46a..000000000000
--- a/media-gfx/openvdb/openvdb-8.2.0-r7.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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-r4.ebuild b/media-gfx/openvdb/openvdb-9.0.0-r4.ebuild
deleted file mode 100644
index 505f3490aaa3..000000000000
--- a/media-gfx/openvdb/openvdb-9.0.0-r4.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9,10} )
-
-inherit cmake cuda 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/9"
-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 abi7-compat abi8-compat +abi9-compat"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="blosc? ( zlib )
-	numpy? ( python )
-	cuda? ( nanovdb )
-	^^ ( abi7-compat abi8-compat abi9-compat )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-cpp/tbb-2020.3:=
-	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:= )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-11 )
-	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}-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"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use cuda; then
-		cuda_add_sandbox -w
-		cuda_src_prepare
-	fi
-}
-
-src_configure() {
-	local myprefix="${EPREFIX}/usr/"
-
-	local version
-	if use abi7-compat; then
-		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
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
-		-DOPENVDB_ABI_VERSION_NUMBER="${version}"
-		-DOPENVDB_BUILD_DOCS=$(usex doc)
-		-DOPENVDB_BUILD_UNITTESTS=$(usex test)
-		-DOPENVDB_BUILD_VDB_LOD=$(usex utils)
-		-DOPENVDB_BUILD_VDB_RENDER=$(usex utils)
-		-DOPENVDB_BUILD_VDB_VIEW=$(usex utils)
-		-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
-		-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
-			-DUSE_NUMPY=$(usex numpy)
-			-DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test)
-			-DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
-			-DPython_INCLUDE_DIR="$(python_get_includedir)"
-		)
-	fi
-
-	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
-}