feed2exec: pypi distfile does not match distinfo

Set DIST_SUBDIR and update package.
setuptools_scm works fine now, and additional tests are installed.

Update PLIST.
Simplify package.

Bump PKGREVISION.

6 files changed, 71 insertions, 85 deletions

diff --git a/mail/feed2exec/Makefile b/mail/feed2exec/Makefile
index 5a5fc2b3ef7..d43247fecd9 100644
--- a/mail/feed2exec/Makefile
+++ b/mail/feed2exec/Makefile
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.13 2022/02/01 18:43:17 schmonz Exp $
+# $NetBSD: Makefile,v 1.14 2022/02/04 00:04:09 wiz Exp $
 
 DISTNAME=		feed2exec-0.18.0
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=		1
 CATEGORIES=		mail python
 MASTER_SITES=		${MASTER_SITE_PYPI:=f/feed2exec/}
+# remove after 0.18.0
+DIST_SUBDIR=		${DISTNAME}
 
 MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		https://feed2exec.readthedocs.io/
@@ -14,6 +17,7 @@ BUILD_DEPENDS+=		${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox
 BUILD_DEPENDS+=		${PYPKGPREFIX}-flakes-[0-9]*:../../devel/py-flakes
 BUILD_DEPENDS+=		${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 BUILD_DEPENDS+=		${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
+BUILD_DEPENDS+=		${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
 DEPENDS+=		${PYPKGPREFIX}-Unidecode-[0-9]*:../../textproc/py-Unidecode
 DEPENDS+=		${PYPKGPREFIX}-attrs-[0-9]*:../../devel/py-attrs
 DEPENDS+=		${PYPKGPREFIX}-cachecontrol-[0-9]*:../../devel/py-cachecontrol
@@ -39,14 +43,6 @@ PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 USE_PKG_RESOURCES=	yes
 
-SUBST_CLASSES+=		version
-SUBST_STAGE.version=	pre-configure
-SUBST_FILES.version=	feed2exec/__init__.py
-SUBST_VARS.version=	PKGVERSION_NOREV
-
-pre-install:
-	find ${WRKSRC} -type f -name '*.orig' -print | xargs rm -f
-
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/feed2exec/PLIST b/mail/feed2exec/PLIST
index d99a2c3db4b..28e622619fe 100644
--- a/mail/feed2exec/PLIST
+++ b/mail/feed2exec/PLIST
@@ -1,17 +1,20 @@
-@comment $NetBSD: PLIST,v 1.4 2022/02/01 18:43:17 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.5 2022/02/04 00:04:09 wiz 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
-${PYSITELIB}/feed2exec-0.0.0-py${PYVERSSUFFIX}.egg-info/entry_points.txt
-${PYSITELIB}/feed2exec-0.0.0-py${PYVERSSUFFIX}.egg-info/requires.txt
-${PYSITELIB}/feed2exec-0.0.0-py${PYVERSSUFFIX}.egg-info/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/feed2exec/__init__.py
 ${PYSITELIB}/feed2exec/__init__.pyc
 ${PYSITELIB}/feed2exec/__init__.pyo
 ${PYSITELIB}/feed2exec/__main__.py
 ${PYSITELIB}/feed2exec/__main__.pyc
 ${PYSITELIB}/feed2exec/__main__.pyo
+${PYSITELIB}/feed2exec/_version.py
+${PYSITELIB}/feed2exec/_version.pyc
+${PYSITELIB}/feed2exec/_version.pyo
 ${PYSITELIB}/feed2exec/controller.py
 ${PYSITELIB}/feed2exec/controller.pyc
 ${PYSITELIB}/feed2exec/controller.pyo
@@ -72,9 +75,61 @@ ${PYSITELIB}/feed2exec/plugins/wayback.pyo
 ${PYSITELIB}/feed2exec/tests/__init__.py
 ${PYSITELIB}/feed2exec/tests/__init__.pyc
 ${PYSITELIB}/feed2exec/tests/__init__.pyo
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_feeds.test_add.json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_feeds.test_cache.json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_feeds.test_fetch.json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_feeds.test_fetch_cache.json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_feeds.test_fetch_parallel.json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_feeds.test_normalize.json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_feeds.test_pattern.json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_feeds.test_settings.json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_main.test_basics.json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_main.test_parse.json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_main.test_planet.json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_opml.test_opml.json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_archive.json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_email.json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_maildir.json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_archive[full].json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_archive[page].json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_catchup[full].json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_catchup[page].json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_example_404[full].json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_example_404[page].json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_example_invalid[full].json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_example_invalid[page].json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_example_too_fast[full].json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_example_too_fast[page].json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_example_working[full].json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_example_working[page].json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_invalid_example[full].json
+${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_invalid_example[page].json
+${PYSITELIB}/feed2exec/tests/cassettes/planet-debian.mbx
 ${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/pytest.ini
 ${PYSITELIB}/feed2exec/tests/test_feeds.py
 ${PYSITELIB}/feed2exec/tests/test_feeds.pyc
 ${PYSITELIB}/feed2exec/tests/test_feeds.pyo
diff --git a/mail/feed2exec/distinfo b/mail/feed2exec/distinfo
index 179bd3a902f..9bd0b2d8101 100644
--- a/mail/feed2exec/distinfo
+++ b/mail/feed2exec/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.7 2022/02/01 18:43:17 schmonz Exp $
+$NetBSD: distinfo,v 1.8 2022/02/04 00:04:09 wiz Exp $
 
-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
+BLAKE2s (feed2exec-0.18.0/feed2exec-0.18.0.tar.gz) = d5230be55f16fe0f04c98cb4465eb04ace47df125a8c8c9cc3de7ff2effaa806
+SHA512 (feed2exec-0.18.0/feed2exec-0.18.0.tar.gz) = cc3bc9f69c9347478d1aff40abebe500bdcde0b1e15df1dc389d84ff0806611128f99ca1ba40a063861f5fe5047a71455f6d3480c666afd4af042fcc52515793
+Size (feed2exec-0.18.0/feed2exec-0.18.0.tar.gz) = 704031 bytes
diff --git a/mail/feed2exec/patches/patch-feed2exec_____init____.py b/mail/feed2exec/patches/patch-feed2exec_____init____.py
deleted file mode 100644
index 2bf4617eeb9..00000000000
--- a/mail/feed2exec/patches/patch-feed2exec_____init____.py
+++ /dev/null
@@ -1,25 +0,0 @@
-$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	2022-02-01 02:24:32.000000000 +0000
-+++ feed2exec/__init__.py
-@@ -2,17 +2,8 @@
- 
- from __future__ import print_function, absolute_import
- 
--try:
--    from ._version import version
--except ImportError:  # pragma: nocover
--    try:
--        from setuptools_scm import get_version
--        version = get_version()
--    except (ImportError, LookupError):
--        version = '???'
--
- __description__ = 'The programmable feed reader'
--__version__ = version
-+__version__ = '@PKGVERSION_NOREV@'
- __website__ = 'https://feed2exec.readthedocs.io/'
- __prog__ = 'feed2exec'
- __author__ = u'Antoine Beaupré'
diff --git a/mail/feed2exec/patches/patch-pyproject.toml b/mail/feed2exec/patches/patch-pyproject.toml
deleted file mode 100644
index ee673e2b010..00000000000
--- a/mail/feed2exec/patches/patch-pyproject.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-$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
deleted file mode 100644
index 15b49d6df53..00000000000
--- a/mail/feed2exec/patches/patch-setup.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-$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]