diff --git a/audio/py-eyed3/Makefile b/audio/py-eyed3/Makefile
index fe5cac52e96..5b591b922a9 100644
--- a/audio/py-eyed3/Makefile
+++ b/audio/py-eyed3/Makefile
@@ -1,29 +1,29 @@
-COMMENT=		module and program for processing ID3 tags
+COMMENT=	module and program for processing ID3 tags
 
 # standalone software - intentionally no py-* prefix/FLAVOR.
 MODPY_EGG_VERSION=	0.9.6
-DISTNAME=		eyeD3-${MODPY_EGG_VERSION}
-CATEGORIES=		audio
-REVISION=		3
+DISTNAME=	eyeD3-${MODPY_EGG_VERSION}
+CATEGORIES=	audio
+REVISION=	4
 
-HOMEPAGE=		http://eyed3.nicfit.net/
+HOMEPAGE=	https://eyed3.readthedocs.io/
 
 # GPLv2+
 PERMIT_PACKAGE=	Yes
 
-MASTER_SITES=		${HOMEPAGE}releases/
+MASTER_SITES=	${HOMEPAGE}releases/
 
-MODULES=		lang/python
-RUN_DEPENDS=		devel/py-deprecation${MODPY_FLAVOR} \
-			devel/py-filetype${MODPY_FLAVOR}
+MODULES=	lang/python
+MODPY_PYBUILD=	poetry-core
+RUN_DEPENDS=	devel/py-deprecation${MODPY_FLAVOR} \
+		devel/py-filetype${MODPY_FLAVOR}
 
-MODPY_SETUPTOOLS=	Yes
+FAKE_FLAGS=	docdir=${WRKINST}${PREFIX}/share/doc/py-eyed3
 
-FAKE_FLAGS=		docdir=${WRKINST}${PREFIX}/share/doc/py-eyed3
+MODPY_PYTEST_ARGS= --ignore tests/test_factory.py
 
-MODPY_PYTEST=		Yes
-
-# needs factory_boy
-NO_TEST=		Yes
+# https://github.com/nicfit/eyeD3/issues/588
+post-install:
+	rm -r ${WRKINST}${MODPY_SITEPKG}/!(eyed3*)
 
 .include <bsd.port.mk>
diff --git a/audio/py-eyed3/patches/patch-pyproject_toml b/audio/py-eyed3/patches/patch-pyproject_toml
new file mode 100644
index 00000000000..b1539c5559a
--- /dev/null
+++ b/audio/py-eyed3/patches/patch-pyproject_toml
@@ -0,0 +1,12 @@
+Index: pyproject.toml
+--- pyproject.toml.orig
++++ pyproject.toml
+@@ -1,6 +1,6 @@
+ [build-system]
+-requires = ["poetry>=0.12"]
+-build-backend = "poetry.masonry.api"
++requires = ["poetry-core>=0.12"]
++build-backend = "poetry.core.masonry.api"
+ 
+ 
+ [tool.regarding]
diff --git a/audio/py-eyed3/pkg/PLIST b/audio/py-eyed3/pkg/PLIST
index 3e7d8842acd..57fd2ed194a 100644
--- a/audio/py-eyed3/pkg/PLIST
+++ b/audio/py-eyed3/pkg/PLIST
@@ -1,30 +1,40 @@
 bin/eyeD3
 lib/python${MODPY_VERSION}/site-packages/eyed3/
-lib/python${MODPY_VERSION}/site-packages/eyed3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/eyed3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/eyed3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/eyed3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/eyed3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/eyed3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/eyed3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/eyed3-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/eyed3-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/eyed3-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/eyed3-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/eyed3-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/eyed3-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
 lib/python${MODPY_VERSION}/site-packages/eyed3/__about__.py
 lib/python${MODPY_VERSION}/site-packages/eyed3/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}__about__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}__about__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}__regarding__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}__regarding__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}mimetype.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}mimetype.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/eyed3/__regarding__.py
 lib/python${MODPY_VERSION}/site-packages/eyed3/core.py
 lib/python${MODPY_VERSION}/site-packages/eyed3/id3/
 lib/python${MODPY_VERSION}/site-packages/eyed3/id3/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/eyed3/id3/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/eyed3/id3/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/id3/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/id3/${MODPY_PYCACHE}apple.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/id3/${MODPY_PYCACHE}apple.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/id3/${MODPY_PYCACHE}frames.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/id3/${MODPY_PYCACHE}frames.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/id3/${MODPY_PYCACHE}headers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/id3/${MODPY_PYCACHE}headers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/id3/${MODPY_PYCACHE}tag.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/id3/${MODPY_PYCACHE}tag.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/eyed3/id3/apple.py
 lib/python${MODPY_VERSION}/site-packages/eyed3/id3/frames.py
@@ -35,30 +45,50 @@ lib/python${MODPY_VERSION}/site-packages/eyed3/mimetype.py
 lib/python${MODPY_VERSION}/site-packages/eyed3/mp3/
 lib/python${MODPY_VERSION}/site-packages/eyed3/mp3/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/eyed3/mp3/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/eyed3/mp3/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/mp3/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/mp3/${MODPY_PYCACHE}headers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/mp3/${MODPY_PYCACHE}headers.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/eyed3/mp3/headers.py
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/DisplayPattern.ebnf
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}_display_parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}_display_parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}art.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}art.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}classic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}classic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}display.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}display.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}extract.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}extract.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}fixup.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}fixup.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}genres.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}genres.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}itunes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}itunes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}jsontag.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}jsontag.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}lameinfo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}lameinfo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}lastfm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}lastfm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}mimetype.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}mimetype.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}nfo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}nfo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}pymod.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}pymod.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}stats.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}stats.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}xep_118.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}xep_118.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}yamltag.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}yamltag.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/_display_parser.py
 lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/art.py
@@ -80,11 +110,17 @@ lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/yamltag.py
 lib/python${MODPY_VERSION}/site-packages/eyed3/utils/
 lib/python${MODPY_VERSION}/site-packages/eyed3/utils/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/eyed3/utils/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/eyed3/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/utils/${MODPY_PYCACHE}art.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/utils/${MODPY_PYCACHE}art.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/utils/${MODPY_PYCACHE}binfuncs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/utils/${MODPY_PYCACHE}binfuncs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/utils/${MODPY_PYCACHE}console.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/utils/${MODPY_PYCACHE}console.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/utils/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/utils/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/utils/${MODPY_PYCACHE}prompt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eyed3/utils/${MODPY_PYCACHE}prompt.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/eyed3/utils/art.py
 lib/python${MODPY_VERSION}/site-packages/eyed3/utils/binfuncs.py