eyeD3: updated to 0.9.6

v0.9.6 (2020-12-28) : True Blue

New

Id3.Tag(version=) keyword argument.
Expose TextFrame ctor kwargs to Apple frames.
Added --about CLI argument for extra version/program info.

Fix

Preserve linked file info in Tag.clear().
Handle v1 .id3/.tag files.
Improved art plugin behavior when missing dependencies.
[art plugin] Improved error for missing dependencies.
TYER conversion (and restored non v2.2 breakage, for now)
ID3 v2.2, date getters return values again.
Passed filtered files list or handleDirectory, and skip non-existant symlinks
Fixed installation supported Python text.
Implement v1.0/v1.1 tag conversion rules.

Other

Poetry build system

4 files changed, 24 insertions, 46 deletions

diff --git a/audio/eyeD3/Makefile b/audio/eyeD3/Makefile
index f90fab59c60..1bb2e4b234d 100644
--- a/audio/eyeD3/Makefile
+++ b/audio/eyeD3/Makefile
@@ -1,39 +1,31 @@
-# $NetBSD: Makefile,v 1.20 2022/06/30 11:18:02 nia Exp $
+# $NetBSD: Makefile,v 1.21 2022/07/07 10:27:14 adam Exp $
 
-DISTNAME=	eyeD3-0.9.5
-PKGREVISION=	4
-CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_PYPI:=e/eyeD3/}
+DISTNAME=	eyeD3-0.9.6
+CATEGORIES=	audio python
+MASTER_SITES=	${MASTER_SITE_PYPI:=e/eyed3/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://eyed3.readthedocs.io/en/latest/
 COMMENT=	Python audio data toolkit (ID3 and MP3)
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=	${PYPKGPREFIX}-deprecation-[0-9]*:../../devel/py-deprecation
-DEPENDS+=	${PYPKGPREFIX}-factory_boy-[0-9]*:../../devel/py-factory_boy
-DEPENDS+=	${PYPKGPREFIX}-filetype-[0-9]*:../../sysutils/py-filetype
-#TEST_DEPENDS+=	wget-[0-9]*:../../net/wget
-#TEST_DEPENDS+=	${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox
+EGG_NAME=	${DISTNAME:tl}
 
-PYTHON_VERSIONED_DEPENDENCIES+=	test:test
+DEPENDS+=	${PYPKGPREFIX}-deprecation>=2.1.0:../../devel/py-deprecation
+DEPENDS+=	${PYPKGPREFIX}-filetype>=1.0.7:../../sysutils/py-filetype
+TEST_DEPENDS+=	${PYPKGPREFIX}-factory_boy>=3.1.0:../../devel/py-factory_boy
+TEST_DEPENDS+=	${PYPKGPREFIX}-flake8>=3.8.4:../../devel/py-flake8
+TEST_DEPENDS+=	${PYPKGPREFIX}-test>=6.2.1:../../devel/py-test
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-cov>=2.10.1:../../devel/py-test-cov
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-faker via py-factory_boy
+USE_LANGUAGES=	# none
 
 USE_PKG_RESOURCES=	yes
 
-USE_LANGUAGES=	# none
-USE_TOOLS+=	gmake
-
-#SUBST_CLASSES+=		test
-#SUBST_SED.test+=	-e "s,tox,tox-${PYVERSSUFFIX},g"
-#SUBST_STAGE.test+=	pre-configure
-#SUBST_FILES.test+=	Makefile
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
-# tox-based testing
-#do-test:
-#	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} test-data test
+do-test:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} pytest-${PYVERSSUFFIX} tests
 
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/eyeD3/PLIST b/audio/eyeD3/PLIST
index 524f607303f..15340dc5283 100644
--- a/audio/eyeD3/PLIST
+++ b/audio/eyeD3/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2020/05/19 18:52:35 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2022/07/07 10:27:14 adam Exp $
 bin/eyeD3
 ${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}/not-zip-safe
 ${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/eyed3/__about__.py
@@ -13,6 +12,9 @@ ${PYSITELIB}/eyed3/__about__.pyo
 ${PYSITELIB}/eyed3/__init__.py
 ${PYSITELIB}/eyed3/__init__.pyc
 ${PYSITELIB}/eyed3/__init__.pyo
+${PYSITELIB}/eyed3/__regarding__.py
+${PYSITELIB}/eyed3/__regarding__.pyc
+${PYSITELIB}/eyed3/__regarding__.pyo
 ${PYSITELIB}/eyed3/core.py
 ${PYSITELIB}/eyed3/core.pyc
 ${PYSITELIB}/eyed3/core.pyo
@@ -43,6 +45,7 @@ ${PYSITELIB}/eyed3/mp3/__init__.pyo
 ${PYSITELIB}/eyed3/mp3/headers.py
 ${PYSITELIB}/eyed3/mp3/headers.pyc
 ${PYSITELIB}/eyed3/mp3/headers.pyo
+${PYSITELIB}/eyed3/plugins/DisplayPattern.ebnf
 ${PYSITELIB}/eyed3/plugins/__init__.py
 ${PYSITELIB}/eyed3/plugins/__init__.pyc
 ${PYSITELIB}/eyed3/plugins/__init__.pyo
diff --git a/audio/eyeD3/distinfo b/audio/eyeD3/distinfo
index eee4dacbef1..5fcfb0c2317 100644
--- a/audio/eyeD3/distinfo
+++ b/audio/eyeD3/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 09:58:53 nia Exp $
+$NetBSD: distinfo,v 1.8 2022/07/07 10:27:14 adam Exp $
 
-BLAKE2s (eyeD3-0.9.5.tar.gz) = 18a9e79956a0dec19e8f930a291a02b81df0e24e29ee5f4ec895da6402c20c85
-SHA512 (eyeD3-0.9.5.tar.gz) = 74f75bc583a6cf7ee277a581b3ef4111804fd220371b65ab4d0a4491ce8434da6ce48f32e2b845426819948e4cb2b224e8a263137b9fad5297d5b9fd57befd9e
-Size (eyeD3-0.9.5.tar.gz) = 222994 bytes
-SHA1 (patch-Makefile) = d7f902b125c6e92e7191d3b7d46b345525fbc8ad
+BLAKE2s (eyeD3-0.9.6.tar.gz) = 1049cfc418a02eedd8206d37736bb026e12b2f2c52ea118b701c0a2b99a048c2
+SHA512 (eyeD3-0.9.6.tar.gz) = 574962702628c64351d6dce3dcd7796731c185515f854727110edbc2001f8d36ed3acf96591d117d08ba9f41a0566eafa1194c110ac33560d24fc16bcda183c4
+Size (eyeD3-0.9.6.tar.gz) = 221831 bytes
diff --git a/audio/eyeD3/patches/patch-Makefile b/audio/eyeD3/patches/patch-Makefile
deleted file mode 100644
index c1bedd4b920..00000000000
--- a/audio/eyeD3/patches/patch-Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2020/05/19 18:52:35 wiz Exp $
-
-Fix unportable test(1) operator.
-https://github.com/nicfit/eyeD3/pull/438
-
---- Makefile.orig	2020-03-22 03:42:08.000000000 +0000
-+++ Makefile
-@@ -269,7 +269,7 @@ CC_OPTS ?= --no-input
- GIT_COMMIT_HOOK = .git/hooks/commit-msg
- cookiecutter:
- 	tmp_d=`mktemp -d`; cc_d=$$tmp_d/eyeD3; \
--	if test "${CC_MERGE}" == "no"; then \
-+	if test "${CC_MERGE}" = "no"; then \
- 		nicfit cookiecutter ${CC_OPTS} "$${tmp_d}"; \
- 		git -C "$$cc_d" diff; \
- 		git -C "$$cc_d" status -s -b; \