diff --git a/audio/eyeD3/Makefile b/audio/eyeD3/Makefile index 799e4fd2e47a..3df098b7e581 100644 --- a/audio/eyeD3/Makefile +++ b/audio/eyeD3/Makefile @@ -1,24 +1,27 @@ -# $NetBSD: Makefile,v 1.13 2020/01/26 17:30:41 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2020/05/19 18:52:35 wiz Exp $ -DISTNAME= eyeD3-0.7.11 -PKGREVISION= 1 +DISTNAME= eyeD3-0.9.5 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_PYPI:=e/eyeD3/} MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://eyed3.nicfit.net/ -COMMENT= Python tool for working with audio files (in particular, mp3) -LICENSE= gnu-gpl-v2 +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 + +PYTHON_VERSIONED_DEPENDENCIES+= test:test USE_LANGUAGES= # none -PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.7.11 -REPLACE_SH+= bin/eyeD3 -SUBST_CLASSES+= python -SUBST_STAGE.python= post-configure -SUBST_MESSAGE.python= Fixing path to python executable. -SUBST_FILES.python+= bin/eyeD3 -SUBST_SED.python+= -e "s,python,${PYTHONBIN}," +# 13 test failures as of 0.9.5 +# https://github.com/nicfit/eyeD3/issues/437 +do-test: + cd ${WRKSRC} && ${SETENV} ${TEST_ENV} py.test-${PYVERSSUFFIX} +.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 19f135dd1547..524f607303f1 100644 --- a/audio/eyeD3/PLIST +++ b/audio/eyeD3/PLIST @@ -1,16 +1,18 @@ -@comment $NetBSD: PLIST,v 1.2 2017/02/08 14:21:26 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2020/05/19 18:52:35 wiz 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 +${PYSITELIB}/eyed3/__about__.pyc +${PYSITELIB}/eyed3/__about__.pyo ${PYSITELIB}/eyed3/__init__.py ${PYSITELIB}/eyed3/__init__.pyc ${PYSITELIB}/eyed3/__init__.pyo -${PYSITELIB}/eyed3/compat.py -${PYSITELIB}/eyed3/compat.pyc -${PYSITELIB}/eyed3/compat.pyo ${PYSITELIB}/eyed3/core.py ${PYSITELIB}/eyed3/core.pyc ${PYSITELIB}/eyed3/core.pyo @@ -29,13 +31,12 @@ ${PYSITELIB}/eyed3/id3/headers.pyo ${PYSITELIB}/eyed3/id3/tag.py ${PYSITELIB}/eyed3/id3/tag.pyc ${PYSITELIB}/eyed3/id3/tag.pyo -${PYSITELIB}/eyed3/info.py -${PYSITELIB}/eyed3/info.py.in -${PYSITELIB}/eyed3/info.pyc -${PYSITELIB}/eyed3/info.pyo ${PYSITELIB}/eyed3/main.py ${PYSITELIB}/eyed3/main.pyc ${PYSITELIB}/eyed3/main.pyo +${PYSITELIB}/eyed3/mimetype.py +${PYSITELIB}/eyed3/mimetype.pyc +${PYSITELIB}/eyed3/mimetype.pyo ${PYSITELIB}/eyed3/mp3/__init__.py ${PYSITELIB}/eyed3/mp3/__init__.pyc ${PYSITELIB}/eyed3/mp3/__init__.pyo @@ -45,12 +46,21 @@ ${PYSITELIB}/eyed3/mp3/headers.pyo ${PYSITELIB}/eyed3/plugins/__init__.py ${PYSITELIB}/eyed3/plugins/__init__.pyc ${PYSITELIB}/eyed3/plugins/__init__.pyo +${PYSITELIB}/eyed3/plugins/_display_parser.py +${PYSITELIB}/eyed3/plugins/_display_parser.pyc +${PYSITELIB}/eyed3/plugins/_display_parser.pyo ${PYSITELIB}/eyed3/plugins/art.py ${PYSITELIB}/eyed3/plugins/art.pyc ${PYSITELIB}/eyed3/plugins/art.pyo ${PYSITELIB}/eyed3/plugins/classic.py ${PYSITELIB}/eyed3/plugins/classic.pyc ${PYSITELIB}/eyed3/plugins/classic.pyo +${PYSITELIB}/eyed3/plugins/display.py +${PYSITELIB}/eyed3/plugins/display.pyc +${PYSITELIB}/eyed3/plugins/display.pyo +${PYSITELIB}/eyed3/plugins/extract.py +${PYSITELIB}/eyed3/plugins/extract.pyc +${PYSITELIB}/eyed3/plugins/extract.pyo ${PYSITELIB}/eyed3/plugins/fixup.py ${PYSITELIB}/eyed3/plugins/fixup.pyc ${PYSITELIB}/eyed3/plugins/fixup.pyo @@ -60,21 +70,33 @@ ${PYSITELIB}/eyed3/plugins/genres.pyo ${PYSITELIB}/eyed3/plugins/itunes.py ${PYSITELIB}/eyed3/plugins/itunes.pyc ${PYSITELIB}/eyed3/plugins/itunes.pyo +${PYSITELIB}/eyed3/plugins/jsontag.py +${PYSITELIB}/eyed3/plugins/jsontag.pyc +${PYSITELIB}/eyed3/plugins/jsontag.pyo ${PYSITELIB}/eyed3/plugins/lameinfo.py ${PYSITELIB}/eyed3/plugins/lameinfo.pyc ${PYSITELIB}/eyed3/plugins/lameinfo.pyo +${PYSITELIB}/eyed3/plugins/lastfm.py +${PYSITELIB}/eyed3/plugins/lastfm.pyc +${PYSITELIB}/eyed3/plugins/lastfm.pyo +${PYSITELIB}/eyed3/plugins/mimetype.py +${PYSITELIB}/eyed3/plugins/mimetype.pyc +${PYSITELIB}/eyed3/plugins/mimetype.pyo ${PYSITELIB}/eyed3/plugins/nfo.py ${PYSITELIB}/eyed3/plugins/nfo.pyc ${PYSITELIB}/eyed3/plugins/nfo.pyo ${PYSITELIB}/eyed3/plugins/pymod.py ${PYSITELIB}/eyed3/plugins/pymod.pyc ${PYSITELIB}/eyed3/plugins/pymod.pyo -${PYSITELIB}/eyed3/plugins/statistics.py -${PYSITELIB}/eyed3/plugins/statistics.pyc -${PYSITELIB}/eyed3/plugins/statistics.pyo +${PYSITELIB}/eyed3/plugins/stats.py +${PYSITELIB}/eyed3/plugins/stats.pyc +${PYSITELIB}/eyed3/plugins/stats.pyo ${PYSITELIB}/eyed3/plugins/xep_118.py ${PYSITELIB}/eyed3/plugins/xep_118.pyc ${PYSITELIB}/eyed3/plugins/xep_118.pyo +${PYSITELIB}/eyed3/plugins/yamltag.py +${PYSITELIB}/eyed3/plugins/yamltag.pyc +${PYSITELIB}/eyed3/plugins/yamltag.pyo ${PYSITELIB}/eyed3/utils/__init__.py ${PYSITELIB}/eyed3/utils/__init__.pyc ${PYSITELIB}/eyed3/utils/__init__.pyo @@ -84,9 +106,6 @@ ${PYSITELIB}/eyed3/utils/art.pyo ${PYSITELIB}/eyed3/utils/binfuncs.py ${PYSITELIB}/eyed3/utils/binfuncs.pyc ${PYSITELIB}/eyed3/utils/binfuncs.pyo -${PYSITELIB}/eyed3/utils/cli.py -${PYSITELIB}/eyed3/utils/cli.pyc -${PYSITELIB}/eyed3/utils/cli.pyo ${PYSITELIB}/eyed3/utils/console.py ${PYSITELIB}/eyed3/utils/console.pyc ${PYSITELIB}/eyed3/utils/console.pyo diff --git a/audio/eyeD3/distinfo b/audio/eyeD3/distinfo index 2c3379deca68..3834bd081a24 100644 --- a/audio/eyeD3/distinfo +++ b/audio/eyeD3/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.4 2017/03/14 19:17:21 adam Exp $ +$NetBSD: distinfo,v 1.5 2020/05/19 18:52:35 wiz Exp $ -SHA1 (eyeD3-0.7.11.tar.gz) = e497d01366497b2112598043eb715710d3a826c4 -RMD160 (eyeD3-0.7.11.tar.gz) = 852b7fd18cb4dead92275f345e2d177e7738f9ef -SHA512 (eyeD3-0.7.11.tar.gz) = 39452dc4ae01f71da976e41d38027f67b4389ebd14294327b058fb0156a46e1da517081c7e9e716b1cbede5743e03c43fd43860dc98118c04a850b1a33d99f45 -Size (eyeD3-0.7.11.tar.gz) = 234235 bytes +SHA1 (eyeD3-0.9.5.tar.gz) = eaba68dd6991ad12fcb64dfa0fcf5b8e66d2f41f +RMD160 (eyeD3-0.9.5.tar.gz) = 32caacd2ce61e0eb5ed5743bcbe12404b225f107 +SHA512 (eyeD3-0.9.5.tar.gz) = 74f75bc583a6cf7ee277a581b3ef4111804fd220371b65ab4d0a4491ce8434da6ce48f32e2b845426819948e4cb2b224e8a263137b9fad5297d5b9fd57befd9e +Size (eyeD3-0.9.5.tar.gz) = 222994 bytes +SHA1 (patch-Makefile) = d7f902b125c6e92e7191d3b7d46b345525fbc8ad diff --git a/audio/eyeD3/patches/patch-Makefile b/audio/eyeD3/patches/patch-Makefile new file mode 100644 index 000000000000..c1bedd4b9205 --- /dev/null +++ b/audio/eyeD3/patches/patch-Makefile @@ -0,0 +1,16 @@ +$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; \