summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/CHANGES-20223
-rw-r--r--lang/python/versioned_dependencies.mk5
-rw-r--r--textproc/Makefile3
-rw-r--r--textproc/py-jsonlib/DESCR6
-rw-r--r--textproc/py-jsonlib/Makefile19
-rw-r--r--textproc/py-jsonlib/PLIST9
-rw-r--r--textproc/py-jsonlib/distinfo5
7 files changed, 5 insertions, 45 deletions
diff --git a/doc/CHANGES-2022 b/doc/CHANGES-2022
index 1e6358f739d..8f18a5b2071 100644
--- a/doc/CHANGES-2022
+++ b/doc/CHANGES-2022
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2022,v 1.500 2022/01/29 14:55:19 sjmulder Exp $
+$NetBSD: CHANGES-2022,v 1.501 2022/01/29 21:46:17 wiz Exp $
Changes to the packages collection and infrastructure in 2022:
@@ -659,3 +659,4 @@ Changes to the packages collection and infrastructure in 2022:
Updated mail/roundcube-plugin-password to 1.5.2 [taca 2022-01-29]
Updated mail/roundcube-plugin-zipdownload to 1.5.2 [taca 2022-01-29]
Updated math/bcal to 2.4 [sjmulder 2022-01-29]
+ Removed textproc/py-jsonlib [wiz 2022-01-29]
diff --git a/lang/python/versioned_dependencies.mk b/lang/python/versioned_dependencies.mk
index b32f8b4d54a..e253c935d3f 100644
--- a/lang/python/versioned_dependencies.mk
+++ b/lang/python/versioned_dependencies.mk
@@ -1,4 +1,4 @@
-# $NetBSD: versioned_dependencies.mk,v 1.61 2022/01/29 08:42:50 wiz Exp $
+# $NetBSD: versioned_dependencies.mk,v 1.62 2022/01/29 21:46:17 wiz Exp $
#
# This file determines which separate distribution of a Python
# package is used as dependency, depending on the Python version
@@ -9,7 +9,7 @@
# PYTHON_VERSIONED_DEPENDENCIES
# The Python package which should be added as a dependency.
#
-# Possible values: Pmw Pillow X cairo flake8 html2text hypothesis importlib-metadata ipython jsonlib markdown more-itertools pip packaging pygments pyparsing python-digest rsa setuptools setuptools_scm sphinx test testtools zipp
+# Possible values: Pmw Pillow X cairo flake8 html2text hypothesis importlib-metadata ipython markdown more-itertools pip packaging pygments pyparsing python-digest rsa setuptools setuptools_scm sphinx test testtools zipp
# Default: (nothing)
#
@@ -29,7 +29,6 @@ _SUPPORTED_PACKAGES+= hypothesis devel/py-hypothesis4 devel/py-hypothesis
_SUPPORTED_PACKAGES+= importlib-metadata devel/py-importlib-metadata2 devel/py-importlib-metadata
_SUPPORTED_PACKAGES+= ipython devel/py-ipython5 devel/py-ipython
_SUPPORTED_PACKAGES+= isort devel/py-isort4 devel/py-isort
-_SUPPORTED_PACKAGES+= jsonlib textproc/py-jsonlib textproc/py-jsonlib3
_SUPPORTED_PACKAGES+= markdown textproc/py-markdown3 textproc/py-markdown
_SUPPORTED_PACKAGES+= more-itertools devel/py-more-itertools2 devel/py-more-itertools
_SUPPORTED_PACKAGES+= packaging devel/py-packaging2 devel/py-packaging
diff --git a/textproc/Makefile b/textproc/Makefile
index 7003e23bb49..d8c011e920a 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1271 2022/01/17 09:42:26 wiz Exp $
+# $NetBSD: Makefile,v 1.1272 2022/01/29 21:46:17 wiz Exp $
#
COMMENT= Text processing utilities (does not include desktop publishing)
@@ -1009,7 +1009,6 @@ SUBDIR+= py-jellyfish
SUBDIR+= py-jinja2
SUBDIR+= py-jmespath
SUBDIR+= py-jsbeautifier
-SUBDIR+= py-jsonlib
SUBDIR+= py-jsonlib3
SUBDIR+= py-jsonpickle
SUBDIR+= py-jsonref
diff --git a/textproc/py-jsonlib/DESCR b/textproc/py-jsonlib/DESCR
deleted file mode 100644
index c7984d056a0..00000000000
--- a/textproc/py-jsonlib/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-JSON is a lightweight data-interchange format. It's often used for
-exchanging data between a web server and user agent. This module
-aims to produce a library for serializing and deserializing JSON
-that conforms strictly to RFC 4627.
-
-This package contains the python-2.x version of the module.
diff --git a/textproc/py-jsonlib/Makefile b/textproc/py-jsonlib/Makefile
deleted file mode 100644
index 84b465abddc..00000000000
--- a/textproc/py-jsonlib/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2022/01/04 20:54:57 wiz Exp $
-
-DISTNAME= jsonlib-1.6.1
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 1
-CATEGORIES= textproc python
-MASTER_SITES= ${MASTER_SITE_PYPI:=j/jsonlib/}
-
-MAINTAINER= wenheping@gmail.com
-HOMEPAGE= https://launchpad.net/jsonlib
-COMMENT= JSON serializer/deserializer for Python (python-2.x version)
-LICENSE= gnu-gpl-v2
-
-USE_LANGUAGES= c
-
-PYTHON_VERSIONS_ACCEPTED= 27
-
-.include "../../lang/python/egg.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-jsonlib/PLIST b/textproc/py-jsonlib/PLIST
deleted file mode 100644
index 5da357c447b..00000000000
--- a/textproc/py-jsonlib/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/12 08:58:34 wiz Exp $
-${PYSITELIB}/_jsonlib.so
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/jsonlib.py
-${PYSITELIB}/jsonlib.pyc
-${PYSITELIB}/jsonlib.pyo
diff --git a/textproc/py-jsonlib/distinfo b/textproc/py-jsonlib/distinfo
deleted file mode 100644
index bda10aae550..00000000000
--- a/textproc/py-jsonlib/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:23:06 nia Exp $
-
-BLAKE2s (jsonlib-1.6.1.tar.gz) = c406a1e9f9d9a8872ad821264f0fc776326e43e0aa7f143fc7f041462a2166e4
-SHA512 (jsonlib-1.6.1.tar.gz) = 62de57e55bc5322ffdb1872dd4bffcceb16d2ab168642b5ddb1ff828fe6e8f2b25137c5efcf5cb55e2c89d803a31297474498cd19d40e5f8b54a90062148fd88
-Size (jsonlib-1.6.1.tar.gz) = 43828 bytes