diff --git a/devel/bpython/Makefile b/devel/bpython/Makefile
index 6cdc4f341e5..e135e291d11 100644
--- a/devel/bpython/Makefile
+++ b/devel/bpython/Makefile
@@ -3,7 +3,7 @@ COMMENT=	fancy interface to the Python interpreter
 MODPY_EGG_VERSION=0.18
 DISTNAME=	bpython-${MODPY_EGG_VERSION}
 CATEGORIES=	devel
-REVISION=	3
+REVISION=	4
 
 HOMEPAGE=	https://bpython-interpreter.org/
 MAINTAINER=	Brian Callahan <bcallah@openbsd.org>
@@ -15,7 +15,7 @@ MASTER_SITES=	${HOMEPAGE}/releases/
 
 MODULES=	lang/python
 
-MODPY_SETUPTOOLS=Yes
+MODPY_PYBUILD=	setuptools
 
 FLAVORS=	python3
 FLAVOR=		python3
diff --git a/devel/bpython/pkg/PLIST b/devel/bpython/pkg/PLIST
index b25f7d59d50..8f4b8760cb3 100644
--- a/devel/bpython/pkg/PLIST
+++ b/devel/bpython/pkg/PLIST
@@ -8,46 +8,76 @@ lib/python${MODPY_VERSION}/site-packages/bpdb/
 lib/python${MODPY_VERSION}/site-packages/bpdb/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bpdb/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/bpdb/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/bpdb/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpdb/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpdb/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpdb/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpdb/${MODPY_PYCACHE}debugger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpdb/${MODPY_PYCACHE}debugger.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/bpdb/debugger.py
 lib/python${MODPY_VERSION}/site-packages/bpython/
-lib/python${MODPY_VERSION}/site-packages/bpython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/bpython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/bpython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/bpython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/bpython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/bpython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/bpython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/bpython-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/bpython-${MODPY_EGG_VERSION}.dist-info/AUTHORS
+lib/python${MODPY_VERSION}/site-packages/bpython-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/bpython-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/bpython-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/bpython-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/bpython-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/bpython-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/bpython/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bpython/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}_internal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}_internal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}_py3compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}_py3compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}args.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}args.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}autocomplete.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}autocomplete.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}clipboard.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}clipboard.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}curtsies.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}curtsies.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}filelock.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}filelock.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}formatter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}formatter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}history.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}history.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}importcompletion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}importcompletion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}inspection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}inspection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}keys.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}keys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}lazyre.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}lazyre.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}line.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}line.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}pager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}pager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}paste.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}paste.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}patch_linecache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}patch_linecache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}repl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}repl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}simpleeval.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}simpleeval.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}simplerepl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}simplerepl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}urwid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}urwid.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/bpython/_internal.py
 lib/python${MODPY_VERSION}/site-packages/bpython/_py3compat.py
@@ -61,18 +91,31 @@ lib/python${MODPY_VERSION}/site-packages/bpython/curtsies.py
 lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/
 lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}_internal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}_internal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}coderunner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}coderunner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}filewatch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}filewatch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}interaction.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}interaction.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}interpreter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}interpreter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}manual_readline.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}manual_readline.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}parse.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}parse.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}preprocess.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}preprocess.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}repl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}repl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}replpainter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}replpainter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}sitefix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/${MODPY_PYCACHE}sitefix.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/_internal.py
 lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/coderunner.py
@@ -104,35 +147,62 @@ lib/python${MODPY_VERSION}/site-packages/bpython/simplerepl.py
 lib/python${MODPY_VERSION}/site-packages/bpython/test/
 lib/python${MODPY_VERSION}/site-packages/bpython/test/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_args.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_args.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_autocomplete.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_autocomplete.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_crashers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_crashers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_curtsies.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_curtsies.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_curtsies_coderunner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_curtsies_coderunner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_curtsies_painting.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_curtsies_painting.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_curtsies_parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_curtsies_parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_curtsies_repl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_curtsies_repl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_filewatch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_filewatch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_history.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_history.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_importcompletion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_importcompletion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_inspection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_inspection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_interpreter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_interpreter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_keys.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_keys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_line_properties.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_line_properties.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_manual_readline.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_manual_readline.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_preprocess.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_preprocess.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_repl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_repl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_simpleeval.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_simpleeval.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/bpython/test/fodder/
 lib/python${MODPY_VERSION}/site-packages/bpython/test/fodder/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/bpython/test/fodder/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/bpython/test/fodder/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/fodder/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/fodder/${MODPY_PYCACHE}encoding_ascii.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/fodder/${MODPY_PYCACHE}encoding_ascii.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/fodder/${MODPY_PYCACHE}encoding_latin1.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/fodder/${MODPY_PYCACHE}encoding_latin1.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/fodder/${MODPY_PYCACHE}encoding_utf8.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/fodder/${MODPY_PYCACHE}encoding_utf8.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/fodder/${MODPY_PYCACHE}original.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/fodder/${MODPY_PYCACHE}original.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/fodder/${MODPY_PYCACHE}processed.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/test/fodder/${MODPY_PYCACHE}processed.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/bpython/test/fodder/encoding_ascii.py
 lib/python${MODPY_VERSION}/site-packages/bpython/test/fodder/encoding_latin1.py
@@ -164,22 +234,8 @@ lib/python${MODPY_VERSION}/site-packages/bpython/test/test_simpleeval.py
 lib/python${MODPY_VERSION}/site-packages/bpython/translations/
 lib/python${MODPY_VERSION}/site-packages/bpython/translations/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/bpython/translations/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/bpython/translations/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/bpython/translations/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/bpython/translations/de/
-lib/python${MODPY_VERSION}/site-packages/bpython/translations/de/LC_MESSAGES/
-lib/python${MODPY_VERSION}/site-packages/bpython/translations/de/LC_MESSAGES/bpython.mo
-lib/python${MODPY_VERSION}/site-packages/bpython/translations/es_ES/
-lib/python${MODPY_VERSION}/site-packages/bpython/translations/es_ES/LC_MESSAGES/
-lib/python${MODPY_VERSION}/site-packages/bpython/translations/es_ES/LC_MESSAGES/bpython.mo
-lib/python${MODPY_VERSION}/site-packages/bpython/translations/fr_FR/
-lib/python${MODPY_VERSION}/site-packages/bpython/translations/fr_FR/LC_MESSAGES/
-lib/python${MODPY_VERSION}/site-packages/bpython/translations/fr_FR/LC_MESSAGES/bpython.mo
-lib/python${MODPY_VERSION}/site-packages/bpython/translations/it_IT/
-lib/python${MODPY_VERSION}/site-packages/bpython/translations/it_IT/LC_MESSAGES/
-lib/python${MODPY_VERSION}/site-packages/bpython/translations/it_IT/LC_MESSAGES/bpython.mo
-lib/python${MODPY_VERSION}/site-packages/bpython/translations/nl_NL/
-lib/python${MODPY_VERSION}/site-packages/bpython/translations/nl_NL/LC_MESSAGES/
-lib/python${MODPY_VERSION}/site-packages/bpython/translations/nl_NL/LC_MESSAGES/bpython.mo
 lib/python${MODPY_VERSION}/site-packages/bpython/urwid.py
 @man man/man1/bpython.1
 @man man/man5/bpython-config.5
diff --git a/devel/flake8/Makefile b/devel/flake8/Makefile
index 4d9f45cfef8..51e405c84db 100644
--- a/devel/flake8/Makefile
+++ b/devel/flake8/Makefile
@@ -2,7 +2,7 @@ COMMENT =		modular python code checker wrapping pep8 and pyflakes
 
 MODPY_EGG_VERSION =	4.0.1
 DISTNAME =		flake8-${MODPY_EGG_VERSION}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		devel
 
@@ -14,8 +14,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools
 MODPY_PYTEST_ARGS =	tests
 
 RUN_DEPENDS =		devel/py-codestyle${MODPY_FLAVOR}>=2.5.0 \
diff --git a/devel/flake8/pkg/PLIST b/devel/flake8/pkg/PLIST
index 6c0c208d4b3..39f574643b4 100644
--- a/devel/flake8/pkg/PLIST
+++ b/devel/flake8/pkg/PLIST
@@ -1,30 +1,42 @@
 bin/flake8
 lib/python${MODPY_VERSION}/site-packages/flake8/
-lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/flake8/__init__.py
 lib/python${MODPY_VERSION}/site-packages/flake8/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}checker.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}checker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}defaults.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}defaults.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}processor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}processor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}statistics.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}statistics.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}style_guide.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}style_guide.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/_compat.py
 lib/python${MODPY_VERSION}/site-packages/flake8/api/
 lib/python${MODPY_VERSION}/site-packages/flake8/api/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/flake8/api/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/flake8/api/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/api/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/api/${MODPY_PYCACHE}legacy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/api/${MODPY_PYCACHE}legacy.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/api/legacy.py
 lib/python${MODPY_VERSION}/site-packages/flake8/checker.py
@@ -33,18 +45,26 @@ lib/python${MODPY_VERSION}/site-packages/flake8/exceptions.py
 lib/python${MODPY_VERSION}/site-packages/flake8/formatting/
 lib/python${MODPY_VERSION}/site-packages/flake8/formatting/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/flake8/formatting/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/flake8/formatting/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/formatting/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/formatting/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/formatting/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/formatting/${MODPY_PYCACHE}default.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/formatting/${MODPY_PYCACHE}default.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/formatting/base.py
 lib/python${MODPY_VERSION}/site-packages/flake8/formatting/default.py
 lib/python${MODPY_VERSION}/site-packages/flake8/main/
 lib/python${MODPY_VERSION}/site-packages/flake8/main/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/flake8/main/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/flake8/main/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/main/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/main/${MODPY_PYCACHE}application.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/main/${MODPY_PYCACHE}application.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/main/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/main/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/main/${MODPY_PYCACHE}debug.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/main/${MODPY_PYCACHE}debug.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/main/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/main/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/main/application.py
 lib/python${MODPY_VERSION}/site-packages/flake8/main/cli.py
@@ -53,9 +73,13 @@ lib/python${MODPY_VERSION}/site-packages/flake8/main/options.py
 lib/python${MODPY_VERSION}/site-packages/flake8/options/
 lib/python${MODPY_VERSION}/site-packages/flake8/options/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/flake8/options/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/flake8/options/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/options/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/options/${MODPY_PYCACHE}aggregator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/options/${MODPY_PYCACHE}aggregator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/options/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/options/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/options/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/options/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/options/aggregator.py
 lib/python${MODPY_VERSION}/site-packages/flake8/options/config.py
@@ -63,8 +87,11 @@ lib/python${MODPY_VERSION}/site-packages/flake8/options/manager.py
 lib/python${MODPY_VERSION}/site-packages/flake8/plugins/
 lib/python${MODPY_VERSION}/site-packages/flake8/plugins/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/flake8/plugins/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/flake8/plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/plugins/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/plugins/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/plugins/${MODPY_PYCACHE}pyflakes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flake8/plugins/${MODPY_PYCACHE}pyflakes.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/plugins/manager.py
 lib/python${MODPY_VERSION}/site-packages/flake8/plugins/pyflakes.py
diff --git a/devel/github-backup/Makefile b/devel/github-backup/Makefile
index f72ecde9326..94c06944a39 100644
--- a/devel/github-backup/Makefile
+++ b/devel/github-backup/Makefile
@@ -2,7 +2,7 @@ COMMENT =	 backup a github user or organization
 
 MODPY_EGG_VERSION =	0.33.0
 PKGNAME =	github-backup-${MODPY_EGG_VERSION}
-REVISION =	1
+REVISION =	2
 
 GH_ACCOUNT =	josegonzalez
 GH_PROJECT =	python-github-backup
@@ -16,6 +16,6 @@ MAINTAINER =	Laurence Tratt <laurie@tratt.net>
 PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 .include <bsd.port.mk>
diff --git a/devel/github-backup/pkg/PLIST b/devel/github-backup/pkg/PLIST
index d701a789bd6..2563f77a5a9 100644
--- a/devel/github-backup/pkg/PLIST
+++ b/devel/github-backup/pkg/PLIST
@@ -1,13 +1,16 @@
 bin/github-backup
 lib/python${MODPY_VERSION}/site-packages/github_backup/
-lib/python${MODPY_VERSION}/site-packages/github_backup-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/github_backup-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/github_backup-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/github_backup-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/github_backup-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/github_backup-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
+lib/python${MODPY_VERSION}/site-packages/github_backup-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/github_backup-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/github_backup-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/github_backup-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/github_backup-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/github_backup-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/github_backup-${MODPY_EGG_VERSION}.dist-info/zip-safe
 lib/python${MODPY_VERSION}/site-packages/github_backup/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/github_backup/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/github_backup/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/github_backup/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/github_backup/${MODPY_PYCACHE}github_backup.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/github_backup/${MODPY_PYCACHE}github_backup.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/github_backup/github_backup.py
diff --git a/devel/gyp/Makefile b/devel/gyp/Makefile
index a78bc56b8a8..5aaaef4313d 100644
--- a/devel/gyp/Makefile
+++ b/devel/gyp/Makefile
@@ -5,7 +5,7 @@ GH_PROJECT=	gyp
 GH_COMMIT=	caa60026e223fc501e8b337fd5086ece4028b1c6
 
 DISTNAME=	gyp-0.20200512
-REVISION=	1
+REVISION=	2
 
 CATEGORIES=	devel
 
@@ -15,7 +15,7 @@ HOMEPAGE=	https://bugs.chromium.org/p/gyp/
 PERMIT_PACKAGE=	Yes
 
 MODULES=	lang/python
-MODPY_SETUPTOOLS=	Yes
+MODPY_PYBUILD=	setuptools
 TEST_DEPENDS=	devel/ninja
 
 pre-configure:
diff --git a/devel/gyp/pkg/PLIST b/devel/gyp/pkg/PLIST
index 6646e4564c8..6c8387cdbae 100644
--- a/devel/gyp/pkg/PLIST
+++ b/devel/gyp/pkg/PLIST
@@ -1,11 +1,13 @@
 bin/gyp
 lib/python${MODPY_VERSION}/site-packages/gyp/
-lib/python${MODPY_VERSION}/site-packages/gyp-0.1-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/gyp-0.1-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/gyp-0.1-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/gyp-0.1-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/gyp-0.1-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/gyp-0.1-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/gyp-0.1.dist-info/
+lib/python${MODPY_VERSION}/site-packages/gyp-0.1.dist-info/AUTHORS
+lib/python${MODPY_VERSION}/site-packages/gyp-0.1.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/gyp-0.1.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/gyp-0.1.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/gyp-0.1.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/gyp-0.1.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/gyp-0.1.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/gyp/MSVSNew.py
 lib/python${MODPY_VERSION}/site-packages/gyp/MSVSProject.py
 lib/python${MODPY_VERSION}/site-packages/gyp/MSVSSettings.py
@@ -16,30 +18,55 @@ lib/python${MODPY_VERSION}/site-packages/gyp/MSVSUtil.py
 lib/python${MODPY_VERSION}/site-packages/gyp/MSVSVersion.py
 lib/python${MODPY_VERSION}/site-packages/gyp/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSNew.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSNew.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSProject.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSProject.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSSettings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSSettings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSSettings_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSSettings_test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSToolFile.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSToolFile.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSUserFile.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSUserFile.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSUtil.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSUtil.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSVersion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSVersion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}common_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}common_test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}easy_xml.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}easy_xml.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}easy_xml_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}easy_xml_test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}flock_tool.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}flock_tool.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}input.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}input.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}input_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}input_test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}mac_tool.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}mac_tool.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}msvs_emulation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}msvs_emulation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}ninja_syntax.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}ninja_syntax.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}simple_copy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}simple_copy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}win_tool.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}win_tool.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}xcode_emulation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}xcode_emulation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}xcode_ninja.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}xcode_ninja.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}xcodeproj_file.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}xcodeproj_file.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}xml_fix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}xml_fix.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gyp/common.py
 lib/python${MODPY_VERSION}/site-packages/gyp/common_test.py
@@ -49,19 +76,33 @@ lib/python${MODPY_VERSION}/site-packages/gyp/flock_tool.py
 lib/python${MODPY_VERSION}/site-packages/gyp/generator/
 lib/python${MODPY_VERSION}/site-packages/gyp/generator/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}analyzer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}analyzer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}cmake.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}cmake.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}dump_dependency_json.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}dump_dependency_json.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}eclipse.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}eclipse.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}gypd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}gypd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}gypsh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}gypsh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}make.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}make.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}msvs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}msvs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}msvs_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}msvs_test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}ninja.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}ninja.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}ninja_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}ninja_test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}xcode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}xcode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}xcode_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}xcode_test.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gyp/generator/analyzer.py
 lib/python${MODPY_VERSION}/site-packages/gyp/generator/cmake.py
diff --git a/devel/legit/Makefile b/devel/legit/Makefile
index ad6fe0fe0ec..a97a73306cb 100644
--- a/devel/legit/Makefile
+++ b/devel/legit/Makefile
@@ -3,7 +3,7 @@ COMMENT=		complementary command-line interface for Git
 MODPY_EGG_VERSION=	1.2.0
 DISTNAME=		legit-${MODPY_EGG_VERSION}
 CATEGORIES=		devel
-REVISION=		1
+REVISION=		2
 
 HOMEPAGE=		https://frostming.github.io/legit/
 
@@ -13,7 +13,7 @@ PERMIT_PACKAGE=	Yes
 MODULES=		lang/python
 
 MODPY_PI=		Yes
-MODPY_SETUPTOOLS=	Yes
+MODPY_PYBUILD=		setuptools
 
 RUN_DEPENDS=		devel/py-clint${MODPY_FLAVOR}>=0.5.1 \
 			devel/py-click${MODPY_FLAVOR} \
diff --git a/devel/legit/pkg/PLIST b/devel/legit/pkg/PLIST
index 67cff22a70a..22505e86512 100644
--- a/devel/legit/pkg/PLIST
+++ b/devel/legit/pkg/PLIST
@@ -1,20 +1,27 @@
 bin/legit
 lib/python${MODPY_VERSION}/site-packages/legit/
-lib/python${MODPY_VERSION}/site-packages/legit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/legit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/legit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/legit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/legit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/legit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/legit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/legit-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/legit-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/legit-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/legit-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/legit-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/legit-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/legit-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/legit/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}bootstrap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}bootstrap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}scm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}scm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/legit/bootstrap.py
 lib/python${MODPY_VERSION}/site-packages/legit/cli.py
diff --git a/devel/pudb/Makefile b/devel/pudb/Makefile
index 33fe0af63fb..2de63c5f0b2 100644
--- a/devel/pudb/Makefile
+++ b/devel/pudb/Makefile
@@ -3,7 +3,7 @@ COMMENT =		console-based visual debugger for Python
 MODPY_EGG_VERSION =	2019.2
 DISTNAME =		pudb-${MODPY_EGG_VERSION}
 PKGNAME =		py-pudb-${MODPY_EGG_VERSION}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		devel
 
@@ -12,8 +12,7 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools
 
 RUN_DEPENDS =		devel/py-urwid${MODPY_FLAVOR}>=1.1.1 \
 			textproc/py-pygments${MODPY_FLAVOR}
diff --git a/devel/pudb/pkg/PLIST b/devel/pudb/pkg/PLIST
index 86a39ceb90c..855a9c868ed 100644
--- a/devel/pudb/pkg/PLIST
+++ b/devel/pudb/pkg/PLIST
@@ -2,31 +2,46 @@
 @pkgpath devel/pudb
 bin/${PUDB_SCRIPT_NAME}
 lib/python${MODPY_VERSION}/site-packages/pudb/
-lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
-lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}.dist-info/pbr.json
+lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pudb/__init__.py
 lib/python${MODPY_VERSION}/site-packages/pudb/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}b.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}b.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}debugger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}debugger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}ipython.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}ipython.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}lowlevel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}lowlevel.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}py3compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}py3compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}remote.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}remote.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}run.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}run.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}shell.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}shell.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}source_view.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}source_view.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}theme.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}theme.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}ui_tools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}ui_tools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}var_view.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}var_view.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pudb/b.py
 lib/python${MODPY_VERSION}/site-packages/pudb/debugger.py
diff --git a/devel/py-colorama/Makefile b/devel/py-colorama/Makefile
index e3b2c3f5b12..48cdb40949c 100644
--- a/devel/py-colorama/Makefile
+++ b/devel/py-colorama/Makefile
@@ -5,7 +5,7 @@ COMMENT=		print colored terminal text from Python apps
 MODPY_EGG_VERSION=	0.4.4
 DISTNAME=		colorama-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		devel
 
@@ -19,7 +19,7 @@ PERMIT_PACKAGE=	Yes
 MODULES=		lang/python
 
 MODPY_PI=		Yes
-MODPY_SETUPTOOLS=	Yes
+MODPY_PYBUILD=		setuptools
 
 FLAVORS=		python3
 FLAVOR=			python3
diff --git a/devel/py-colorama/pkg/PLIST b/devel/py-colorama/pkg/PLIST
index 9f79aae3a14..2eca6383c59 100644
--- a/devel/py-colorama/pkg/PLIST
+++ b/devel/py-colorama/pkg/PLIST
@@ -1,18 +1,25 @@
 @conflict py-colorama-*
 @pkgpath devel/py-colorama
 lib/python${MODPY_VERSION}/site-packages/colorama/
-lib/python${MODPY_VERSION}/site-packages/colorama-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/colorama-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/colorama-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/colorama-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/colorama-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/colorama-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/colorama-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/colorama-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/colorama-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/colorama-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/colorama-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/colorama/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/colorama/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/colorama/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/colorama/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/colorama/${MODPY_PYCACHE}ansi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/colorama/${MODPY_PYCACHE}ansi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/colorama/${MODPY_PYCACHE}ansitowin32.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/colorama/${MODPY_PYCACHE}ansitowin32.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/colorama/${MODPY_PYCACHE}initialise.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/colorama/${MODPY_PYCACHE}initialise.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/colorama/${MODPY_PYCACHE}win32.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/colorama/${MODPY_PYCACHE}win32.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/colorama/${MODPY_PYCACHE}winterm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/colorama/${MODPY_PYCACHE}winterm.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/colorama/ansi.py
 lib/python${MODPY_VERSION}/site-packages/colorama/ansitowin32.py
diff --git a/devel/py-configargparse/Makefile b/devel/py-configargparse/Makefile
index dbc823ca5f5..5b2bb28f923 100644
--- a/devel/py-configargparse/Makefile
+++ b/devel/py-configargparse/Makefile
@@ -1,9 +1,9 @@
 COMMENT=		argparse replacement, allows options to be set via files/env
 
-MODPY_EGG_VERSION =	1.5.3
+MODPY_EGG_VERSION=	1.5.3
 DISTNAME=		ConfigArgParse-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
-REVISION=		0
+REVISION=		1
 
 CATEGORIES=		devel
 
@@ -15,8 +15,7 @@ FLAVOR=			python3
 
 MODULES=		lang/python
 MODPY_PI=		Yes
-MODPY_SETUPTOOLS=	Yes
-MODPY_PYTEST=		Yes
+MODPY_PYBUILD=		setuptools
 
 TEST_DEPENDS=		textproc/py-yaml${MODPY_FLAVOR}
 
diff --git a/devel/py-configargparse/pkg/PLIST b/devel/py-configargparse/pkg/PLIST
index af1ec96ec24..e383a3cc4c8 100644
--- a/devel/py-configargparse/pkg/PLIST
+++ b/devel/py-configargparse/pkg/PLIST
@@ -1,11 +1,12 @@
 @conflict py-configargparse-*
 @pkgpath devel/py-configargparse
-lib/python${MODPY_VERSION}/site-packages/ConfigArgParse-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/ConfigArgParse-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/ConfigArgParse-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/ConfigArgParse-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/ConfigArgParse-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/ConfigArgParse-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/ConfigArgParse-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/ConfigArgParse-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/ConfigArgParse-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/ConfigArgParse-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/ConfigArgParse-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/ConfigArgParse-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}configargparse.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}configargparse.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/configargparse.py
diff --git a/devel/py-country/Makefile b/devel/py-country/Makefile
index cb24f8464d0..1999488ef42 100644
--- a/devel/py-country/Makefile
+++ b/devel/py-country/Makefile
@@ -3,7 +3,7 @@ COMMENT =		country, language, currency and scripts definitions
 MODPY_EGG_VERSION =	22.3.5
 DISTNAME =		pycountry-${MODPY_EGG_VERSION}
 PKGNAME =		${DISTNAME:S/py/py-/}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		devel
 
@@ -13,11 +13,9 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 MODPY_PYTEST_ARGS =	src
 
-#TEST_ENV =		PYTHONPATH=${WRKSRC}/lib
-
 FLAVORS =		python3
 FLAVOR =		python3
 
diff --git a/devel/py-country/pkg/PLIST b/devel/py-country/pkg/PLIST
index e4511d1f85a..3ae62fbb6d3 100644
--- a/devel/py-country/pkg/PLIST
+++ b/devel/py-country/pkg/PLIST
@@ -1,15 +1,16 @@
 @pkgpath devel/py-country
 lib/python${MODPY_VERSION}/site-packages/pycountry/
-lib/python${MODPY_VERSION}/site-packages/pycountry-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pycountry-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pycountry-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pycountry-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pycountry-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/pycountry-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pycountry-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pycountry-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pycountry-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/pycountry-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pycountry-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pycountry-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pycountry-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pycountry/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pycountry/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pycountry/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pycountry/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pycountry/${MODPY_PYCACHE}db.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pycountry/${MODPY_PYCACHE}db.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pycountry/databases/
 lib/python${MODPY_VERSION}/site-packages/pycountry/databases/iso15924.json
@@ -1139,5 +1140,6 @@ lib/python${MODPY_VERSION}/site-packages/pycountry/locales/zu/LC_MESSAGES/iso639
 lib/python${MODPY_VERSION}/site-packages/pycountry/locales/zu/LC_MESSAGES/iso639_3.mo
 lib/python${MODPY_VERSION}/site-packages/pycountry/tests/
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pycountry/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pycountry/tests/${MODPY_PYCACHE}test_general.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pycountry/tests/${MODPY_PYCACHE}test_general.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pycountry/tests/test_general.py
diff --git a/devel/py-coveralls/Makefile b/devel/py-coveralls/Makefile
index 81c3bfb0ed3..cea24e563a8 100644
--- a/devel/py-coveralls/Makefile
+++ b/devel/py-coveralls/Makefile
@@ -3,7 +3,7 @@ COMMENT =	display coverage stats online via coveralls.io
 MODPY_EGG_VERSION =	3.3.1
 DISTNAME =	coveralls-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	devel
 
@@ -18,7 +18,7 @@ FLAVORS =		python3
 FLAVOR =		python3
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 RUN_DEPENDS =		devel/py-docopt${MODPY_FLAVOR} \
 			devel/py-coverage${MODPY_FLAVOR} \
diff --git a/devel/py-coveralls/pkg/PLIST b/devel/py-coveralls/pkg/PLIST
index 51b630208e9..4b8585e5a7b 100644
--- a/devel/py-coveralls/pkg/PLIST
+++ b/devel/py-coveralls/pkg/PLIST
@@ -2,23 +2,31 @@
 @pkgpath devel/py-coveralls
 bin/coveralls
 lib/python${MODPY_VERSION}/site-packages/coveralls/
-lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/coveralls/__init__.py
 lib/python${MODPY_VERSION}/site-packages/coveralls/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}exception.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}exception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}git.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}git.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}reporter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}reporter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/api.py
 lib/python${MODPY_VERSION}/site-packages/coveralls/cli.py
diff --git a/devel/py-extras/Makefile b/devel/py-extras/Makefile
index 0312cc8813d..71f1b2f13c2 100644
--- a/devel/py-extras/Makefile
+++ b/devel/py-extras/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION=	1.0.0
 DISTNAME=		extras-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
 CATEGORIES=		devel
-REVISION=		5
+REVISION=		6
 
 # MIT
 PERMIT_PACKAGE=	Yes
@@ -12,7 +12,7 @@ PERMIT_PACKAGE=	Yes
 MODULES=		lang/python
 
 MODPY_PI=		Yes
-MODPY_SETUPTOOLS=	Yes
+MODPY_PYBUILD=		setuptools
 
 FLAVORS=		python3
 FLAVOR=			python3
diff --git a/devel/py-extras/pkg/PLIST b/devel/py-extras/pkg/PLIST
index 9daa5df3e00..4a0b673ef6d 100644
--- a/devel/py-extras/pkg/PLIST
+++ b/devel/py-extras/pkg/PLIST
@@ -1,17 +1,21 @@
 @pkgpath devel/py-extras
 lib/python${MODPY_VERSION}/site-packages/extras/
-lib/python${MODPY_VERSION}/site-packages/extras-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/extras-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/extras-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/extras-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/extras-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
-lib/python${MODPY_VERSION}/site-packages/extras-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/extras-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/extras-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/extras-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/extras-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/extras-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/extras-${MODPY_EGG_VERSION}.dist-info/pbr.json
+lib/python${MODPY_VERSION}/site-packages/extras-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/extras/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/extras/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/extras/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/extras/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/extras/tests/
 lib/python${MODPY_VERSION}/site-packages/extras/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/extras/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/extras/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/extras/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/extras/tests/${MODPY_PYCACHE}test_extras.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/extras/tests/${MODPY_PYCACHE}test_extras.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/extras/tests/test_extras.py
diff --git a/devel/py-filebytes/Makefile b/devel/py-filebytes/Makefile
index 8ac48ad6132..0cd361de9e1 100644
--- a/devel/py-filebytes/Makefile
+++ b/devel/py-filebytes/Makefile
@@ -3,7 +3,7 @@ COMMENT =	python module to read and write ELF, PE, MachO or OAT
 MODPY_EGG_VERSION =	0.9.21
 DISTNAME =	filebytes-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	4
+REVISION =	5
 
 CATEGORIES =	devel security
 
@@ -15,7 +15,7 @@ MAINTAINER =	Remi Pointel <rpointel@openbsd.org>
 PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 MODPY_PI =		Yes
 
 FLAVORS =	python3
diff --git a/devel/py-filebytes/pkg/PLIST b/devel/py-filebytes/pkg/PLIST
index bebf989aa7b..6b2ae30be70 100644
--- a/devel/py-filebytes/pkg/PLIST
+++ b/devel/py-filebytes/pkg/PLIST
@@ -1,19 +1,28 @@
 @pkgpath devel/py-filebytes
 lib/python${MODPY_VERSION}/site-packages/filebytes/
-lib/python${MODPY_VERSION}/site-packages/filebytes-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/filebytes-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/filebytes-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/filebytes-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/filebytes-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/filebytes-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/filebytes-${MODPY_EGG_VERSION}.dist-info/COPYING
+lib/python${MODPY_VERSION}/site-packages/filebytes-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/filebytes-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/filebytes-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/filebytes-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/filebytes/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/filebytes/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/filebytes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/filebytes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/filebytes/${MODPY_PYCACHE}binary.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/filebytes/${MODPY_PYCACHE}binary.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/filebytes/${MODPY_PYCACHE}ctypes_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/filebytes/${MODPY_PYCACHE}ctypes_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/filebytes/${MODPY_PYCACHE}elf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/filebytes/${MODPY_PYCACHE}elf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/filebytes/${MODPY_PYCACHE}enum.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/filebytes/${MODPY_PYCACHE}enum.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/filebytes/${MODPY_PYCACHE}mach_o.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/filebytes/${MODPY_PYCACHE}mach_o.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/filebytes/${MODPY_PYCACHE}oat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/filebytes/${MODPY_PYCACHE}oat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/filebytes/${MODPY_PYCACHE}pe.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/filebytes/${MODPY_PYCACHE}pe.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/filebytes/binary.py
 lib/python${MODPY_VERSION}/site-packages/filebytes/ctypes_helper.py
diff --git a/devel/py-fixtures/Makefile b/devel/py-fixtures/Makefile
index 256b395e419..7dc8c790eb8 100644
--- a/devel/py-fixtures/Makefile
+++ b/devel/py-fixtures/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	3.0.0
 
 DISTNAME =		fixtures-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		4
+REVISION =		5
 
 CATEGORIES =		devel
 
@@ -18,8 +18,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools
 MODPY_PYTEST_ARGS =	fixtures
 
 FLAVORS =		python3
diff --git a/devel/py-fixtures/pkg/PLIST b/devel/py-fixtures/pkg/PLIST
index 43f07c619fa..f824074de4c 100644
--- a/devel/py-fixtures/pkg/PLIST
+++ b/devel/py-fixtures/pkg/PLIST
@@ -1,35 +1,53 @@
 @pkgpath devel/py-fixtures
 lib/python${MODPY_VERSION}/site-packages/fixtures/
-lib/python${MODPY_VERSION}/site-packages/fixtures-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/fixtures-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/fixtures-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/fixtures-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/fixtures-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/fixtures-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
-lib/python${MODPY_VERSION}/site-packages/fixtures-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/fixtures-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/fixtures-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/fixtures-${MODPY_EGG_VERSION}.dist-info/AUTHORS
+lib/python${MODPY_VERSION}/site-packages/fixtures-${MODPY_EGG_VERSION}.dist-info/COPYING
+lib/python${MODPY_VERSION}/site-packages/fixtures-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/fixtures-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/fixtures-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/fixtures-${MODPY_EGG_VERSION}.dist-info/pbr.json
+lib/python${MODPY_VERSION}/site-packages/fixtures-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/fixtures/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/fixtures/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/fixtures/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/${MODPY_PYCACHE}callmany.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/${MODPY_PYCACHE}callmany.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/${MODPY_PYCACHE}fixture.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/${MODPY_PYCACHE}fixture.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/${MODPY_PYCACHE}testcase.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/${MODPY_PYCACHE}testcase.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/
 lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}environ.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}environ.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}mockpatch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}mockpatch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}monkeypatch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}monkeypatch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}packagepath.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}packagepath.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}popen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}popen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}pythonpackage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}pythonpackage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}pythonpath.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}pythonpath.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}streams.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}streams.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}tempdir.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}tempdir.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}temphomedir.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}temphomedir.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}timeout.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}timeout.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}warnings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/${MODPY_PYCACHE}warnings.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/environ.py
 lib/python${MODPY_VERSION}/site-packages/fixtures/_fixtures/logger.py
@@ -50,27 +68,46 @@ lib/python${MODPY_VERSION}/site-packages/fixtures/testcase.py
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/fixtures/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/fixtures/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/tests/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/tests/${MODPY_PYCACHE}test_callmany.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/${MODPY_PYCACHE}test_callmany.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/tests/${MODPY_PYCACHE}test_fixture.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/${MODPY_PYCACHE}test_fixture.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/tests/${MODPY_PYCACHE}test_testcase.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/${MODPY_PYCACHE}test_testcase.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_environ.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_environ.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_mockpatch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_mockpatch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_monkeypatch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_monkeypatch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_packagepath.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_packagepath.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_popen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_popen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_pythonpackage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_pythonpackage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_pythonpath.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_pythonpath.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_streams.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_streams.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_tempdir.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_tempdir.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_temphomedir.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_temphomedir.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_timeout.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_timeout.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_warnings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/${MODPY_PYCACHE}test_warnings.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/test_environ.py
 lib/python${MODPY_VERSION}/site-packages/fixtures/tests/_fixtures/test_logger.py
diff --git a/devel/py-flexmock/Makefile b/devel/py-flexmock/Makefile
index 609c978eea9..e3a0a76d67f 100644
--- a/devel/py-flexmock/Makefile
+++ b/devel/py-flexmock/Makefile
@@ -3,7 +3,7 @@ COMMENT =		testing library for Python
 MODPY_EGG_VERSION =	0.11.3
 DISTNAME =		flexmock-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		devel
 
@@ -12,8 +12,7 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		poetry-core
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/devel/py-flexmock/pkg/PLIST b/devel/py-flexmock/pkg/PLIST
index d8461186a53..cf0536c3fac 100644
--- a/devel/py-flexmock/pkg/PLIST
+++ b/devel/py-flexmock/pkg/PLIST
@@ -1,15 +1,19 @@
 @pkgpath devel/py-flexmock
 lib/python${MODPY_VERSION}/site-packages/flexmock/
-lib/python${MODPY_VERSION}/site-packages/flexmock-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/flexmock-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/flexmock-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/flexmock-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/flexmock-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/flexmock-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/flexmock-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/flexmock-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/flexmock-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/flexmock-${MODPY_EGG_VERSION}.dist-info/WHEEL
 lib/python${MODPY_VERSION}/site-packages/flexmock/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/flexmock/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/flexmock/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flexmock/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flexmock/${MODPY_PYCACHE}_api.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flexmock/${MODPY_PYCACHE}_api.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flexmock/${MODPY_PYCACHE}_integrations.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flexmock/${MODPY_PYCACHE}_integrations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flexmock/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/flexmock/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/flexmock/_api.py
 lib/python${MODPY_VERSION}/site-packages/flexmock/_integrations.py
diff --git a/devel/py-freezegun/Makefile b/devel/py-freezegun/Makefile
index 3fece95b299..1cd5ae86d85 100644
--- a/devel/py-freezegun/Makefile
+++ b/devel/py-freezegun/Makefile
@@ -3,7 +3,7 @@ COMMENT =		let your Python tests travel through time
 MODPY_EGG_VERSION =	0.3.12
 DISTNAME =		freezegun-${MODPY_EGG_VERSION}
 PKGNAME =		py-freezegun-${MODPY_EGG_VERSION}
-REVISION =		4
+REVISION =		5
 
 CATEGORIES =		devel
 
@@ -15,8 +15,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools
 
 RUN_DEPENDS =		devel/py-dateutil${MODPY_FLAVOR} \
 			devel/py-six${MODPY_FLAVOR}
diff --git a/devel/py-freezegun/pkg/PLIST b/devel/py-freezegun/pkg/PLIST
index ddf5b7d72b6..de7fed98e0d 100644
--- a/devel/py-freezegun/pkg/PLIST
+++ b/devel/py-freezegun/pkg/PLIST
@@ -1,15 +1,19 @@
 @pkgpath devel/py-freezegun
 lib/python${MODPY_VERSION}/site-packages/freezegun/
-lib/python${MODPY_VERSION}/site-packages/freezegun-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/freezegun-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/freezegun-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/freezegun-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/freezegun-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/freezegun-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/freezegun-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/freezegun-${MODPY_EGG_VERSION}.dist-info/AUTHORS.rst
+lib/python${MODPY_VERSION}/site-packages/freezegun-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/freezegun-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/freezegun-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/freezegun-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/freezegun-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/freezegun/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/freezegun/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/freezegun/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/freezegun/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/freezegun/${MODPY_PYCACHE}_async.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/freezegun/${MODPY_PYCACHE}_async.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/freezegun/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/freezegun/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/freezegun/_async.py
 lib/python${MODPY_VERSION}/site-packages/freezegun/api.py
diff --git a/devel/py-frozendict/Makefile b/devel/py-frozendict/Makefile
index d5b38a3258c..573fc14b7b4 100644
--- a/devel/py-frozendict/Makefile
+++ b/devel/py-frozendict/Makefile
@@ -3,7 +3,7 @@ COMMENT =		immutable dictionary
 MODPY_EGG_VERSION =	2.3.4
 DISTNAME =		frozendict-${MODPY_EGG_VERSION}
 PKGNAME =		py-frozendict-${MODPY_EGG_VERSION}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		devel
 
@@ -16,9 +16,8 @@ FLAVORS =		python3
 FLAVOR =		python3
 
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 MODPY_PI =		Yes
-MODPY_PYTEST =		Yes
 
 .include <bsd.port.arch.mk>
 .if !${PROPERTIES:Mclang}
diff --git a/devel/py-frozendict/pkg/PLIST b/devel/py-frozendict/pkg/PLIST
index 61b7ecb1812..5808ac4b803 100644
--- a/devel/py-frozendict/pkg/PLIST
+++ b/devel/py-frozendict/pkg/PLIST
@@ -1,14 +1,17 @@
 @pkgpath devel/py-frozendict
 lib/python${MODPY_VERSION}/site-packages/frozendict/
-lib/python${MODPY_VERSION}/site-packages/frozendict-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/frozendict-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/frozendict-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/frozendict-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/frozendict-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/frozendict-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/frozendict-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/frozendict-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/frozendict-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/frozendict-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/frozendict-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/frozendict/VERSION
 lib/python${MODPY_VERSION}/site-packages/frozendict/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/frozendict/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/frozendict/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/frozendict/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/frozendict/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/frozendict/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
 @so lib/python${MODPY_VERSION}/site-packages/frozendict/_frozendict.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/frozendict/core.py
diff --git a/devel/py-gevent-eventemitter/Makefile b/devel/py-gevent-eventemitter/Makefile
index 56df1c86fca..9eb28ece7f3 100644
--- a/devel/py-gevent-eventemitter/Makefile
+++ b/devel/py-gevent-eventemitter/Makefile
@@ -5,14 +5,14 @@ DISTNAME =		gevent-eventemitter-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		devel
 HOMEPAGE =		https://github.com/rossengeorgiev/gevent-eventemitter
-REVISION =		0
+REVISION =		1
 
 # MIT
 PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 RUN_DEPENDS =		devel/py-gevent${MODPY_FLAVOR} \
 			devel/py-zopeevent${MODPY_FLAVOR} \
diff --git a/devel/py-gevent-eventemitter/pkg/PLIST b/devel/py-gevent-eventemitter/pkg/PLIST
index 6752b94c142..f4fc80ad935 100644
--- a/devel/py-gevent-eventemitter/pkg/PLIST
+++ b/devel/py-gevent-eventemitter/pkg/PLIST
@@ -1,11 +1,11 @@
 lib/python${MODPY_VERSION}/site-packages/eventemitter/
 lib/python${MODPY_VERSION}/site-packages/eventemitter/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/eventemitter/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/eventemitter/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/eventemitter/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gevent_eventemitter-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/gevent_eventemitter-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/gevent_eventemitter-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/gevent_eventemitter-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/gevent_eventemitter-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/gevent_eventemitter-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/gevent_eventemitter-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
+lib/python${MODPY_VERSION}/site-packages/gevent_eventemitter-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/gevent_eventemitter-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/gevent_eventemitter-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/gevent_eventemitter-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/gevent_eventemitter-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/gevent_eventemitter-${MODPY_EGG_VERSION}.dist-info/zip-safe
diff --git a/devel/py-gobject3/Makefile b/devel/py-gobject3/Makefile
index 7ee7e5d0c44..2075189fc82 100644
--- a/devel/py-gobject3/Makefile
+++ b/devel/py-gobject3/Makefile
@@ -4,7 +4,7 @@ GNOME_PROJECT=		pygobject
 GNOME_VERSION=		3.42.2
 MODPY_EGG_VERSION=	${GNOME_VERSION}
 PKGNAME=		py3-gobject3-${GNOME_VERSION}
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		devel
 
@@ -26,7 +26,7 @@ MODULES=		lang/python \
 			x11/gnome
 
 MODGNOME_TOOLS=		gobject-introspection
-MODPY_SETUPTOOLS=	Yes
+MODPY_PYBUILD =		setuptools
 
 # XXX https://bugzilla.gnome.org/show_bug.cgi?id=737874
 MODULES +=		gcc4
diff --git a/devel/py-gobject3/pkg/PLIST b/devel/py-gobject3/pkg/PLIST
index a3c7ce63db4..3d54b7c3ab9 100644
--- a/devel/py-gobject3/pkg/PLIST
+++ b/devel/py-gobject3/pkg/PLIST
@@ -6,29 +6,40 @@
 @pkgpath devel/py-gobject3,-common
 include/pygobject-3.0/
 include/pygobject-3.0/pygobject.h
-lib/pkgconfig/pygobject-3.0.pc
-lib/python${MODPY_VERSION}/site-packages/PyGObject-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/PyGObject-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/PyGObject-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/PyGObject-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/PyGObject-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/PyGObject-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/PyGObject-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/PyGObject-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/PyGObject-${MODPY_EGG_VERSION}.dist-info/COPYING
+lib/python${MODPY_VERSION}/site-packages/PyGObject-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/PyGObject-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/PyGObject-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/PyGObject-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/gi/
 lib/python${MODPY_VERSION}/site-packages/gi/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}_constants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}_constants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}_error.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}_error.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}_gtktemplate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}_gtktemplate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}_option.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}_option.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}_ossighelper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}_ossighelper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}_propertyhelper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}_propertyhelper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}_signalhelper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}_signalhelper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}docstring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}docstring.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}importer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}importer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}module.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}module.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}pygtkcompat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}pygtkcompat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gi/_constants.py
 lib/python${MODPY_VERSION}/site-packages/gi/_error.py
@@ -53,28 +64,42 @@ lib/python${MODPY_VERSION}/site-packages/gi/overrides/Gtk.py
 lib/python${MODPY_VERSION}/site-packages/gi/overrides/Pango.py
 lib/python${MODPY_VERSION}/site-packages/gi/overrides/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}GIMarshallingTests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}GIMarshallingTests.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}GLib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}GLib.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}GObject.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}GObject.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}Gdk.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}Gdk.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}GdkPixbuf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}GdkPixbuf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}Gio.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}Gio.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}Gtk.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}Gtk.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}Pango.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}Pango.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}keysyms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}keysyms.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gi/overrides/keysyms.py
 lib/python${MODPY_VERSION}/site-packages/gi/pygtkcompat.py
 lib/python${MODPY_VERSION}/site-packages/gi/repository/
 lib/python${MODPY_VERSION}/site-packages/gi/repository/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gi/repository/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/gi/repository/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gi/repository/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gi/types.py
 lib/python${MODPY_VERSION}/site-packages/pygtkcompat/
 lib/python${MODPY_VERSION}/site-packages/pygtkcompat/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pygtkcompat/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pygtkcompat/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pygtkcompat/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pygtkcompat/${MODPY_PYCACHE}generictreemodel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pygtkcompat/${MODPY_PYCACHE}generictreemodel.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pygtkcompat/${MODPY_PYCACHE}pygtkcompat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pygtkcompat/${MODPY_PYCACHE}pygtkcompat.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pygtkcompat/generictreemodel.py
 lib/python${MODPY_VERSION}/site-packages/pygtkcompat/pygtkcompat.py
diff --git a/devel/py-html5lib/Makefile b/devel/py-html5lib/Makefile
index 3195831d831..b8e8efbd51e 100644
--- a/devel/py-html5lib/Makefile
+++ b/devel/py-html5lib/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION=	1.1
 DISTNAME=		html5lib-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
 CATEGORIES=		devel www textproc
-REVISION=		1
+REVISION=		2
 
 HOMEPAGE=		https://github.com/html5lib/html5lib-python/
 
@@ -14,8 +14,7 @@ PERMIT_PACKAGE=		Yes
 MODULES=		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools
 
 RUN_DEPENDS =		devel/py-six${MODPY_FLAVOR} \
 			textproc/py-webencodings${MODPY_FLAVOR}
diff --git a/devel/py-html5lib/pkg/PLIST b/devel/py-html5lib/pkg/PLIST
index b317bcacaa7..f36d1e7034d 100644
--- a/devel/py-html5lib/pkg/PLIST
+++ b/devel/py-html5lib/pkg/PLIST
@@ -1,20 +1,29 @@
 @pkgpath devel/py-html5lib
 lib/python${MODPY_VERSION}/site-packages/html5lib/
-lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}.dist-info/AUTHORS.rst
+lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/html5lib/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}_ihatexml.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}_ihatexml.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}_inputstream.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}_inputstream.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}_tokenizer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}_tokenizer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}_utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}html5parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}html5parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}serializer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}serializer.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/html5lib/_ihatexml.py
 lib/python${MODPY_VERSION}/site-packages/html5lib/_inputstream.py
@@ -22,8 +31,11 @@ lib/python${MODPY_VERSION}/site-packages/html5lib/_tokenizer.py
 lib/python${MODPY_VERSION}/site-packages/html5lib/_trie/
 lib/python${MODPY_VERSION}/site-packages/html5lib/_trie/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/html5lib/_trie/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/html5lib/_trie/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/_trie/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/_trie/${MODPY_PYCACHE}_base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/_trie/${MODPY_PYCACHE}_base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/_trie/${MODPY_PYCACHE}py.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/_trie/${MODPY_PYCACHE}py.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/html5lib/_trie/_base.py
 lib/python${MODPY_VERSION}/site-packages/html5lib/_trie/py.py
@@ -32,13 +44,21 @@ lib/python${MODPY_VERSION}/site-packages/html5lib/constants.py
 lib/python${MODPY_VERSION}/site-packages/html5lib/filters/
 lib/python${MODPY_VERSION}/site-packages/html5lib/filters/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}alphabeticalattributes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}alphabeticalattributes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}inject_meta_charset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}inject_meta_charset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}lint.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}lint.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}optionaltags.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}optionaltags.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}sanitizer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}sanitizer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}whitespace.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}whitespace.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/html5lib/filters/alphabeticalattributes.py
 lib/python${MODPY_VERSION}/site-packages/html5lib/filters/base.py
@@ -52,18 +72,26 @@ lib/python${MODPY_VERSION}/site-packages/html5lib/serializer.py
 lib/python${MODPY_VERSION}/site-packages/html5lib/treeadapters/
 lib/python${MODPY_VERSION}/site-packages/html5lib/treeadapters/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/html5lib/treeadapters/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/html5lib/treeadapters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/treeadapters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/treeadapters/${MODPY_PYCACHE}genshi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/treeadapters/${MODPY_PYCACHE}genshi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/treeadapters/${MODPY_PYCACHE}sax.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/treeadapters/${MODPY_PYCACHE}sax.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/html5lib/treeadapters/genshi.py
 lib/python${MODPY_VERSION}/site-packages/html5lib/treeadapters/sax.py
 lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/
 lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/${MODPY_PYCACHE}dom.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/${MODPY_PYCACHE}dom.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/${MODPY_PYCACHE}etree.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/${MODPY_PYCACHE}etree.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/${MODPY_PYCACHE}etree_lxml.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/${MODPY_PYCACHE}etree_lxml.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/base.py
 lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/dom.py
@@ -72,11 +100,17 @@ lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/etree_lxml.py
 lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/
 lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}dom.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}dom.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}etree.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}etree.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}etree_lxml.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}etree_lxml.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}genshi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}genshi.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/base.py
 lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/dom.py
diff --git a/devel/py-icalendar/Makefile b/devel/py-icalendar/Makefile
index d254bd3d91d..f3198a1d76a 100644
--- a/devel/py-icalendar/Makefile
+++ b/devel/py-icalendar/Makefile
@@ -3,7 +3,7 @@ COMMENT =		parser/generator of iCalendar files
 MODPY_EGG_VERSION =	4.0.4
 DISTNAME =		icalendar-${MODPY_EGG_VERSION}
 PKGNAME =		py-icalendar-${MODPY_EGG_VERSION}
-REVISION =		5
+REVISION =		6
 
 CATEGORIES =		devel
 
@@ -17,8 +17,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools
 MODPY_PYTEST_ARGS =	src/icalendar/tests
 
 RUN_DEPENDS =		devel/py-dateutil${MODPY_FLAVOR} \
diff --git a/devel/py-icalendar/pkg/PLIST b/devel/py-icalendar/pkg/PLIST
index 97da75b520b..b64761f9bc3 100644
--- a/devel/py-icalendar/pkg/PLIST
+++ b/devel/py-icalendar/pkg/PLIST
@@ -1,27 +1,37 @@
-@pkgpath devel/py-icalendar
 @conflict py-icalendar-<4.0.4p1
+@pkgpath devel/py-icalendar
 bin/icalendar
 lib/python${MODPY_VERSION}/site-packages/icalendar/
-lib/python${MODPY_VERSION}/site-packages/icalendar-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/icalendar-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/icalendar-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/icalendar-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/icalendar-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/icalendar-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/icalendar-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/icalendar-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/icalendar-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/icalendar-${MODPY_EGG_VERSION}.dist-info/LICENSE.rst
+lib/python${MODPY_VERSION}/site-packages/icalendar-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/icalendar-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/icalendar-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/icalendar-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/icalendar-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/icalendar/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}cal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}cal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}caselessdict.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}caselessdict.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}parser_tools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}parser_tools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}prop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}prop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}timezone_cache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}timezone_cache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}tools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}tools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}windows_to_olson.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/${MODPY_PYCACHE}windows_to_olson.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/icalendar/cal.py
 lib/python${MODPY_VERSION}/site-packages/icalendar/caselessdict.py
@@ -33,24 +43,39 @@ lib/python${MODPY_VERSION}/site-packages/icalendar/prop.py
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_encoding.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_encoding.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_fixed_issues.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_fixed_issues.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_icalendar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_icalendar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_multiple.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_multiple.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_property_params.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_property_params.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_recurrence.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_recurrence.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_time.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_time.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_timezoned.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_timezoned.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_unit_cal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_unit_cal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_unit_caselessdict.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_unit_caselessdict.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_unit_parser_tools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_unit_parser_tools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_unit_prop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_unit_prop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_unit_tools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/${MODPY_PYCACHE}test_unit_tools.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/america_new_york.ics
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/encoding.ics
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/hypothesis/
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/icalendar/tests/hypothesis/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/icalendar/tests/hypothesis/${MODPY_PYCACHE}test_fuzzing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/hypothesis/${MODPY_PYCACHE}test_fuzzing.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/hypothesis/test_fuzzing.py
 lib/python${MODPY_VERSION}/site-packages/icalendar/tests/issue_112_missing_tzinfo_on_exdate.ics
diff --git a/devel/py-incremental/Makefile b/devel/py-incremental/Makefile
index 1ca0304d604..df9e0660023 100644
--- a/devel/py-incremental/Makefile
+++ b/devel/py-incremental/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	21.3.0
 
 DISTNAME =		incremental-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		devel
 
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 MODPY_PYTEST_ARGS =	src/incremental
 
 TEST_DEPENDS =		devel/py-click${MODPY_FLAVOR} \
diff --git a/devel/py-incremental/pkg/PLIST b/devel/py-incremental/pkg/PLIST
index a5005d1c15e..1d208652fda 100644
--- a/devel/py-incremental/pkg/PLIST
+++ b/devel/py-incremental/pkg/PLIST
@@ -1,24 +1,29 @@
 @pkgpath devel/py-incremental
 lib/python${MODPY_VERSION}/site-packages/incremental/
-lib/python${MODPY_VERSION}/site-packages/incremental-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/incremental-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/incremental-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/incremental-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/incremental-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/incremental-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/incremental-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/incremental-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/incremental-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/incremental-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/incremental-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/incremental-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/incremental-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/incremental-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/incremental-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/incremental/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/incremental/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/incremental/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/incremental/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/incremental/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/incremental/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/incremental/${MODPY_PYCACHE}update.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/incremental/${MODPY_PYCACHE}update.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/incremental/_version.py
 lib/python${MODPY_VERSION}/site-packages/incremental/tests/
 lib/python${MODPY_VERSION}/site-packages/incremental/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/incremental/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/incremental/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/incremental/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/incremental/tests/${MODPY_PYCACHE}test_update.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/incremental/tests/${MODPY_PYCACHE}test_update.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/incremental/tests/${MODPY_PYCACHE}test_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/incremental/tests/${MODPY_PYCACHE}test_version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/incremental/tests/test_update.py
 lib/python${MODPY_VERSION}/site-packages/incremental/tests/test_version.py
diff --git a/devel/py-iso3166/Makefile b/devel/py-iso3166/Makefile
index dc0675529a1..50c26c8b1eb 100644
--- a/devel/py-iso3166/Makefile
+++ b/devel/py-iso3166/Makefile
@@ -3,7 +3,7 @@ COMMENT =	self-contained ISO 3166-1 country definitions library
 DISTNAME =	iso3166-${MODPY_EGG_VERSION}
 PKGNAME =	py-iso3166-${MODPY_EGG_VERSION}
 CATEGORIES =	devel
-REVISION =	4
+REVISION =	5
 
 HOMEPAGE =	https://github.com/deactivated/python-iso3166
 MAINTAINER =	Brian Callahan <bcallah@openbsd.org>
@@ -14,8 +14,7 @@ PERMIT_PACKAGE =	Yes
 MODPY_PI =	Yes
 
 MODULES =	lang/python
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =	setuptools
 
 FLAVORS =	python3
 FLAVOR =	python3
diff --git a/devel/py-iso3166/pkg/PLIST b/devel/py-iso3166/pkg/PLIST
index 18ffd59fcf6..014aba12f35 100644
--- a/devel/py-iso3166/pkg/PLIST
+++ b/devel/py-iso3166/pkg/PLIST
@@ -1,11 +1,12 @@
 @pkgpath devel/py-iso3166
 lib/python${MODPY_VERSION}/site-packages/iso3166/
-lib/python${MODPY_VERSION}/site-packages/iso3166-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/iso3166-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/iso3166-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/iso3166-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/iso3166-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/iso3166-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/iso3166-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/iso3166-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/iso3166-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/iso3166-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/iso3166-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/iso3166-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/iso3166/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/iso3166/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/iso3166/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/iso3166/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
diff --git a/devel/py-iso639/Makefile b/devel/py-iso639/Makefile
index 93f04494cc8..1b0d9b190ec 100644
--- a/devel/py-iso639/Makefile
+++ b/devel/py-iso639/Makefile
@@ -3,7 +3,7 @@ COMMENT =	Python library for the ISO 639 language code standard
 DISTNAME =	iso-639-${MODPY_EGG_VERSION}
 PKGNAME =	py-iso639-${MODPY_EGG_VERSION}
 CATEGORIES =	devel
-REVISION =	7
+REVISION =	8
 
 HOMEPAGE =	https://github.com/noumar/iso639
 MAINTAINER =	Brian Callahan <bcallah@openbsd.org>
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 MODPY_PI =	Yes
 
 MODULES =	lang/python
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 FLAVORS =	python3
 FLAVOR =	python3
diff --git a/devel/py-iso639/pkg/PLIST b/devel/py-iso639/pkg/PLIST
index 37e2dc3e9ed..10eab7970a0 100644
--- a/devel/py-iso639/pkg/PLIST
+++ b/devel/py-iso639/pkg/PLIST
@@ -2,7 +2,9 @@
 lib/python${MODPY_VERSION}/site-packages/iso639/
 lib/python${MODPY_VERSION}/site-packages/iso639/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/iso639/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/iso639/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/iso639/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/iso639/${MODPY_PYCACHE}iso639.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/iso639/${MODPY_PYCACHE}iso639.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/iso639/iso-639-3-macrolanguages.tab
 lib/python${MODPY_VERSION}/site-packages/iso639/iso-639-3.tab
@@ -12,9 +14,8 @@ lib/python${MODPY_VERSION}/site-packages/iso639/iso639-1.tsv
 lib/python${MODPY_VERSION}/site-packages/iso639/iso639-2.tsv
 lib/python${MODPY_VERSION}/site-packages/iso639/iso639-5.tsv
 lib/python${MODPY_VERSION}/site-packages/iso639/iso639.py
-lib/python${MODPY_VERSION}/site-packages/iso_639-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/iso_639-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/iso_639-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/iso_639-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/iso_639-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/iso_639-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/iso_639-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/iso_639-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/iso_639-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/iso_639-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/iso_639-${MODPY_EGG_VERSION}.dist-info/top_level.txt
diff --git a/devel/py-isodate/Makefile b/devel/py-isodate/Makefile
index e66dc913005..52dca760aa6 100644
--- a/devel/py-isodate/Makefile
+++ b/devel/py-isodate/Makefile
@@ -3,7 +3,7 @@ COMMENT =		ISO 8601 date/time/duration parser and formater
 MODPY_EGG_VERSION =	0.6.1
 DISTNAME =		isodate-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		devel
 
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes
 MODPY_PI =		Yes
 
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 MODPY_PYTEST_ARGS =	src
 
 RUN_DEPENDS =		devel/py-six${MODPY_FLAVOR}
diff --git a/devel/py-isodate/pkg/PLIST b/devel/py-isodate/pkg/PLIST
index c6a6229e36c..6f6b457a454 100644
--- a/devel/py-isodate/pkg/PLIST
+++ b/devel/py-isodate/pkg/PLIST
@@ -1,22 +1,31 @@
 @pkgpath devel/py-isodate
 lib/python${MODPY_VERSION}/site-packages/isodate/
-lib/python${MODPY_VERSION}/site-packages/isodate-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/isodate-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/isodate-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/isodate-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/isodate-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/isodate-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/isodate-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/isodate-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/isodate-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/isodate-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/isodate-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/isodate/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/isodate/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/isodate/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/isodate/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/isodate/${MODPY_PYCACHE}duration.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/isodate/${MODPY_PYCACHE}duration.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/isodate/${MODPY_PYCACHE}isodates.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/isodate/${MODPY_PYCACHE}isodates.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/isodate/${MODPY_PYCACHE}isodatetime.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/isodate/${MODPY_PYCACHE}isodatetime.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/isodate/${MODPY_PYCACHE}isoduration.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/isodate/${MODPY_PYCACHE}isoduration.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/isodate/${MODPY_PYCACHE}isoerror.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/isodate/${MODPY_PYCACHE}isoerror.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/isodate/${MODPY_PYCACHE}isostrf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/isodate/${MODPY_PYCACHE}isostrf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/isodate/${MODPY_PYCACHE}isotime.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/isodate/${MODPY_PYCACHE}isotime.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/isodate/${MODPY_PYCACHE}isotzinfo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/isodate/${MODPY_PYCACHE}isotzinfo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/isodate/${MODPY_PYCACHE}tzinfo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/isodate/${MODPY_PYCACHE}tzinfo.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/isodate/duration.py
 lib/python${MODPY_VERSION}/site-packages/isodate/isodates.py
@@ -29,12 +38,19 @@ lib/python${MODPY_VERSION}/site-packages/isodate/isotzinfo.py
 lib/python${MODPY_VERSION}/site-packages/isodate/tests/
 lib/python${MODPY_VERSION}/site-packages/isodate/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/isodate/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/isodate/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/isodate/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/isodate/tests/${MODPY_PYCACHE}test_date.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/isodate/tests/${MODPY_PYCACHE}test_date.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/isodate/tests/${MODPY_PYCACHE}test_datetime.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/isodate/tests/${MODPY_PYCACHE}test_datetime.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/isodate/tests/${MODPY_PYCACHE}test_duration.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/isodate/tests/${MODPY_PYCACHE}test_duration.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/isodate/tests/${MODPY_PYCACHE}test_pickle.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/isodate/tests/${MODPY_PYCACHE}test_pickle.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/isodate/tests/${MODPY_PYCACHE}test_strf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/isodate/tests/${MODPY_PYCACHE}test_strf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/isodate/tests/${MODPY_PYCACHE}test_time.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/isodate/tests/${MODPY_PYCACHE}test_time.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/isodate/tests/test_date.py
 lib/python${MODPY_VERSION}/site-packages/isodate/tests/test_datetime.py
diff --git a/devel/py-jeepney/Makefile b/devel/py-jeepney/Makefile
index a401e134ae2..4174794bd39 100644
--- a/devel/py-jeepney/Makefile
+++ b/devel/py-jeepney/Makefile
@@ -3,7 +3,7 @@ COMMENT=		low-level, pure Python DBus protocol wrapper
 MODPY_EGG_VERSION=	0.7.1
 DISTNAME=		jeepney-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		devel
 
@@ -15,7 +15,7 @@ PERMIT_PACKAGE=		Yes
 MODULES=		lang/python
 
 MODPY_PI=		Yes
-#MODPY_SETUPTOOLS=	Yes
+MODPY_PYBUILD=		flit_core
 
 FLAVORS=		python3
 FLAVOR=			python3
diff --git a/devel/py-jeepney/pkg/PLIST b/devel/py-jeepney/pkg/PLIST
index 29a88b52602..306e5a672e3 100644
--- a/devel/py-jeepney/pkg/PLIST
+++ b/devel/py-jeepney/pkg/PLIST
@@ -1,15 +1,28 @@
 lib/python${MODPY_VERSION}/site-packages/jeepney/
-lib/python${MODPY_VERSION}/site-packages/jeepney-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/jeepney-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/jeepney-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/jeepney-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/jeepney-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/jeepney-${MODPY_EGG_VERSION}.dist-info/WHEEL
 lib/python${MODPY_VERSION}/site-packages/jeepney/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jeepney/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jeepney/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/${MODPY_PYCACHE}bindgen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/${MODPY_PYCACHE}bindgen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/${MODPY_PYCACHE}bus.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/${MODPY_PYCACHE}bus.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/${MODPY_PYCACHE}bus_messages.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/${MODPY_PYCACHE}bus_messages.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/${MODPY_PYCACHE}fds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/${MODPY_PYCACHE}fds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/${MODPY_PYCACHE}low_level.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/${MODPY_PYCACHE}low_level.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/${MODPY_PYCACHE}routing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/${MODPY_PYCACHE}routing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/${MODPY_PYCACHE}wrappers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/${MODPY_PYCACHE}wrappers.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jeepney/auth.py
 lib/python${MODPY_VERSION}/site-packages/jeepney/bindgen.py
@@ -19,28 +32,41 @@ lib/python${MODPY_VERSION}/site-packages/jeepney/fds.py
 lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/
 lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/${MODPY_PYCACHE}asyncio.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/${MODPY_PYCACHE}asyncio.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/${MODPY_PYCACHE}blocking.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/${MODPY_PYCACHE}blocking.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/${MODPY_PYCACHE}tornado.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/${MODPY_PYCACHE}tornado.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/asyncio.py
 lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/blocking.py
 lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/tests/
 lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/tests/${MODPY_PYCACHE}test_asyncio.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/tests/${MODPY_PYCACHE}test_asyncio.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/tests/test_asyncio.py
 lib/python${MODPY_VERSION}/site-packages/jeepney/integrate/tornado.py
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jeepney/io/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jeepney/io/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/io/${MODPY_PYCACHE}asyncio.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/${MODPY_PYCACHE}asyncio.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/io/${MODPY_PYCACHE}blocking.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/${MODPY_PYCACHE}blocking.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/io/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/io/${MODPY_PYCACHE}threading.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/${MODPY_PYCACHE}threading.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/io/${MODPY_PYCACHE}tornado.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/${MODPY_PYCACHE}tornado.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/io/${MODPY_PYCACHE}trio.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/${MODPY_PYCACHE}trio.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/asyncio.py
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/blocking.py
@@ -48,12 +74,19 @@ lib/python${MODPY_VERSION}/site-packages/jeepney/io/common.py
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/tests/
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jeepney/io/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jeepney/io/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/io/tests/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/tests/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/io/tests/${MODPY_PYCACHE}test_asyncio.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/tests/${MODPY_PYCACHE}test_asyncio.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/io/tests/${MODPY_PYCACHE}test_blocking.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/tests/${MODPY_PYCACHE}test_blocking.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/io/tests/${MODPY_PYCACHE}test_threading.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/tests/${MODPY_PYCACHE}test_threading.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/io/tests/${MODPY_PYCACHE}test_trio.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/tests/${MODPY_PYCACHE}test_trio.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/io/tests/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/tests/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/tests/conftest.py
 lib/python${MODPY_VERSION}/site-packages/jeepney/io/tests/test_asyncio.py
@@ -69,13 +102,21 @@ lib/python${MODPY_VERSION}/site-packages/jeepney/routing.py
 lib/python${MODPY_VERSION}/site-packages/jeepney/tests/
 lib/python${MODPY_VERSION}/site-packages/jeepney/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jeepney/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jeepney/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/tests/${MODPY_PYCACHE}test_auth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/tests/${MODPY_PYCACHE}test_auth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/tests/${MODPY_PYCACHE}test_bindgen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/tests/${MODPY_PYCACHE}test_bindgen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/tests/${MODPY_PYCACHE}test_bus.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/tests/${MODPY_PYCACHE}test_bus.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/tests/${MODPY_PYCACHE}test_bus_messages.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/tests/${MODPY_PYCACHE}test_bus_messages.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/tests/${MODPY_PYCACHE}test_fds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/tests/${MODPY_PYCACHE}test_fds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/tests/${MODPY_PYCACHE}test_low_level.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/tests/${MODPY_PYCACHE}test_low_level.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jeepney/tests/${MODPY_PYCACHE}test_routing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jeepney/tests/${MODPY_PYCACHE}test_routing.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jeepney/tests/secrets_introspect.xml
 lib/python${MODPY_VERSION}/site-packages/jeepney/tests/test_auth.py
diff --git a/devel/py-more-itertools/Makefile b/devel/py-more-itertools/Makefile
index 0bdc8ad9a08..997fa80b73d 100644
--- a/devel/py-more-itertools/Makefile
+++ b/devel/py-more-itertools/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	8.12.0
 DISTNAME =		more-itertools-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		devel
-REVISION =		0
+REVISION =		1
 
 # MIT
 PERMIT_PACKAGE =	Yes
@@ -12,8 +12,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools
 MODPY_PYTEST_ARGS =	tests
 
 FLAVORS =		python3
diff --git a/devel/py-more-itertools/pkg/PLIST b/devel/py-more-itertools/pkg/PLIST
index da6c202be37..4eeca674576 100644
--- a/devel/py-more-itertools/pkg/PLIST
+++ b/devel/py-more-itertools/pkg/PLIST
@@ -1,15 +1,19 @@
 @pkgpath devel/py-more-itertools
 lib/python${MODPY_VERSION}/site-packages/more_itertools/
-lib/python${MODPY_VERSION}/site-packages/more_itertools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/more_itertools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/more_itertools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/more_itertools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/more_itertools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/more_itertools-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/more_itertools-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/more_itertools-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/more_itertools-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/more_itertools-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/more_itertools-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/more_itertools/__init__.py
 lib/python${MODPY_VERSION}/site-packages/more_itertools/__init__.pyi
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/more_itertools/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/more_itertools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/more_itertools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/more_itertools/${MODPY_PYCACHE}more.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/more_itertools/${MODPY_PYCACHE}more.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/more_itertools/${MODPY_PYCACHE}recipes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/more_itertools/${MODPY_PYCACHE}recipes.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/more_itertools/more.py
 lib/python${MODPY_VERSION}/site-packages/more_itertools/more.pyi
diff --git a/devel/py-ordered-set/Makefile b/devel/py-ordered-set/Makefile
index 285bb605b2f..fb6722f67f2 100644
--- a/devel/py-ordered-set/Makefile
+++ b/devel/py-ordered-set/Makefile
@@ -3,7 +3,7 @@ COMMENT=		ordered sets in Python
 MODPY_EGG_VERSION=	4.1.0
 DISTNAME=		ordered-set-${MODPY_EGG_VERSION}
 PKGNAME=		py-ordered-set-${MODPY_EGG_VERSION}
-REVISION=		0
+REVISION=		1
 
 CATEGORIES=		devel
 
@@ -19,8 +19,7 @@ MODULES=		lang/python
 FLAVORS=		python3
 FLAVOR=			python3
 
-MODPY_SETUPTOOLS=	Yes
+MODPY_PYBUILD=		flit_core
 MODPY_PI=		Yes
-MODPY_PYTEST=		Yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-ordered-set/pkg/PLIST b/devel/py-ordered-set/pkg/PLIST
index 038eb599a45..3645de29581 100644
--- a/devel/py-ordered-set/pkg/PLIST
+++ b/devel/py-ordered-set/pkg/PLIST
@@ -1,9 +1,10 @@
 lib/python${MODPY_VERSION}/site-packages/ordered_set/
-lib/python${MODPY_VERSION}/site-packages/ordered_set-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/ordered_set-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/ordered_set-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/ordered_set-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/ordered_set-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/ordered_set-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/ordered_set-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/ordered_set-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/ordered_set-${MODPY_EGG_VERSION}.dist-info/WHEEL
 lib/python${MODPY_VERSION}/site-packages/ordered_set/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ordered_set/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ordered_set/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ordered_set/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ordered_set/py.typed
diff --git a/devel/py-parallel/Makefile b/devel/py-parallel/Makefile
index 011c782df27..e10fd714b33 100644
--- a/devel/py-parallel/Makefile
+++ b/devel/py-parallel/Makefile
@@ -3,7 +3,7 @@ COMMENT =	access to parallel port from Python
 DISTNAME =	pyparallel-${V}
 PKGNAME =	py-parallel-${V}
 CATEGORIES =	devel
-REVISION =	5
+REVISION =	6
 
 HOMEPAGE =	https://github.com/pyserial/pyparallel
 MAINTAINER =	Brian Callahan <bcallah@openbsd.org>
@@ -17,7 +17,7 @@ FLAVORS =	python3
 FLAVOR =	python3
 
 MODULES =	lang/python
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 # No tests upstream
 
diff --git a/devel/py-parallel/pkg/PLIST b/devel/py-parallel/pkg/PLIST
index 95124c27635..bca38641743 100644
--- a/devel/py-parallel/pkg/PLIST
+++ b/devel/py-parallel/pkg/PLIST
@@ -2,15 +2,19 @@
 lib/python${MODPY_VERSION}/site-packages/parallel/
 lib/python${MODPY_VERSION}/site-packages/parallel/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/parallel/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/parallel/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parallel/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/parallel/${MODPY_PYCACHE}parallelppdev.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parallel/${MODPY_PYCACHE}parallelppdev.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/parallel/${MODPY_PYCACHE}parallelutil.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parallel/${MODPY_PYCACHE}parallelutil.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/parallel/${MODPY_PYCACHE}parallelwin32.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parallel/${MODPY_PYCACHE}parallelwin32.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/parallel/parallelppdev.py
 lib/python${MODPY_VERSION}/site-packages/parallel/parallelutil.py
 lib/python${MODPY_VERSION}/site-packages/parallel/parallelwin32.py
-lib/python${MODPY_VERSION}/site-packages/pyparallel-0.2.2-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pyparallel-0.2.2-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pyparallel-0.2.2-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pyparallel-0.2.2-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pyparallel-0.2.2-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pyparallel-0.2.2.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pyparallel-0.2.2.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pyparallel-0.2.2.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pyparallel-0.2.2.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pyparallel-0.2.2.dist-info/top_level.txt
diff --git a/devel/py-parameterized/Makefile b/devel/py-parameterized/Makefile
index df3a79fb6b7..3a838f7ab79 100644
--- a/devel/py-parameterized/Makefile
+++ b/devel/py-parameterized/Makefile
@@ -1,25 +1,25 @@
-COMMENT =		parameterized testing with any Python test framework
+COMMENT=	parameterized testing with any Python test framework
 
-MODPY_EGG_VERSION =	0.8.1
+MODPY_EGG_VERSION=	0.8.1
 
-DISTNAME =		parameterized-${MODPY_EGG_VERSION}
-PKGNAME =		py-${DISTNAME}
-REVISION =		0
+DISTNAME=	parameterized-${MODPY_EGG_VERSION}
+PKGNAME=	py-${DISTNAME}
+REVISION=	1
 
-CATEGORIES =		devel
+CATEGORIES=	devel
 
-HOMEPAGE =		https://github.com/wolever/parameterized
+HOMEPAGE=	https://github.com/wolever/parameterized
 
 # BSD
-PERMIT_PACKAGE =	Yes
+PERMIT_PACKAGE=	Yes
 
-MODULES =		lang/python
+MODULES=	lang/python
 
-MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-NO_TEST =	Yes
+MODPY_PI=	Yes
+MODPY_PYBUILD=	setuptools
+NO_TEST=	Yes
 
-FLAVORS =		python3
-FLAVOR =		python3
+FLAVORS=	python3
+FLAVOR=		python3
 
 .include <bsd.port.mk>
diff --git a/devel/py-parameterized/pkg/PLIST b/devel/py-parameterized/pkg/PLIST
index 9479eda6ffb..6ae4cbe7216 100644
--- a/devel/py-parameterized/pkg/PLIST
+++ b/devel/py-parameterized/pkg/PLIST
@@ -1,15 +1,18 @@
 lib/python${MODPY_VERSION}/site-packages/parameterized/
-lib/python${MODPY_VERSION}/site-packages/parameterized-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/parameterized-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/parameterized-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/parameterized-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/parameterized-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
-lib/python${MODPY_VERSION}/site-packages/parameterized-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/parameterized-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/parameterized-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/parameterized-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/parameterized-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/parameterized-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/parameterized-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/parameterized-${MODPY_EGG_VERSION}.dist-info/pbr.json
+lib/python${MODPY_VERSION}/site-packages/parameterized-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/parameterized/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/parameterized/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/parameterized/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parameterized/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/parameterized/${MODPY_PYCACHE}parameterized.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parameterized/${MODPY_PYCACHE}parameterized.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/parameterized/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parameterized/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/parameterized/parameterized.py
 lib/python${MODPY_VERSION}/site-packages/parameterized/test.py
diff --git a/devel/py-parsedatetime/Makefile b/devel/py-parsedatetime/Makefile
index 08ca3e431a5..2d01e22c5c1 100644
--- a/devel/py-parsedatetime/Makefile
+++ b/devel/py-parsedatetime/Makefile
@@ -1,9 +1,9 @@
 COMMENT=		parse human-readable date/time text
 
-MODPY_EGG_VERSION =	2.6
+MODPY_EGG_VERSION=	2.6
 DISTNAME=		parsedatetime-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
-REVISION=		0
+REVISION=		1
 
 CATEGORIES=		devel
 
@@ -15,9 +15,8 @@ FLAVOR=			python3
 
 MODULES=		lang/python
 MODPY_PI=		Yes
-MODPY_SETUPTOOLS=	Yes
-MODPY_PYTEST =		Yes
-MODPY_PYTEST_ARGS =	tests/*.py
+MODPY_PYBUILD=		setuptools
+MODPY_PYTEST_ARGS=	tests/*.py
 
 BUILD_DEPENDS=		devel/py-test-runner${MODPY_FLAVOR}
 TEST_DEPENDS=		textproc/py-ICU${MODPY_FLAVOR}
diff --git a/devel/py-parsedatetime/pkg/PLIST b/devel/py-parsedatetime/pkg/PLIST
index c0e026931ed..0aa8817e623 100644
--- a/devel/py-parsedatetime/pkg/PLIST
+++ b/devel/py-parsedatetime/pkg/PLIST
@@ -1,31 +1,48 @@
 @pkgpath devel/py-parsedatetime
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/
-lib/python${MODPY_VERSION}/site-packages/parsedatetime-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/parsedatetime-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/parsedatetime-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/parsedatetime-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/parsedatetime-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/parsedatetime-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/parsedatetime-${MODPY_EGG_VERSION}.dist-info/AUTHORS.txt
+lib/python${MODPY_VERSION}/site-packages/parsedatetime-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/parsedatetime-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/parsedatetime-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/parsedatetime-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/parsedatetime-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/parsedatetime/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/parsedatetime/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/parsedatetime/${MODPY_PYCACHE}context.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/${MODPY_PYCACHE}context.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/parsedatetime/${MODPY_PYCACHE}parsedatetime.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/${MODPY_PYCACHE}parsedatetime.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/parsedatetime/${MODPY_PYCACHE}warns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/${MODPY_PYCACHE}warns.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/context.py
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/parsedatetime.py
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}de_DE.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}de_DE.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}en_AU.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}en_AU.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}en_US.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}en_US.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}es.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}es.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}fr_FR.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}fr_FR.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}icu.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}icu.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}nl_NL.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}nl_NL.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}pt_BR.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}pt_BR.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}ru_RU.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/${MODPY_PYCACHE}ru_RU.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/base.py
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/pdt_locales/de_DE.py
diff --git a/devel/py-pluggy/Makefile b/devel/py-pluggy/Makefile
index d6c70bdea59..908a2f4ae6f 100644
--- a/devel/py-pluggy/Makefile
+++ b/devel/py-pluggy/Makefile
@@ -5,7 +5,7 @@ MODPY_EGG_VERSION =	1.0.0
 DISTNAME =		pluggy-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		devel
-REVISION =		0
+REVISION =		1
 
 # MIT
 PERMIT_PACKAGE =	Yes
@@ -16,8 +16,7 @@ FLAVORS =		python3
 FLAVOR =		python3
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools
 
 BUILD_DEPENDS =		devel/py-setuptools_scm${MODPY_FLAVOR}
 
diff --git a/devel/py-pluggy/pkg/PLIST b/devel/py-pluggy/pkg/PLIST
index 4472dd0edf9..c52ea8bda42 100644
--- a/devel/py-pluggy/pkg/PLIST
+++ b/devel/py-pluggy/pkg/PLIST
@@ -1,19 +1,26 @@
 @pkgpath devel/py-pluggy
 lib/python${MODPY_VERSION}/site-packages/pluggy/
-lib/python${MODPY_VERSION}/site-packages/pluggy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pluggy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pluggy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pluggy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pluggy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pluggy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pluggy-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pluggy-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/pluggy-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pluggy-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pluggy-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pluggy-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pluggy/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pluggy/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pluggy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pluggy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pluggy/${MODPY_PYCACHE}_callers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pluggy/${MODPY_PYCACHE}_callers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pluggy/${MODPY_PYCACHE}_hooks.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pluggy/${MODPY_PYCACHE}_hooks.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pluggy/${MODPY_PYCACHE}_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pluggy/${MODPY_PYCACHE}_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pluggy/${MODPY_PYCACHE}_result.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pluggy/${MODPY_PYCACHE}_result.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pluggy/${MODPY_PYCACHE}_tracing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pluggy/${MODPY_PYCACHE}_tracing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pluggy/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pluggy/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pluggy/_callers.py
 lib/python${MODPY_VERSION}/site-packages/pluggy/_hooks.py
diff --git a/devel/py-ply/Makefile b/devel/py-ply/Makefile
index dc0fd4cd7b8..b1f2d2d9f98 100644
--- a/devel/py-ply/Makefile
+++ b/devel/py-ply/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	3.11
 DISTNAME =		ply-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		devel
-REVISION =		5
+REVISION =		6
 
 HOMEPAGE =		https://www.dabeaz.com/ply/
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/devel/py-ply/pkg/PLIST b/devel/py-ply/pkg/PLIST
index 05aebcace89..35ac5067e08 100644
--- a/devel/py-ply/pkg/PLIST
+++ b/devel/py-ply/pkg/PLIST
@@ -1,17 +1,23 @@
 @pkgpath devel/py-ply
 lib/python${MODPY_VERSION}/site-packages/ply/
-lib/python${MODPY_VERSION}/site-packages/ply-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/ply-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/ply-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/ply-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/ply-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/ply-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/ply-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/ply-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/ply-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/ply-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/ply/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ply/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ply/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ply/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ply/${MODPY_PYCACHE}cpp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ply/${MODPY_PYCACHE}cpp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ply/${MODPY_PYCACHE}ctokens.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ply/${MODPY_PYCACHE}ctokens.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ply/${MODPY_PYCACHE}lex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ply/${MODPY_PYCACHE}lex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ply/${MODPY_PYCACHE}yacc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ply/${MODPY_PYCACHE}yacc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ply/${MODPY_PYCACHE}ygen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ply/${MODPY_PYCACHE}ygen.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ply/cpp.py
 lib/python${MODPY_VERSION}/site-packages/ply/ctokens.py
diff --git a/devel/py-pretend/Makefile b/devel/py-pretend/Makefile
index 4c86a5c1025..8b6c223c17a 100644
--- a/devel/py-pretend/Makefile
+++ b/devel/py-pretend/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	1.0.9
 DISTNAME =		pretend-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		devel
-REVISION =		5
+REVISION =		6
 
 HOMEPAGE =		https://github.com/alex/pretend
 
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes
 
 MODPY_PI =		Yes
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/devel/py-pretend/pkg/PLIST b/devel/py-pretend/pkg/PLIST
index f3a1652fa39..f26f37a15a9 100644
--- a/devel/py-pretend/pkg/PLIST
+++ b/devel/py-pretend/pkg/PLIST
@@ -1,8 +1,11 @@
 @pkgpath devel/py-pretend
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pretend.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pretend.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pretend-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pretend-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pretend-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pretend-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pretend-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pretend-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pretend-${MODPY_EGG_VERSION}.dist-info/LICENSE.rst
+lib/python${MODPY_VERSION}/site-packages/pretend-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pretend-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pretend-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pretend-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pretend.py
diff --git a/devel/py-progress/Makefile b/devel/py-progress/Makefile
index 7379ec79f17..3046255d065 100644
--- a/devel/py-progress/Makefile
+++ b/devel/py-progress/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	1.6
 DISTNAME =		progress-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		devel
-REVISION =		0
+REVISION =		1
 
 HOMEPAGE =		https://github.com/verigak/progress/
 
@@ -15,7 +15,7 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 FLAVORS =		python3
 FLAVOR =	python3
diff --git a/devel/py-progress/pkg/PLIST b/devel/py-progress/pkg/PLIST
index 1a5daf386d8..dbef4d5450d 100644
--- a/devel/py-progress/pkg/PLIST
+++ b/devel/py-progress/pkg/PLIST
@@ -1,16 +1,22 @@
 @pkgpath devel/py-progress
 lib/python${MODPY_VERSION}/site-packages/progress/
-lib/python${MODPY_VERSION}/site-packages/progress-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/progress-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/progress-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/progress-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/progress-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/progress-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/progress-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/progress-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/progress-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/progress-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/progress-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/progress/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}bar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}bar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}colors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}colors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}counter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}counter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}spinner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}spinner.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/progress/bar.py
 lib/python${MODPY_VERSION}/site-packages/progress/colors.py
diff --git a/devel/py-progressbar/Makefile b/devel/py-progressbar/Makefile
index 2faad3d3419..6344a8ca983 100644
--- a/devel/py-progressbar/Makefile
+++ b/devel/py-progressbar/Makefile
@@ -1,22 +1,22 @@
 COMMENT =		text progressbar library for python
 
-MODPY_EGG_VERSION =    2.5
+MODPY_EGG_VERSION =	2.5
 
 DISTNAME =		progressbar-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		devel
-REVISION =		5
+REVISION =		6
 
 HOMEPAGE =		https://github.com/niltonvolpato/python-progressbar
 
-MAINTAINER = 		Remi Pointel <rpointel@openbsd.org>
+MAINTAINER =		Remi Pointel <rpointel@openbsd.org>
 
 # LGPLv2.1
 PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
-MODPY_PI =        Yes
+MODPY_PYBUILD =		setuptools
+MODPY_PI =		Yes
 
 FLAVORS =	python3
 FLAVOR =	python3
diff --git a/devel/py-progressbar/pkg/PLIST b/devel/py-progressbar/pkg/PLIST
index 29a7fb4355f..ceb531fb1e2 100644
--- a/devel/py-progressbar/pkg/PLIST
+++ b/devel/py-progressbar/pkg/PLIST
@@ -1,15 +1,20 @@
 @pkgpath devel/py-progressbar
 lib/python${MODPY_VERSION}/site-packages/progressbar/
-lib/python${MODPY_VERSION}/site-packages/progressbar-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/progressbar-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/progressbar-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/progressbar-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/progressbar-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/progressbar-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/progressbar-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/progressbar-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/progressbar-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/progressbar-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/progressbar-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/progressbar/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/progressbar/${MODPY_PYCACHE}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/progressbar/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/progressbar/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/progressbar/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/progressbar/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/progressbar/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/progressbar/${MODPY_PYCACHE}progressbar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/progressbar/${MODPY_PYCACHE}progressbar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/progressbar/${MODPY_PYCACHE}widgets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/progressbar/${MODPY_PYCACHE}widgets.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/progressbar/compat.py
 lib/python${MODPY_VERSION}/site-packages/progressbar/progressbar.py
diff --git a/devel/py-py/Makefile b/devel/py-py/Makefile
index 874c8fe6f21..acf7297ee30 100644
--- a/devel/py-py/Makefile
+++ b/devel/py-py/Makefile
@@ -1,7 +1,7 @@
 COMMENT=		cross-python path, ini-parsing, io, code, log facilities
 
 MODPY_EGG_VERSION =	1.11.0
-REVISION=		1
+REVISION=		2
 DISTNAME=		py-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
 
@@ -13,12 +13,9 @@ PERMIT_PACKAGE=	Yes
 MODULES=		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS=	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools_scm
 
 FLAVORS=		python3
 FLAVOR=			python3
 
-BUILD_DEPENDS +=	devel/py-setuptools_scm${MODPY_FLAVOR}
-
 .include <bsd.port.mk>
diff --git a/devel/py-py/pkg/PLIST b/devel/py-py/pkg/PLIST
index 47f3ddcf2f7..6bc923f74b4 100644
--- a/devel/py-py/pkg/PLIST
+++ b/devel/py-py/pkg/PLIST
@@ -1,33 +1,48 @@
 @pkgpath devel/py-py
 lib/python${MODPY_VERSION}/site-packages/py/
-lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/py/__init__.py
 lib/python${MODPY_VERSION}/site-packages/py/__init__.pyi
 lib/python${MODPY_VERSION}/site-packages/py/__metainfo.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__metainfo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__metainfo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_builtin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_builtin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_error.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_error.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_std.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_std.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_xmlgen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_xmlgen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/py/_builtin.py
 lib/python${MODPY_VERSION}/site-packages/py/_code/
 lib/python${MODPY_VERSION}/site-packages/py/_code/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_assertionnew.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_assertionnew.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_assertionold.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_assertionold.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_py2traceback.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_py2traceback.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}assertion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}assertion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}code.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}code.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}source.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}source.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/py/_code/_assertionnew.py
 lib/python${MODPY_VERSION}/site-packages/py/_code/_assertionold.py
@@ -39,9 +54,13 @@ lib/python${MODPY_VERSION}/site-packages/py/_error.py
 lib/python${MODPY_VERSION}/site-packages/py/_io/
 lib/python${MODPY_VERSION}/site-packages/py/_io/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}capture.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}capture.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}saferepr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}saferepr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}terminalwriter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}terminalwriter.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/py/_io/capture.py
 lib/python${MODPY_VERSION}/site-packages/py/_io/saferepr.py
@@ -49,19 +68,28 @@ lib/python${MODPY_VERSION}/site-packages/py/_io/terminalwriter.py
 lib/python${MODPY_VERSION}/site-packages/py/_log/
 lib/python${MODPY_VERSION}/site-packages/py/_log/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_log/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/py/_log/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_log/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_log/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_log/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_log/${MODPY_PYCACHE}warning.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_log/${MODPY_PYCACHE}warning.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/py/_log/log.py
 lib/python${MODPY_VERSION}/site-packages/py/_log/warning.py
 lib/python${MODPY_VERSION}/site-packages/py/_path/
 lib/python${MODPY_VERSION}/site-packages/py/_path/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}cacheutil.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}cacheutil.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}local.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}local.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}svnurl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}svnurl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}svnwc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}svnwc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/py/_path/cacheutil.py
 lib/python${MODPY_VERSION}/site-packages/py/_path/common.py
@@ -71,9 +99,13 @@ lib/python${MODPY_VERSION}/site-packages/py/_path/svnwc.py
 lib/python${MODPY_VERSION}/site-packages/py/_process/
 lib/python${MODPY_VERSION}/site-packages/py/_process/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_process/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/py/_process/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_process/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_process/${MODPY_PYCACHE}cmdexec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_process/${MODPY_PYCACHE}cmdexec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_process/${MODPY_PYCACHE}forkedfunc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_process/${MODPY_PYCACHE}forkedfunc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_process/${MODPY_PYCACHE}killproc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_process/${MODPY_PYCACHE}killproc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/py/_process/cmdexec.py
 lib/python${MODPY_VERSION}/site-packages/py/_process/forkedfunc.py
@@ -82,6 +114,7 @@ lib/python${MODPY_VERSION}/site-packages/py/_std.py
 lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/
 lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/apipkg/
 lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/apipkg-2.0.0.dist-info/
@@ -94,7 +127,9 @@ lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/apipkg-2.0.0.dist
 lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/apipkg-2.0.0.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/apipkg/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/apipkg/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/apipkg/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/apipkg/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/apipkg/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/apipkg/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/apipkg/version.py
 lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/iniconfig/
@@ -109,6 +144,7 @@ lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/iniconfig-1.1.1.d
 lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/iniconfig/__init__.py
 lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/iniconfig/__init__.pyi
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/iniconfig/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/iniconfig/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/iniconfig/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/iniconfig/py.typed
 lib/python${MODPY_VERSION}/site-packages/py/_version.py
diff --git a/devel/py-regex/Makefile b/devel/py-regex/Makefile
index c973cbe97c8..a5f25a8db9c 100644
--- a/devel/py-regex/Makefile
+++ b/devel/py-regex/Makefile
@@ -1,25 +1,25 @@
-COMMENT =		alternative regular expression module to replace re
+COMMENT=	alternative regular expression module to replace re
 
-MODPY_EGG_VERSION =	2022.6.2
-DISTNAME =		regex-${MODPY_EGG_VERSION}
-PKGNAME =		py-${DISTNAME}
-CATEGORIES =		devel
-REVISION =		0
+MODPY_EGG_VERSION=	2022.6.2
+DISTNAME=	regex-${MODPY_EGG_VERSION}
+PKGNAME=	py-${DISTNAME}
+CATEGORIES=	devel
+REVISION=	1
 
-HOMEPAGE =		https://github.com/mrabarnett/mrab-regex
+HOMEPAGE=	https://github.com/mrabarnett/mrab-regex
 
 # Apache 2.0
 PERMIT_PACKAGE=	Yes
 
 WANTLIB += pthread
 
-MODULES =	lang/python
+MODULES=	lang/python
 
-FLAVORS =	python3
-FLAVOR =	python3
+FLAVORS=	python3
+FLAVOR=		python3
 
-MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST_ARGS =	-v regex_3
+MODPY_PI=	Yes
+MODPY_PYBUILD=	setuptools
+MODPY_PYTEST_ARGS=	-v regex_3
 
 .include <bsd.port.mk>
diff --git a/devel/py-regex/pkg/PLIST b/devel/py-regex/pkg/PLIST
index e3284e42bab..ee6b94b1a7d 100644
--- a/devel/py-regex/pkg/PLIST
+++ b/devel/py-regex/pkg/PLIST
@@ -1,14 +1,19 @@
 lib/python${MODPY_VERSION}/site-packages/regex/
-lib/python${MODPY_VERSION}/site-packages/regex-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/regex-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/regex-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/regex-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/regex-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/regex-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/regex-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/regex-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/regex-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/regex-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/regex-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/regex/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/regex/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/regex/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/regex/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/regex/${MODPY_PYCACHE}_regex_core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/regex/${MODPY_PYCACHE}_regex_core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/regex/${MODPY_PYCACHE}regex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/regex/${MODPY_PYCACHE}regex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/regex/${MODPY_PYCACHE}test_regex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/regex/${MODPY_PYCACHE}test_regex.${MODPY_PYC_MAGIC_TAG}pyc
 @so lib/python${MODPY_VERSION}/site-packages/regex/_regex.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/regex/_regex_core.py
diff --git a/devel/py-rfc6555/Makefile b/devel/py-rfc6555/Makefile
index 5987314b7cb..79135c45c3d 100644
--- a/devel/py-rfc6555/Makefile
+++ b/devel/py-rfc6555/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	0.1.0
 
 DISTNAME =		rfc6555-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		devel
 
@@ -16,10 +16,9 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 # tests connect to www.google.com on port 80
-MODPY_PYTEST =		Yes
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/devel/py-rfc6555/pkg/PLIST b/devel/py-rfc6555/pkg/PLIST
index 62a5f0bae6b..c57885c8fb0 100644
--- a/devel/py-rfc6555/pkg/PLIST
+++ b/devel/py-rfc6555/pkg/PLIST
@@ -1,11 +1,11 @@
 @pkgpath devel/py-rfc6555
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}rfc6555.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}rfc6555.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/rfc6555-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/rfc6555-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/rfc6555-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/rfc6555-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/rfc6555-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/rfc6555-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/rfc6555-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/rfc6555-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/rfc6555-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/rfc6555-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/rfc6555-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/rfc6555-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/rfc6555-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/rfc6555.py
diff --git a/devel/py-setproctitle/Makefile b/devel/py-setproctitle/Makefile
index 572ba6d4945..42756af425e 100644
--- a/devel/py-setproctitle/Makefile
+++ b/devel/py-setproctitle/Makefile
@@ -3,7 +3,7 @@ COMMENT =		library for getting/setting process names
 MODPY_EGG_VERSION =	1.3.2
 DISTNAME =		setproctitle-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		devel
 
@@ -15,10 +15,9 @@ PERMIT_PACKAGE =	Yes
 WANTLIB +=		pthread
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 MODULES =		lang/python
-MODPY_PYTEST =		Yes
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/devel/py-setproctitle/pkg/PLIST b/devel/py-setproctitle/pkg/PLIST
index d1ad16540ba..e0fa754a8f1 100644
--- a/devel/py-setproctitle/pkg/PLIST
+++ b/devel/py-setproctitle/pkg/PLIST
@@ -1,14 +1,13 @@
 @pkgpath devel/py-setproctitle
 lib/python${MODPY_VERSION}/site-packages/setproctitle/
-lib/python${MODPY_VERSION}/site-packages/setproctitle-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/setproctitle-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/setproctitle-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/setproctitle-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/setproctitle-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/setproctitle-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/setproctitle-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/setproctitle-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/setproctitle-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/setproctitle-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/setproctitle-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/setproctitle-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/setproctitle/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/setproctitle/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/setproctitle/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/setproctitle/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 @so lib/python${MODPY_VERSION}/site-packages/setproctitle/_setproctitle.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/setproctitle/py.typed
diff --git a/devel/py-test-arraydiff/Makefile b/devel/py-test-arraydiff/Makefile
index 36a0becf0fa..fd2a462947a 100644
--- a/devel/py-test-arraydiff/Makefile
+++ b/devel/py-test-arraydiff/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	0.5.0
 
 DISTNAME =	pytest-arraydiff-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:S/py//}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	devel
 
@@ -16,13 +16,11 @@ PERMIT_PACKAGE =	Yes
 MODULES =	lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools_scm
 
 FLAVOR =	python3
 FLAVORS =	python3
 
-BUILD_DEPENDS =	devel/py-setuptools_scm${MODPY_FLAVOR}
 RUN_DEPENDS =	devel/py-test${MODPY_FLAVOR} \
 		math/py-numpy${MODPY_FLAVOR}
 TEST_DEPENDS =	astro/py-astropy${MODPY_FLAVOR}
diff --git a/devel/py-test-arraydiff/pkg/PLIST b/devel/py-test-arraydiff/pkg/PLIST
index cfc7e01819a..e7089d172cd 100644
--- a/devel/py-test-arraydiff/pkg/PLIST
+++ b/devel/py-test-arraydiff/pkg/PLIST
@@ -1,16 +1,18 @@
 lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff/
-lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff/plugin.py
 lib/python${MODPY_VERSION}/site-packages/pytest_arraydiff/version.py
diff --git a/devel/py-test-astropy/Makefile b/devel/py-test-astropy/Makefile
index 3a7f68438cf..88b115e830c 100644
--- a/devel/py-test-astropy/Makefile
+++ b/devel/py-test-astropy/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	0.10.0
 
 DISTNAME =	pytest-astropy-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:S/py//}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	devel
 
@@ -16,13 +16,12 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools_scm
 NO_TEST =		Yes
 
 FLAVOR =	python3
 FLAVORS =	python3
 
-BUILD_DEPENDS =	devel/py-setuptools_scm${MODPY_FLAVOR}
 RUN_DEPENDS =	devel/py-attrs${MODPY_FLAVOR} \
 		devel/py-hypothesis${MODPY_FLAVOR} \
 		devel/py-test${MODPY_FLAVOR} \
diff --git a/devel/py-test-astropy/pkg/PLIST b/devel/py-test-astropy/pkg/PLIST
index b7450c1ddcf..48127f97809 100644
--- a/devel/py-test-astropy/pkg/PLIST
+++ b/devel/py-test-astropy/pkg/PLIST
@@ -1,16 +1,18 @@
 lib/python${MODPY_VERSION}/site-packages/pytest_astropy/
-lib/python${MODPY_VERSION}/site-packages/pytest_astropy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pytest_astropy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pytest_astropy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_astropy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_astropy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_astropy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/pytest_astropy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_astropy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_astropy-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pytest_astropy-${MODPY_EGG_VERSION}.dist-info/LICENSE.rst
+lib/python${MODPY_VERSION}/site-packages/pytest_astropy-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pytest_astropy-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pytest_astropy-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pytest_astropy-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_astropy-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pytest_astropy/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pytest_astropy/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pytest_astropy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_astropy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_astropy/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_astropy/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_astropy/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_astropy/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pytest_astropy/plugin.py
 lib/python${MODPY_VERSION}/site-packages/pytest_astropy/version.py
diff --git a/devel/py-test-benchmark/Makefile b/devel/py-test-benchmark/Makefile
index 7ecdbc9e812..b13ee39a2b5 100644
--- a/devel/py-test-benchmark/Makefile
+++ b/devel/py-test-benchmark/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	3.4.1
 DISTNAME =		pytest-benchmark-${MODPY_EGG_VERSION}
 PKGNAME =		${DISTNAME:S/py/py-/}
 CATEGORIES =		devel
-REVISION =		0
+REVISION =		1
 
 HOMEPAGE =		https://pytest-benchmark.readthedocs.io/en/stable/
 
@@ -14,8 +14,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools
 MODPY_PYTEST_ARGS =	tests
 
 RUN_DEPENDS =		devel/py-test${MODPY_FLAVOR} \
diff --git a/devel/py-test-benchmark/pkg/PLIST b/devel/py-test-benchmark/pkg/PLIST
index 598ae2a2e6c..60d9f31d8f7 100644
--- a/devel/py-test-benchmark/pkg/PLIST
+++ b/devel/py-test-benchmark/pkg/PLIST
@@ -3,32 +3,48 @@
 bin/py.test-benchmark
 bin/pytest-benchmark
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/
-lib/python${MODPY_VERSION}/site-packages/pytest_benchmark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pytest_benchmark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pytest_benchmark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_benchmark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_benchmark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_benchmark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/pytest_benchmark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_benchmark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark-${MODPY_EGG_VERSION}.dist-info/AUTHORS.rst
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/__init__.py
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}csv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}csv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}fixture.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}fixture.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}histogram.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}histogram.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}hookspec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}hookspec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}pep418.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}pep418.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}session.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}session.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}stats.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}stats.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}table.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}table.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}timers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}timers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/cli.py
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/compat.py
@@ -44,8 +60,11 @@ lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/stats.py
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/storage/
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/storage/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/storage/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/storage/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/storage/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/storage/${MODPY_PYCACHE}elasticsearch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/storage/${MODPY_PYCACHE}elasticsearch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/storage/${MODPY_PYCACHE}file.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/storage/${MODPY_PYCACHE}file.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/storage/elasticsearch.py
 lib/python${MODPY_VERSION}/site-packages/pytest_benchmark/storage/file.py
diff --git a/devel/py-test-expect/Makefile b/devel/py-test-expect/Makefile
index 0f3073082fc..ccfa62e44b5 100644
--- a/devel/py-test-expect/Makefile
+++ b/devel/py-test-expect/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	1.1.0
 DISTNAME =		pytest-expect-${MODPY_EGG_VERSION}
 PKGNAME =		${DISTNAME:S/py/py-/}
 CATEGORIES =		devel
-REVISION =		7
+REVISION =		8
 
 HOMEPAGE =		https://github.com/gsnedders/pytest-expect
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/devel/py-test-expect/pkg/PLIST b/devel/py-test-expect/pkg/PLIST
index e2bdab3483f..4086e56f02d 100644
--- a/devel/py-test-expect/pkg/PLIST
+++ b/devel/py-test-expect/pkg/PLIST
@@ -1,14 +1,15 @@
 @pkgpath devel/py-test-expect
 lib/python${MODPY_VERSION}/site-packages/pytest_expect/
-lib/python${MODPY_VERSION}/site-packages/pytest_expect-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pytest_expect-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pytest_expect-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_expect-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_expect-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_expect-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_expect-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_expect-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pytest_expect-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pytest_expect-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pytest_expect-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pytest_expect-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_expect-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pytest_expect/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pytest_expect/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pytest_expect/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_expect/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_expect/${MODPY_PYCACHE}expect.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_expect/${MODPY_PYCACHE}expect.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pytest_expect/expect.py
diff --git a/devel/py-test-filter-subpackage/Makefile b/devel/py-test-filter-subpackage/Makefile
index 9409f886454..0993d4596b7 100644
--- a/devel/py-test-filter-subpackage/Makefile
+++ b/devel/py-test-filter-subpackage/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	0.1.1
 
 DISTNAME =	pytest-filter-subpackage-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:S/py//}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	devel
 
@@ -16,13 +16,11 @@ PERMIT_PACKAGE =	Yes
 MODULES =	lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools_scm
 
 FLAVOR =	python3
 FLAVORS =	python3
 
-BUILD_DEPENDS =	devel/py-setuptools_scm${MODPY_FLAVOR}
 RUN_DEPENDS =	devel/py-test${MODPY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-test-filter-subpackage/pkg/PLIST b/devel/py-test-filter-subpackage/pkg/PLIST
index ce5227b8035..df48a08c6ff 100644
--- a/devel/py-test-filter-subpackage/pkg/PLIST
+++ b/devel/py-test-filter-subpackage/pkg/PLIST
@@ -1,16 +1,18 @@
 lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage/
-lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage-${MODPY_EGG_VERSION}.dist-info/LICENSE.rst
+lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage/plugin.py
 lib/python${MODPY_VERSION}/site-packages/pytest_filter_subpackage/version.py
diff --git a/devel/py-test-forked/Makefile b/devel/py-test-forked/Makefile
index eef8574cc1c..4ae0d2ec846 100644
--- a/devel/py-test-forked/Makefile
+++ b/devel/py-test-forked/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	1.4.0
 
 DISTNAME =		pytest-forked-${MODPY_EGG_VERSION}
 PKGNAME =		py-test-forked-${MODPY_EGG_VERSION}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		devel
 
@@ -19,10 +19,9 @@ FLAVOR =		python3
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools_scm
 MODPY_PYTEST_ARGS =	-v
 
-BUILD_DEPENDS +=	devel/py-setuptools_scm${MODPY_FLAVOR}
 RUN_DEPENDS =		devel/py-test${MODPY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-test-forked/patches/patch-pyproject_toml b/devel/py-test-forked/patches/patch-pyproject_toml
new file mode 100644
index 00000000000..be30dbb8cba
--- /dev/null
+++ b/devel/py-test-forked/patches/patch-pyproject_toml
@@ -0,0 +1,8 @@
+Index: pyproject.toml
+--- pyproject.toml.orig
++++ pyproject.toml
+@@ -1,3 +1,3 @@
+ [build-system]
+-requires = ['setuptools ~= 41.4', 'setuptools_scm ~= 3.3', 'wheel ~= 0.33.6']
++requires = ['setuptools', 'setuptools_scm', 'wheel']
+ build-backend = 'setuptools.build_meta'
diff --git a/devel/py-test-forked/pkg/PLIST b/devel/py-test-forked/pkg/PLIST
index a68428301ae..d6ee4ec8d11 100644
--- a/devel/py-test-forked/pkg/PLIST
+++ b/devel/py-test-forked/pkg/PLIST
@@ -1,13 +1,13 @@
 @pkgpath devel/py-test-forked
 lib/python${MODPY_VERSION}/site-packages/pytest_forked/
-lib/python${MODPY_VERSION}/site-packages/pytest_forked-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pytest_forked-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pytest_forked-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_forked-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_forked-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_forked-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/pytest_forked-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_forked-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_forked-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pytest_forked-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/pytest_forked-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pytest_forked-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pytest_forked-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pytest_forked-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_forked-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pytest_forked/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pytest_forked/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pytest_forked/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_forked/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
diff --git a/devel/py-test-httpbin/Makefile b/devel/py-test-httpbin/Makefile
index e92ac869729..07fa5938781 100644
--- a/devel/py-test-httpbin/Makefile
+++ b/devel/py-test-httpbin/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	1.0.2
 DISTNAME =		pytest-httpbin-${MODPY_EGG_VERSION}
 PKGNAME =		${DISTNAME:S/py/py-/}
 CATEGORIES =		devel
-REVISION =		0
+REVISION =		1
 
 HOMEPAGE =		https://github.com/kevin1024/pytest-httpbin
 
@@ -14,8 +14,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/devel/py-test-httpbin/pkg/PLIST b/devel/py-test-httpbin/pkg/PLIST
index 6d7762f11d5..215fc086e89 100644
--- a/devel/py-test-httpbin/pkg/PLIST
+++ b/devel/py-test-httpbin/pkg/PLIST
@@ -1,18 +1,22 @@
 @pkgpath devel/py-test-httpbin
 lib/python${MODPY_VERSION}/site-packages/pytest_httpbin/
-lib/python${MODPY_VERSION}/site-packages/pytest_httpbin-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pytest_httpbin-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pytest_httpbin-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_httpbin-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_httpbin-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_httpbin-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_httpbin-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_httpbin-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pytest_httpbin-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pytest_httpbin-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pytest_httpbin-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pytest_httpbin-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_httpbin-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pytest_httpbin/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pytest_httpbin/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pytest_httpbin/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_httpbin/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_httpbin/${MODPY_PYCACHE}certs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_httpbin/${MODPY_PYCACHE}certs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_httpbin/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_httpbin/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_httpbin/${MODPY_PYCACHE}serve.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_httpbin/${MODPY_PYCACHE}serve.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_httpbin/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_httpbin/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pytest_httpbin/certs/
 lib/python${MODPY_VERSION}/site-packages/pytest_httpbin/certs.py
diff --git a/devel/py-test-lazy-fixture/Makefile b/devel/py-test-lazy-fixture/Makefile
index 2f8223cb55f..e9febbfcd9c 100644
--- a/devel/py-test-lazy-fixture/Makefile
+++ b/devel/py-test-lazy-fixture/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	0.6.3
 
 DISTNAME =		pytest-lazy-fixture-${MODPY_EGG_VERSION}
 PKGNAME =		${DISTNAME:S/py/py-/}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		devel
 
@@ -16,8 +16,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools
 
 RUN_DEPENDS =		devel/py-test${MODPY_FLAVOR}
 
diff --git a/devel/py-test-lazy-fixture/pkg/PLIST b/devel/py-test-lazy-fixture/pkg/PLIST
index 8cfe7b797f7..804126c1614 100644
--- a/devel/py-test-lazy-fixture/pkg/PLIST
+++ b/devel/py-test-lazy-fixture/pkg/PLIST
@@ -1,10 +1,11 @@
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pytest_lazyfixture.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pytest_lazyfixture.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pytest_lazy_fixture-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pytest_lazy_fixture-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pytest_lazy_fixture-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_lazy_fixture-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_lazy_fixture-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_lazy_fixture-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_lazy_fixture-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_lazy_fixture-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pytest_lazy_fixture-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/pytest_lazy_fixture-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pytest_lazy_fixture-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pytest_lazy_fixture-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pytest_lazy_fixture-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_lazy_fixture-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pytest_lazyfixture.py
diff --git a/devel/py-test-mock/Makefile b/devel/py-test-mock/Makefile
index 23a44027f29..b1323c59767 100644
--- a/devel/py-test-mock/Makefile
+++ b/devel/py-test-mock/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	3.8.2
 DISTNAME =		pytest-mock-${MODPY_EGG_VERSION}
 PKGNAME =		${DISTNAME:S/py/py-/}
 CATEGORIES =		devel
-REVISION =		0
+REVISION =		1
 
 HOMEPAGE =		https://github.com/pytest-dev/pytest-mock/
 
@@ -13,13 +13,11 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 
-BUILD_DEPENDS =		devel/py-setuptools_scm${MODPY_FLAVOR}
 RUN_DEPENDS =		devel/py-test${MODPY_FLAVOR}
 TEST_DEPENDS =		${BASE_PKGPATH}
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools_scm
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/devel/py-test-mock/pkg/PLIST b/devel/py-test-mock/pkg/PLIST
index 7ce883ca38a..c820bb3ad1d 100644
--- a/devel/py-test-mock/pkg/PLIST
+++ b/devel/py-test-mock/pkg/PLIST
@@ -1,17 +1,21 @@
 @pkgpath devel/py-test-mock
 lib/python${MODPY_VERSION}/site-packages/pytest_mock/
-lib/python${MODPY_VERSION}/site-packages/pytest_mock-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pytest_mock-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pytest_mock-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_mock-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_mock-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_mock-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_mock-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_mock-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pytest_mock-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/pytest_mock-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pytest_mock-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pytest_mock-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pytest_mock-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_mock-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pytest_mock/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pytest_mock/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pytest_mock/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_mock/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_mock/${MODPY_PYCACHE}_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_mock/${MODPY_PYCACHE}_util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_mock/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_mock/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_mock/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_mock/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pytest_mock/_util.py
 lib/python${MODPY_VERSION}/site-packages/pytest_mock/_version.py
diff --git a/devel/py-test-openfiles/Makefile b/devel/py-test-openfiles/Makefile
index bbababe0a9f..aa6a7702de0 100644
--- a/devel/py-test-openfiles/Makefile
+++ b/devel/py-test-openfiles/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	0.5.0
 
 DISTNAME =	pytest-openfiles-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:S/py//}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	devel
 
@@ -15,14 +15,12 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =	lang/python
 
-MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PI =	Yes
+MODPY_PYBUILD =	setuptools_scm
 
 FLAVOR =	python3
 FLAVORS =	python3
 
-BUILD_DEPENDS =	devel/py-setuptools_scm${MODPY_FLAVOR}
 RUN_DEPENDS =	devel/py-test${MODPY_FLAVOR} \
 		sysutils/py-packaging${MODPY_FLAVOR} \
 		sysutils/py-psutil${MODPY_FLAVOR}
diff --git a/devel/py-test-openfiles/pkg/PLIST b/devel/py-test-openfiles/pkg/PLIST
index 8fd54937bb1..923b267a343 100644
--- a/devel/py-test-openfiles/pkg/PLIST
+++ b/devel/py-test-openfiles/pkg/PLIST
@@ -1,16 +1,18 @@
 lib/python${MODPY_VERSION}/site-packages/pytest_openfiles/
-lib/python${MODPY_VERSION}/site-packages/pytest_openfiles-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pytest_openfiles-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pytest_openfiles-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_openfiles-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_openfiles-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_openfiles-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/pytest_openfiles-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_openfiles-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_openfiles-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pytest_openfiles-${MODPY_EGG_VERSION}.dist-info/LICENSE.rst
+lib/python${MODPY_VERSION}/site-packages/pytest_openfiles-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pytest_openfiles-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pytest_openfiles-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pytest_openfiles-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_openfiles-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pytest_openfiles/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pytest_openfiles/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pytest_openfiles/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_openfiles/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_openfiles/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_openfiles/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_openfiles/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_openfiles/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pytest_openfiles/plugin.py
 lib/python${MODPY_VERSION}/site-packages/pytest_openfiles/version.py
diff --git a/devel/py-test-relaxed/Makefile b/devel/py-test-relaxed/Makefile
index 302a0883fca..013aa62db78 100644
--- a/devel/py-test-relaxed/Makefile
+++ b/devel/py-test-relaxed/Makefile
@@ -1,29 +1,28 @@
-COMMENT =		relaxed test discovery/organization for pytest
+COMMENT =	relaxed test discovery/organization for pytest
 
 MODPY_EGG_VERSION =	1.1.5
 
-DISTNAME =		pytest-relaxed-${MODPY_EGG_VERSION}
-PKGNAME =		${DISTNAME:S/py/py-/}
-REVISION =		4
+DISTNAME =	pytest-relaxed-${MODPY_EGG_VERSION}
+PKGNAME =	${DISTNAME:S/py/py-/}
+REVISION =	5
 
-CATEGORIES =		devel
+CATEGORIES =	devel
 
-HOMEPAGE =		https://pytest-relaxed.readthedocs.io/
+HOMEPAGE =	https://pytest-relaxed.readthedocs.io/
 
 # BSD
 PERMIT_PACKAGE =	Yes
 
-MODULES =		lang/python
+MODULES =	lang/python
 
-MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PI =	Yes
+MODPY_PYBUILD =	setuptools
 
-RUN_DEPENDS =		devel/py-decorator${MODPY_FLAVOR} \
-			devel/py-six${MODPY_FLAVOR} \
-			devel/py-test${MODPY_FLAVOR}
+RUN_DEPENDS =	devel/py-decorator${MODPY_FLAVOR} \
+		devel/py-six${MODPY_FLAVOR} \
+		devel/py-test${MODPY_FLAVOR}
 
-FLAVORS =		python3
+FLAVORS =	python3
 FLAVOR =	python3
 
 .include <bsd.port.mk>
diff --git a/devel/py-test-relaxed/pkg/PLIST b/devel/py-test-relaxed/pkg/PLIST
index 0939fb8f8d3..7dfb530f846 100644
--- a/devel/py-test-relaxed/pkg/PLIST
+++ b/devel/py-test-relaxed/pkg/PLIST
@@ -1,21 +1,29 @@
 @pkgpath devel/py-test-relaxed
 lib/python${MODPY_VERSION}/site-packages/pytest_relaxed/
-lib/python${MODPY_VERSION}/site-packages/pytest_relaxed-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pytest_relaxed-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pytest_relaxed-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_relaxed-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_relaxed-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_relaxed-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_relaxed-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_relaxed-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pytest_relaxed-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/pytest_relaxed-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pytest_relaxed-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pytest_relaxed-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pytest_relaxed-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_relaxed-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pytest_relaxed/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pytest_relaxed/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pytest_relaxed/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_relaxed/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_relaxed/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_relaxed/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_relaxed/${MODPY_PYCACHE}classes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_relaxed/${MODPY_PYCACHE}classes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_relaxed/${MODPY_PYCACHE}fixtures.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_relaxed/${MODPY_PYCACHE}fixtures.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_relaxed/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_relaxed/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_relaxed/${MODPY_PYCACHE}raises.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_relaxed/${MODPY_PYCACHE}raises.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_relaxed/${MODPY_PYCACHE}reporter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_relaxed/${MODPY_PYCACHE}reporter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_relaxed/${MODPY_PYCACHE}trap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_relaxed/${MODPY_PYCACHE}trap.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pytest_relaxed/_version.py
 lib/python${MODPY_VERSION}/site-packages/pytest_relaxed/classes.py
diff --git a/devel/py-test-remotedata/Makefile b/devel/py-test-remotedata/Makefile
index 38c211a9ab0..79b5a6124d4 100644
--- a/devel/py-test-remotedata/Makefile
+++ b/devel/py-test-remotedata/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	0.3.3
 
 DISTNAME =	pytest-remotedata-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:S/py//}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	devel
 
@@ -13,16 +13,14 @@ HOMEPAGE =	https://github.com/astropy/pytest-remotedata
 # BSD
 PERMIT_PACKAGE =	Yes
 
-MODULES =		lang/python
+MODULES =	lang/python
 
-MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PI =	Yes
+MODPY_PYBUILD =	setuptools_scm
 
 FLAVOR =	python3
 FLAVORS =	python3
 
-BUILD_DEPENDS =	devel/py-setuptools_scm${MODPY_FLAVOR}
 RUN_DEPENDS =	devel/py-test${MODPY_FLAVOR} \
 		sysutils/py-packaging${MODPY_FLAVOR}
 
diff --git a/devel/py-test-remotedata/pkg/PLIST b/devel/py-test-remotedata/pkg/PLIST
index 63a2c9c2abb..478f0fa2d5c 100644
--- a/devel/py-test-remotedata/pkg/PLIST
+++ b/devel/py-test-remotedata/pkg/PLIST
@@ -1,17 +1,20 @@
 lib/python${MODPY_VERSION}/site-packages/pytest_remotedata/
-lib/python${MODPY_VERSION}/site-packages/pytest_remotedata-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pytest_remotedata-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pytest_remotedata-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_remotedata-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_remotedata-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_remotedata-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/pytest_remotedata-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_remotedata-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_remotedata-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pytest_remotedata-${MODPY_EGG_VERSION}.dist-info/LICENSE.rst
+lib/python${MODPY_VERSION}/site-packages/pytest_remotedata-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pytest_remotedata-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pytest_remotedata-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pytest_remotedata-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_remotedata-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pytest_remotedata/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pytest_remotedata/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pytest_remotedata/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_remotedata/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_remotedata/${MODPY_PYCACHE}disable_internet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_remotedata/${MODPY_PYCACHE}disable_internet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_remotedata/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_remotedata/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pytest_remotedata/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pytest_remotedata/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pytest_remotedata/disable_internet.py
 lib/python${MODPY_VERSION}/site-packages/pytest_remotedata/plugin.py
diff --git a/devel/py-test-subtests/Makefile b/devel/py-test-subtests/Makefile
index 02c4982dcec..fd7010f3e1b 100644
--- a/devel/py-test-subtests/Makefile
+++ b/devel/py-test-subtests/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	0.8.0
 
 DISTNAME =	pytest-subtests-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	devel
 
@@ -16,14 +16,11 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools_scm
 
 FLAVOR =		python3
 FLAVORS =		python3
 
-BUILD_DEPENDS =		devel/py-setuptools_scm${MODPY_FLAVOR}
-
 RUN_DEPENDS =		devel/py-test${MODPY_FLAVOR}
-MODPY_PYTEST =		Yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-test-subtests/pkg/PLIST b/devel/py-test-subtests/pkg/PLIST
index ef9c3d1730e..1be0d382eaf 100644
--- a/devel/py-test-subtests/pkg/PLIST
+++ b/devel/py-test-subtests/pkg/PLIST
@@ -1,10 +1,11 @@
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pytest_subtests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pytest_subtests.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pytest_subtests-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pytest_subtests-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pytest_subtests-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_subtests-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_subtests-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_subtests-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_subtests-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_subtests-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pytest_subtests-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/pytest_subtests-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pytest_subtests-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pytest_subtests-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pytest_subtests-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_subtests-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pytest_subtests.py
diff --git a/devel/py-test-timeout/Makefile b/devel/py-test-timeout/Makefile
index 9b96cdd1057..2f31903ad9e 100644
--- a/devel/py-test-timeout/Makefile
+++ b/devel/py-test-timeout/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	1.4.2
 
 DISTNAME =		pytest-timeout-${MODPY_EGG_VERSION}
 PKGNAME =		${DISTNAME:S/py/py-/}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		devel
 
@@ -18,8 +18,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools
 
 RUN_DEPENDS =		devel/py-test${MODPY_FLAVOR}
 TEST_DEPENDS =		devel/py-pexpect${MODPY_FLAVOR} \
diff --git a/devel/py-test-timeout/pkg/PLIST b/devel/py-test-timeout/pkg/PLIST
index 6bbe4d86aeb..95f71e15635 100644
--- a/devel/py-test-timeout/pkg/PLIST
+++ b/devel/py-test-timeout/pkg/PLIST
@@ -1,11 +1,13 @@
 @conflict py-test-timeout-*
 @pkgpath devel/py-test-timeout
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pytest_timeout.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pytest_timeout.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pytest_timeout-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pytest_timeout-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pytest_timeout-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_timeout-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_timeout-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_timeout-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_timeout-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_timeout-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pytest_timeout-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/pytest_timeout-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pytest_timeout-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pytest_timeout-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pytest_timeout-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_timeout-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pytest_timeout.py
diff --git a/devel/py-test-vcr/Makefile b/devel/py-test-vcr/Makefile
index 8ed6cf0e46a..8648030558c 100644
--- a/devel/py-test-vcr/Makefile
+++ b/devel/py-test-vcr/Makefile
@@ -3,7 +3,7 @@ COMMENT =		plugin for managing VCR.py cassettes
 MODPY_EGG_VERSION =	1.0.2
 DISTNAME =		pytest-vcr-${MODPY_EGG_VERSION}
 PKGNAME =		py-test-vcr-${MODPY_EGG_VERSION}
-REVISION =		3
+REVISION =		4
 
 CATEGORIES =		devel
 
@@ -15,9 +15,8 @@ MAINTAINER =		Pamela Mosiejczuk <pamela@openbsd.org>
 PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 MODPY_PI =		Yes
-MODPY_PYTEST =		Yes
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/devel/py-test-vcr/pkg/PLIST b/devel/py-test-vcr/pkg/PLIST
index 1339caa8b52..e6c02eec423 100644
--- a/devel/py-test-vcr/pkg/PLIST
+++ b/devel/py-test-vcr/pkg/PLIST
@@ -1,10 +1,11 @@
 @pkgpath devel/py-test-vcr
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pytest_vcr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pytest_vcr.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pytest_vcr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pytest_vcr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pytest_vcr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_vcr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_vcr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_vcr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_vcr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_vcr-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pytest_vcr-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/pytest_vcr-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pytest_vcr-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pytest_vcr-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pytest_vcr-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_vcr-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pytest_vcr.py
diff --git a/devel/py-test-xdist/Makefile b/devel/py-test-xdist/Makefile
index 76d67852361..71b25704d52 100644
--- a/devel/py-test-xdist/Makefile
+++ b/devel/py-test-xdist/Makefile
@@ -4,7 +4,7 @@ DISTNAME =		pytest-xdist-${MODPY_EGG_VERSION}
 PKGNAME =		py-test-xdist-${MODPY_EGG_VERSION}
 MODPY_EGG_VERSION =	2.5.0
 MODPY_PI =		Yes
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =	devel
 
@@ -17,11 +17,9 @@ FLAVORS =		python3
 FLAVOR =		python3
 
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools_scm
 MODPY_PYTEST_ARGS =	testing
 
-BUILD_DEPENDS +=	devel/py-setuptools_scm${MODPY_FLAVOR}
 RUN_DEPENDS =		devel/py-execnet${MODPY_FLAVOR} \
 			devel/py-test${MODPY_FLAVOR} \
 			devel/py-apipkg${MODPY_FLAVOR}
diff --git a/devel/py-test-xdist/pkg/PLIST b/devel/py-test-xdist/pkg/PLIST
index eff51f5f8cd..bd9a46c1f65 100644
--- a/devel/py-test-xdist/pkg/PLIST
+++ b/devel/py-test-xdist/pkg/PLIST
@@ -1,23 +1,31 @@
 @pkgpath devel/py-test-xdist
-lib/python${MODPY_VERSION}/site-packages/pytest_xdist-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pytest_xdist-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pytest_xdist-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_xdist-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_xdist-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_xdist-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/pytest_xdist-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pytest_xdist-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_xdist-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pytest_xdist-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/pytest_xdist-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pytest_xdist-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pytest_xdist-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pytest_xdist-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_xdist-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/xdist/
 lib/python${MODPY_VERSION}/site-packages/xdist/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/xdist/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/xdist/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/xdist/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdist/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/xdist/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdist/${MODPY_PYCACHE}dsession.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/xdist/${MODPY_PYCACHE}dsession.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdist/${MODPY_PYCACHE}looponfail.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/xdist/${MODPY_PYCACHE}looponfail.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdist/${MODPY_PYCACHE}newhooks.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/xdist/${MODPY_PYCACHE}newhooks.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdist/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/xdist/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdist/${MODPY_PYCACHE}remote.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/xdist/${MODPY_PYCACHE}remote.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdist/${MODPY_PYCACHE}report.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/xdist/${MODPY_PYCACHE}report.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdist/${MODPY_PYCACHE}workermanage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/xdist/${MODPY_PYCACHE}workermanage.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/xdist/_version.py
 lib/python${MODPY_VERSION}/site-packages/xdist/dsession.py
@@ -29,11 +37,17 @@ lib/python${MODPY_VERSION}/site-packages/xdist/report.py
 lib/python${MODPY_VERSION}/site-packages/xdist/scheduler/
 lib/python${MODPY_VERSION}/site-packages/xdist/scheduler/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/xdist/scheduler/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/xdist/scheduler/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/xdist/scheduler/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdist/scheduler/${MODPY_PYCACHE}each.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/xdist/scheduler/${MODPY_PYCACHE}each.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdist/scheduler/${MODPY_PYCACHE}load.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/xdist/scheduler/${MODPY_PYCACHE}load.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdist/scheduler/${MODPY_PYCACHE}loadfile.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/xdist/scheduler/${MODPY_PYCACHE}loadfile.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdist/scheduler/${MODPY_PYCACHE}loadgroup.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/xdist/scheduler/${MODPY_PYCACHE}loadgroup.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdist/scheduler/${MODPY_PYCACHE}loadscope.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/xdist/scheduler/${MODPY_PYCACHE}loadscope.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/xdist/scheduler/each.py
 lib/python${MODPY_VERSION}/site-packages/xdist/scheduler/load.py
diff --git a/devel/py-testtools/Makefile b/devel/py-testtools/Makefile
index 929accb1fa5..07e528f29fb 100644
--- a/devel/py-testtools/Makefile
+++ b/devel/py-testtools/Makefile
@@ -4,14 +4,14 @@ MODPY_EGG_VERSION= 1.8.1
 DISTNAME=	testtools-${MODPY_EGG_VERSION}
 PKGNAME=	py-${DISTNAME}
 CATEGORIES=	devel
-REVISION=	7
+REVISION=	8
 
 # MIT
 PERMIT_PACKAGE=	Yes
 
 MODULES=	lang/python
 MODPY_PI=	Yes
-MODPY_SETUPTOOLS= Yes
+MODPY_PYBUILD =	setuptools
 BUILD_DEPENDS=	devel/py-pbr${MODPY_FLAVOR}
 RUN_DEPENDS=	devel/py-extras${MODPY_FLAVOR}
 
diff --git a/devel/py-testtools/pkg/PLIST b/devel/py-testtools/pkg/PLIST
index 29cdd030b43..1f2a969c063 100644
--- a/devel/py-testtools/pkg/PLIST
+++ b/devel/py-testtools/pkg/PLIST
@@ -1,31 +1,48 @@
 @pkgpath devel/py-testtools
 lib/python${MODPY_VERSION}/site-packages/testtools/
-lib/python${MODPY_VERSION}/site-packages/testtools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/testtools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/testtools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/testtools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/testtools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/testtools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
-lib/python${MODPY_VERSION}/site-packages/testtools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/testtools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/testtools-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/testtools-${MODPY_EGG_VERSION}.dist-info/AUTHORS
+lib/python${MODPY_VERSION}/site-packages/testtools-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/testtools-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/testtools-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/testtools-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/testtools-${MODPY_EGG_VERSION}.dist-info/pbr.json
+lib/python${MODPY_VERSION}/site-packages/testtools-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/testtools/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}_compat3x.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}_compat3x.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}_spinner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}_spinner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}assertions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}assertions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}content.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}content.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}content_type.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}content_type.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}deferredruntest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}deferredruntest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}distutilscmd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}distutilscmd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}monkey.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}monkey.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}run.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}run.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}runtest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}runtest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}tags.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}tags.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}testcase.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}testcase.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}testsuite.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}testsuite.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/testtools/_compat2x.py
 lib/python${MODPY_VERSION}/site-packages/testtools/_compat3x.py
@@ -40,14 +57,23 @@ lib/python${MODPY_VERSION}/site-packages/testtools/helpers.py
 lib/python${MODPY_VERSION}/site-packages/testtools/matchers/
 lib/python${MODPY_VERSION}/site-packages/testtools/matchers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/testtools/matchers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/testtools/matchers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/matchers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/matchers/${MODPY_PYCACHE}_basic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/matchers/${MODPY_PYCACHE}_basic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/matchers/${MODPY_PYCACHE}_datastructures.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/matchers/${MODPY_PYCACHE}_datastructures.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/matchers/${MODPY_PYCACHE}_dict.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/matchers/${MODPY_PYCACHE}_dict.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/matchers/${MODPY_PYCACHE}_doctest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/matchers/${MODPY_PYCACHE}_doctest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/matchers/${MODPY_PYCACHE}_exception.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/matchers/${MODPY_PYCACHE}_exception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/matchers/${MODPY_PYCACHE}_filesystem.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/matchers/${MODPY_PYCACHE}_filesystem.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/matchers/${MODPY_PYCACHE}_higherorder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/matchers/${MODPY_PYCACHE}_higherorder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/matchers/${MODPY_PYCACHE}_impl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/matchers/${MODPY_PYCACHE}_impl.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/testtools/matchers/_basic.py
 lib/python${MODPY_VERSION}/site-packages/testtools/matchers/_datastructures.py
@@ -65,46 +91,78 @@ lib/python${MODPY_VERSION}/site-packages/testtools/testcase.py
 lib/python${MODPY_VERSION}/site-packages/testtools/testresult/
 lib/python${MODPY_VERSION}/site-packages/testtools/testresult/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/testtools/testresult/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/testtools/testresult/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/testresult/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/testresult/${MODPY_PYCACHE}doubles.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/testresult/${MODPY_PYCACHE}doubles.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/testresult/${MODPY_PYCACHE}real.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/testresult/${MODPY_PYCACHE}real.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/testtools/testresult/doubles.py
 lib/python${MODPY_VERSION}/site-packages/testtools/testresult/real.py
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_assert_that.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_assert_that.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_content.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_content.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_content_type.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_content_type.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_deferredruntest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_deferredruntest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_distutilscmd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_distutilscmd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_fixturesupport.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_fixturesupport.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_helpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_monkey.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_monkey.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_run.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_run.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_runtest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_runtest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_spinner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_spinner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_tags.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_tags.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_testcase.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_testcase.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_testresult.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_testresult.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_testsuite.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_testsuite.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_with_with.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/${MODPY_PYCACHE}test_with_with.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/helpers.py
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/${MODPY_PYCACHE}test_basic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/${MODPY_PYCACHE}test_basic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/${MODPY_PYCACHE}test_datastructures.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/${MODPY_PYCACHE}test_datastructures.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/${MODPY_PYCACHE}test_dict.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/${MODPY_PYCACHE}test_dict.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/${MODPY_PYCACHE}test_doctest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/${MODPY_PYCACHE}test_doctest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/${MODPY_PYCACHE}test_exception.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/${MODPY_PYCACHE}test_exception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/${MODPY_PYCACHE}test_filesystem.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/${MODPY_PYCACHE}test_filesystem.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/${MODPY_PYCACHE}test_higherorder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/${MODPY_PYCACHE}test_higherorder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/${MODPY_PYCACHE}test_impl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/${MODPY_PYCACHE}test_impl.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/helpers.py
 lib/python${MODPY_VERSION}/site-packages/testtools/tests/matchers/test_basic.py
diff --git a/devel/py-tzlocal/Makefile b/devel/py-tzlocal/Makefile
index 41df3888680..aee0c0146ee 100644
--- a/devel/py-tzlocal/Makefile
+++ b/devel/py-tzlocal/Makefile
@@ -3,7 +3,7 @@ COMMENT =		python tzinfo object for the local timezone
 MODPY_EGG_VERSION =	2.1
 DISTNAME =		tzlocal-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		devel
 
@@ -13,7 +13,7 @@ HOMEPAGE =		https://github.com/regebro/tzlocal
 PERMIT_PACKAGE =	Yes
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/devel/py-tzlocal/pkg/PLIST b/devel/py-tzlocal/pkg/PLIST
index d7341cfd02a..56390a3f1fc 100644
--- a/devel/py-tzlocal/pkg/PLIST
+++ b/devel/py-tzlocal/pkg/PLIST
@@ -1,18 +1,23 @@
 @pkgpath devel/py-tzlocal
 lib/python${MODPY_VERSION}/site-packages/tzlocal/
-lib/python${MODPY_VERSION}/site-packages/tzlocal-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/tzlocal-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/tzlocal-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/tzlocal-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/tzlocal-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/tzlocal-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/tzlocal-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
+lib/python${MODPY_VERSION}/site-packages/tzlocal-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/tzlocal-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/tzlocal-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/tzlocal-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/tzlocal-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/tzlocal-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/tzlocal-${MODPY_EGG_VERSION}.dist-info/zip-safe
 lib/python${MODPY_VERSION}/site-packages/tzlocal/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tzlocal/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/tzlocal/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tzlocal/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tzlocal/${MODPY_PYCACHE}unix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tzlocal/${MODPY_PYCACHE}unix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tzlocal/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tzlocal/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tzlocal/${MODPY_PYCACHE}win32.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tzlocal/${MODPY_PYCACHE}win32.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tzlocal/${MODPY_PYCACHE}windows_tz.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tzlocal/${MODPY_PYCACHE}windows_tz.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/tzlocal/unix.py
 lib/python${MODPY_VERSION}/site-packages/tzlocal/utils.py
diff --git a/devel/py-wcwidth/Makefile b/devel/py-wcwidth/Makefile
index e9980460079..bba588cb630 100644
--- a/devel/py-wcwidth/Makefile
+++ b/devel/py-wcwidth/Makefile
@@ -3,7 +3,7 @@ COMMENT=		measures number of terminal column cells of wide-char code
 MODPY_EGG_VERSION=	0.1.9
 DISTNAME=		wcwidth-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
-REVISION=		2
+REVISION=		3
 
 CATEGORIES=		devel
 
@@ -15,8 +15,7 @@ PERMIT_PACKAGE=	Yes
 MODULES=		lang/python
 
 MODPY_PI=		Yes
-MODPY_SETUPTOOLS=	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools
 MODPY_PYTEST_ARGS =	wcwidth
 
 FLAVORS=		python3
diff --git a/devel/py-wcwidth/pkg/PLIST b/devel/py-wcwidth/pkg/PLIST
index 5ef2fb6591c..57148fc615c 100644
--- a/devel/py-wcwidth/pkg/PLIST
+++ b/devel/py-wcwidth/pkg/PLIST
@@ -1,24 +1,31 @@
 @conflict py-wcwidth-*
 @pkgpath devel/py-wcwidth
 lib/python${MODPY_VERSION}/site-packages/wcwidth/
-lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
+lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}.dist-info/zip-safe
 lib/python${MODPY_VERSION}/site-packages/wcwidth/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wcwidth/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wcwidth/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wcwidth/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wcwidth/${MODPY_PYCACHE}table_wide.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wcwidth/${MODPY_PYCACHE}table_wide.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wcwidth/${MODPY_PYCACHE}table_zero.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wcwidth/${MODPY_PYCACHE}table_zero.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wcwidth/${MODPY_PYCACHE}wcwidth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wcwidth/${MODPY_PYCACHE}wcwidth.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wcwidth/table_wide.py
 lib/python${MODPY_VERSION}/site-packages/wcwidth/table_zero.py
 lib/python${MODPY_VERSION}/site-packages/wcwidth/tests/
 lib/python${MODPY_VERSION}/site-packages/wcwidth/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wcwidth/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wcwidth/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wcwidth/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wcwidth/tests/${MODPY_PYCACHE}test_core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wcwidth/tests/${MODPY_PYCACHE}test_core.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wcwidth/tests/test_core.py
 lib/python${MODPY_VERSION}/site-packages/wcwidth/wcwidth.py
diff --git a/devel/py-yamllint/Makefile b/devel/py-yamllint/Makefile
index bde394cb5fc..9ccf9554707 100644
--- a/devel/py-yamllint/Makefile
+++ b/devel/py-yamllint/Makefile
@@ -3,7 +3,7 @@ COMMENT =	linter for YAML files
 MODPY_EGG_VERSION = 1.26.3
 DISTNAME =	yamllint-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	devel
 
@@ -14,8 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =	lang/python
 MODPY_PI =	Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =	Yes
+MODPY_PYBUILD =		setuptools
 
 RUN_DEPENDS =	devel/py-pathspec${MODPY_FLAVOR} \
 		textproc/py-yaml${MODPY_FLAVOR}
diff --git a/devel/py-yamllint/pkg/PLIST b/devel/py-yamllint/pkg/PLIST
index 4b4ffc8286f..f3510216c62 100644
--- a/devel/py-yamllint/pkg/PLIST
+++ b/devel/py-yamllint/pkg/PLIST
@@ -2,21 +2,27 @@
 @pkgpath devel/py-yamllint
 bin/yamllint
 lib/python${MODPY_VERSION}/site-packages/yamllint/
-lib/python${MODPY_VERSION}/site-packages/yamllint-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/yamllint-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/yamllint-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/yamllint-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/yamllint-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/yamllint-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/yamllint-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/yamllint-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/yamllint-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/yamllint-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/yamllint-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/yamllint-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/yamllint-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/yamllint-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/yamllint/__init__.py
 lib/python${MODPY_VERSION}/site-packages/yamllint/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/yamllint/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/yamllint/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/${MODPY_PYCACHE}linter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/${MODPY_PYCACHE}linter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/yamllint/cli.py
 lib/python${MODPY_VERSION}/site-packages/yamllint/conf/
@@ -28,28 +34,51 @@ lib/python${MODPY_VERSION}/site-packages/yamllint/parser.py
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}braces.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}braces.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}brackets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}brackets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}colons.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}colons.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}commas.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}commas.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}comments.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}comments.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}comments_indentation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}comments_indentation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}document_end.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}document_end.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}document_start.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}document_start.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}empty_lines.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}empty_lines.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}empty_values.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}empty_values.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}hyphens.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}hyphens.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}indentation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}indentation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}key_duplicates.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}key_duplicates.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}key_ordering.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}key_ordering.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}line_length.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}line_length.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}new_line_at_end_of_file.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}new_line_at_end_of_file.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}new_lines.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}new_lines.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}octal_values.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}octal_values.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}quoted_strings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}quoted_strings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}trailing_spaces.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}trailing_spaces.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}truthy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/${MODPY_PYCACHE}truthy.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/braces.py
 lib/python${MODPY_VERSION}/site-packages/yamllint/rules/brackets.py
diff --git a/devel/pyflakes/Makefile b/devel/pyflakes/Makefile
index 5335fe951c7..70220bd4530 100644
--- a/devel/pyflakes/Makefile
+++ b/devel/pyflakes/Makefile
@@ -2,7 +2,7 @@ COMMENT =		passive checker of Python programs
 
 MODPY_EGG_VERSION =	2.3.1
 DISTNAME =		pyflakes-${MODPY_EGG_VERSION}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		devel
 
@@ -14,8 +14,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools
 TEST_ENV =		PY_IGNORE_IMPORTMISMATCH=1
 
 FLAVORS =		python3
diff --git a/devel/pyflakes/pkg/PLIST b/devel/pyflakes/pkg/PLIST
index ec23c6c141c..0d07f9f2643 100644
--- a/devel/pyflakes/pkg/PLIST
+++ b/devel/pyflakes/pkg/PLIST
@@ -3,20 +3,27 @@
 @pkgpath devel/pyflakes
 bin/pyflakes
 lib/python${MODPY_VERSION}/site-packages/pyflakes/
-lib/python${MODPY_VERSION}/site-packages/pyflakes-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pyflakes-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pyflakes-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pyflakes-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pyflakes-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/pyflakes-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pyflakes-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pyflakes-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/pyflakes-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pyflakes-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pyflakes-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pyflakes-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pyflakes-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pyflakes/__init__.py
 lib/python${MODPY_VERSION}/site-packages/pyflakes/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyflakes/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pyflakes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyflakes/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyflakes/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyflakes/${MODPY_PYCACHE}checker.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/${MODPY_PYCACHE}checker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyflakes/${MODPY_PYCACHE}messages.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/${MODPY_PYCACHE}messages.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyflakes/${MODPY_PYCACHE}reporter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/${MODPY_PYCACHE}reporter.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pyflakes/api.py
 lib/python${MODPY_VERSION}/site-packages/pyflakes/checker.py
@@ -25,25 +32,41 @@ lib/python${MODPY_VERSION}/site-packages/pyflakes/reporter.py
 lib/python${MODPY_VERSION}/site-packages/pyflakes/scripts/
 lib/python${MODPY_VERSION}/site-packages/pyflakes/scripts/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyflakes/scripts/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pyflakes/scripts/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/scripts/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyflakes/scripts/${MODPY_PYCACHE}pyflakes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/scripts/${MODPY_PYCACHE}pyflakes.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pyflakes/scripts/pyflakes.py
 lib/python${MODPY_VERSION}/site-packages/pyflakes/test/
 lib/python${MODPY_VERSION}/site-packages/pyflakes/test/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}harness.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}harness.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_api.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_api.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_builtin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_builtin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_checker.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_checker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_code_segment.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_code_segment.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_dict.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_dict.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_doctests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_doctests.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_imports.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_imports.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_is_literal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_is_literal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_other.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_other.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_return_with_arguments_inside_generator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_return_with_arguments_inside_generator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_type_annotations.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_type_annotations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_undefined_names.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyflakes/test/${MODPY_PYCACHE}test_undefined_names.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pyflakes/test/harness.py
 lib/python${MODPY_VERSION}/site-packages/pyflakes/test/test_api.py
diff --git a/devel/scons/Makefile b/devel/scons/Makefile
index 6cf4139fc75..8192e310407 100644
--- a/devel/scons/Makefile
+++ b/devel/scons/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION= 4.4.0
 DISTNAME=	SCons-${MODPY_EGG_VERSION}
 PKGNAME=	${DISTNAME:L}
 CATEGORIES=	devel
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	https://www.scons.org/
 
@@ -13,7 +13,7 @@ PERMIT_PACKAGE=	Yes
 
 MODULES=		lang/python
 MODPY_PI=		Yes
-MODPY_SETUPTOOLS=	Yes
+MODPY_PYBUILD =		setuptools
 
 NO_TEST=	Yes
 
diff --git a/devel/scons/pkg/PLIST b/devel/scons/pkg/PLIST
index 702a9014d9f..4e3ba12433b 100644
--- a/devel/scons/pkg/PLIST
+++ b/devel/scons/pkg/PLIST
@@ -2,14 +2,13 @@ bin/scons
 bin/scons-configure-cache
 bin/sconsign
 lib/python${MODPY_VERSION}/site-packages/SCons/
-lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/SCons/Action.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Builder.py
 lib/python${MODPY_VERSION}/site-packages/SCons/CacheDir.py
@@ -29,25 +28,41 @@ lib/python${MODPY_VERSION}/site-packages/SCons/Node/FS.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Node/Python.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Node/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Node/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/Node/${MODPY_PYCACHE}Alias.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Node/${MODPY_PYCACHE}Alias.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Node/${MODPY_PYCACHE}FS.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Node/${MODPY_PYCACHE}FS.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Node/${MODPY_PYCACHE}Python.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Node/${MODPY_PYCACHE}Python.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Node/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Node/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/PathList.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Platform/
 lib/python${MODPY_VERSION}/site-packages/SCons/Platform/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}aix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}aix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}cygwin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}cygwin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}darwin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}darwin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}hpux.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}hpux.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}irix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}irix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}mingw.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}mingw.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}os2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}os2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}posix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}posix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}sunos.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}sunos.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}virtualenv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}virtualenv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}win32.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Platform/${MODPY_PYCACHE}win32.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Platform/aix.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Platform/cygwin.py
@@ -76,17 +91,29 @@ lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/RC.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/SWIG.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}C.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}C.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}D.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}D.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}Dir.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}Dir.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}Fortran.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}Fortran.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}IDL.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}IDL.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}Java.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}Java.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}LaTeX.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}LaTeX.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}Prog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}Prog.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}Python.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}Python.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}RC.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}RC.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}SWIG.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}SWIG.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Script/
 lib/python${MODPY_VERSION}/site-packages/SCons/Script/Interactive.py
@@ -95,10 +122,15 @@ lib/python${MODPY_VERSION}/site-packages/SCons/Script/SConsOptions.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Script/SConscript.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Script/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Script/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/Script/${MODPY_PYCACHE}Interactive.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Script/${MODPY_PYCACHE}Interactive.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Script/${MODPY_PYCACHE}Main.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Script/${MODPY_PYCACHE}Main.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Script/${MODPY_PYCACHE}SConsOptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Script/${MODPY_PYCACHE}SConsOptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Script/${MODPY_PYCACHE}SConscript.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Script/${MODPY_PYCACHE}SConscript.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Script/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Script/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Subst.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster.py
@@ -122,25 +154,43 @@ lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/Warnings.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/WinSDK.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Dispatcher.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Dispatcher.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Policy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Policy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Registry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Registry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}ScriptArguments.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}ScriptArguments.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}SetupEnvDefault.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}SetupEnvDefault.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Warnings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Warnings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}WinSDK.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}WinSDK.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/${MODPY_PYCACHE}arch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/${MODPY_PYCACHE}arch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/${MODPY_PYCACHE}netframework.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/${MODPY_PYCACHE}netframework.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/${MODPY_PYCACHE}sdk.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/${MODPY_PYCACHE}sdk.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/${MODPY_PYCACHE}vc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/${MODPY_PYCACHE}vc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/${MODPY_PYCACHE}vs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/${MODPY_PYCACHE}vs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/arch.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/common.py
@@ -151,119 +201,233 @@ lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/vs.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/PharLapCommon.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}386asm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}386asm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}DCommon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}DCommon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}FortranCommon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}FortranCommon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}GettextCommon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}GettextCommon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}JavaCommon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}JavaCommon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}PharLapCommon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}PharLapCommon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}aixc++.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}aixc++.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}aixcc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}aixcc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}aixcxx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}aixcxx.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}aixf77.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}aixf77.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}aixlink.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}aixlink.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}applelink.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}applelink.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}ar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}ar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}as.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}as.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}asm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}asm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}bcc32.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}bcc32.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}c++.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}c++.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}cc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}cc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}clang.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}clang.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}clangxx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}clangxx.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}compilation_db.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}compilation_db.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}cvf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}cvf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}cxx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}cxx.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}cyglink.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}cyglink.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}default.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}default.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}dmd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}dmd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}dvi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}dvi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}dvipdf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}dvipdf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}dvips.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}dvips.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}f03.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}f03.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}f08.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}f08.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}f77.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}f77.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}f90.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}f90.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}f95.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}f95.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}filesystem.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}filesystem.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}fortran.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}fortran.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}g++.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}g++.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}g77.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}g77.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}gas.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}gas.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}gcc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}gcc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}gdc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}gdc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}gettext_tool.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}gettext_tool.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}gfortran.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}gfortran.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}gnulink.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}gnulink.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}gs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}gs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}gxx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}gxx.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}hpc++.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}hpc++.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}hpcc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}hpcc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}hpcxx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}hpcxx.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}hplink.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}hplink.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}icc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}icc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}icl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}icl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}ifl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}ifl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}ifort.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}ifort.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}ilink.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}ilink.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}ilink32.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}ilink32.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}install.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}install.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}intelc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}intelc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}ipkg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}ipkg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}jar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}jar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}javac.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}javac.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}javah.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}javah.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}latex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}latex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}ldc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}ldc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}lex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}lex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}link.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}link.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}linkloc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}linkloc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}m4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}m4.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}masm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}masm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}midl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}midl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}mingw.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}mingw.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}msgfmt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}msgfmt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}msginit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}msginit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}msgmerge.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}msgmerge.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}mslib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}mslib.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}mslink.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}mslink.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}mssdk.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}mssdk.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}msvc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}msvc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}msvs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}msvs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}mwcc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}mwcc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}mwld.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}mwld.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}nasm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}nasm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}pdf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}pdf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}pdflatex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}pdflatex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}pdftex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}pdftex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}python.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}python.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}qt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}qt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}rmic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}rmic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}rpcgen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}rpcgen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}rpm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}rpm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}rpmutils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}rpmutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sgiar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sgiar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sgic++.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sgic++.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sgicc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sgicc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sgicxx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sgicxx.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sgilink.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sgilink.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sunar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sunar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sunc++.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sunc++.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}suncc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}suncc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}suncxx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}suncxx.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sunf77.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sunf77.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sunf90.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sunf90.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sunf95.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sunf95.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sunlink.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}sunlink.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}swig.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}swig.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}tar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}tar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}tex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}tex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}textfile.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}textfile.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}tlib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}tlib.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}wix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}wix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}xgettext.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}xgettext.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}yacc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}yacc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}zip.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}zip.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/aixc++.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/aixcc.py
@@ -281,6 +445,7 @@ lib/python${MODPY_VERSION}/site-packages/SCons/Tool/clang.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/clangCommon/
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/clangCommon/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Tool/clangCommon/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/clangCommon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/clangCommon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/clangxx.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/compilation_db.py
@@ -292,6 +457,7 @@ lib/python${MODPY_VERSION}/site-packages/SCons/Tool/dmd.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/docbook-xsl-1.76.1/
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/docbook-xsl-1.76.1/.CatalogManager.properties.example
@@ -438,7 +604,9 @@ lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/docbook-xsl-1.76.1/e
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/README.LIBXSLT
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/README.txt
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/${MODPY_PYCACHE}docbook.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/${MODPY_PYCACHE}docbook.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/${MODPY_PYCACHE}xslt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/${MODPY_PYCACHE}xslt.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/docbook.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/xslt.py
@@ -1699,8 +1867,11 @@ lib/python${MODPY_VERSION}/site-packages/SCons/Tool/linkCommon/LoadableModule.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/linkCommon/SharedLibrary.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/linkCommon/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Tool/linkCommon/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/linkCommon/${MODPY_PYCACHE}LoadableModule.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/linkCommon/${MODPY_PYCACHE}LoadableModule.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/linkCommon/${MODPY_PYCACHE}SharedLibrary.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/linkCommon/${MODPY_PYCACHE}SharedLibrary.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/linkCommon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/linkCommon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/linkloc.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/m4.py
@@ -1727,15 +1898,25 @@ lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/Rules.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/Utils.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Globals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Globals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Methods.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Methods.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}NinjaState.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}NinjaState.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Overrides.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Overrides.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Rules.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Rules.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}ninja_daemon_build.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}ninja_daemon_build.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}ninja_run_daemon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}ninja_run_daemon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}ninja_scons_daemon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}ninja_scons_daemon.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/ninja_daemon_build.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/ninja_run_daemon.py
@@ -1743,17 +1924,29 @@ lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/ninja_scons_daemon.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}ipk.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}ipk.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}msi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}msi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}rpm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}rpm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}src_tarbz2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}src_tarbz2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}src_targz.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}src_targz.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}src_tarxz.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}src_tarxz.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}src_zip.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}src_zip.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}tarbz2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}tarbz2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}targz.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}targz.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}tarxz.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}tarxz.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}zip.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}zip.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/ipk.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/msi.py
@@ -1802,8 +1995,11 @@ lib/python${MODPY_VERSION}/site-packages/SCons/Utilities/
 lib/python${MODPY_VERSION}/site-packages/SCons/Utilities/ConfigureCache.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Utilities/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Utilities/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/Utilities/${MODPY_PYCACHE}ConfigureCache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Utilities/${MODPY_PYCACHE}ConfigureCache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Utilities/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Utilities/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Utilities/${MODPY_PYCACHE}sconsign.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Utilities/${MODPY_PYCACHE}sconsign.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Utilities/sconsign.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Variables/
@@ -1814,46 +2010,80 @@ lib/python${MODPY_VERSION}/site-packages/SCons/Variables/PackageVariable.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Variables/PathVariable.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Variables/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Variables/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/Variables/${MODPY_PYCACHE}BoolVariable.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Variables/${MODPY_PYCACHE}BoolVariable.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Variables/${MODPY_PYCACHE}EnumVariable.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Variables/${MODPY_PYCACHE}EnumVariable.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Variables/${MODPY_PYCACHE}ListVariable.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Variables/${MODPY_PYCACHE}ListVariable.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Variables/${MODPY_PYCACHE}PackageVariable.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Variables/${MODPY_PYCACHE}PackageVariable.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Variables/${MODPY_PYCACHE}PathVariable.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Variables/${MODPY_PYCACHE}PathVariable.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Variables/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Variables/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Warnings.py
 lib/python${MODPY_VERSION}/site-packages/SCons/__init__.py
 lib/python${MODPY_VERSION}/site-packages/SCons/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Action.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Action.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Builder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Builder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}CacheDir.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}CacheDir.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Conftest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Conftest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Debug.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Debug.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Defaults.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Defaults.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Environment.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Environment.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}EnvironmentValues.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}EnvironmentValues.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}EnvironmentValuesTest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}EnvironmentValuesTest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Executor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Executor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Job.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Job.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Memoize.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Memoize.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}PathList.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}PathList.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}SConf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}SConf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}SConsign.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}SConsign.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Subst.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Subst.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Taskmaster.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Taskmaster.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Warnings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Warnings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}cpp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}cpp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}dblite.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}dblite.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}exitfuncs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}exitfuncs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/compat/
 lib/python${MODPY_VERSION}/site-packages/SCons/compat/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/compat/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/compat/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/compat/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/compat/${MODPY_PYCACHE}_scons_dbm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/compat/${MODPY_PYCACHE}_scons_dbm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/compat/${MODPY_PYCACHE}win32.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/compat/${MODPY_PYCACHE}win32.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/compat/_scons_dbm.py
 lib/python${MODPY_VERSION}/site-packages/SCons/compat/win32.py