summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2024-08-30 16:43:03 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2024-08-30 17:39:45 +0200
commit4b22a61f118b7d82f50479d5fc67287d5fbab3f2 (patch)
tree62d0d27190af7731d91b896bdb55d66e746435bb /media-libs
parentmedia-gfx/rawtherapee: add 5.11 (diff)
downloadgentoo-4b22a61f118b7d82f50479d5fc67287d5fbab3f2.tar.gz
gentoo-4b22a61f118b7d82f50479d5fc67287d5fbab3f2.tar.bz2
gentoo-4b22a61f118b7d82f50479d5fc67287d5fbab3f2.zip
media-libs/vigra: drop 1.11.1-r9
Bug: https://bugs.gentoo.org/938737 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/vigra/Manifest1
-rw-r--r--media-libs/vigra/files/vigra-1.11.1-boost-python.patch22
-rw-r--r--media-libs/vigra/files/vigra-1.11.1-fix-incorrect-template-parameter-type.patch139
-rw-r--r--media-libs/vigra/files/vigra-1.11.1-gcc-10.patch46
-rw-r--r--media-libs/vigra/files/vigra-1.11.1-openexr3.patch37
-rw-r--r--media-libs/vigra/files/vigra-1.11.1-python-syntax.patch64
-rw-r--r--media-libs/vigra/files/vigra-1.11.1-python3.12-distutils.patch70
-rw-r--r--media-libs/vigra/files/vigra-1.11.1-python3.7.patch30
-rw-r--r--media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch27
-rw-r--r--media-libs/vigra/vigra-1.11.1-r9.ebuild159
10 files changed, 0 insertions, 595 deletions
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 6bacbbf4893a..02889381064a 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,2 +1 @@
-DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
DIST vigra-1.11.2_p20240505.tar.gz 34219390 BLAKE2B ad92dc6d21acb52c1aa587a4fbe051fb8416ab8f0b5a7560a6d720f38e73d467c9cebb3940cede83827e7657e30438e4d0d52207cffaf208be76f4ff8cdebca9 SHA512 fa51fc456046989e8bf1225d8ae4bac9ef77b24b9343e657c327f817f3a1b622c645ef22772a6c14c30f7e86ec5ab08df8592ec7b21727146d0f775c010cc9d5
diff --git a/media-libs/vigra/files/vigra-1.11.1-boost-python.patch b/media-libs/vigra/files/vigra-1.11.1-boost-python.patch
deleted file mode 100644
index ffa3334f873a..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-boost-python.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 32ce9bc334580de7df3a97b106189145744e3726 Mon Sep 17 00:00:00 2001
-From: Ullrich Koethe <ullrich.koethe@iwr.uni-heidelberg.de>
-Date: Tue, 16 Oct 2018 19:10:56 +0200
-Subject: [PATCH] cmake: add boost_python${MAJOR}${MINOR} (fixes #445)
-
----
- config/FindVIGRANUMPY_DEPENDENCIES.cmake | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/config/FindVIGRANUMPY_DEPENDENCIES.cmake b/config/FindVIGRANUMPY_DEPENDENCIES.cmake
-index f6f9d563b..47cf4237c 100644
---- a/config/FindVIGRANUMPY_DEPENDENCIES.cmake
-+++ b/config/FindVIGRANUMPY_DEPENDENCIES.cmake
-@@ -115,6 +115,8 @@ IF(PYTHONINTERP_FOUND)
- boost_python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}
- # Mac with Python 3
- boost_python${PYTHON_VERSION_MAJOR}
-+ # conda-forge
-+ boost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}
- # default
- boost_python)
-
diff --git a/media-libs/vigra/files/vigra-1.11.1-fix-incorrect-template-parameter-type.patch b/media-libs/vigra/files/vigra-1.11.1-fix-incorrect-template-parameter-type.patch
deleted file mode 100644
index 88ed61ee374c..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-fix-incorrect-template-parameter-type.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 81958d302494e137f98a8b1d7869841532f90388 Mon Sep 17 00:00:00 2001
-From: JaimeIvanCervantes <jimmycc80@hotmail.com>
-Date: Fri, 16 Jun 2017 13:21:45 -0700
-Subject: [PATCH] multi_convolution: Fix for incorrect template parameter type
- when using unsigned int N for TinyVector SIZE. (Fixes #414)
-
----
- include/vigra/multi_convolution.hxx | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/include/vigra/multi_convolution.hxx b/include/vigra/multi_convolution.hxx
-index 1b5efa740..ec89bcf58 100644
---- a/include/vigra/multi_convolution.hxx
-+++ b/include/vigra/multi_convolution.hxx
-@@ -1426,7 +1426,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
- class T2, class S2>
- void
- gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- double sigma,
- ConvolutionOptions<N> opt = ConvolutionOptions<N>());
-
-@@ -1435,7 +1435,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
- class T2, class S2>
- void
- gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- ConvolutionOptions<N> opt);
-
- // likewise, but execute algorithm in parallel
-@@ -1443,7 +1443,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
- class T2, class S2>
- void
- gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- BlockwiseConvolutionOptions<N> opt);
- }
- \endcode
-@@ -1590,7 +1590,7 @@ template <unsigned int N, class T1, class S1,
- class T2, class S2>
- inline void
- gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- ConvolutionOptions<N> opt )
- {
- if(opt.to_point != typename MultiArrayShape<N>::type())
-@@ -1614,7 +1614,7 @@ template <unsigned int N, class T1, class S1,
- class T2, class S2>
- inline void
- gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- double sigma,
- ConvolutionOptions<N> opt = ConvolutionOptions<N>())
- {
-@@ -1653,7 +1653,7 @@ gaussianGradientMagnitudeImpl(MultiArrayView<N+1, T1, S1> const & src,
- dest.init(0.0);
-
- typedef typename NumericTraits<T1>::RealPromote TmpType;
-- MultiArray<N, TinyVector<TmpType, N> > grad(dest.shape());
-+ MultiArray<N, TinyVector<TmpType, int(N)> > grad(dest.shape());
-
- using namespace multi_math;
-
-@@ -1771,7 +1771,7 @@ gaussianGradientMagnitude(MultiArrayView<N+1, Multiband<T1>, S1> const & src,
- class T2, class S2>
- void
- symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- ConvolutionOptions<N> opt = ConvolutionOptions<N>());
-
- // execute algorithm in parallel
-@@ -1779,7 +1779,7 @@ gaussianGradientMagnitude(MultiArrayView<N+1, Multiband<T1>, S1> const & src,
- class T2, class S2>
- void
- symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- BlockwiseConvolutionOptions<N> opt);
- }
- \endcode
-@@ -1895,7 +1895,7 @@ template <unsigned int N, class T1, class S1,
- class T2, class S2>
- inline void
- symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- ConvolutionOptions<N> opt = ConvolutionOptions<N>())
- {
- if(opt.to_point != typename MultiArrayShape<N>::type())
-@@ -2214,14 +2214,14 @@ laplacianOfGaussianMultiArray(MultiArrayView<N, T1, S1> const & source,
- template <unsigned int N, class T1, class S1,
- class T2, class S2>
- void
-- gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
- MultiArrayView<N, T2, S2> divergence,
- ConvolutionOptions<N> const & opt);
-
- template <unsigned int N, class T1, class S1,
- class T2, class S2>
- void
-- gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
- MultiArrayView<N, T2, S2> divergence,
- double sigma,
- ConvolutionOptions<N> opt = ConvolutionOptions<N>());
-@@ -2231,7 +2231,7 @@ laplacianOfGaussianMultiArray(MultiArrayView<N, T1, S1> const & source,
- template <unsigned int N, class T1, class S1,
- class T2, class S2>
- void
-- gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
- MultiArrayView<N, T2, S2> divergence,
- BlockwiseConvolutionOptions<N> const & opt);
- }
-@@ -2324,7 +2324,7 @@ gaussianDivergenceMultiArray(Iterator vectorField, Iterator vectorFieldEnd,
- template <unsigned int N, class T1, class S1,
- class T2, class S2>
- inline void
--gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
- MultiArrayView<N, T2, S2> divergence,
- ConvolutionOptions<N> const & opt)
- {
-@@ -2338,7 +2338,7 @@ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & ve
- template <unsigned int N, class T1, class S1,
- class T2, class S2>
- inline void
--gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
- MultiArrayView<N, T2, S2> divergence,
- double sigma,
- ConvolutionOptions<N> opt = ConvolutionOptions<N>())
diff --git a/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch b/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch
deleted file mode 100644
index 2433ba41712a..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From dc730be49fc8def4304a651fa525e43b7754955e Mon Sep 17 00:00:00 2001
-From: Ullrich Koethe <ullrich.koethe@iwr.uni-heidelberg.de>
-Date: Tue, 16 Oct 2018 19:26:17 +0200
-Subject: [PATCH] fixed noexcept declaration
-
----
- include/vigra/separableconvolution.hxx | 6 +++---
- include/vigra/stdconvolution.hxx | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/include/vigra/separableconvolution.hxx b/include/vigra/separableconvolution.hxx
-index 7ee33c09d..8fd120602 100644
---- a/include/vigra/separableconvolution.hxx
-+++ b/include/vigra/separableconvolution.hxx
-@@ -1409,10 +1409,10 @@ class Kernel1D
- {}
-
- ~InitProxy()
--#ifndef _MSC_VER
-- throw(PreconditionViolation)
--#elif _MSC_VER >= 1900
-+#if _MSC_VER >= 1900 || __cplusplus >= 201103L
- noexcept(false)
-+#else
-+ throw(PreconditionViolation)
- #endif
- {
- vigra_precondition(count_ == 1 || count_ == sum_,
-diff --git a/include/vigra/stdconvolution.hxx b/include/vigra/stdconvolution.hxx
-index 76d61a53f..657247259 100644
---- a/include/vigra/stdconvolution.hxx
-+++ b/include/vigra/stdconvolution.hxx
-@@ -792,10 +792,10 @@ public:
- {}
-
- ~InitProxy()
--#ifndef _MSC_VER
-- throw(PreconditionViolation)
--#elif _MSC_VER >= 1900
-+#if _MSC_VER >= 1900 || __cplusplus >= 201103L
- noexcept(false)
-+#else
-+ throw(PreconditionViolation)
- #endif
- {
- vigra_precondition(count_ == 1 || count_ == sum_,
diff --git a/media-libs/vigra/files/vigra-1.11.1-openexr3.patch b/media-libs/vigra/files/vigra-1.11.1-openexr3.patch
deleted file mode 100644
index 703cd22b9321..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-openexr3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://src.fedoraproject.org/rpms/vigra/raw/rawhide/f/vigra-openexr3.patch
-https://bugs.gentoo.org/823632
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
-
-
- IF(WITH_OPENEXR)
-+ FIND_PACKAGE(Imath CONFIG)
-+ IF(TARGET Imath::Imath)
-+ FIND_PACKAGE(OpenEXR CONFIG)
-+ SET(OPENEXR_LIBRARIES
-+ OpenEXR::OpenEXR
-+ OpenEXR::Iex
-+ OpenEXR::IlmThread
-+ Imath::Imath
-+ )
-+ get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
-+ get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
-+ include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
-+ set(OPENEXR_FOUND TRUE)
-+ ELSE()
- VIGRA_FIND_PACKAGE(OpenEXR)
-+ ENDIF()
- ENDIF()
-
- IF(WITH_HDF5)
---- a/src/impex/CMakeLists.txt
-+++ b/src/impex/CMakeLists.txt
-@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
- ENDIF(TIFF_FOUND)
-
- IF(OPENEXR_FOUND)
-+ cmake_policy(SET CMP0028 NEW)
- TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
- ENDIF(OPENEXR_FOUND)
-
diff --git a/media-libs/vigra/files/vigra-1.11.1-python-syntax.patch b/media-libs/vigra/files/vigra-1.11.1-python-syntax.patch
deleted file mode 100644
index 111bc06d5716..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-python-syntax.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-https://github.com/ukoethe/vigra/commit/aba7e731bdde39516b5470673ce40a0036665201
-https://github.com/ukoethe/vigra/commit/c949d3640266f515eb1e3ecca2b752e13e0c3804
-
-From aba7e731bdde39516b5470673ce40a0036665201 Mon Sep 17 00:00:00 2001
-From: Mark Harfouche <mark.harfouche@gmail.com>
-Date: Mon, 5 Sep 2022 15:10:08 -0400
-Subject: [PATCH] Avoid using `is not` when comparing to an integer
-
----
- vigranumpy/lib/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vigranumpy/lib/__init__.py b/vigranumpy/lib/__init__.py
-index 072a797c6..f598e0a8d 100644
---- a/vigranumpy/lib/__init__.py
-+++ b/vigranumpy/lib/__init__.py
-@@ -1780,7 +1780,7 @@ def handle_click(self, event):
- for yo in range(-1*bs, bs+1):
- xx = x+xo
- yy = y+yo
-- if xo is not 0 or yo is not 0:
-+ if (xo != 0) or (yo != 0):
- if xx >=0 and xx<shape[0] and \
- yy >=0 and yy<shape[0]:
- otherLabel = labels[xx, yy]
-
-From c949d3640266f515eb1e3ecca2b752e13e0c3804 Mon Sep 17 00:00:00 2001
-From: Omari Stephens <xsdg@xsdg.org>
-Date: Tue, 28 Dec 2021 21:54:51 +0000
-Subject: [PATCH] Updates doc generation config for Python 3 compatibility
-
----
- vigranumpy/docsrc/conf.py.cmake2.in | 2 +-
- vigranumpy/docsrc/conf.py.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/vigranumpy/docsrc/conf.py.cmake2.in b/vigranumpy/docsrc/conf.py.cmake2.in
-index e4266a636..175dfb39f 100644
---- a/vigranumpy/docsrc/conf.py.cmake2.in
-+++ b/vigranumpy/docsrc/conf.py.cmake2.in
-@@ -23,7 +23,7 @@ _original_getargspec = inspect.getargspec
- def _getargspec_workaround(*args, **kw):
- try:
- return _original_getargspec(*args, **kw)
-- except TypeError, e:
-+ except TypeError as e:
- if str(e).startswith('arg is not a Python function'):
- return inspect.ArgSpec([], None, None, None)
- else:
-diff --git a/vigranumpy/docsrc/conf.py.in b/vigranumpy/docsrc/conf.py.in
-index 607559352..ac2261d20 100644
---- a/vigranumpy/docsrc/conf.py.in
-+++ b/vigranumpy/docsrc/conf.py.in
-@@ -22,7 +22,7 @@ _original_getargspec = inspect.getargspec
- def _getargspec_workaround(*args, **kw):
- try:
- return _original_getargspec(*args, **kw)
-- except TypeError, e:
-+ except TypeError as e:
- if str(e).startswith('arg is not a Python function'):
- return inspect.ArgSpec([], None, None, None)
- else:
-
-
diff --git a/media-libs/vigra/files/vigra-1.11.1-python3.12-distutils.patch b/media-libs/vigra/files/vigra-1.11.1-python3.12-distutils.patch
deleted file mode 100644
index 7001a2a0217e..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-python3.12-distutils.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-https://github.com/ukoethe/vigra/commit/1203cccaed97c276d7c3cf6886730d03f6e8dfc6
-
-(But with some edits for more distutils removals & rebase.)
-
-From 1203cccaed97c276d7c3cf6886730d03f6e8dfc6 Mon Sep 17 00:00:00 2001
-From: Mark Harfouche <mark.harfouche@gmail.com>
-Date: Sat, 30 Sep 2023 16:25:08 -0400
-Subject: [PATCH] Do not use distutils since it is deprecated
-
---- a/vigranumpy/setup.py.cmake2.in
-+++ b/vigranumpy/setup.py.cmake2.in
-@@ -1,5 +1,8 @@
--import distutils, ctypes.util, shutil, os, sys
--from distutils.core import setup
-+import ctypes.util
-+import shutil
-+import os
-+import sys
-+from setuptools import setup
-
- # copy the required DLLs to the directory $vigranumpy_tmp_dir/dlls
- # if additional libraries are linked dynamically (e.g. tiff, png)
---- a/vigranumpy/setup.py.in
-+++ b/vigranumpy/setup.py.in
-@@ -1,5 +1,9 @@
--import distutils, ctypes.util, shutil, os, sys
--from distutils.core import setup
-+import ctypes.util
-+import shutil
-+import os
-+import sys
-+from setuptools import setup
-+
-
- # copy the required DLLs to the directory $vigranumpy_tmp_dir/dlls
- # if additional libraries are linked dynamically (e.g. tiff, png)
-
---- a/config/FindVIGRANUMPY_DEPENDENCIES.cmake
-+++ b/config/FindVIGRANUMPY_DEPENDENCIES.cmake
-@@ -40,7 +40,7 @@ IF(PYTHONINTERP_FOUND)
- #
- ######################################################################
- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
-- "from distutils.sysconfig import *; print(get_python_inc())"
-+ "import sysconfig; print(sysconfig.get_paths()['include'])"
- OUTPUT_VARIABLE PYTHON_INCLUDE OUTPUT_STRIP_TRAILING_WHITESPACE)
- SET(PYTHON_INCLUDE_PATH ${PYTHON_INCLUDE}
- CACHE PATH "Path to Python include files"
-@@ -66,10 +66,10 @@ IF(PYTHONINTERP_FOUND)
- set(PYTHON_LIBRARY_NAME python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
- ELSE()
- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
-- "from distutils.sysconfig import *; print(get_config_var('LDLIBRARY'))"
-+ "import sysconfig; print(sysconfig.get_config_var('LDLIBRARY'))"
- OUTPUT_VARIABLE PYTHON_LIBRARY_NAME OUTPUT_STRIP_TRAILING_WHITESPACE)
- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
-- "from distutils.sysconfig import *; print(get_config_var('LIBDIR'))"
-+ "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))"
- OUTPUT_VARIABLE PYTHON_LIBRARY_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
- ENDIF()
- FIND_LIBRARY(PYTHON_LIBRARIES ${PYTHON_LIBRARY_NAME} HINTS "${PYTHON_LIBRARY_PREFIX}" "${PYTHON_PREFIX}"
-@@ -139,7 +139,7 @@ IF(PYTHONINTERP_FOUND)
- ######################################################################
- IF(NOT DEFINED VIGRANUMPY_INSTALL_DIR OR VIGRANUMPY_INSTALL_DIR MATCHES "^$")
- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
-- "from distutils.sysconfig import *; print(get_python_lib(1))"
-+ "import sysconfig; print(sysconfig.get_paths()['purelib'])"
- OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
- FILE(TO_CMAKE_PATH ${PYTHON_SITE_PACKAGES} VIGRANUMPY_INSTALL_DIR)
- ENDIF()
diff --git a/media-libs/vigra/files/vigra-1.11.1-python3.7.patch b/media-libs/vigra/files/vigra-1.11.1-python3.7.patch
deleted file mode 100644
index 2e6cd3469f8e..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-python3.7.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a6fa62663c6a6b752ed0707e95f643e25867a0f9 Mon Sep 17 00:00:00 2001
-From: John Kirkham <kirkhamj@janelia.hhmi.org>
-Date: Fri, 19 Oct 2018 11:32:42 -0400
-Subject: [PATCH] Receive `const char *` from `PyUnicode_AsUTF8`
-
-In Python 3.7, `PyUnicode_AsUTF8` was changed to return a `const char *`
-instead of a `char *`. This broke VIGRA as we were accepting a `char *`
-in this case instead. Fortunately we do not need it to be mutable for
-our use case. So just type the variable storing the result from
-`PyUnicode_AsUTF8` as a `const char *`. Should still work on older
-Python 3 versions that return `char *` as well.
-
-ref: https://bugs.python.org/issue28769
----
- vigranumpy/src/core/vigranumpycore.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vigranumpy/src/core/vigranumpycore.cxx b/vigranumpy/src/core/vigranumpycore.cxx
-index ec38d3636..c81c6ae52 100644
---- a/vigranumpy/src/core/vigranumpycore.cxx
-+++ b/vigranumpy/src/core/vigranumpycore.cxx
-@@ -61,7 +61,7 @@ UInt32 pychecksum(python::str const & s)
- return checksum(data, size);
- #else
- Py_ssize_t size = 0;
-- char * data = PyUnicode_AsUTF8AndSize(s.ptr(), &size);
-+ const char * data = PyUnicode_AsUTF8AndSize(s.ptr(), &size);
- return checksum(data, size);
- #endif
- }
diff --git a/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch b/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch
deleted file mode 100644
index fc265763f6ad..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Replace sphinx.ext.pngmath by sphinx.ext.imgmath to build with sphinx 1.8
-Bug-Debian: https://bugs.debian.org/923467
-Author: Andreas Tille <tille@debian.org>
-Last-Update: Fri, 08 Mar 2019 18:38:02 +0100
-
---- a/vigranumpy/docsrc/conf.py.cmake2.in
-+++ b/vigranumpy/docsrc/conf.py.cmake2.in
-@@ -59,7 +59,7 @@ os.environ['PATH'] = os.pathsep.join([vi
-
- # Add any Sphinx extension module names here, as strings. They can be extensions
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath']
-+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.imgmath']
-
- # Add any paths that contain templates here, relative to this directory.
- templates_path = ['_templates']
---- a/vigranumpy/docsrc/conf.py.in
-+++ b/vigranumpy/docsrc/conf.py.in
-@@ -58,7 +58,7 @@ os.environ['PATH'] = os.pathsep.join([vi
-
- # Add any Sphinx extension module names here, as strings. They can be extensions
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath']
-+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.imgmath']
-
- # Add any paths that contain templates here, relative to this directory.
- templates_path = ['_templates']
diff --git a/media-libs/vigra/vigra-1.11.1-r9.ebuild b/media-libs/vigra/vigra-1.11.1-r9.ebuild
deleted file mode 100644
index 07f703b229be..000000000000
--- a/media-libs/vigra/vigra-1.11.1-r9.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-inherit cmake flag-o-matic python-r1
-
-DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
-HOMEPAGE="https://ukoethe.github.io/vigra/"
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
- KEYWORDS="amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff +zlib"
-
-REQUIRED_USE="
- python? ( hdf5 ${PYTHON_REQUIRED_USE} )
- test? ( hdf5 python fftw )"
-
-# runtime dependency on python is required by the vigra-config script
-DEPEND="
- fftw? ( sci-libs/fftw:3.0= )
- hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
- jpeg? ( media-libs/libjpeg-turbo:= )
- openexr? (
- >=dev-libs/imath-3.1.4-r2:=
- >=media-libs/openexr-3:0=
- )
- png? ( media-libs/libpng:0= )
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost:=[python?,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- tiff? ( media-libs/tiff:= )
- zlib? ( sys-libs/zlib )
-"
-RDEPEND="${PYTHON_DEPS}
- ${DEPEND}
-"
-
-# Severely broken, also disabled in Fedora, bugs #390447, #653442
-RESTRICT="test"
-
-PATCHES=(
- # git master
- "${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
- "${FILESDIR}/${P}-boost-python.patch"
- "${FILESDIR}/${P}-python3.7.patch" # bug 701208
- "${FILESDIR}/${P}-gcc-10.patch" # bug 723302
- "${FILESDIR}/${PN}-1.11.2-python3.12-remove-imp.patch" # bug 929649
- "${FILESDIR}/${PN}-1.11.1-python3.12-distutils.patch" # bug 929649
- # TODO: upstream
- "${FILESDIR}/${P}-lib_suffix.patch"
- "${FILESDIR}/${P}-cmake-module-dir.patch"
- "${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308
- "${FILESDIR}/${P}-openexr3.patch"
- "${FILESDIR}/${P}-python-syntax.patch"
-)
-
-pkg_setup() {
- use python && python_setup
-}
-
-src_prepare() {
- vigra_disable() {
- if ! use ${1}; then
- sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled by USE=${1}: /" \
- -i CMakeLists.txt || die "failed to disable ${1}"
- fi
- }
-
- cmake_src_prepare
-
- vigra_disable fftw fftw3
- vigra_disable fftw fftw3f
- vigra_disable jpeg
- vigra_disable png
- vigra_disable tiff
- vigra_disable zlib
-
- # Don't use python_fix_shebang because we can't put this behind USE="python"
- sed -i -e '/env/s:python:python3:' config/vigra-config.in || die
-
- use doc || cmake_comment_add_subdirectory docsrc
-
- if ! use test; then
- cmake_comment_add_subdirectory test
- cmake_run_in vigranumpy cmake_comment_add_subdirectory test
- fi
-}
-
-src_configure() {
- # Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12)
- # bug #808731
- use hdf5 && append-cppflags -DH5_USE_110_API
-
- vigra_configure() {
- local mycmakeargs=(
- -DAUTOEXEC_TESTS=OFF
- -DDOCINSTALL="share/doc/${PF}/html"
- -DWITH_HDF5=$(usex hdf5)
- -DWITH_OPENEXR=$(usex openexr)
- -DWITH_VALGRIND=OFF # only used for tests
- -DWITH_VIGRANUMPY=$(usex python)
- )
- cmake_src_configure
- }
-
- if use python; then
- python_foreach_impl vigra_configure
- else
- vigra_configure
- fi
-}
-
-src_compile() {
- local VIGRA_BUILD_DIR
- vigra_compile() {
- cmake_src_compile
- VIGRA_BUILD_DIR="${BUILD_DIR}"
- }
- if use python; then
- python_foreach_impl vigra_compile
- else
- vigra_compile
- fi
-}
-
-src_install() {
- if use python; then
- python_foreach_impl cmake_src_install
- python_optimize
- else
- cmake_src_install
- fi
-}
-
-src_test() {
- # perhaps disable tests (see #390447)
- vigra_test() {
- PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
- }
- if use python; then
- python_foreach_impl vigra_test
- else
- vigra_test
- fi
-}