devel/py-cppy, math/py-kiwisolver: fix versions

These ports install lib tagged as v0.0.0.
Both ports require devel/py-setuptools_scm to generate
the version of the library.

PR:		267120
Reported by:	jwb
Reviewed by:	jwb

18 files changed, 25 insertions, 6 deletions

diff --git a/devel/py-cppy/Makefile b/devel/py-cppy/Makefile
index 500b7ae66b80..9d646ac42443 100644
--- a/devel/py-cppy/Makefile
+++ b/devel/py-cppy/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	cppy
 DISTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,6 +12,9 @@ WWW=		https://pypi.python.org/pypi/cppy
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
diff --git a/graphics/py-cartopy/Makefile b/graphics/py-cartopy/Makefile
index 0f427de1fbd5..e06ac4ceb7f5 100644
--- a/graphics/py-cartopy/Makefile
+++ b/graphics/py-cartopy/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	cartopy
 PORTVERSION=	0.21.0
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-momepy/Makefile b/graphics/py-momepy/Makefile
index ced845661958..dd874a58f603 100644
--- a/graphics/py-momepy/Makefile
+++ b/graphics/py-momepy/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	momepy
 PORTVERSION=	0.5.4
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-osmnet/Makefile b/graphics/py-osmnet/Makefile
index 36f509446fd9..fbacaae2b60b 100644
--- a/graphics/py-osmnet/Makefile
+++ b/graphics/py-osmnet/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	osmnet
 PORTVERSION=	0.1.6
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
index e8d73f96d05c..1148816bd8a2 100644
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	qgis
 DISTVERSION=	3.22.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/
 PKGNAMESUFFIX=	-ltr
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 73e7c7f85f57..4b9265691e87 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	qgis
 DISTVERSION=	3.26.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/
 
diff --git a/math/py-kiwisolver/Makefile b/math/py-kiwisolver/Makefile
index f61b2c444e09..4f8890a24242 100644
--- a/math/py-kiwisolver/Makefile
+++ b/math/py-kiwisolver/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	kiwisolver
 PORTVERSION=	1.4.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
@@ -11,7 +12,10 @@ WWW=		https://github.com/nucleic/kiwi
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}cppy>=1.1.0:devel/py-cppy@${PY_FLAVOR}
+BUILD_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}cppy>=1.1.0:devel/py-cppy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+
 
 USES=		compiler:c++11-lang python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile
index f232334d85f2..82451814bd0a 100644
--- a/math/py-matplotlib/Makefile
+++ b/math/py-matplotlib/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	matplotlib
 PORTVERSION=	3.4.3
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-matplotlib2/Makefile b/math/py-matplotlib2/Makefile
index cdd8a90997ff..8c5bd827f3ae 100644
--- a/math/py-matplotlib2/Makefile
+++ b/math/py-matplotlib2/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	matplotlib
 DISTVERSION=	2.2.4
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-splot/Makefile b/math/py-splot/Makefile
index 7f849361ae77..8beedda9b36c 100644
--- a/math/py-splot/Makefile
+++ b/math/py-splot/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	splot
 PORTVERSION=	1.1.5.post1
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-spopt/Makefile b/math/py-spopt/Makefile
index 1bb8147aeb6a..31ae5f54f11f 100644
--- a/math/py-spopt/Makefile
+++ b/math/py-spopt/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	spopt
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/math/sage/Makefile b/math/sage/Makefile
index c01f5a830c24..8629b9e8ff76 100644
--- a/math/sage/Makefile
+++ b/math/sage/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	sage
 PORTVERSION=	9.2
-PORTREVISION=	32
+PORTREVISION=	34
 CATEGORIES=	math
 MASTER_SITES=	https://mirrors.xmission.com/sage/src/		\
 		http://mirrors.xmission.com/sage/src/		\
diff --git a/science/py-access/Makefile b/science/py-access/Makefile
index e801610fbd33..02dd742c5df4 100644
--- a/science/py-access/Makefile
+++ b/science/py-access/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	access
 PORTVERSION=	1.1.8
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-esda/Makefile b/science/py-esda/Makefile
index a601599d0a0c..dd42a09245ea 100644
--- a/science/py-esda/Makefile
+++ b/science/py-esda/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	esda
 PORTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-pycsw/Makefile b/science/py-pycsw/Makefile
index abf7d41c392b..55965f3438cd 100644
--- a/science/py-pycsw/Makefile
+++ b/science/py-pycsw/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pycsw
 PORTVERSION=	2.6.1
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-pygeometa/Makefile b/science/py-pygeometa/Makefile
index dba1d4b45a1c..fe205007699c 100644
--- a/science/py-pygeometa/Makefile
+++ b/science/py-pygeometa/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pygeometa
 PORTVERSION=	0.13.1
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-segregation/Makefile b/science/py-segregation/Makefile
index eed4ead68915..94bdbf66d7d7 100644
--- a/science/py-segregation/Makefile
+++ b/science/py-segregation/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	segregation
 PORTVERSION=	2.3.1
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-tobler/Makefile b/science/py-tobler/Makefile
index 902efe9cbbd0..d61d1df5a156 100644
--- a/science/py-tobler/Makefile
+++ b/science/py-tobler/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	tobler
 PORTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}