git: 2d76732556ae - main - graphics/py-cartopy: Update to 0.22.0

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2d76732556aec9b9c4e51761dfb348ce32d9ee30

commit 2d76732556aec9b9c4e51761dfb348ce32d9ee30
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-08-21 17:04:23 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-08-21 17:04:23 +0000

    graphics/py-cartopy: Update to 0.22.0
    
    - Convert to USE_PYTHON=pep517
    
    Changes:        https://github.com/SciTools/cartopy/releases
---
 graphics/py-cartopy/Makefile                   | 28 ++++++++++++--------------
 graphics/py-cartopy/distinfo                   |  6 +++---
 graphics/py-cartopy/files/patch-pyproject.toml | 19 +++++++++++++++++
 3 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/graphics/py-cartopy/Makefile b/graphics/py-cartopy/Makefile
index 4a49c9928082..33bc8af8e457 100644
--- a/graphics/py-cartopy/Makefile
+++ b/graphics/py-cartopy/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	cartopy
-PORTVERSION=	0.21.1
-PORTREVISION=	1
+PORTVERSION=	0.22.0
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,28 +12,27 @@ WWW=		https://github.com/SciTools/cartopy
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
-BUILD_DEPENDS=	geos>=3.7.2:graphics/geos \
-		${PYTHON_PKGNAMEPREFIX}numpy>=1.19,1:math/py-numpy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
-LIB_DEPENDS=	libgeos.so:graphics/geos
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=3.1:math/py-matplotlib@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}numpy>=1.19,1:math/py-numpy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyproj>=3.0.0:graphics/py-pyproj@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools>=40.6.0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=6.0.0:devel/py-setuptools_scm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4:math/py-matplotlib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}numpy>=1.21,1:math/py-numpy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}packaging>=20:devel/py-packaging@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyproj>=3.1.0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyshp>=2.1:devel/py-pyshp@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.3.0:devel/py-six@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}shapely>=1.7:devel/py-shapely@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist concurrent cython distutils
+USE_PYTHON=	autoplist concurrent cython pep517
 
 OPTIONS_DEFINE=	OWS PLOTTING
 OWS_DESC=	OGC Web Service support
 PLOTTING_DESC=	Plotting support
 
-OWS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}OWSLib>=0.18.0:graphics/py-OWSLib@${PY_FLAVOR} \
+OWS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}OWSLib>=0.20.0:graphics/py-OWSLib@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pillow>=6.1.0:graphics/py-pillow@${PY_FLAVOR}
-PLOTTING_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdal>=2.3.2:graphics/py-gdal@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}pillow>=6.1.0:graphics/py-pillow@${PY_FLAVOR} \
+PLOTTING_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=6.1.0:graphics/py-pillow@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}scipy>=1.3.1:science/py-scipy@${PY_FLAVOR}
 
 post-install:
diff --git a/graphics/py-cartopy/distinfo b/graphics/py-cartopy/distinfo
index b30e08f73734..2782fcd5170e 100644
--- a/graphics/py-cartopy/distinfo
+++ b/graphics/py-cartopy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1674589934
-SHA256 (Cartopy-0.21.1.tar.gz) = 89d5649712c8582231c6e11825a04c85f6f0cee94dbb89e4db23eabca1cc250a
-SIZE (Cartopy-0.21.1.tar.gz) = 10917080
+TIMESTAMP = 1692211791
+SHA256 (Cartopy-0.22.0.tar.gz) = b300f90120931d43f11ef87c064ea1dacec1b59a4940aa76ebf82cf09548bb49
+SIZE (Cartopy-0.22.0.tar.gz) = 10938577
diff --git a/graphics/py-cartopy/files/patch-pyproject.toml b/graphics/py-cartopy/files/patch-pyproject.toml
new file mode 100644
index 000000000000..6bd998ddad34
--- /dev/null
+++ b/graphics/py-cartopy/files/patch-pyproject.toml
@@ -0,0 +1,19 @@
+--- pyproject.toml.orig	2023-08-05 00:47:19 UTC
++++ pyproject.toml
+@@ -3,13 +3,13 @@ requires = [
+     "wheel",
+     "setuptools >= 40.6.0",
+     "Cython >= 0.29.24",
+-    "oldest-supported-numpy",
+-    "setuptools_scm >= 7.0.0",
++    "numpy",
++    "setuptools_scm >= 6.0.0",
+ ]
+ build-backend = "setuptools.build_meta"
+ 
+ [project]
+-name = "Cartopy"
++name = "cartopy"
+ authors = [
+     {name = "UK Met Office"},
+ ]