Update to 0.16.0. From the changelog:

API changes:

* refactoring into a somewhat MVC model: split large feeds.py into
  model.py and controller.py
* rename FeedCacheStorage to FeedItemCacheStorage
* factor out getter/setters in the base sqlite class
* remove conn member in sqlite to force use of context manager
* move session and fetching to the feed manager
* rename feeds to feed_manager in main
* allow absolute path in folder setting (Closes: #14)

New features:

* caching: latest feed contents get cached to avoid re-downloading
  unchanged feeds. this includes parsing HTTP headers and so on, and
  relies on the good behavior of the `cachecontrol` Python module
* Python 3.6-3.8 support

Bugfixes:
* recover from feedparser exceptions (Closes: #964597)

[ Roland Hieber ]
* README: don't let the example config create a folder named '~/Mailbox/'

[ Ian Zimmerman ]
* add --quiet option to silence warnings since --loglevel was broken

4 files changed, 27 insertions, 25 deletions

diff --git a/mail/feed2exec/Makefile b/mail/feed2exec/Makefile
index f1bffdb8d0b..6dcc34cb88b 100644
--- a/mail/feed2exec/Makefile
+++ b/mail/feed2exec/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2020/03/31 10:31:30 schmonz Exp $
+# $NetBSD: Makefile,v 1.7 2020/10/07 19:46:53 schmonz Exp $
 
-DISTNAME=		feed2exec-0.15.0
-PKGREVISION=		2
+DISTNAME=		feed2exec-0.16.0
 CATEGORIES=		mail python
 MASTER_SITES=		https://gitlab.com/anarcat/feed2exec/-/archive/${PKGVERSION_NOREV}/
 
@@ -18,9 +17,10 @@ BUILD_DEPENDS+=		${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 BUILD_DEPENDS+=		${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 DEPENDS+=		${PYPKGPREFIX}-Unidecode-[0-9]*:../../textproc/py-Unidecode
 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-[0-9]*:../../textproc/py-feedparser
+DEPENDS+=		${PYPKGPREFIX}-feedparser<6.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
diff --git a/mail/feed2exec/PLIST b/mail/feed2exec/PLIST
index 7dabdfc3cd9..c8ca6365402 100644
--- a/mail/feed2exec/PLIST
+++ b/mail/feed2exec/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2020/01/29 19:09:54 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/10/07 19:46:53 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
 ${PYSITELIB}/feed2exec-0.0.0-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
@@ -11,15 +12,18 @@ ${PYSITELIB}/feed2exec/__init__.pyo
 ${PYSITELIB}/feed2exec/__main__.py
 ${PYSITELIB}/feed2exec/__main__.pyc
 ${PYSITELIB}/feed2exec/__main__.pyo
+${PYSITELIB}/feed2exec/controller.py
+${PYSITELIB}/feed2exec/controller.pyc
+${PYSITELIB}/feed2exec/controller.pyo
 ${PYSITELIB}/feed2exec/email.py
 ${PYSITELIB}/feed2exec/email.pyc
 ${PYSITELIB}/feed2exec/email.pyo
-${PYSITELIB}/feed2exec/feeds.py
-${PYSITELIB}/feed2exec/feeds.pyc
-${PYSITELIB}/feed2exec/feeds.pyo
 ${PYSITELIB}/feed2exec/logging.py
 ${PYSITELIB}/feed2exec/logging.pyc
 ${PYSITELIB}/feed2exec/logging.pyo
+${PYSITELIB}/feed2exec/model.py
+${PYSITELIB}/feed2exec/model.pyc
+${PYSITELIB}/feed2exec/model.pyo
 ${PYSITELIB}/feed2exec/plugins/__init__.py
 ${PYSITELIB}/feed2exec/plugins/__init__.pyc
 ${PYSITELIB}/feed2exec/plugins/__init__.pyo
@@ -110,5 +114,4 @@ ${PYSITELIB}/feed2exec/tests/test_plugins.pyo
 ${PYSITELIB}/feed2exec/utils.py
 ${PYSITELIB}/feed2exec/utils.pyc
 ${PYSITELIB}/feed2exec/utils.pyo
-bin/feed2exec
 share/bash-completion/completions/feed2exec
diff --git a/mail/feed2exec/distinfo b/mail/feed2exec/distinfo
index 369591ae8a0..613328c11cd 100644
--- a/mail/feed2exec/distinfo
+++ b/mail/feed2exec/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2020/03/31 10:31:30 schmonz Exp $
+$NetBSD: distinfo,v 1.3 2020/10/07 19:46:53 schmonz Exp $
 
-SHA1 (feed2exec-0.15.0.tar.gz) = 2a2120f2d1cb0518e067b1546de594667fd05ba8
-RMD160 (feed2exec-0.15.0.tar.gz) = 97afa89776b3ffa49f9e5c67c63d7cf8790048e2
-SHA512 (feed2exec-0.15.0.tar.gz) = 4e147e349ab60787d38e675f9199256f84a56f222255497f1a82fbee1f4abcb324c7426a81616f861680f049a4d9eec709b6de509017794333c4fb21cc5c3ca5
-Size (feed2exec-0.15.0.tar.gz) = 393089 bytes
+SHA1 (feed2exec-0.16.0.tar.gz) = 764340ac55564f0534e5d6416bad610f220f4d68
+RMD160 (feed2exec-0.16.0.tar.gz) = e30b1b4b427eb579d22f130808b9a831183952a9
+SHA512 (feed2exec-0.16.0.tar.gz) = 02d3ad6ebc3d7bbebd41c51cc6190adaa2ab68e9e689352a04e860262e551d6c1a1f9c5caada230d87910613c8188177a146274f9305cf068892266d8955b120
+Size (feed2exec-0.16.0.tar.gz) = 396779 bytes
 SHA1 (patch-feed2exec_____init____.py) = 6381dc9198cb257dce82a96106b21b53af282f6f
-SHA1 (patch-setup.py) = 0d587ed61798294793fd5896648d5bebebceab01
+SHA1 (patch-setup.py) = 2bac00a185bff16f419a314b0347d3e70ce7e60c
diff --git a/mail/feed2exec/patches/patch-setup.py b/mail/feed2exec/patches/patch-setup.py
index a1ef699e876..79442fbd678 100644
--- a/mail/feed2exec/patches/patch-setup.py
+++ b/mail/feed2exec/patches/patch-setup.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-setup.py,v 1.1 2020/01/29 16:48:48 schmonz Exp $
+$NetBSD: patch-setup.py,v 1.2 2020/10/07 19:46:53 schmonz Exp $
 
 Avoid setuptools_scm since tarball has no .git.
 
---- setup.py.orig	2019-02-26 22:03:32.000000000 +0000
+--- setup.py.orig	2020-10-06 18:35:43.000000000 +0000
 +++ setup.py
-@@ -113,10 +113,6 @@ if __name__ == '__main__':
+@@ -126,10 +126,6 @@ if __name__ == '__main__':
            long_description=sphinx2rst('README.rst'),
            license=mod.__license_short__,
            url=mod.__website__,
@@ -15,12 +15,11 @@ Avoid setuptools_scm since tarball has no .git.
            packages=packages,
            package_data=package_data,
            entry_points={
-@@ -126,7 +122,7 @@ if __name__ == '__main__':
-                   % (mod.__prog__, mod.__prog__),
+@@ -140,7 +136,6 @@ if __name__ == '__main__':
                ]
            },
--          setup_requires=['setuptools_scm',
-+          setup_requires=[
-                           'pytest-runner',
-                           'pytest-cov',
-                           'sphinx',
+           setup_requires=[
+-              'setuptools_scm',
+               'sphinx',
+           ],
+           install_requires=requires,