git: a2f2582c5c9a - main - devel/py-ipykernel5: Remove in favor of devel/py-ipykernel

From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Sat, 15 Oct 2022 16:54:07 UTC
The branch main has been updated by yuri:

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

commit a2f2582c5c9a3c7b962fa93f8da4ac69294f3fa6
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-10-15 16:47:12 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-10-15 16:47:12 +0000

    devel/py-ipykernel5: Remove in favor of devel/py-ipykernel
    
    Ports were switched to devel/py-ipykernel5 on 2020-05-07
    because devel/py-ipykernel has expired at the time.
    
    Currently main consumers of devel/py-ipykernel - Jupyter and
    Spyder - work fine with devel/py-ipykernel.
    
    There is no reason to use an outdated devel/py-ipykernel5 everywhere.
---
 MOVED                             |  1 +
 devel/Makefile                    |  1 -
 devel/py-ipykernel5/Makefile      | 27 ---------------------------
 devel/py-ipykernel5/distinfo      |  3 ---
 devel/py-ipykernel5/pkg-descr     |  1 -
 devel/py-ipympl/Makefile          |  3 ++-
 devel/py-ipyparallel/Makefile     |  3 ++-
 devel/py-ipywidgets/Makefile      |  3 ++-
 devel/py-jupyter_console/Makefile |  4 ++--
 devel/py-nbclassic/Makefile       |  4 ++--
 devel/py-qtconsole/Makefile       |  2 +-
 devel/py-spyder-kernels/Makefile  |  3 ++-
 math/py-mathics/Makefile          |  4 ++--
 math/sage/Makefile                |  6 +++---
 science/py-jupyter_jsmol/Makefile |  3 ++-
 www/py-notebook/Makefile          |  4 ++--
 16 files changed, 23 insertions(+), 49 deletions(-)

diff --git a/MOVED b/MOVED
index d563ed57a9ff..39898e76bd71 100644
--- a/MOVED
+++ b/MOVED
@@ -17599,3 +17599,4 @@ www/rubygem-rack223|www/rubygem-rack|2022-10-09|Remove obsoleted port. Use www/r
 databases/pymongo|databases/py-pymongo|2022-10-09|Add the py- prefix which all Python ports should have
 audio/protracker|audio/pt2-clone|2022-10-12|Renamed to match project name
 multimedia/gstreamer1-transcoder|multimedia/gstreamer1-plugins-bad|2022-10-15|Upstream included transcoding in plugins-bad
+devel/py-ipykernel5|devel/py-ipykernel|2022-10-15|ipykernel5 is discontinued, ipykernel is used instead
diff --git a/devel/Makefile b/devel/Makefile
index 474d071a7d99..7fa3b5d25299 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -4667,7 +4667,6 @@
     SUBDIR += py-ipaddr
     SUBDIR += py-ipdb
     SUBDIR += py-ipykernel
-    SUBDIR += py-ipykernel5
     SUBDIR += py-ipympl
     SUBDIR += py-ipyparallel
     SUBDIR += py-ipython_genutils
diff --git a/devel/py-ipykernel5/Makefile b/devel/py-ipykernel5/Makefile
deleted file mode 100644
index a09fe5be255d..000000000000
--- a/devel/py-ipykernel5/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-PORTNAME=	ipykernel
-PORTVERSION=	5.5.6
-CATEGORIES=	devel python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX=	5
-
-MAINTAINER=	python@FreeBSD.org
-COMMENT=	IPython Kernel for Jupyter
-WWW=		https://ipython.org/
-
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/COPYING.md
-
-BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>=5.0.0:devel/ipython@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}jupyter-client>=0:devel/py-jupyter-client@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tornado>=4.2:www/py-tornado@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}traitlets>=4.1.0:devel/py-traitlets@${PY_FLAVOR}
-
-USES=		python:3.7+
-USE_PYTHON=	autoplist distutils
-
-NO_ARCH=	yes
-
-.include <bsd.port.mk>
diff --git a/devel/py-ipykernel5/distinfo b/devel/py-ipykernel5/distinfo
deleted file mode 100644
index 82d941f2aca9..000000000000
--- a/devel/py-ipykernel5/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1650229192
-SHA256 (ipykernel-5.5.6.tar.gz) = 4ea44b90ae1f7c38987ad58ea0809562a17c2695a0499644326f334aecd369ec
-SIZE (ipykernel-5.5.6.tar.gz) = 112924
diff --git a/devel/py-ipykernel5/pkg-descr b/devel/py-ipykernel5/pkg-descr
deleted file mode 100644
index f0974bc59ff5..000000000000
--- a/devel/py-ipykernel5/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-IPython Kernel for Jupyter.
diff --git a/devel/py-ipympl/Makefile b/devel/py-ipympl/Makefile
index 6373bf49d29e..9ebf99c8e6c8 100644
--- a/devel/py-ipympl/Makefile
+++ b/devel/py-ipympl/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ipympl
 DISTVERSION=	0.9.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jupyter-packaging>0:devel/py-jupyter-packaging@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipykernel5>=4.7:devel/py-ipykernel5@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipykernel>=4.7:devel/py-ipykernel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipywidgets>=7.6.0:devel/py-ipywidgets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.0.0:math/py-matplotlib@${PY_FLAVOR}
 
diff --git a/devel/py-ipyparallel/Makefile b/devel/py-ipyparallel/Makefile
index b867654eb679..a25bc1755149 100644
--- a/devel/py-ipyparallel/Makefile
+++ b/devel/py-ipyparallel/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ipyparallel
 PORTVERSION=	8.4.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING.md
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}entrypoints>=0:devel/py-entrypoints@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ipykernel5>=4.4:devel/py-ipykernel5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ipykernel>=4.4:devel/py-ipykernel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython>=4.0.0:devel/ipython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jupyter-client>=0:devel/py-jupyter-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}notebook>=0:www/py-notebook@${PY_FLAVOR} \
diff --git a/devel/py-ipywidgets/Makefile b/devel/py-ipywidgets/Makefile
index 12b92a23b2a2..5c41af4fee6a 100644
--- a/devel/py-ipywidgets/Makefile
+++ b/devel/py-ipywidgets/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ipywidgets
 PORTVERSION=	7.6.5
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ WWW=		https://ipywidgets.readthedocs.io
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipykernel5>=4.5.1:devel/py-ipykernel5@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipykernel>=4.5.1:devel/py-ipykernel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython>=4.0.0:devel/ipython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=4.2.0:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}traitlets>=4.3.1:devel/py-traitlets@${PY_FLAVOR} \
diff --git a/devel/py-jupyter_console/Makefile b/devel/py-jupyter_console/Makefile
index fa61d2649561..f1278d82b531 100644
--- a/devel/py-jupyter_console/Makefile
+++ b/devel/py-jupyter_console/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	jupyter_console
 PORTVERSION=	6.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING.md
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jupyter-client>=0:devel/py-jupyter-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython>=7.0.0:devel/ipython@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ipykernel5>=5.0.0:devel/py-ipykernel5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ipykernel>=5.0.0:devel/py-ipykernel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=2.0.0<3.1.0:devel/py-prompt-toolkit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR}
 
diff --git a/devel/py-nbclassic/Makefile b/devel/py-nbclassic/Makefile
index 1a447d7e3b2f..e285daca8e29 100644
--- a/devel/py-nbclassic/Makefile
+++ b/devel/py-nbclassic/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	nbclassic
 PORTVERSION=	0.4.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP \
 		https://github.com/jupyter/nbclassic/releases/download/v${PORTVERSION}/
@@ -14,7 +14,7 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argon2-cffi>=0:security/py-argon2-cffi@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ipykernel5>=0:devel/py-ipykernel5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ipykernel>=0:devel/py-ipykernel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jupyter-client>=6.1.1:devel/py-jupyter-client@${PY_FLAVOR} \
diff --git a/devel/py-qtconsole/Makefile b/devel/py-qtconsole/Makefile
index 08e7fb3d4248..d548f4da9dc8 100644
--- a/devel/py-qtconsole/Makefile
+++ b/devel/py-qtconsole/Makefile
@@ -12,7 +12,7 @@ WWW=		https://qtconsole.readthedocs.io/
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipykernel5>=5.1:devel/py-ipykernel5@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipykernel>=5.1:devel/py-ipykernel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jupyter-client>=4.1:devel/py-jupyter-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jupyter-core>=0:devel/py-jupyter-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
diff --git a/devel/py-spyder-kernels/Makefile b/devel/py-spyder-kernels/Makefile
index 009fd6528533..0a6d34c3a9cd 100644
--- a/devel/py-spyder-kernels/Makefile
+++ b/devel/py-spyder-kernels/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	spyder-kernels
 PORTVERSION=	2.3.3
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,7 +20,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 # situations.
 # devel/py-ipykernel      should be >=6.9.2,<7, but is 5.5.6 (conflicts ...)
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ipykernel5>0:devel/py-ipykernel5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ipykernel>0:devel/py-ipykernel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipyparallel>0:devel/py-ipyparallel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython>=7.31.1,<8:devel/ipython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jupyter-client>=7.3.4<8:devel/py-jupyter-client@${PY_FLAVOR} \
diff --git a/math/py-mathics/Makefile b/math/py-mathics/Makefile
index f0562fa3325c..4bf3aba3f9f1 100644
--- a/math/py-mathics/Makefile
+++ b/math/py-mathics/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	Mathics3
 PORTVERSION=	5.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -50,7 +50,7 @@ RUN_DEPENDS=	${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}palettable>0:misc/py-palettable@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tifffile>0:graphics/py-tifffile@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ipykernel5>0:devel/py-ipykernel5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ipykernel>0:devel/py-ipykernel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycountry>0:textproc/py-pycountry@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wordcloud>0:textproc/py-wordcloud@${PY_FLAVOR} \
diff --git a/math/sage/Makefile b/math/sage/Makefile
index 8901003c134d..94df27cc2620 100644
--- a/math/sage/Makefile
+++ b/math/sage/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	sage
 PORTVERSION=	9.2
-PORTREVISION=	30
+PORTREVISION=	31
 CATEGORIES=	math
 MASTER_SITES=	https://mirrors.xmission.com/sage/src/		\
 		http://mirrors.xmission.com/sage/src/		\
@@ -47,7 +47,7 @@ BUILD_DEPENDS=	bash:shells/bash		\
 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}imagesize>0:graphics/py-imagesize@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR}\
-		${PYTHON_PKGNAMEPREFIX}ipykernel5>0:devel/py-ipykernel5@${PY_FLAVOR}\
+		${PYTHON_PKGNAMEPREFIX}ipykernel>0:devel/py-ipykernel@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipython_genutils>0:devel/py-ipython_genutils@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR}\
@@ -243,7 +243,7 @@ RUN_DEPENDS=	bash:shells/bash		\
 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}imagesize>0:graphics/py-imagesize@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR}\
-		${PYTHON_PKGNAMEPREFIX}ipykernel5>0:devel/py-ipykernel5@${PY_FLAVOR}\
+		${PYTHON_PKGNAMEPREFIX}ipykernel>0:devel/py-ipykernel@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipython_genutils>0:devel/py-ipython_genutils@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR}\
diff --git a/science/py-jupyter_jsmol/Makefile b/science/py-jupyter_jsmol/Makefile
index e8813027319c..662c978f3f95 100644
--- a/science/py-jupyter_jsmol/Makefile
+++ b/science/py-jupyter_jsmol/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	jupyter-jsmol
 PORTVERSION=	2021.3.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	science devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}widgetsnbextension>0:devel/py-widgetsnbextension@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ipykernel5>=5.0.0:devel/py-ipykernel5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ipykernel>=5.0.0:devel/py-ipykernel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython>=7.0.0:devel/ipython@${PY_FLAVOR}
 
diff --git a/www/py-notebook/Makefile b/www/py-notebook/Makefile
index 9f19dfddb0e0..52f80706965a 100644
--- a/www/py-notebook/Makefile
+++ b/www/py-notebook/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	notebook
 PORTVERSION=	6.4.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}argon2-cffi>=0:security/py-argon2-cffi@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ipykernel5>=0:devel/py-ipykernel5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ipykernel>=0:devel/py-ipykernel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jupyter-client>=5.3.4:devel/py-jupyter-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jupyter-core>=4.6.1:devel/py-jupyter-core@${PY_FLAVOR} \