Hi, ports@:
Here is a patch for www/py-bleach :
i) Update to 4.1.0
ii) Switch to python3
It buiild well and pass all test on amd64-7.0 system,
no other ports depends on it.
Comments?
wen
Index: www/py-bleach/Makefile
===================================================================
RCS file: /cvs/ports/www/py-bleach/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- www/py-bleach/Makefile 21 May 2021 19:50:37 -0000 1.9
+++ www/py-bleach/Makefile 19 Oct 2021 13:02:04 -0000
@@ -2,11 +2,10 @@
COMMENT = easy whitelist-based HTML-sanitizing tool
-MODPY_EGG_VERSION = 2.0.0
+MODPY_EGG_VERSION = 4.1.0
DISTNAME = bleach-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = www
-REVISION = 3
HOMEPAGE = https://github.com/mozilla/bleach
@@ -20,7 +19,7 @@ MODPY_SETUPTOOLS = Yes
MODPY_PYTEST = Yes
FLAVORS = python3
-FLAVOR ?=
+FLAVOR ?= python3
RUN_DEPENDS = devel/py-html5lib${MODPY_FLAVOR} \
devel/py-six${MODPY_FLAVOR}
Index: www/py-bleach/distinfo
===================================================================
RCS file: /cvs/ports/www/py-bleach/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- www/py-bleach/distinfo 28 Jun 2017 18:03:20 -0000 1.2
+++ www/py-bleach/distinfo 19 Oct 2021 13:02:04 -0000
@@ -1,2 +1,2 @@
-SHA256 (bleach-2.0.0.tar.gz) = uVIhMAA+TK7fTwCjnBIKkG3NQkIynByPYh9TcCA8vDA=
-SIZE (bleach-2.0.0.tar.gz) = 46083
+SHA256 (bleach-4.1.0.tar.gz) = CQDYs366YagC7kCsAGH4wrXe4pwZJ90dIz4HXr9acdo=
+SIZE (bleach-4.1.0.tar.gz) = 195798
Index: www/py-bleach/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/py-bleach/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- www/py-bleach/pkg/PLIST 28 Jun 2017 18:03:20 -0000 1.2
+++ www/py-bleach/pkg/PLIST 19 Oct 2021 13:02:04 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.2 2017/06/28 18:03:20 shadchin Exp $
+@pkgpath www/py-bleach
lib/python${MODPY_VERSION}/site-packages/bleach/
lib/python${MODPY_VERSION}/site-packages/bleach-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/bleach-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -11,14 +12,106 @@ lib/python${MODPY_VERSION}/site-packages
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/bleach/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/bleach/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/bleach/${MODPY_PYCACHE}callbacks.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/bleach/${MODPY_PYCACHE}encoding.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/${MODPY_PYCACHE}html5lib_shim.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/bleach/${MODPY_PYCACHE}linkifier.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/bleach/${MODPY_PYCACHE}sanitizer.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/bleach/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/bleach/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/README.rst
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/${MODPY_PYCACHE}parse.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib-1.1.dist-info/
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib-1.1.dist-info/AUTHORS.rst
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib-1.1.dist-info/INSTALLER
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib-1.1.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib-1.1.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib-1.1.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib-1.1.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/${MODPY_PYCACHE}_ihatexml.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/${MODPY_PYCACHE}_inputstream.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/${MODPY_PYCACHE}_tokenizer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/${MODPY_PYCACHE}_utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/${MODPY_PYCACHE}html5parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/${MODPY_PYCACHE}serializer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/_ihatexml.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/_inputstream.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/_tokenizer.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/_trie/
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/_trie/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/_trie/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/_trie/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/_trie/${MODPY_PYCACHE}_base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/_trie/${MODPY_PYCACHE}py.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/_trie/_base.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/_trie/py.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/_utils.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/constants.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/filters/
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/filters/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/filters/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/filters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/filters/${MODPY_PYCACHE}alphabeticalattributes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/filters/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/filters/${MODPY_PYCACHE}inject_meta_charset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/filters/${MODPY_PYCACHE}lint.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/filters/${MODPY_PYCACHE}optionaltags.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/filters/${MODPY_PYCACHE}sanitizer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/filters/${MODPY_PYCACHE}whitespace.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/filters/alphabeticalattributes.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/filters/base.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/filters/inject_meta_charset.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/filters/lint.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/filters/optionaltags.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/filters/sanitizer.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/filters/whitespace.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/html5parser.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/serializer.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treeadapters/
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treeadapters/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treeadapters/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treeadapters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treeadapters/${MODPY_PYCACHE}genshi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treeadapters/${MODPY_PYCACHE}sax.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treeadapters/genshi.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treeadapters/sax.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treebuilders/
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treebuilders/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treebuilders/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treebuilders/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treebuilders/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treebuilders/${MODPY_PYCACHE}dom.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treebuilders/${MODPY_PYCACHE}etree.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treebuilders/${MODPY_PYCACHE}etree_lxml.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treebuilders/base.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treebuilders/dom.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treebuilders/etree.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treebuilders/etree_lxml.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treewalkers/
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treewalkers/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treewalkers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treewalkers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treewalkers/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treewalkers/${MODPY_PYCACHE}dom.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treewalkers/${MODPY_PYCACHE}etree.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treewalkers/${MODPY_PYCACHE}etree_lxml.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treewalkers/${MODPY_PYCACHE}genshi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treewalkers/base.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treewalkers/dom.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treewalkers/etree.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treewalkers/etree_lxml.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/html5lib/treewalkers/genshi.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/parse.py
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/vendor.txt
+lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/vendor_install.sh
lib/python${MODPY_VERSION}/site-packages/bleach/callbacks.py
-lib/python${MODPY_VERSION}/site-packages/bleach/encoding.py
+lib/python${MODPY_VERSION}/site-packages/bleach/html5lib_shim.py
lib/python${MODPY_VERSION}/site-packages/bleach/linkifier.py
lib/python${MODPY_VERSION}/site-packages/bleach/sanitizer.py
lib/python${MODPY_VERSION}/site-packages/bleach/utils.py
-lib/python${MODPY_VERSION}/site-packages/bleach/version.py
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1317
diff -u -p -r1.1317 Quirks.pm
--- devel/quirks/files/Quirks.pm 6 Oct 2021 21:13:29 -0000 1.1317
+++ devel/quirks/files/Quirks.pm 19 Oct 2021 13:02:04 -0000
@@ -496,6 +496,7 @@ my $stem_extensions = {
'py-websocket-client' => 'py3-websocket-client',
'libmesode' => 'libstrophe',
'py-stem' => 'py3-stem',
+ 'py-bleach' => 'py3-bleach',
};
my $obsolete_reason = {};
