math/py-primme: update 3.2.1 → 3.2.2

Reported by:	portscout

3 files changed, 12 insertions, 69 deletions

diff --git a/math/py-primme/Makefile b/math/py-primme/Makefile
index a52af0aa4fa0..afc596e83e0c 100644
--- a/math/py-primme/Makefile
+++ b/math/py-primme/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	primme
-DISTVERSION=	3.2.1
-PORTREVISION=	1
+DISTVERSION=	3.2.2
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,16 +10,20 @@ WWW=		https://www.cs.wm.edu/~andreas/software/
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
-LIB_DEPENDS=	libprimme.so:math/primme
+BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYNUMPY} \
+		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+LIB_DEPENDS=	libprimme.so:math/primme \
+		libblas.so:math/blas \
+		liblapack.so:math/lapack
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
 
 USES=		fortran gmake localbase:ldflags python shebangfix
-USE_PYTHON=	distutils cython autoplist
+USE_PYTHON=	pep517 cython autoplist
 
 TEST_TARGET=	test
 
diff --git a/math/py-primme/distinfo b/math/py-primme/distinfo
index 48fa2f5b68b7..e949d039bf54 100644
--- a/math/py-primme/distinfo
+++ b/math/py-primme/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1652145885
-SHA256 (primme-3.2.1.tar.gz) = 0d10daa32899eca8aaf9a3e1dcf7ce088acb17e04668b7317087d279e48db256
-SIZE (primme-3.2.1.tar.gz) = 543155
+TIMESTAMP = 1716351600
+SHA256 (primme-3.2.2.tar.gz) = 9260f8d56c3a9e67abfb2af1c4a5d1b4997959690b1ef6fa7209a25958927d32
+SIZE (primme-3.2.2.tar.gz) = 624043
diff --git a/math/py-primme/files/patch-setup.py b/math/py-primme/files/patch-setup.py
deleted file mode 100644
index 7beb0297e2aa..000000000000
--- a/math/py-primme/files/patch-setup.py
+++ /dev/null
@@ -1,60 +0,0 @@
---- setup.py.orig	2018-10-26 18:03:19 UTC
-+++ setup.py
-@@ -16,31 +16,33 @@ def get_numpy_options():
-    numpy_include = numpy.get_include()
- 
-    # Obtain BLAS/LAPACK linking options
--   lapack_info = get_info('lapack_opt')
--   blas_info = get_info('blas_opt')
--   using_atlas = False
--   using_f77blas = False
--   using_lapack = False
--   for l in lapack_info.get('libraries', []) + blas_info.get('libraries', []):
--      if "atlas" in l: using_atlas = True
--      if "f77blas" in l: using_f77blas = True
--      if "lapack" in l: using_lapack = True
--   if using_atlas and (not using_f77blas or not using_lapack):
--      lapack_info = get_info('atlas')
--      # ATLAS notices an incomplete LAPACK by not setting language to f77
--      complete_lapack = lapack_info.get('language', "") == "f77"
--      if complete_lapack:
--         blas_info = {}
--      else:
--         # If ATLAS has an incomplete LAPACK, use a regular one
--         blas_info = get_info('atlas_blas')
--         lapack_info = get_info('lapack')
-+   #lapack_info = get_info('lapack_opt')
-+   #blas_info = get_info('blas_opt')
-+   #using_atlas = False
-+   #using_f77blas = False
-+   #using_lapack = False
-+   #for l in lapack_info.get('libraries', []) + blas_info.get('libraries', []):
-+   #   if "atlas" in l: using_atlas = True
-+   #   if "f77blas" in l: using_f77blas = True
-+   #   if "lapack" in l: using_lapack = True
-+   #if using_atlas and (not using_f77blas or not using_lapack):
-+   #   lapack_info = get_info('atlas')
-+   #   # ATLAS notices an incomplete LAPACK by not setting language to f77
-+   #   complete_lapack = lapack_info.get('language', "") == "f77"
-+   #   if complete_lapack:
-+   #      blas_info = {}
-+   #   else:
-+   #      # If ATLAS has an incomplete LAPACK, use a regular one
-+   #      blas_info = get_info('atlas_blas')
-+   #      lapack_info = get_info('lapack')
-    
--   blaslapack_libraries = lapack_info.get('libraries', []) + blas_info.get('libraries', [])
--   blaslapack_library_dirs = lapack_info.get('library_dirs', []) + blas_info.get('library_dirs', [])
--   blaslapack_extra_link_args = lapack_info.get('extra_link_args', []) + blas_info.get('extra_link_args', [])
--   if not blaslapack_libraries and not blaslapack_extra_link_args:
--       blaslapack_libraries = ['lapack', 'blas']
-+   #blaslapack_libraries = lapack_info.get('libraries', []) + blas_info.get('libraries', [])
-+   #blaslapack_library_dirs = lapack_info.get('library_dirs', []) + blas_info.get('library_dirs', [])
-+   #blaslapack_extra_link_args = lapack_info.get('extra_link_args', []) + blas_info.get('extra_link_args', [])
-+   #if not blaslapack_libraries and not blaslapack_extra_link_args:
-+   blaslapack_libraries = []
-+   blaslapack_extra_link_args = []
-+   blaslapack_library_dirs = []
- 
-    r = dict(
-                    include_dirs = [numpy_include, "primme/include", "primme/src/include"],