Update to 0.18.0. From the changelog:

ship accumulated bugfixes and catchup with wayback machine changes.

special thanks to Paul Wise for the immesurable patience on
the wayback plugin and test suite, and to Jelmer Vernooij for the
Debian Janitor.

New features:

* Add support for saving page resources to the Wayback Machine too,
  thanks Paul Wise!

API changes:

* we now generate a standard message-id, which has brackets around it

Bugfixes:

* fix rare crash in feed2exec parse with an empty `mailbox` setting
* fix feedparser dependencies for newer python
* catchup with html2text again (2020.1.16)
* add failing test and fix for cachecontrol 0.12.10 new API (Closes: GL#22)
* do not cache requests in plugins (Closes: #1001412, GL#26)
* Require feedparser 5 as minimum version for Python 3, thanks Paul Wise

Documentation:

* mention (lack of) Gemini and other protocol support
* leave Freenode for oftc.net

Cleanup, CI, linting:

* avoid dateparser bug workaround in newer versions
* drop support for python 3.5, add 3.9
* enforce black in tox, but not in CI
* first pass at type checking with mypy, with failures allowed
* switch to setup.cfg as much as possible
* fix rst syntax since we are not hacking it anymore
* mention build module, which may be necessary for newer setuptools_scm
* move fixtures to conftest.py
* use pytest.mark.network instead of xfail

6 files changed, 58 insertions, 39 deletions

diff --git a/mail/feed2exec/Makefile b/mail/feed2exec/Makefile
index 2412d0baa45..5a5fc2b3ef7 100644
--- a/mail/feed2exec/Makefile
+++ b/mail/feed2exec/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2022/01/05 15:41:13 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2022/02/01 18:43:17 schmonz Exp $
 
-DISTNAME=		feed2exec-0.17.1
-PKGREVISION=		2
+DISTNAME=		feed2exec-0.18.0
+PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		mail python
-MASTER_SITES=		https://gitlab.com/anarcat/feed2exec/-/archive/${PKGVERSION_NOREV}/
+MASTER_SITES=		${MASTER_SITE_PYPI:=f/feed2exec/}
 
 MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		https://feed2exec.readthedocs.io/
@@ -19,14 +19,16 @@ DEPENDS+=		${PYPKGPREFIX}-attrs-[0-9]*:../../devel/py-attrs
 DEPENDS+=		${PYPKGPREFIX}-cachecontrol-[0-9]*:../../devel/py-cachecontrol
 DEPENDS+=		${PYPKGPREFIX}-click-[0-9]*:../../devel/py-click
 DEPENDS+=		${PYPKGPREFIX}-dateparser-[0-9]*:../../time/py-dateparser
-DEPENDS+=		${PYPKGPREFIX}-feedparser<6.0.0:../../textproc/py-feedparser5
+DEPENDS+=		${PYPKGPREFIX}-feedparser>=6.0.0:../../textproc/py-feedparser
 DEPENDS+=		${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text
 DEPENDS+=		${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg
 DEPENDS+=		${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
 DEPENDS+=		${PYPKGPREFIX}-requests-file-[0-9]*:../../devel/py-requests-file
 DEPENDS+=		${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 DEPENDS+=		${PYPKGPREFIX}-wcwidth-[0-9]*:../../devel/py-wcwidth
-TEST_DEPENDS+=		${PYPKGPREFIX}-betamax-[0-9]*:../../www/py-betamax
+DEPENDS+=		${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
+DEPENDS+=		${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
+TEST_DEPENDS+=		${PYPKGPREFIX}-betamax>=0.8.0:../../www/py-betamax
 TEST_DEPENDS+=		${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+=		${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-runner
 TEST_DEPENDS+=		${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
diff --git a/mail/feed2exec/PLIST b/mail/feed2exec/PLIST
index c8ca6365402..d99a2c3db4b 100644
--- a/mail/feed2exec/PLIST
+++ b/mail/feed2exec/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2020/10/07 19:46:53 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.4 2022/02/01 18:43:17 schmonz Exp $
 bin/feed2exec
 ${PYSITELIB}/feed2exec-0.0.0-py${PYVERSSUFFIX}.egg-info/PKG-INFO
 ${PYSITELIB}/feed2exec-0.0.0-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
@@ -75,36 +75,15 @@ ${PYSITELIB}/feed2exec/tests/__init__.pyo
 ${PYSITELIB}/feed2exec/tests/conftest.py
 ${PYSITELIB}/feed2exec/tests/conftest.pyc
 ${PYSITELIB}/feed2exec/tests/conftest.pyo
-${PYSITELIB}/feed2exec/tests/files/README.mdwn
-${PYSITELIB}/feed2exec/tests/files/breaking_news.mbx
-${PYSITELIB}/feed2exec/tests/files/breaking_news.xml
-${PYSITELIB}/feed2exec/tests/files/duplicates.ini
-${PYSITELIB}/feed2exec/tests/files/duplicates.opml
-${PYSITELIB}/feed2exec/tests/files/liferea.ini
-${PYSITELIB}/feed2exec/tests/files/liferea.opml
-${PYSITELIB}/feed2exec/tests/files/planet-debian.mbx
-${PYSITELIB}/feed2exec/tests/files/planet-debian.xml
-${PYSITELIB}/feed2exec/tests/files/restic.mbx
-${PYSITELIB}/feed2exec/tests/files/restic.xml
-${PYSITELIB}/feed2exec/tests/files/rsswithpermalink.xml
-${PYSITELIB}/feed2exec/tests/files/sample.mbx
-${PYSITELIB}/feed2exec/tests/files/sample.xml
-${PYSITELIB}/feed2exec/tests/files/security.opml
-${PYSITELIB}/feed2exec/tests/files/simple.ini
-${PYSITELIB}/feed2exec/tests/files/simple.opml
-${PYSITELIB}/feed2exec/tests/files/udd.mbx
-${PYSITELIB}/feed2exec/tests/files/udd.xml
-${PYSITELIB}/feed2exec/tests/files/weird-dates.mbx
-${PYSITELIB}/feed2exec/tests/files/weird-dates.xml
-${PYSITELIB}/feed2exec/tests/fixtures.py
-${PYSITELIB}/feed2exec/tests/fixtures.pyc
-${PYSITELIB}/feed2exec/tests/fixtures.pyo
 ${PYSITELIB}/feed2exec/tests/test_feeds.py
 ${PYSITELIB}/feed2exec/tests/test_feeds.pyc
 ${PYSITELIB}/feed2exec/tests/test_feeds.pyo
 ${PYSITELIB}/feed2exec/tests/test_main.py
 ${PYSITELIB}/feed2exec/tests/test_main.pyc
 ${PYSITELIB}/feed2exec/tests/test_main.pyo
+${PYSITELIB}/feed2exec/tests/test_network.py
+${PYSITELIB}/feed2exec/tests/test_network.pyc
+${PYSITELIB}/feed2exec/tests/test_network.pyo
 ${PYSITELIB}/feed2exec/tests/test_opml.py
 ${PYSITELIB}/feed2exec/tests/test_opml.pyc
 ${PYSITELIB}/feed2exec/tests/test_opml.pyo
diff --git a/mail/feed2exec/distinfo b/mail/feed2exec/distinfo
index 1ded3582c12..179bd3a902f 100644
--- a/mail/feed2exec/distinfo
+++ b/mail/feed2exec/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:54:00 nia Exp $
+$NetBSD: distinfo,v 1.7 2022/02/01 18:43:17 schmonz Exp $
 
-BLAKE2s (feed2exec-0.17.1.tar.gz) = 5cb92a8bafaf99bb04d4cfa0466f9f3391b46c95adfe9afbf3bab2d8ac372064
-SHA512 (feed2exec-0.17.1.tar.gz) = e7d00cefb9ee40010a912eff3cc49c5f1388fa74adfc8f5084ac379697a8164e05083ef4b1c712ac4616a08c142181b5393cbe59a76594bfaf3ac33b41d99afa
-Size (feed2exec-0.17.1.tar.gz) = 397334 bytes
-SHA1 (patch-feed2exec_____init____.py) = 6381dc9198cb257dce82a96106b21b53af282f6f
-SHA1 (patch-setup.py) = 2bac00a185bff16f419a314b0347d3e70ce7e60c
+BLAKE2s (feed2exec-0.18.0.tar.gz) = a2f4ede32fde409d43018f1a24fa0ae269e8b083dfec179ccb76a365210a30a9
+SHA512 (feed2exec-0.18.0.tar.gz) = 6a344c39f75fa55d573efc023dee4f4b24f7efb0be26cd98ad2fa8d3a2cd942c5cbe4c05f473372ef16073117969fdeba1aba46f0dd5b045c9f46ae7476edfa8
+Size (feed2exec-0.18.0.tar.gz) = 686663 bytes
+SHA1 (patch-feed2exec_____init____.py) = fbacc1c5f9014a85d7bbb795e3b15d749442a85e
+SHA1 (patch-pyproject.toml) = 46da4b24ee875f243c14ca90468224d83eb6b8da
+SHA1 (patch-setup.cfg) = 3234e5e088394a2190024b0634848dcd35d34dc5
diff --git a/mail/feed2exec/patches/patch-feed2exec_____init____.py b/mail/feed2exec/patches/patch-feed2exec_____init____.py
index faa57f9ced0..2bf4617eeb9 100644
--- a/mail/feed2exec/patches/patch-feed2exec_____init____.py
+++ b/mail/feed2exec/patches/patch-feed2exec_____init____.py
@@ -1,8 +1,8 @@
-$NetBSD: patch-feed2exec_____init____.py,v 1.1 2020/01/29 16:48:48 schmonz Exp $
+$NetBSD: patch-feed2exec_____init____.py,v 1.2 2022/02/01 18:43:17 schmonz Exp $
 
 Avoid setuptools_scm since tarball has no .git.
 
---- feed2exec/__init__.py.orig	2019-02-26 22:03:32.000000000 +0000
+--- feed2exec/__init__.py.orig	2022-02-01 02:24:32.000000000 +0000
 +++ feed2exec/__init__.py
 @@ -2,17 +2,8 @@
  
diff --git a/mail/feed2exec/patches/patch-pyproject.toml b/mail/feed2exec/patches/patch-pyproject.toml
new file mode 100644
index 00000000000..ee673e2b010
--- /dev/null
+++ b/mail/feed2exec/patches/patch-pyproject.toml
@@ -0,0 +1,23 @@
+$NetBSD: patch-pyproject.toml,v 1.1 2022/02/01 18:43:17 schmonz Exp $
+
+Avoid setuptools_scm since tarball has no .git.
+
+--- pyproject.toml.orig	2022-02-01 02:24:32.000000000 +0000
++++ pyproject.toml
+@@ -7,7 +7,6 @@ module = [
+   "html2text",
+   "pytest",
+   "requests_file",
+-  "setuptools_scm",
+   "unidecode",
+   "xdg",
+   "xdg.BaseDirectory",
+@@ -15,7 +14,4 @@ module = [
+ ignore_missing_imports = true
+ 
+ [build-system]
+-requires = ["setuptools>=45", "wheel", "setuptools_scm>=6.2"]
+-
+-[tool.setuptools_scm]
+-write_to = "feed2exec/_version.py"
++requires = ["setuptools>=45", "wheel"]
diff --git a/mail/feed2exec/patches/patch-setup.cfg b/mail/feed2exec/patches/patch-setup.cfg
new file mode 100644
index 00000000000..15b49d6df53
--- /dev/null
+++ b/mail/feed2exec/patches/patch-setup.cfg
@@ -0,0 +1,14 @@
+$NetBSD: patch-setup.cfg,v 1.1 2022/02/01 18:43:17 schmonz Exp $
+
+Avoid setuptools_scm since tarball has no .git.
+
+--- setup.cfg.orig	2022-02-01 02:24:32.000000000 +0000
++++ setup.cfg
+@@ -51,7 +51,6 @@ install_requires =
+     pyxdg
+     requests
+     requests-file
+-    setuptools_scm
+     unidecode
+ 
+ [options.package_data]