From e6dba44ee9d8b019bcad4d17710b8c40400ad001 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Sun, 13 Nov 2022 19:37:40 +0000
Subject: [PATCH] use MODPY_PYBUILD for most of net/

---
 net/blaeu/Makefile                            |   4 +-
 net/deluge/Makefile                           |   3 +
 net/exabgp/Makefile                           |   4 +-
 net/exabgp/pkg/PLIST                          | 323 +++++++++++-
 net/gajim/Makefile                            |   6 +-
 net/gajim/pkg/PLIST                           | 257 +++++++++-
 net/libtorrent-rasterbar/Makefile             |   7 +-
 net/magic-wormhole/Makefile                   |   4 +-
 net/magic-wormhole/pkg/PLIST                  |  98 +++-
 net/nyx/Makefile                              |   4 +-
 net/nyx/pkg/PLIST                             |  34 +-
 net/pbgpp/Makefile                            |   4 +-
 net/pbgpp/pkg/PLIST                           | 169 ++++++-
 net/poezio/Makefile                           |   7 +-
 net/poezio/pkg/PLIST                          | 158 +++++-
 net/py-IOSXR/Makefile                         |   4 +-
 net/py-IOSXR/pkg/PLIST                        |  14 +-
 net/py-aiodns/Makefile                        |   5 +-
 net/py-aiodns/pkg/PLIST                       |  14 +-
 net/py-cares/Makefile                         |   5 +-
 net/py-cares/pkg/PLIST                        |  18 +-
 net/py-curl/Makefile                          |   5 +-
 net/py-curl/pkg/PLIST                         |  14 +-
 net/py-cymruwhois/Makefile                    |  10 +-
 net/py-cymruwhois/pkg/PLIST                   |  17 +-
 net/py-dnspython/Makefile                     |   3 +-
 net/py-dnspython/patches/patch-pyproject_toml |  11 +
 net/py-dnspython/pkg/PLIST                    | 132 ++++-
 net/py-eapi/Makefile                          |   5 +-
 net/py-eapi/pkg/PLIST                         |  36 +-
 net/py-engineio/Makefile                      |   4 +-
 net/py-engineio/pkg/PLIST                     |  34 +-
 net/py-ftpdlib/Makefile                       |   4 +-
 net/py-ftpdlib/pkg/PLIST                      |  34 +-
 net/py-geventhttpclient/Makefile              |   4 +-
 net/py-geventhttpclient/pkg/PLIST             |  20 +-
 net/py-idna/Makefile                          |   4 +-
 net/py-idna/pkg/PLIST                         |  19 +-
 net/py-ifaddr/Makefile                        |   7 +-
 net/py-ifaddr/pkg/PLIST                       |  19 +-
 net/py-impacket/Makefile                      |   4 +-
 net/py-impacket/pkg/PLIST                     | 155 +++++-
 net/py-irclib/Makefile                        |   6 +-
 net/py-irclib/pkg/PLIST                       |  14 +-
 net/py-junos-eznc/Makefile                    |   4 +-
 net/py-junos-eznc/pkg/PLIST                   | 118 ++++-
 net/py-libcloud/Makefile                      |   5 +-
 net/py-libcloud/pkg/PLIST                     | 254 +++++++++-
 net/py-libknot/Makefile                       |   4 +-
 net/py-libknot/pkg/PLIST                      |  13 +-
 net/py-minimalmodbus/Makefile                 |   6 +-
 net/py-minimalmodbus/pkg/PLIST                |  14 +-
 net/py-ncclient/Makefile                      |   4 +-
 net/py-ncclient/pkg/PLIST                     |  70 ++-
 net/py-netaddr/Makefile                       |   5 +-
 net/py-netaddr/pkg/PLIST                      |  35 +-
 net/py-netifaces/Makefile                     |   6 +-
 net/py-netifaces/pkg/PLIST                    |  13 +-
 net/py-netmiko/Makefile                       |   4 +-
 net/py-netmiko/pkg/PLIST                      | 143 +++++-
 net/py-nxos/Makefile                          |   4 +-
 net/py-nxos/pkg/PLIST                         |  24 +-
 net/py-paho-mqtt/Makefile                     |   5 +-
 net/py-paho-mqtt/pkg/PLIST                    |  23 +-
 net/py-pcapy/Makefile                         |   4 +-
 net/py-pcapy/pkg/PLIST                        |  11 +-
 net/py-portend/Makefile                       |   5 +-
 net/py-portend/pkg/PLIST                      |  17 +-
 net/py-ripe.atlas.cousteau/Makefile           |   9 +-
 net/py-ripe.atlas.cousteau/pkg/PLIST          |  24 +-
 net/py-ripe.atlas.sagan/Makefile              |  11 +-
 net/py-ripe.atlas.sagan/pkg/PLIST             |  27 +-
 net/py-ripe.atlas.tools/Makefile              |   6 +-
 net/py-ripe.atlas.tools/pkg/PLIST             |  64 ++-
 net/py-rrdtool/Makefile                       |   8 +-
 net/py-rrdtool/pkg/PLIST                      |  11 +-
 net/py-siphon/Makefile                        |  16 +-
 net/py-siphon/pkg/PLIST                       |  38 +-
 net/py-smbc/Makefile                          |   4 +-
 net/py-smbc/pkg/PLIST                         |  13 +-
 net/py-snmp/Makefile                          |   6 +-
 net/py-snmp/pkg/PLIST                         | 462 ++++++++++++------
 net/py-socketio-client/Makefile               |   4 +-
 net/py-socketio-client/pkg/PLIST              |  21 +-
 net/py-socketio/Makefile                      |   4 +-
 net/py-socketio/pkg/PLIST                     |  35 +-
 net/py-socks/Makefile                         |   4 +-
 net/py-socks/pkg/PLIST                        |  14 +-
 net/py-tinytuya/Makefile                      |  12 +-
 net/py-tinytuya/pkg/PLIST                     |  27 +-
 net/py-tld/Makefile                           |   4 +-
 net/py-tld/pkg/PLIST                          |  31 +-
 net/py-transmissionrpc-ng/Makefile            |   5 +-
 net/py-transmissionrpc-ng/pkg/PLIST           |  20 +-
 net/py-twitter/Makefile                       |  30 +-
 net/py-twitter/pkg/PLIST                      |  34 +-
 net/py-txtorcon/Makefile                      |   4 +-
 net/py-txtorcon/pkg/PLIST                     |  36 +-
 net/py-u-msgpack/Makefile                     |   5 +-
 net/py-u-msgpack/pkg/PLIST                    |  12 +-
 net/py-websocket-client/Makefile              |   4 +-
 net/py-websocket-client/pkg/PLIST             |  26 +-
 net/py-zeroconf/Makefile                      |   4 +-
 net/py-zeroconf/pkg/PLIST                     |  15 +-
 net/scapy/Makefile                            |   4 +-
 net/scapy/pkg/PLIST                           | 292 ++++++++++-
 net/sshuttle/Makefile                         |   8 +-
 net/sshuttle/pkg/PLIST                        |  36 +-
 net/tg/Makefile                               |   4 +-
 net/tg/pkg/PLIST                              |  23 +-
 net/toot/Makefile                             |   5 +-
 net/toot/pkg/PLIST                            |  34 +-
 net/vf1/Makefile                              |   4 +-
 net/vf1/pkg/PLIST                             |  15 +-
 net/websockify/Makefile                       |   4 +-
 net/websockify/pkg/PLIST                      |  24 +-
 116 files changed, 3287 insertions(+), 710 deletions(-)
 create mode 100644 net/py-dnspython/patches/patch-pyproject_toml

diff --git a/net/blaeu/Makefile b/net/blaeu/Makefile
index 327ead9e4c4..185886f5f6f 100644
--- a/net/blaeu/Makefile
+++ b/net/blaeu/Makefile
@@ -3,7 +3,7 @@ COMMENT =	create measurements on RIPE Atlas probes
 MODPY_EGG_VERSION = 1.1.9
 DISTNAME =	blaeu-${MODPY_EGG_VERSION}
 CATEGORIES =	net
-REVISION =	0
+REVISION =	1
 
 MAINTAINER =	Denis Fondras <denis@openbsd.org>
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 NO_TEST =		Yes
 
 RUN_DEPENDS =		net/py-dnspython${MODPY_FLAVOR} \
diff --git a/net/deluge/Makefile b/net/deluge/Makefile
index c86235a69f2..3a069e3ba06 100644
--- a/net/deluge/Makefile
+++ b/net/deluge/Makefile
@@ -24,6 +24,9 @@ MODPY_PYTEST_ARGS =	-v \
 			--ignore deluge/tests/test_files_tab.py \
 			--ignore deluge/tests/test_torrentview.py \
 			--ignore deluge/tests/test_ui_entry.py
+# needs fixing up for MODPY_PYBUILD; doesn't install
+# share/appdata/deluge.appdata.xml
+# share/applications/deluge.desktop
 MODPY_SETUPTOOLS =	Yes
 BUILD_DEPENDS =		devel/py-wheel${MODPY_FLAVOR} \
 			devel/py-xdg${MODPY_FLAVOR} \
diff --git a/net/exabgp/Makefile b/net/exabgp/Makefile
index 7ac2c3935c7..21376129578 100644
--- a/net/exabgp/Makefile
+++ b/net/exabgp/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION=	4.2.21
 GH_ACCOUNT=		exa-networks
 GH_PROJECT=		exabgp
 GH_TAGNAME=		${MODPY_EGG_VERSION}
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		net
 
@@ -12,7 +12,7 @@ CATEGORIES=		net
 PERMIT_PACKAGE=	Yes
 
 MODULES=		lang/python
-MODPY_SETUPTOOLS=	Yes
+MODPY_PYBUILD=		setuptools
 
 TEST_DEPENDS=		devel/py-coverage${MODPY_FLAVOR} \
 			devel/py-nose${MODPY_FLAVOR} \
diff --git a/net/exabgp/pkg/PLIST b/net/exabgp/pkg/PLIST
index a1fb83fe402..423039535a3 100644
--- a/net/exabgp/pkg/PLIST
+++ b/net/exabgp/pkg/PLIST
@@ -7,41 +7,46 @@ bin/exabgp-cli
 bin/exabgp-healthcheck
 bin/exabgpcli
 lib/python${MODPY_VERSION}/site-packages/exabgp/
-lib/python${MODPY_VERSION}/site-packages/exabgp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/exabgp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/exabgp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/exabgp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/exabgp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/exabgp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/exabgp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/exabgp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/exabgp.egg-info/
-lib/python${MODPY_VERSION}/site-packages/exabgp.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/exabgp.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/exabgp.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/exabgp.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/exabgp.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/exabgp.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/exabgp.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/exabgp-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/exabgp-${MODPY_EGG_VERSION}.dist-info/LICENCE.txt
+lib/python${MODPY_VERSION}/site-packages/exabgp-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/exabgp-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/exabgp-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/exabgp-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/exabgp-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/exabgp/__init__.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/${MODPY_PYCACHE}debug.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/${MODPY_PYCACHE}debug.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/application/
 lib/python${MODPY_VERSION}/site-packages/exabgp/application/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/application/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/application/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/application/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/application/${MODPY_PYCACHE}bgp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/application/${MODPY_PYCACHE}bgp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/application/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/application/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/application/${MODPY_PYCACHE}control.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/application/${MODPY_PYCACHE}control.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/application/${MODPY_PYCACHE}flow.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/application/${MODPY_PYCACHE}flow.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/application/${MODPY_PYCACHE}healthcheck.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/application/${MODPY_PYCACHE}healthcheck.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/application/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/application/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/application/${MODPY_PYCACHE}netlink.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/application/${MODPY_PYCACHE}netlink.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/application/${MODPY_PYCACHE}tojson.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/application/${MODPY_PYCACHE}tojson.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/application/bgp.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/application/cli.py
@@ -54,22 +59,35 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/application/tojson.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/${MODPY_PYCACHE}fsm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/${MODPY_PYCACHE}fsm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/${MODPY_PYCACHE}neighbor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/${MODPY_PYCACHE}neighbor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/${MODPY_PYCACHE}timer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/${MODPY_PYCACHE}timer.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/fsm.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/${MODPY_PYCACHE}direction.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/${MODPY_PYCACHE}direction.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/${MODPY_PYCACHE}keepalive.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/${MODPY_PYCACHE}keepalive.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/${MODPY_PYCACHE}message.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/${MODPY_PYCACHE}message.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/${MODPY_PYCACHE}nop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/${MODPY_PYCACHE}nop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/${MODPY_PYCACHE}notification.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/${MODPY_PYCACHE}notification.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/${MODPY_PYCACHE}operational.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/${MODPY_PYCACHE}operational.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/${MODPY_PYCACHE}refresh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/${MODPY_PYCACHE}refresh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/${MODPY_PYCACHE}unknown.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/${MODPY_PYCACHE}unknown.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/direction.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/keepalive.py
@@ -79,29 +97,49 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/notification.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/${MODPY_PYCACHE}asn.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/${MODPY_PYCACHE}asn.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/${MODPY_PYCACHE}holdtime.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/${MODPY_PYCACHE}holdtime.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/${MODPY_PYCACHE}routerid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/${MODPY_PYCACHE}routerid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/asn.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}addpath.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}addpath.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}asn4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}asn4.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}capabilities.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}capabilities.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}capability.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}capability.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}extended.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}extended.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}graceful.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}graceful.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}hostname.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}hostname.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}mp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}mp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}ms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}ms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}negotiated.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}negotiated.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}nexthop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}nexthop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}operational.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}operational.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}refresh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}refresh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}unknown.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/${MODPY_PYCACHE}unknown.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/addpath.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/open/capability/asn4.py
@@ -126,27 +164,46 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/unknown.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/${MODPY_PYCACHE}eor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/${MODPY_PYCACHE}eor.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}aggregator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}aggregator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}aigp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}aigp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}aspath.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}aspath.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}atomicaggregate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}atomicaggregate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}attribute.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}attribute.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}attributes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}attributes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}clusterlist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}clusterlist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}generic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}generic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}localpref.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}localpref.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}med.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}med.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}mprnlri.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}mprnlri.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}mpurnlri.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}mpurnlri.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}nexthop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}nexthop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}origin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}origin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}originatorid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}originatorid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}pmsi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/${MODPY_PYCACHE}pmsi.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/aggregator.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/aigp.py
@@ -157,25 +214,42 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/att
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/${MODPY_PYCACHE}linkstate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/${MODPY_PYCACHE}linkstate.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}admingroup.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}admingroup.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}igpmetric.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}igpmetric.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}linkname.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}linkname.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}maxbw.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}maxbw.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}mplsmask.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}mplsmask.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}opaque.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}opaque.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}protection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}protection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}rsvpbw.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}rsvpbw.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}rterid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}rterid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}sradj.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}sradj.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}sradjlan.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}sradjlan.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}srlg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}srlg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}temetric.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}temetric.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}unrsvpbw.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/${MODPY_PYCACHE}unrsvpbw.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/admingroup.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/link/igpmetric.py
@@ -195,13 +269,21 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgp
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/node/
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/node/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/node/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/node/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/node/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/node/${MODPY_PYCACHE}isisarea.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/node/${MODPY_PYCACHE}isisarea.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/node/${MODPY_PYCACHE}lterid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/node/${MODPY_PYCACHE}lterid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/node/${MODPY_PYCACHE}nodeflags.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/node/${MODPY_PYCACHE}nodeflags.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/node/${MODPY_PYCACHE}nodename.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/node/${MODPY_PYCACHE}nodename.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/node/${MODPY_PYCACHE}opaque.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/node/${MODPY_PYCACHE}opaque.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/node/${MODPY_PYCACHE}sralgo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/node/${MODPY_PYCACHE}sralgo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/node/${MODPY_PYCACHE}srcap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/node/${MODPY_PYCACHE}srcap.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/node/isisarea.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/node/lterid.py
@@ -213,15 +295,25 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgp
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/${MODPY_PYCACHE}igpextags.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/${MODPY_PYCACHE}igpextags.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/${MODPY_PYCACHE}igpflags.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/${MODPY_PYCACHE}igpflags.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/${MODPY_PYCACHE}igptags.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/${MODPY_PYCACHE}igptags.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/${MODPY_PYCACHE}opaque.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/${MODPY_PYCACHE}opaque.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/${MODPY_PYCACHE}ospfaddr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/${MODPY_PYCACHE}ospfaddr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/${MODPY_PYCACHE}prefixmetric.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/${MODPY_PYCACHE}prefixmetric.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/${MODPY_PYCACHE}srigpprefixattr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/${MODPY_PYCACHE}srigpprefixattr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/${MODPY_PYCACHE}srprefix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/${MODPY_PYCACHE}srprefix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/${MODPY_PYCACHE}srrid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/${MODPY_PYCACHE}srrid.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/igpextags.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/bgpls/prefix/igpflags.py
@@ -236,22 +328,36 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/clu
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}bandwidth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}bandwidth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}chso.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}chso.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}communities.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}communities.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}community.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}community.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}encapsulation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}encapsulation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}flowspec_scope.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}flowspec_scope.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}l2info.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}l2info.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}mac_mobility.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}mac_mobility.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}origin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}origin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}rt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}rt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}rt_record.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}rt_record.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}traffic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/${MODPY_PYCACHE}traffic.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/bandwidth.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/extended/chso.py
@@ -268,16 +374,22 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/com
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/initial/
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/initial/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/initial/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/initial/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/initial/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/initial/${MODPY_PYCACHE}communities.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/initial/${MODPY_PYCACHE}communities.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/initial/${MODPY_PYCACHE}community.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/initial/${MODPY_PYCACHE}community.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/initial/communities.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/initial/community.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/large/
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/large/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/large/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/large/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/large/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/large/${MODPY_PYCACHE}communities.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/large/${MODPY_PYCACHE}communities.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/large/${MODPY_PYCACHE}community.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/large/${MODPY_PYCACHE}community.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/large/communities.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/community/large/community.py
@@ -293,12 +405,19 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/pms
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/sr/
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/sr/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/sr/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/sr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/sr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/sr/${MODPY_PYCACHE}ipv6sid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/sr/${MODPY_PYCACHE}ipv6sid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/sr/${MODPY_PYCACHE}labelindex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/sr/${MODPY_PYCACHE}labelindex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/sr/${MODPY_PYCACHE}prefixsid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/sr/${MODPY_PYCACHE}prefixsid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/sr/${MODPY_PYCACHE}srgb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/sr/${MODPY_PYCACHE}srgb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/sr/${MODPY_PYCACHE}srv6l3vpnsid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/sr/${MODPY_PYCACHE}srv6l3vpnsid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/sr/${MODPY_PYCACHE}srv6vpnsid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/sr/${MODPY_PYCACHE}srv6vpnsid.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/sr/ipv6sid.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/attribute/sr/labelindex.py
@@ -310,23 +429,38 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/eor.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/${MODPY_PYCACHE}cidr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/${MODPY_PYCACHE}cidr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/${MODPY_PYCACHE}flow.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/${MODPY_PYCACHE}flow.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/${MODPY_PYCACHE}inet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/${MODPY_PYCACHE}inet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/${MODPY_PYCACHE}ipvpn.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/${MODPY_PYCACHE}ipvpn.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/${MODPY_PYCACHE}label.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/${MODPY_PYCACHE}label.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/${MODPY_PYCACHE}nlri.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/${MODPY_PYCACHE}nlri.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/${MODPY_PYCACHE}rtc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/${MODPY_PYCACHE}rtc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/${MODPY_PYCACHE}vpls.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/${MODPY_PYCACHE}vpls.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/${MODPY_PYCACHE}link.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/${MODPY_PYCACHE}link.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/${MODPY_PYCACHE}nlri.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/${MODPY_PYCACHE}nlri.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/${MODPY_PYCACHE}node.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/${MODPY_PYCACHE}node.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/${MODPY_PYCACHE}prefixv4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/${MODPY_PYCACHE}prefixv4.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/${MODPY_PYCACHE}prefixv6.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/${MODPY_PYCACHE}prefixv6.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/link.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/nlri.py
@@ -336,13 +470,21 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/pr
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/tlvs/
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/tlvs/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/tlvs/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/tlvs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/tlvs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/tlvs/${MODPY_PYCACHE}ifaceaddr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/tlvs/${MODPY_PYCACHE}ifaceaddr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/tlvs/${MODPY_PYCACHE}ipreach.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/tlvs/${MODPY_PYCACHE}ipreach.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/tlvs/${MODPY_PYCACHE}linkid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/tlvs/${MODPY_PYCACHE}linkid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/tlvs/${MODPY_PYCACHE}neighaddr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/tlvs/${MODPY_PYCACHE}neighaddr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/tlvs/${MODPY_PYCACHE}node.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/tlvs/${MODPY_PYCACHE}node.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/tlvs/${MODPY_PYCACHE}ospfroute.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/tlvs/${MODPY_PYCACHE}ospfroute.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/tlvs/${MODPY_PYCACHE}prefix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/tlvs/${MODPY_PYCACHE}prefix.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/tlvs/ifaceaddr.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/bgpls/tlvs/ipreach.py
@@ -355,12 +497,19 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/cidr.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/evpn/
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/evpn/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/evpn/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/evpn/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/evpn/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/evpn/${MODPY_PYCACHE}ethernetad.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/evpn/${MODPY_PYCACHE}ethernetad.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/evpn/${MODPY_PYCACHE}mac.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/evpn/${MODPY_PYCACHE}mac.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/evpn/${MODPY_PYCACHE}multicast.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/evpn/${MODPY_PYCACHE}multicast.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/evpn/${MODPY_PYCACHE}nlri.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/evpn/${MODPY_PYCACHE}nlri.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/evpn/${MODPY_PYCACHE}prefix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/evpn/${MODPY_PYCACHE}prefix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/evpn/${MODPY_PYCACHE}segment.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/evpn/${MODPY_PYCACHE}segment.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/evpn/ethernetad.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/evpn/mac.py
@@ -376,12 +525,19 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/nlri.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/qualifier/
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/qualifier/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/qualifier/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/qualifier/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/qualifier/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/qualifier/${MODPY_PYCACHE}esi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/qualifier/${MODPY_PYCACHE}esi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/qualifier/${MODPY_PYCACHE}etag.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/qualifier/${MODPY_PYCACHE}etag.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/qualifier/${MODPY_PYCACHE}labels.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/qualifier/${MODPY_PYCACHE}labels.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/qualifier/${MODPY_PYCACHE}mac.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/qualifier/${MODPY_PYCACHE}mac.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/qualifier/${MODPY_PYCACHE}path.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/qualifier/${MODPY_PYCACHE}path.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/qualifier/${MODPY_PYCACHE}rd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/qualifier/${MODPY_PYCACHE}rd.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/qualifier/esi.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/message/update/nlri/qualifier/etag.py
@@ -396,23 +552,38 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/bgp/timer.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/${MODPY_PYCACHE}capability.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/${MODPY_PYCACHE}capability.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/${MODPY_PYCACHE}check.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/${MODPY_PYCACHE}check.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/${MODPY_PYCACHE}configuration.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/${MODPY_PYCACHE}configuration.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/${MODPY_PYCACHE}environment.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/${MODPY_PYCACHE}environment.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/${MODPY_PYCACHE}usage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/${MODPY_PYCACHE}usage.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/announce/
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/announce/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/announce/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/announce/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/announce/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/announce/${MODPY_PYCACHE}flow.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/announce/${MODPY_PYCACHE}flow.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/announce/${MODPY_PYCACHE}ip.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/announce/${MODPY_PYCACHE}ip.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/announce/${MODPY_PYCACHE}label.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/announce/${MODPY_PYCACHE}label.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/announce/${MODPY_PYCACHE}path.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/announce/${MODPY_PYCACHE}path.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/announce/${MODPY_PYCACHE}vpls.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/announce/${MODPY_PYCACHE}vpls.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/announce/${MODPY_PYCACHE}vpn.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/announce/${MODPY_PYCACHE}vpn.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/announce/flow.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/announce/ip.py
@@ -426,12 +597,19 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/configuration.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/core/
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/core/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/core/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/core/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/core/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/core/${MODPY_PYCACHE}format.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/core/${MODPY_PYCACHE}format.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/core/${MODPY_PYCACHE}location.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/core/${MODPY_PYCACHE}location.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/core/${MODPY_PYCACHE}scope.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/core/${MODPY_PYCACHE}scope.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/core/${MODPY_PYCACHE}section.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/core/${MODPY_PYCACHE}section.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/core/${MODPY_PYCACHE}tokeniser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/core/${MODPY_PYCACHE}tokeniser.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/core/error.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/core/format.py
@@ -443,11 +621,17 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/environment.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/flow/
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/flow/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/flow/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/flow/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/flow/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/flow/${MODPY_PYCACHE}match.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/flow/${MODPY_PYCACHE}match.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/flow/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/flow/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/flow/${MODPY_PYCACHE}route.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/flow/${MODPY_PYCACHE}route.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/flow/${MODPY_PYCACHE}scope.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/flow/${MODPY_PYCACHE}scope.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/flow/${MODPY_PYCACHE}then.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/flow/${MODPY_PYCACHE}then.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/flow/match.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/flow/parser.py
@@ -457,18 +641,26 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/flow/then.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/l2vpn/
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/l2vpn/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/l2vpn/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/l2vpn/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/l2vpn/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/l2vpn/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/l2vpn/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/l2vpn/${MODPY_PYCACHE}vpls.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/l2vpn/${MODPY_PYCACHE}vpls.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/l2vpn/parser.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/l2vpn/vpls.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/neighbor/
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/neighbor/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/neighbor/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/neighbor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/neighbor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/neighbor/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/neighbor/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/neighbor/${MODPY_PYCACHE}family.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/neighbor/${MODPY_PYCACHE}family.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/neighbor/${MODPY_PYCACHE}nexthop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/neighbor/${MODPY_PYCACHE}nexthop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/neighbor/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/neighbor/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/neighbor/api.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/neighbor/family.py
@@ -477,23 +669,31 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/neighbor/parser.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/operational/
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/operational/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/operational/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/operational/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/operational/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/operational/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/operational/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/operational/parser.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/parser.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/process/
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/process/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/process/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/process/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/process/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/process/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/process/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/process/parser.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/setup.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/static/
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/static/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/static/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/static/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/static/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/static/${MODPY_PYCACHE}mpls.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/static/${MODPY_PYCACHE}mpls.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/static/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/static/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/static/${MODPY_PYCACHE}route.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/static/${MODPY_PYCACHE}route.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/static/mpls.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/static/parser.py
@@ -501,14 +701,18 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/static/route.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/template/
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/template/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/template/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/template/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/template/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/template/${MODPY_PYCACHE}neighbor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/template/${MODPY_PYCACHE}neighbor.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/template/neighbor.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/configuration/usage.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/data/
 lib/python${MODPY_VERSION}/site-packages/exabgp/data/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/data/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/data/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/data/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/data/${MODPY_PYCACHE}check.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/data/${MODPY_PYCACHE}check.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/data/check.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/debug.py
@@ -516,13 +720,21 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/logger.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/
 lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/${MODPY_PYCACHE}attributes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/${MODPY_PYCACHE}attributes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/${MODPY_PYCACHE}firewall.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/${MODPY_PYCACHE}firewall.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/${MODPY_PYCACHE}message.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/${MODPY_PYCACHE}message.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/${MODPY_PYCACHE}netlink.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/${MODPY_PYCACHE}netlink.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/${MODPY_PYCACHE}old.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/${MODPY_PYCACHE}old.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/${MODPY_PYCACHE}sequence.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/${MODPY_PYCACHE}sequence.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/${MODPY_PYCACHE}tc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/${MODPY_PYCACHE}tc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/attributes.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/firewall.py
@@ -532,10 +744,15 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/old.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/route/
 lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/route/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/route/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/route/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/route/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/route/${MODPY_PYCACHE}address.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/route/${MODPY_PYCACHE}address.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/route/${MODPY_PYCACHE}link.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/route/${MODPY_PYCACHE}link.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/route/${MODPY_PYCACHE}neighbor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/route/${MODPY_PYCACHE}neighbor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/route/${MODPY_PYCACHE}network.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/route/${MODPY_PYCACHE}network.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/route/address.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/route/link.py
@@ -546,17 +763,25 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/netlink/tc.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/${MODPY_PYCACHE}family.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/${MODPY_PYCACHE}family.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/${MODPY_PYCACHE}resource.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/${MODPY_PYCACHE}resource.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/family.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/${MODPY_PYCACHE}fragment.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/${MODPY_PYCACHE}fragment.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/${MODPY_PYCACHE}icmp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/${MODPY_PYCACHE}icmp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/${MODPY_PYCACHE}netmask.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/${MODPY_PYCACHE}netmask.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/${MODPY_PYCACHE}port.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/${MODPY_PYCACHE}port.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/fragment.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/icmp.py
@@ -565,43 +790,67 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/port.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/tcp/
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/tcp/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/tcp/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/tcp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/tcp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/tcp/${MODPY_PYCACHE}flag.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/tcp/${MODPY_PYCACHE}flag.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/tcp/flag.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/iso/
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/iso/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/iso/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/iso/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/iso/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/resource.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/${MODPY_PYCACHE}asynchronous.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/${MODPY_PYCACHE}asynchronous.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/${MODPY_PYCACHE}daemon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/${MODPY_PYCACHE}daemon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/${MODPY_PYCACHE}delay.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/${MODPY_PYCACHE}delay.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/${MODPY_PYCACHE}interrupt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/${MODPY_PYCACHE}interrupt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/${MODPY_PYCACHE}keepalive.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/${MODPY_PYCACHE}keepalive.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/${MODPY_PYCACHE}listener.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/${MODPY_PYCACHE}listener.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/${MODPY_PYCACHE}loop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/${MODPY_PYCACHE}loop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/${MODPY_PYCACHE}peer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/${MODPY_PYCACHE}peer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/${MODPY_PYCACHE}protocol.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/${MODPY_PYCACHE}protocol.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/${MODPY_PYCACHE}processes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/${MODPY_PYCACHE}processes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/${MODPY_PYCACHE}transcoder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/${MODPY_PYCACHE}transcoder.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/command/
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/command/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/command/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/command/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/command/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/command/${MODPY_PYCACHE}announce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/command/${MODPY_PYCACHE}announce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/command/${MODPY_PYCACHE}command.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/command/${MODPY_PYCACHE}command.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/command/${MODPY_PYCACHE}limit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/command/${MODPY_PYCACHE}limit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/command/${MODPY_PYCACHE}neighbor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/command/${MODPY_PYCACHE}neighbor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/command/${MODPY_PYCACHE}reactor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/command/${MODPY_PYCACHE}reactor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/command/${MODPY_PYCACHE}rib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/command/${MODPY_PYCACHE}rib.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/command/${MODPY_PYCACHE}watchdog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/command/${MODPY_PYCACHE}watchdog.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/command/announce.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/command/command.py
@@ -614,9 +863,13 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/processes.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/response/
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/response/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/response/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/response/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/response/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/response/${MODPY_PYCACHE}answer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/response/${MODPY_PYCACHE}answer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/response/${MODPY_PYCACHE}json.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/response/${MODPY_PYCACHE}json.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/response/${MODPY_PYCACHE}text.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/response/${MODPY_PYCACHE}text.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/response/answer.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/api/response/json.py
@@ -632,11 +885,17 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/loop.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/network/
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/network/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/network/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/network/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/network/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/network/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/network/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/network/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/network/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/network/${MODPY_PYCACHE}incoming.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/network/${MODPY_PYCACHE}incoming.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/network/${MODPY_PYCACHE}outgoing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/network/${MODPY_PYCACHE}outgoing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/network/${MODPY_PYCACHE}tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/network/${MODPY_PYCACHE}tcp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/network/connection.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/network/error.py
@@ -648,10 +907,15 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/reactor/protocol.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/rib/
 lib/python${MODPY_VERSION}/site-packages/exabgp/rib/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/rib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/rib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/rib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/rib/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/rib/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/rib/${MODPY_PYCACHE}change.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/rib/${MODPY_PYCACHE}change.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/rib/${MODPY_PYCACHE}incoming.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/rib/${MODPY_PYCACHE}incoming.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/rib/${MODPY_PYCACHE}outgoing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/rib/${MODPY_PYCACHE}outgoing.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/rib/cache.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/rib/change.py
@@ -660,19 +924,33 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/rib/outgoing.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/util/
 lib/python${MODPY_VERSION}/site-packages/exabgp/util/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}coroutine.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}coroutine.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}dictionary.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}dictionary.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}dns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}dns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}enumeration.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}enumeration.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}errstr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}errstr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}hashtable.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}hashtable.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}ip.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}ip.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}od.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}od.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}panic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}panic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}trace.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}trace.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}usage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/util/${MODPY_PYCACHE}usage.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/util/cache.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/util/coroutine.py
@@ -690,18 +968,31 @@ lib/python${MODPY_VERSION}/site-packages/exabgp/util/usage.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/
 lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}bitstring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}bitstring.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}cmd2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}cmd2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}counter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}counter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}docopt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}docopt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}gcdump.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}gcdump.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}ipaddress.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}ipaddress.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}lsprofcalltree.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}lsprofcalltree.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}objgraph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}objgraph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}ordereddict.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}ordereddict.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}profiler.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}profiler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}pyparsing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}pyparsing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}six.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/${MODPY_PYCACHE}six.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/bitstring.py
 lib/python${MODPY_VERSION}/site-packages/exabgp/vendoring/cmd2.py
diff --git a/net/gajim/Makefile b/net/gajim/Makefile
index c7a06db5e34..ecd380ad5a1 100644
--- a/net/gajim/Makefile
+++ b/net/gajim/Makefile
@@ -2,11 +2,11 @@ COMMENT=	fully-featured XMPP client written in Python
 MODPY_EGG_VERSION=	1.5.2
 DISTNAME=	gajim-${MODPY_EGG_VERSION}
 CATEGORIES=	net x11
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	https://www.gajim.org
 
-MAINTAINER=    Paco Esteban <paco@openbsd.org>
+MAINTAINER=	Paco Esteban <paco@openbsd.org>
 
 MASTER_SITES=	${HOMEPAGE}/downloads/${MODPY_EGG_VERSION:R}/
 
@@ -14,7 +14,7 @@ MASTER_SITES=	${HOMEPAGE}/downloads/${MODPY_EGG_VERSION:R}/
 PERMIT_PACKAGE=	Yes
 
 MODULES=	lang/python
-MODPY_SETUPTOOLS=	Yes
+MODPY_PYBUILD=	setuptools
 
 BUILD_DEPENDS=	devel/gettext,-tools
 
diff --git a/net/gajim/pkg/PLIST b/net/gajim/pkg/PLIST
index 3b64c3a25a1..a00d581b86e 100644
--- a/net/gajim/pkg/PLIST
+++ b/net/gajim/pkg/PLIST
@@ -1,62 +1,107 @@
 bin/gajim
 bin/gajim-remote
 lib/python${MODPY_VERSION}/site-packages/gajim/
-lib/python${MODPY_VERSION}/site-packages/gajim-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/gajim-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/gajim-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/gajim-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/gajim-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/gajim-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/gajim-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/gajim-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/gajim-${MODPY_EGG_VERSION}.dist-info/COPYING
+lib/python${MODPY_VERSION}/site-packages/gajim-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/gajim-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/gajim-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/gajim-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/gajim-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/gajim/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gajim/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/gajim/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/${MODPY_PYCACHE}gajim.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/${MODPY_PYCACHE}gajim.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/${MODPY_PYCACHE}gajim_remote.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/${MODPY_PYCACHE}gajim_remote.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/${MODPY_PYCACHE}gui_interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/${MODPY_PYCACHE}gui_interface.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/common/
 lib/python${MODPY_VERSION}/site-packages/gajim/common/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}app.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}app.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}application.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}application.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}call_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}call_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}cert_store.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}cert_store.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}commands.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}commands.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}configpaths.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}configpaths.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}const.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}const.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}file_props.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}file_props.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}filetransfer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}filetransfer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}ged.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}ged.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}i18n.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}i18n.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}idle.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}idle.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}jingle_content.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}jingle_content.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}jingle_ft.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}jingle_ft.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}jingle_ftstates.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}jingle_ftstates.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}jingle_rtp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}jingle_rtp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}jingle_session.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}jingle_session.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}jingle_transport.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}jingle_transport.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}jingle_xtls.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}jingle_xtls.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}logging_helpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}logging_helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}multimedia_helpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}multimedia_helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}optparser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}optparser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}passwords.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}passwords.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}preview.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}preview.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}preview_helpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}preview_helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}proxy65_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}proxy65_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}regex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}regex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}setting_values.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}setting_values.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}socks5.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}socks5.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}sound.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}sound.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}structs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}structs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}styling.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}styling.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}task_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}task_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/common/app.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/application.py
@@ -70,11 +115,17 @@ lib/python${MODPY_VERSION}/site-packages/gajim/common/const.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/dbus/
 lib/python${MODPY_VERSION}/site-packages/gajim/common/dbus/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gajim/common/dbus/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/gajim/common/dbus/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/dbus/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/dbus/${MODPY_PYCACHE}location.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/dbus/${MODPY_PYCACHE}location.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/dbus/${MODPY_PYCACHE}logind.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/dbus/${MODPY_PYCACHE}logind.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/dbus/${MODPY_PYCACHE}music_track.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/dbus/${MODPY_PYCACHE}music_track.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/dbus/${MODPY_PYCACHE}remote_control.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/dbus/${MODPY_PYCACHE}remote_control.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/dbus/${MODPY_PYCACHE}system_style.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/dbus/${MODPY_PYCACHE}system_style.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/common/dbus/location.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/dbus/logind.py
@@ -100,51 +151,97 @@ lib/python${MODPY_VERSION}/site-packages/gajim/common/logging_helpers.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}adhoc_commands.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}adhoc_commands.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}annotations.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}annotations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}bits_of_binary.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}bits_of_binary.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}blocking.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}blocking.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}bookmarks.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}bookmarks.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}bytestream.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}bytestream.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}caps.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}caps.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}carbons.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}carbons.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}chat_markers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}chat_markers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}chatstates.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}chatstates.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}contacts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}contacts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}delimiter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}delimiter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}discovery.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}discovery.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}entity_time.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}entity_time.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}gateway.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}gateway.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}http_auth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}http_auth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}httpupload.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}httpupload.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}ibb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}ibb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}iq.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}iq.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}jingle.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}jingle.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}last_activity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}last_activity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}mam.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}mam.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}message.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}message.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}muc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}muc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}pep.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}pep.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}ping.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}ping.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}presence.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}presence.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}pubsub.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}pubsub.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}receipts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}receipts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}register.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}register.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}roster.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}roster.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}roster_item_exchange.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}roster_item_exchange.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}search.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}search.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}security_labels.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}security_labels.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}software_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}software_version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}user_avatar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}user_avatar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}user_location.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}user_location.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}user_nickname.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}user_nickname.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}user_tune.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}user_tune.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}vcard4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}vcard4.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}vcard_avatars.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}vcard_avatars.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}vcard_temp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}vcard_temp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/adhoc_commands.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/annotations.py
@@ -205,10 +302,15 @@ lib/python${MODPY_VERSION}/site-packages/gajim/common/sound.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/storage/
 lib/python${MODPY_VERSION}/site-packages/gajim/common/storage/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gajim/common/storage/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/gajim/common/storage/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/storage/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/storage/${MODPY_PYCACHE}archive.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/storage/${MODPY_PYCACHE}archive.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/storage/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/storage/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/storage/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/storage/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/storage/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/storage/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/common/storage/archive.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/storage/base.py
@@ -627,117 +729,229 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gajim_remote.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}about.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}about.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}account_page.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}account_page.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}account_side_bar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}account_side_bar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}account_wizard.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}account_wizard.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}accounts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}accounts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}add_contact.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}add_contact.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}adhoc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}adhoc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}adhoc_muc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}adhoc_muc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}advanced_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}advanced_config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}app_page.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}app_page.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}app_side_bar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}app_side_bar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}application.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}application.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}apply_button_box.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}apply_button_box.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}assistant.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}assistant.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}avatar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}avatar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}avatar_selector.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}avatar_selector.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}blocking.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}blocking.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}bookmarks.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}bookmarks.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}builder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}builder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}call_window.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}call_window.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}certificate_dialog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}certificate_dialog.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}change_password.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}change_password.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_action_processor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_action_processor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_banner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_banner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_filter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_filter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_function_page.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_function_page.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_list.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_list.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_list_row.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_list_row.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_list_stack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_list_stack.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_page.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_page.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_stack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_stack.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}component_search.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}component_search.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}const.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}const.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}contact_info.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}contact_info.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}contact_settings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}contact_settings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}contacts_flowbox.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}contacts_flowbox.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}control.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}control.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}css_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}css_config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}dataform.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}dataform.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}dialogs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}dialogs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}discovery.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}discovery.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}emoji_chooser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}emoji_chooser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}emoji_data.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}emoji_data.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}emoji_data_gtk.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}emoji_data_gtk.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}exception.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}exception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}features.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}features.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}file_transfer_send.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}file_transfer_send.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}filechoosers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}filechoosers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}filetransfer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}filetransfer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_affiliation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_affiliation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_creation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_creation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_details.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_details.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_info.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_info.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_invitation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_invitation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_inviter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_inviter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_join.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_join.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_manage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_manage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_nick.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_nick.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_nick_completion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_nick_completion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_outcasts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_outcasts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_roster.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_roster.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_settings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_settings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_state.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_state.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_voice_requests_button.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_voice_requests_button.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}gstreamer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}gstreamer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}history_export.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}history_export.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}history_sync.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}history_sync.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}main_stack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}main_stack.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}mam_preferences.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}mam_preferences.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}manage_sounds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}manage_sounds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}menus.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}menus.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}message_actions_box.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}message_actions_box.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}message_input.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}message_input.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}notification.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}notification.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}notification_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}notification_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}password_dialog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}password_dialog.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}pep_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}pep_config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}plugins.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}plugins.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}preferences.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}preferences.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}preview.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}preview.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}preview_audio.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}preview_audio.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}profile.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}profile.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}proxies.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}proxies.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}remove_account.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}remove_account.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}resource_selector.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}resource_selector.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}roster.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}roster.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}roster_item_exchange.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}roster_item_exchange.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}search_view.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}search_view.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}security_label_selector.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}security_label_selector.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}server_info.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}server_info.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}service_registration.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}service_registration.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}sidebar_switcher.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}sidebar_switcher.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}ssl_error_dialog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}ssl_error_dialog.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}start_chat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}start_chat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}status_icon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}status_icon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}status_message_selector.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}status_message_selector.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}status_selector.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}status_selector.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}structs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}structs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}synchronize_accounts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}synchronize_accounts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}themes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}themes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}tooltips.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}tooltips.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}vcard_grid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}vcard_grid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}video_preview.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}video_preview.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}workspace_dialog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}workspace_dialog.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}workspace_side_bar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}workspace_side_bar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}xml_console.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}xml_console.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/about.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/account_page.py
@@ -779,12 +993,19 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/control.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/${MODPY_PYCACHE}code_widget.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/${MODPY_PYCACHE}code_widget.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/${MODPY_PYCACHE}jump_to_end_button.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/${MODPY_PYCACHE}jump_to_end_button.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/${MODPY_PYCACHE}message_widget.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/${MODPY_PYCACHE}message_widget.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/${MODPY_PYCACHE}plain_widget.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/${MODPY_PYCACHE}plain_widget.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/${MODPY_PYCACHE}quote_widget.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/${MODPY_PYCACHE}quote_widget.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/${MODPY_PYCACHE}view.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/${MODPY_PYCACHE}view.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/code_widget.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/jump_to_end_button.py
@@ -794,20 +1015,35 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/quote_widget.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}call.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}call.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}command_output.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}command_output.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}date.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}date.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}file_transfer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}file_transfer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}file_transfer_jingle.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}file_transfer_jingle.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}message.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}message.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}muc_join_left.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}muc_join_left.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}muc_subject.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}muc_subject.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}read_marker.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}read_marker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}scroll_hint.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}scroll_hint.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}user_status.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}user_status.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}widgets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/${MODPY_PYCACHE}widgets.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/base.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/conversation/rows/call.py
@@ -901,16 +1137,23 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/xml_console.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gui/
 lib/python${MODPY_VERSION}/site-packages/gajim/gui/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gajim/gui/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/gajim/gui/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gui/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gui_interface.py
 lib/python${MODPY_VERSION}/site-packages/gajim/plugins/
 lib/python${MODPY_VERSION}/site-packages/gajim/plugins/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gajim/plugins/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/gajim/plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/plugins/${MODPY_PYCACHE}gajimplugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/plugins/${MODPY_PYCACHE}gajimplugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/plugins/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/plugins/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/plugins/${MODPY_PYCACHE}pluginmanager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/plugins/${MODPY_PYCACHE}pluginmanager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/plugins/${MODPY_PYCACHE}plugins_i18n.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/plugins/${MODPY_PYCACHE}plugins_i18n.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/plugins/${MODPY_PYCACHE}repository.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/plugins/${MODPY_PYCACHE}repository.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/plugins/gajimplugin.py
 lib/python${MODPY_VERSION}/site-packages/gajim/plugins/helpers.py
diff --git a/net/libtorrent-rasterbar/Makefile b/net/libtorrent-rasterbar/Makefile
index 4eea041d16b..f85f1857c58 100644
--- a/net/libtorrent-rasterbar/Makefile
+++ b/net/libtorrent-rasterbar/Makefile
@@ -2,7 +2,7 @@ COMMENT =		C++ library implementing a BitTorrent client
 
 MODPY_EGG_VERSION =	1.2.17
 DISTNAME =		libtorrent-rasterbar-${MODPY_EGG_VERSION}
-REVISION =		0
+REVISION =		1
 
 SHARED_LIBS +=  	torrent-rasterbar 6.0	# 10.0.0
 
@@ -20,9 +20,8 @@ MASTER_SITES =		https://github.com/arvidn/libtorrent/releases/download/v${MODPY_
 
 MODULES =		lang/python
 
-MODPY_SETUPTOOLS =	Yes
-# MODPY_SETUPTOOLS sets TEST_TARGET to `test', so reset it to `check'
-TEST_TARGET =		check
+MODPY_PYBUILD =		setuptools
+MODPY_PYTEST =		No
 
 BUILD_DEPENDS =		devel/libtool
 
diff --git a/net/magic-wormhole/Makefile b/net/magic-wormhole/Makefile
index 2ce97966c20..b63f79f1969 100644
--- a/net/magic-wormhole/Makefile
+++ b/net/magic-wormhole/Makefile
@@ -2,7 +2,7 @@ COMMENT =		securely transfer data between computers
 
 MODPY_EGG_VERSION =	0.12.0
 DISTNAME =		magic-wormhole-${MODPY_EGG_VERSION}
-REVISION =		3
+REVISION =		4
 
 HOMEPAGE =		https://magic-wormhole.readthedocs.io
 
@@ -15,7 +15,7 @@ MAINTAINER =		Klemens Nanni <kn@openbsd.org>
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 RUN_DEPENDS =		devel/py-attrs${MODPY_FLAVOR} \
 			devel/py-automat${MODPY_FLAVOR} \
diff --git a/net/magic-wormhole/pkg/PLIST b/net/magic-wormhole/pkg/PLIST
index 0f8c7a26176..1de7cb8cd49 100644
--- a/net/magic-wormhole/pkg/PLIST
+++ b/net/magic-wormhole/pkg/PLIST
@@ -1,45 +1,76 @@
 bin/wormhole
-lib/python${MODPY_VERSION}/site-packages/magic_wormhole-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/magic_wormhole-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/magic_wormhole-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/magic_wormhole-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/magic_wormhole-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/magic_wormhole-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/magic_wormhole-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/magic_wormhole-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/magic_wormhole-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/magic_wormhole-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/magic_wormhole-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/magic_wormhole-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/magic_wormhole-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/magic_wormhole-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/wormhole/
 lib/python${MODPY_VERSION}/site-packages/wormhole/__init__.py
 lib/python${MODPY_VERSION}/site-packages/wormhole/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_allocator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_allocator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_boss.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_boss.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_code.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_code.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_hints.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_hints.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_input.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_input.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_interfaces.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_interfaces.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_key.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_key.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_lister.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_lister.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_mailbox.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_mailbox.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_nameplate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_nameplate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_order.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_order.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_receive.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_receive.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_rendezvous.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_rendezvous.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_rlcompleter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_rlcompleter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_send.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_send.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_terminator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_terminator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_wordlist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}_wordlist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}eventual.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}eventual.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}ipaddrs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}ipaddrs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}journal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}journal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}observer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}observer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}timing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}timing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}tor_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}tor_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}transit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}transit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}wormhole.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}wormhole.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}xfer_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/${MODPY_PYCACHE}xfer_util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wormhole/_allocator.py
 lib/python${MODPY_VERSION}/site-packages/wormhole/_boss.py
@@ -47,15 +78,25 @@ lib/python${MODPY_VERSION}/site-packages/wormhole/_code.py
 lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/
 lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/${MODPY_PYCACHE}_noise.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/${MODPY_PYCACHE}_noise.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/${MODPY_PYCACHE}connector.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/${MODPY_PYCACHE}connector.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/${MODPY_PYCACHE}encode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/${MODPY_PYCACHE}encode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/${MODPY_PYCACHE}inbound.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/${MODPY_PYCACHE}inbound.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/${MODPY_PYCACHE}outbound.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/${MODPY_PYCACHE}outbound.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/${MODPY_PYCACHE}roles.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/${MODPY_PYCACHE}roles.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/${MODPY_PYCACHE}subchannel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/${MODPY_PYCACHE}subchannel.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/_noise.py
 lib/python${MODPY_VERSION}/site-packages/wormhole/_dilation/connection.py
@@ -84,12 +125,19 @@ lib/python${MODPY_VERSION}/site-packages/wormhole/_wordlist.py
 lib/python${MODPY_VERSION}/site-packages/wormhole/cli/
 lib/python${MODPY_VERSION}/site-packages/wormhole/cli/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wormhole/cli/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wormhole/cli/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/cli/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/cli/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/cli/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/cli/${MODPY_PYCACHE}cmd_receive.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/cli/${MODPY_PYCACHE}cmd_receive.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/cli/${MODPY_PYCACHE}cmd_send.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/cli/${MODPY_PYCACHE}cmd_send.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/cli/${MODPY_PYCACHE}cmd_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/cli/${MODPY_PYCACHE}cmd_ssh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/cli/${MODPY_PYCACHE}public_relay.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/cli/${MODPY_PYCACHE}public_relay.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/cli/${MODPY_PYCACHE}welcome.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/cli/${MODPY_PYCACHE}welcome.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wormhole/cli/cli.py
 lib/python${MODPY_VERSION}/site-packages/wormhole/cli/cmd_receive.py
@@ -105,45 +153,81 @@ lib/python${MODPY_VERSION}/site-packages/wormhole/observer.py
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}run_trial.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}run_trial.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_args.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_args.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_eventual.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_eventual.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_hints.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_hints.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_hkdf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_hkdf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_ipaddrs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_ipaddrs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_journal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_journal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_keys.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_keys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_machines.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_machines.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_observer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_observer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_rlcompleter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_rlcompleter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_ssh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_tor_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_tor_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_transit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_transit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_wordlist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_wordlist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_wormhole.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_wormhole.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_xfer_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/${MODPY_PYCACHE}test_xfer_util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/common.py
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_connect.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_connect.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_connection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_connector.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_connector.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_encoding.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_encoding.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_endpoints.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_endpoints.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_framer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_framer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_full.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_full.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_inbound.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_inbound.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_outbound.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_outbound.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_parse.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_parse.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_record.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_record.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_subchannel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/${MODPY_PYCACHE}test_subchannel.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/common.py
 lib/python${MODPY_VERSION}/site-packages/wormhole/test/dilate/test_connect.py
diff --git a/net/nyx/Makefile b/net/nyx/Makefile
index 9f20553ce29..0a1acb30184 100644
--- a/net/nyx/Makefile
+++ b/net/nyx/Makefile
@@ -2,7 +2,7 @@ COMMENT =		terminal status monitor for Tor
 
 MODPY_EGG_VERSION =	2.1.0
 DISTNAME =		nyx-${MODPY_EGG_VERSION}
-REVISION =		3
+REVISION =		4
 
 CATEGORIES =		net
 
@@ -14,7 +14,7 @@ MAINTAINER =		Pascal Stumpf <pascal@stumpf.co>
 PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 MODPY_PI =		Yes
 
 BUILD_DEPENDS =		net/py-stem${MODPY_FLAVOR}
diff --git a/net/nyx/pkg/PLIST b/net/nyx/pkg/PLIST
index 8075e87e1ff..c6a81791527 100644
--- a/net/nyx/pkg/PLIST
+++ b/net/nyx/pkg/PLIST
@@ -1,22 +1,30 @@
 @pkgpath net/arm
 bin/nyx
 lib/python${MODPY_VERSION}/site-packages/nyx/
-lib/python${MODPY_VERSION}/site-packages/nyx-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/nyx-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/nyx-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/nyx-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/nyx-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/nyx-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/nyx-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/nyx-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/nyx-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/nyx-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/nyx-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/nyx-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/nyx-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/nyx-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/nyx/__init__.py
-lib/python${MODPY_VERSION}/site-packages/nyx/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/nyx/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/nyx/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/nyx/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nyx/${MODPY_PYCACHE}arguments.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/nyx/${MODPY_PYCACHE}arguments.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nyx/${MODPY_PYCACHE}curses.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/nyx/${MODPY_PYCACHE}curses.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nyx/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/nyx/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nyx/${MODPY_PYCACHE}menu.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/nyx/${MODPY_PYCACHE}menu.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nyx/${MODPY_PYCACHE}popups.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/nyx/${MODPY_PYCACHE}popups.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nyx/${MODPY_PYCACHE}starter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/nyx/${MODPY_PYCACHE}starter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nyx/${MODPY_PYCACHE}tracker.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/nyx/${MODPY_PYCACHE}tracker.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/nyx/arguments.py
 lib/python${MODPY_VERSION}/site-packages/nyx/curses.py
@@ -24,14 +32,22 @@ lib/python${MODPY_VERSION}/site-packages/nyx/log.py
 lib/python${MODPY_VERSION}/site-packages/nyx/menu.py
 lib/python${MODPY_VERSION}/site-packages/nyx/panel/
 lib/python${MODPY_VERSION}/site-packages/nyx/panel/__init__.py
-lib/python${MODPY_VERSION}/site-packages/nyx/panel/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/nyx/panel/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/nyx/panel/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/nyx/panel/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nyx/panel/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/nyx/panel/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nyx/panel/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/nyx/panel/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nyx/panel/${MODPY_PYCACHE}graph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/nyx/panel/${MODPY_PYCACHE}graph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nyx/panel/${MODPY_PYCACHE}header.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/nyx/panel/${MODPY_PYCACHE}header.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nyx/panel/${MODPY_PYCACHE}interpreter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/nyx/panel/${MODPY_PYCACHE}interpreter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nyx/panel/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/nyx/panel/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nyx/panel/${MODPY_PYCACHE}torrc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/nyx/panel/${MODPY_PYCACHE}torrc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/nyx/panel/config.py
 lib/python${MODPY_VERSION}/site-packages/nyx/panel/connection.py
diff --git a/net/pbgpp/Makefile b/net/pbgpp/Makefile
index 015f73ec8c1..e6f01df8462 100644
--- a/net/pbgpp/Makefile
+++ b/net/pbgpp/Makefile
@@ -2,7 +2,7 @@ COMMENT =	pcap bgp parser
 
 MODPY_EGG_VERSION =	0.2.22
 DISTNAME =	pbgpp-${MODPY_EGG_VERSION}
-REVISION =	2
+REVISION =	3
 
 CATEGORIES =	net
 
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 RUN_DEPENDS =		net/py-pcapy${MODPY_FLAVOR}
 BUILD_DEPENDS +=	${RUN_DEPENDS}
diff --git a/net/pbgpp/pkg/PLIST b/net/pbgpp/pkg/PLIST
index 42e86876819..0f820e89489 100644
--- a/net/pbgpp/pkg/PLIST
+++ b/net/pbgpp/pkg/PLIST
@@ -1,35 +1,40 @@
 bin/pbgpp
 lib/python${MODPY_VERSION}/site-packages/pbgpp/
-lib/python${MODPY_VERSION}/site-packages/pbgpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pbgpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pbgpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pbgpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pbgpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/pbgpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/pbgpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pbgpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pbgpp-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pbgpp-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pbgpp-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pbgpp-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pbgpp-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pbgpp-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Application/
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Application/CLI.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Application/Handler.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Application/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pbgpp/Application/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pbgpp/Application/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Application/${MODPY_PYCACHE}CLI.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Application/${MODPY_PYCACHE}CLI.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Application/${MODPY_PYCACHE}Handler.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Application/${MODPY_PYCACHE}Handler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Application/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Application/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Exceptions.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Keepalive/
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Keepalive/Message.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Keepalive/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Keepalive/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Keepalive/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Keepalive/${MODPY_PYCACHE}Message.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Keepalive/${MODPY_PYCACHE}Message.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Keepalive/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Keepalive/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Message.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Notification/
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Notification/Message.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Notification/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Notification/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Notification/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Notification/${MODPY_PYCACHE}Message.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Notification/${MODPY_PYCACHE}Message.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Notification/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Notification/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Message.py
@@ -53,42 +58,67 @@ lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/SupportForFourOctetAS.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/Unknown.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}AddPath.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}AddPath.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}BGPExtended.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}BGPExtended.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}EnhancedRouteRefresh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}EnhancedRouteRefresh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}ExtendedNextHopEncoding.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}ExtendedNextHopEncoding.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}FQDN.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}FQDN.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}GracefulRestart.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}GracefulRestart.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}LongLivedGracefulRestart.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}LongLivedGracefulRestart.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}MultipleRoutesToDestination.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}MultipleRoutesToDestination.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}MultiprotocolExtensions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}MultiprotocolExtensions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}MultisessionBGP.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}MultisessionBGP.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}OutboundRouteFiltering.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}OutboundRouteFiltering.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}RouteRefresh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}RouteRefresh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}SupportForDynamicCapability.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}SupportForDynamicCapability.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}SupportForFourOctetAS.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}SupportForFourOctetAS.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}Unknown.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}Unknown.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capabilities/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Capability.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/Reserved.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/${MODPY_PYCACHE}Authentication.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/${MODPY_PYCACHE}Authentication.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/${MODPY_PYCACHE}Capability.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/${MODPY_PYCACHE}Capability.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/${MODPY_PYCACHE}Reserved.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/${MODPY_PYCACHE}Reserved.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/Parameters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/${MODPY_PYCACHE}Message.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/${MODPY_PYCACHE}Message.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/${MODPY_PYCACHE}OptionalParameter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/${MODPY_PYCACHE}OptionalParameter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Open/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Packet.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/RouteRefresh/
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/RouteRefresh/Message.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/RouteRefresh/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/RouteRefresh/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/RouteRefresh/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/RouteRefresh/${MODPY_PYCACHE}Message.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/RouteRefresh/${MODPY_PYCACHE}Message.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/RouteRefresh/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/RouteRefresh/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Statics.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Translation.py
@@ -136,61 +166,111 @@ lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/Traffic
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/TunnelEncapsulation.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/Unknown.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}AIGP.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}AIGP.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}AS4Aggregator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}AS4Aggregator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}AS4Path.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}AS4Path.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}ASPath.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}ASPath.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}ASPathLimit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}ASPathLimit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}Advertiser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}Advertiser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}Aggregator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}Aggregator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}AtomicAggregate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}AtomicAggregate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}AttributeSet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}AttributeSet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}BGPEntropyLabelCapability.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}BGPEntropyLabelCapability.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}BGPLS.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}BGPLS.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}ClusterList.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}ClusterList.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}Communities.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}Communities.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}ConnectorAttribute.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}ConnectorAttribute.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}DPA.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}DPA.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}ExtendedCommunities.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}ExtendedCommunities.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}IPv6AddressSpecificExtendedCommunity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}IPv6AddressSpecificExtendedCommunity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}LargeCommunities.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}LargeCommunities.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}LocalPreferences.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}LocalPreferences.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}MPReachNLRI.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}MPReachNLRI.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}MPUnReachNLRI.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}MPUnReachNLRI.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}MultipleExitDiscriminator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}MultipleExitDiscriminator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}NextHop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}NextHop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}Origin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}Origin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}OriginatorID.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}OriginatorID.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}PEDistinguisherLabels.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}PEDistinguisherLabels.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}PMSITunnel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}PMSITunnel.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}RCIDPathClusterID.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}RCIDPathClusterID.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}Reserved.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}Reserved.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}ReservedDevelopment.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}ReservedDevelopment.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}SAFISSA.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}SAFISSA.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}TrafficEngineering.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}TrafficEngineering.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}TunnelEncapsulation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}TunnelEncapsulation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}Unknown.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}Unknown.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/PathAttributes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/Route.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/${MODPY_PYCACHE}ASPathSegment.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/${MODPY_PYCACHE}ASPathSegment.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/${MODPY_PYCACHE}Community.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/${MODPY_PYCACHE}Community.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/${MODPY_PYCACHE}ExtendedCommunity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/${MODPY_PYCACHE}ExtendedCommunity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/${MODPY_PYCACHE}Flags.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/${MODPY_PYCACHE}Flags.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/${MODPY_PYCACHE}LargeCommunity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/${MODPY_PYCACHE}LargeCommunity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/${MODPY_PYCACHE}Message.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/${MODPY_PYCACHE}Message.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/${MODPY_PYCACHE}PathAttribute.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/${MODPY_PYCACHE}PathAttribute.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/${MODPY_PYCACHE}Route.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/${MODPY_PYCACHE}Route.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/Update/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/${MODPY_PYCACHE}Exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/${MODPY_PYCACHE}Exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/${MODPY_PYCACHE}Message.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/${MODPY_PYCACHE}Message.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/${MODPY_PYCACHE}Packet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/${MODPY_PYCACHE}Packet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/${MODPY_PYCACHE}Statics.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/${MODPY_PYCACHE}Statics.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/${MODPY_PYCACHE}Translation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/${MODPY_PYCACHE}Translation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/BGP/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Exceptions.py
@@ -215,25 +295,44 @@ lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/NextHopFilter.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/TimestampFilter.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/WithdrawnFilter.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}ASNFilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}ASNFilter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}BlackholeFilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}BlackholeFilter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}CommunityASNFilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}CommunityASNFilter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}CommunityValueFilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}CommunityValueFilter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}ErrorFilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}ErrorFilter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}IPDestinationFilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}IPDestinationFilter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}IPSourceFilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}IPSourceFilter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}LargeCommunityFilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}LargeCommunityFilter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}LastASNFilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}LastASNFilter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}MACDestinationFilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}MACDestinationFilter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}MACSourceFilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}MACSourceFilter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}MessageSizeFilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}MessageSizeFilter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}MessageSubTypeFilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}MessageSubTypeFilter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}MessageTypeFilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}MessageTypeFilter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}NLRIFilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}NLRIFilter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}NextHopFilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}NextHopFilter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}TimestampFilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}TimestampFilter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}WithdrawnFilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}WithdrawnFilter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Filters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Formatter.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Formatters/
@@ -241,10 +340,14 @@ lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Formatters/HumanReadable.p
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Formatters/JSON.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Formatters/LineBased.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Formatters/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Formatters/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Formatters/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Formatters/${MODPY_PYCACHE}HumanReadable.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Formatters/${MODPY_PYCACHE}HumanReadable.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Formatters/${MODPY_PYCACHE}JSON.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Formatters/${MODPY_PYCACHE}JSON.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Formatters/${MODPY_PYCACHE}LineBased.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Formatters/${MODPY_PYCACHE}LineBased.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Formatters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Formatters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Handler.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Pipe.py
@@ -253,18 +356,28 @@ lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Pipes/FilePipe.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Pipes/KafkaPipe.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Pipes/StdOutPipe.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Pipes/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Pipes/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Pipes/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Pipes/${MODPY_PYCACHE}FilePipe.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Pipes/${MODPY_PYCACHE}FilePipe.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Pipes/${MODPY_PYCACHE}KafkaPipe.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Pipes/${MODPY_PYCACHE}KafkaPipe.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Pipes/${MODPY_PYCACHE}StdOutPipe.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Pipes/${MODPY_PYCACHE}StdOutPipe.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Pipes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/Pipes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/${MODPY_PYCACHE}Exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/${MODPY_PYCACHE}Exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/${MODPY_PYCACHE}Filter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/${MODPY_PYCACHE}Filter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/${MODPY_PYCACHE}Formatter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/${MODPY_PYCACHE}Formatter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/${MODPY_PYCACHE}Handler.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/${MODPY_PYCACHE}Handler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/${MODPY_PYCACHE}Pipe.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/${MODPY_PYCACHE}Pipe.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/Output/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/
 lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/CookedCapture.py
@@ -274,14 +387,22 @@ lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/IP.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/Information.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/TCP.py
 lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/${MODPY_PYCACHE}CookedCapture.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/${MODPY_PYCACHE}CookedCapture.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/${MODPY_PYCACHE}Ethernet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/${MODPY_PYCACHE}Ethernet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/${MODPY_PYCACHE}Exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/${MODPY_PYCACHE}Exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/${MODPY_PYCACHE}IP.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/${MODPY_PYCACHE}IP.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/${MODPY_PYCACHE}Information.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/${MODPY_PYCACHE}Information.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/${MODPY_PYCACHE}TCP.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/${MODPY_PYCACHE}TCP.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/PCAP/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pbgpp/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pbgpp/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pbgpp/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pbgpp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pbgpp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
diff --git a/net/poezio/Makefile b/net/poezio/Makefile
index f07bb51f9db..6faeebe01fa 100644
--- a/net/poezio/Makefile
+++ b/net/poezio/Makefile
@@ -3,7 +3,7 @@ COMMENT =		console XMPP client
 MODPY_EGG_VERSION =	0.13.1
 DISTNAME =		poezio-${MODPY_EGG_VERSION}
 CATEGORIES =		net
-REVISION =		2
+REVISION =		3
 
 HOMEPAGE =		https://poez.io/
 
@@ -15,13 +15,12 @@ WANTLIB += pthread ${MODPY_WANTLIB}
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools
 MODPY_PYTEST_ARGS =	-v test/
 
 MODPY_DISTUTILS_BUILD =	build_ext --inplace
 
-BUILD_DEPENDS =		lang/cython
+BUILD_DEPENDS =		lang/cython${MODPY_FLAVOR}
 
 RUN_DEPENDS =		devel/desktop-file-utils \
 			net/py-aiodns${MODPY_FLAVOR} \
diff --git a/net/poezio/pkg/PLIST b/net/poezio/pkg/PLIST
index c8d3624ad36..9a550440b18 100644
--- a/net/poezio/pkg/PLIST
+++ b/net/poezio/pkg/PLIST
@@ -1,52 +1,89 @@
 bin/poezio
 bin/poezio_logs
 lib/python${MODPY_VERSION}/site-packages/poezio/
-lib/python${MODPY_VERSION}/site-packages/poezio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/poezio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/poezio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/poezio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/poezio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/poezio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/poezio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/poezio-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/poezio-${MODPY_EGG_VERSION}.dist-info/COPYING
+lib/python${MODPY_VERSION}/site-packages/poezio-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/poezio-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/poezio-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/poezio-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/poezio-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/poezio/__init__.py
 lib/python${MODPY_VERSION}/site-packages/poezio/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}args.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}args.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}asyncio.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}asyncio.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}bookmarks.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}bookmarks.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}colors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}colors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}contact.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}contact.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}daemon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}daemon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}fifo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}fifo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}fixes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}fixes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}hsluv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}hsluv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}keyboard.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}keyboard.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}mam.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}mam.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}multiuserchat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}multiuserchat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}pep.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}pep.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}plugin_e2ee.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}plugin_e2ee.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}plugin_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}plugin_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}poezio.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}poezio.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}poezio_shlex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}poezio_shlex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}poopt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}poopt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}roster.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}roster.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}roster_sorting.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}roster_sorting.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}size_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}size_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}text_buffer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}text_buffer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}theming.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}theming.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}timed_events.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}timed_events.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}user.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}user.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}xdg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}xdg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}xhtml.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/${MODPY_PYCACHE}xhtml.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/poezio/args.py
 lib/python${MODPY_VERSION}/site-packages/poezio/asyncio.py
@@ -59,12 +96,19 @@ lib/python${MODPY_VERSION}/site-packages/poezio/contact.py
 lib/python${MODPY_VERSION}/site-packages/poezio/core/
 lib/python${MODPY_VERSION}/site-packages/poezio/core/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/poezio/core/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/poezio/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/core/${MODPY_PYCACHE}commands.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/core/${MODPY_PYCACHE}commands.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/core/${MODPY_PYCACHE}completions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/core/${MODPY_PYCACHE}completions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/core/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/core/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/core/${MODPY_PYCACHE}handlers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/core/${MODPY_PYCACHE}handlers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/core/${MODPY_PYCACHE}structs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/core/${MODPY_PYCACHE}structs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/core/${MODPY_PYCACHE}tabs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/core/${MODPY_PYCACHE}tabs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/poezio/core/commands.py
 lib/python${MODPY_VERSION}/site-packages/poezio/core/completions.py
@@ -99,18 +143,31 @@ lib/python${MODPY_VERSION}/site-packages/poezio/size_manager.py
 lib/python${MODPY_VERSION}/site-packages/poezio/tabs/
 lib/python${MODPY_VERSION}/site-packages/poezio/tabs/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}adhoc_commands_list.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}adhoc_commands_list.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}basetabs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}basetabs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}bookmarkstab.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}bookmarkstab.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}confirmtab.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}confirmtab.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}conversationtab.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}conversationtab.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}data_forms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}data_forms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}listtab.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}listtab.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}muclisttab.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}muclisttab.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}muctab.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}muctab.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}privatetab.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}privatetab.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}rostertab.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}rostertab.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}xmltab.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/tabs/${MODPY_PYCACHE}xmltab.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/poezio/tabs/adhoc_commands_list.py
 lib/python${MODPY_VERSION}/site-packages/poezio/tabs/basetabs.py
@@ -130,10 +187,15 @@ lib/python${MODPY_VERSION}/site-packages/poezio/timed_events.py
 lib/python${MODPY_VERSION}/site-packages/poezio/ui/
 lib/python${MODPY_VERSION}/site-packages/poezio/ui/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/poezio/ui/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/poezio/ui/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/ui/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/ui/${MODPY_PYCACHE}consts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/ui/${MODPY_PYCACHE}consts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/ui/${MODPY_PYCACHE}funcs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/ui/${MODPY_PYCACHE}funcs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/ui/${MODPY_PYCACHE}render.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/ui/${MODPY_PYCACHE}render.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/ui/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/ui/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/poezio/ui/consts.py
 lib/python${MODPY_VERSION}/site-packages/poezio/ui/funcs.py
@@ -144,20 +206,35 @@ lib/python${MODPY_VERSION}/site-packages/poezio/version.py
 lib/python${MODPY_VERSION}/site-packages/poezio/windows/
 lib/python${MODPY_VERSION}/site-packages/poezio/windows/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}base_wins.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}base_wins.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}bookmark_forms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}bookmark_forms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}confirm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}confirm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}data_forms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}data_forms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}image.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}image.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}info_bar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}info_bar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}info_wins.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}info_wins.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}input_placeholders.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}input_placeholders.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}inputs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}inputs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}list.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}list.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}muc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}muc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}roster_win.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}roster_win.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}text_win.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio/windows/${MODPY_PYCACHE}text_win.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/poezio/windows/base_wins.py
 lib/python${MODPY_VERSION}/site-packages/poezio/windows/bookmark_forms.py
@@ -178,68 +255,131 @@ lib/python${MODPY_VERSION}/site-packages/poezio/xhtml.py
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}admin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}admin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}alias.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}alias.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}amsg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}amsg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}autocorrect.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}autocorrect.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}b64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}b64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}bob.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}bob.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}capslock.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}capslock.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}change_title.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}change_title.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}close_all.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}close_all.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}code.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}code.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}contact.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}contact.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}csi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}csi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}cyber.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}cyber.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}day_change.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}day_change.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}dice.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}dice.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}disco.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}disco.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}display_corrections.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}display_corrections.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}double.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}double.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}embed.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}embed.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}emoji_ascii.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}emoji_ascii.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}exec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}exec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}figlet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}figlet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}iq_show.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}iq_show.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}irc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}irc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}lastlog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}lastlog.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}link.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}link.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}marquee.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}marquee.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}mirror.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}mirror.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}mpd_client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}mpd_client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}otr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}otr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}pacokick.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}pacokick.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}ping.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}ping.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}pipe_cmd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}pipe_cmd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}pointpoint.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}pointpoint.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}qr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}qr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}quote.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}quote.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}rainbow.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}rainbow.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}random_nick.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}random_nick.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}regex_admin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}regex_admin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}reminder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}reminder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}remove_get_trackers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}remove_get_trackers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}reorder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}reorder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}replace.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}replace.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}replace_word.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}replace_word.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}revstr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}revstr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}rstrip.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}rstrip.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}screen_detach.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}screen_detach.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}send_delayed.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}send_delayed.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}server_part.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}server_part.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}shuffle.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}shuffle.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}simple_notify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}simple_notify.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}spaces.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}spaces.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}spam.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}spam.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}status.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}status.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}stoi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}stoi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}tell.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}tell.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}time_marker.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}time_marker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}upload.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}upload.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}uptime.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}uptime.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}vcard.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}vcard.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}white.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/${MODPY_PYCACHE}white.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/admin.py
 lib/python${MODPY_VERSION}/site-packages/poezio_plugins/alias.py
@@ -306,9 +446,13 @@ lib/python${MODPY_VERSION}/site-packages/poezio_plugins/white.py
 lib/python${MODPY_VERSION}/site-packages/poezio_themes/
 lib/python${MODPY_VERSION}/site-packages/poezio_themes/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/poezio_themes/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/poezio_themes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_themes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_themes/${MODPY_PYCACHE}clean.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_themes/${MODPY_PYCACHE}clean.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_themes/${MODPY_PYCACHE}dark.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_themes/${MODPY_PYCACHE}dark.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/poezio_themes/${MODPY_PYCACHE}irssi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/poezio_themes/${MODPY_PYCACHE}irssi.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/poezio_themes/clean.py
 lib/python${MODPY_VERSION}/site-packages/poezio_themes/dark.py
diff --git a/net/py-IOSXR/Makefile b/net/py-IOSXR/Makefile
index 398a830ab2f..723ee5780e7 100644
--- a/net/py-IOSXR/Makefile
+++ b/net/py-IOSXR/Makefile
@@ -3,7 +3,7 @@ COMMENT =		library to manage IOS-XR devices
 MODPY_EGG_VERSION =	0.53
 DISTNAME =		pyIOSXR-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME:S/py//}
-REVISION =		5
+REVISION =		6
 
 CATEGORIES =		net
 
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/net/py-IOSXR/pkg/PLIST b/net/py-IOSXR/pkg/PLIST
index 50df4978444..5bd4c77a8d7 100644
--- a/net/py-IOSXR/pkg/PLIST
+++ b/net/py-IOSXR/pkg/PLIST
@@ -1,16 +1,18 @@
 @conflict py-IOSXR-*
 @pkgpath net/py-IOSXR
 lib/python${MODPY_VERSION}/site-packages/pyIOSXR/
-lib/python${MODPY_VERSION}/site-packages/pyIOSXR-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pyIOSXR-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pyIOSXR-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pyIOSXR-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pyIOSXR-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pyIOSXR-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pyIOSXR-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pyIOSXR-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pyIOSXR-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pyIOSXR-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pyIOSXR-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pyIOSXR/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyIOSXR/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pyIOSXR/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyIOSXR/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyIOSXR/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyIOSXR/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyIOSXR/${MODPY_PYCACHE}iosxr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyIOSXR/${MODPY_PYCACHE}iosxr.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pyIOSXR/exceptions.py
 lib/python${MODPY_VERSION}/site-packages/pyIOSXR/iosxr.py
diff --git a/net/py-aiodns/Makefile b/net/py-aiodns/Makefile
index 4eab5126fcb..9035596c6ec 100644
--- a/net/py-aiodns/Makefile
+++ b/net/py-aiodns/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	3.0.0
 DISTNAME =		aiodns-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		net
-REVISION =		1
+REVISION =		2
 
 MAINTAINER =		Kurt Mosiejczuk <kmos@openbsd.org>
 
@@ -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.py
 
 FLAVORS =		python3
diff --git a/net/py-aiodns/pkg/PLIST b/net/py-aiodns/pkg/PLIST
index 246ef319795..f5efc272eab 100644
--- a/net/py-aiodns/pkg/PLIST
+++ b/net/py-aiodns/pkg/PLIST
@@ -1,14 +1,16 @@
 @conflict py-aiodns-*
 @pkgpath net/py-aiodns
 lib/python${MODPY_VERSION}/site-packages/aiodns/
-lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/aiodns/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/aiodns/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/aiodns/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/aiodns/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiodns/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/aiodns/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/aiodns/error.py
diff --git a/net/py-cares/Makefile b/net/py-cares/Makefile
index 154a37be80d..db40dfb2998 100644
--- a/net/py-cares/Makefile
+++ b/net/py-cares/Makefile
@@ -5,7 +5,7 @@ MODPY_EGG_VERSION =	4.2.2
 DISTNAME =		pycares-${MODPY_EGG_VERSION}
 PKGNAME =		py-cares-${MODPY_EGG_VERSION}
 CATEGORIES =		net
-REVISION =		0
+REVISION =		1
 
 # MIT
 PERMIT_PACKAGE =	Yes
@@ -15,8 +15,7 @@ WANTLIB += pthread ${MODPY_WANTLIB}
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools
 MODPY_PYTEST_ARGS =	tests/tests.py
 
 USE_GMAKE =		Yes
diff --git a/net/py-cares/pkg/PLIST b/net/py-cares/pkg/PLIST
index 836520bb086..c0ffc634bdc 100644
--- a/net/py-cares/pkg/PLIST
+++ b/net/py-cares/pkg/PLIST
@@ -1,20 +1,24 @@
 @conflict py-cares-*
 @pkgpath net/py-cares
 lib/python${MODPY_VERSION}/site-packages/pycares/
-lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pycares/__init__.py
 lib/python${MODPY_VERSION}/site-packages/pycares/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pycares/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pycares/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pycares/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pycares/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pycares/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pycares/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pycares/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pycares/${MODPY_PYCACHE}errno.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pycares/${MODPY_PYCACHE}errno.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pycares/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pycares/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 @so lib/python${MODPY_VERSION}/site-packages/pycares/_cares.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/pycares/_version.py
diff --git a/net/py-curl/Makefile b/net/py-curl/Makefile
index ecdce5dcac2..3bf9a9e8f91 100644
--- a/net/py-curl/Makefile
+++ b/net/py-curl/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION=	7.45.1
 DISTNAME=	pycurl-${MODPY_EGG_VERSION}
 PKGNAME=	py-curl-${MODPY_EGG_VERSION}
 CATEGORIES=	net
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	http://pycurl.io/
 
@@ -17,7 +17,7 @@ WANTLIB += crypto curl nghttp2 pthread ssl z
 MODULES=	lang/python
 
 MODPY_PI=	Yes
-MODPY_SETUPTOOLS=	Yes
+MODPY_PYBUILD=	setuptools
 
 FLAVORS=	python3
 FLAVOR=		python3
@@ -26,7 +26,6 @@ LIB_DEPENDS=	net/curl
 
 SUBST_VARS+=	MODPY_PY_PREFIX
 
-MODPY_PYTEST=		Yes
 MODPY_PYTEST_ARGS=	tests
 
 post-install:
diff --git a/net/py-curl/pkg/PLIST b/net/py-curl/pkg/PLIST
index 8246d85664e..b64179b1b46 100644
--- a/net/py-curl/pkg/PLIST
+++ b/net/py-curl/pkg/PLIST
@@ -2,12 +2,16 @@
 lib/python${MODPY_VERSION}/site-packages/curl/
 lib/python${MODPY_VERSION}/site-packages/curl/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/curl/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/curl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/curl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}.dist-info/AUTHORS
+lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}.dist-info/COPYING-LGPL
+lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}.dist-info/COPYING-MIT
+lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 @so lib/python${MODPY_VERSION}/site-packages/pycurl.${MODPY_PYC_MAGIC_TAG}so
 share/doc/${MODPY_PY_PREFIX}curl/
 share/doc/${MODPY_PY_PREFIX}curl/AUTHORS
diff --git a/net/py-cymruwhois/Makefile b/net/py-cymruwhois/Makefile
index 1be347a195c..7898f1b06cb 100644
--- a/net/py-cymruwhois/Makefile
+++ b/net/py-cymruwhois/Makefile
@@ -3,7 +3,7 @@ COMMENT=		client for the whois.cymru.com service
 MODPY_EGG_VERSION=	1.6
 DISTNAME=		cymruwhois-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
-REVISION=		6
+REVISION=		7
 
 CATEGORIES=		net
 
@@ -14,12 +14,12 @@ PERMIT_PACKAGE=	Yes
 
 MODULES=		lang/python
 MODPY_PI=		Yes
-MODPY_SETUPTOOLS=	Yes
+MODPY_PYBUILD=		setuptools
 MODPY_ADJ_FILES=	cymruwhois.py
 
-FLAVORS =		python3
-FLAVOR =		python3
+FLAVORS=		python3
+FLAVOR=			python3
 
-TEST_DEPENDS =		devel/py-nose${MODPY_FLAVOR}
+TEST_DEPENDS=		devel/py-nose${MODPY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/net/py-cymruwhois/pkg/PLIST b/net/py-cymruwhois/pkg/PLIST
index 9f6ee8b07dd..2417fe4de89 100644
--- a/net/py-cymruwhois/pkg/PLIST
+++ b/net/py-cymruwhois/pkg/PLIST
@@ -1,12 +1,13 @@
-@pkgpath net/py-cymruwhois
 @conflict py-cymruwhois-<1.6p2
+@pkgpath net/py-cymruwhois
 bin/cymruwhois
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}cymruwhois.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}cymruwhois.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/cymruwhois.py
diff --git a/net/py-dnspython/Makefile b/net/py-dnspython/Makefile
index ae8b4791508..37486dcd477 100644
--- a/net/py-dnspython/Makefile
+++ b/net/py-dnspython/Makefile
@@ -19,9 +19,8 @@ FLAVOR=			python3
 
 MODULES=		lang/python
 MODPY_PI=		Yes
-MODPY_SETUPTOOLS=	Yes
+MODPY_PYBUILD=		poetry-core
 MODPY_ADJ_FILES=	examples/*.py
-MODPY_PYTEST=		Yes
 
 TEST_DEPENDS=		security/py-ecdsa${MODPY_FLAVOR}
 
diff --git a/net/py-dnspython/patches/patch-pyproject_toml b/net/py-dnspython/patches/patch-pyproject_toml
new file mode 100644
index 00000000000..85ff11faec8
--- /dev/null
+++ b/net/py-dnspython/patches/patch-pyproject_toml
@@ -0,0 +1,11 @@
+Index: pyproject.toml
+--- pyproject.toml.orig
++++ pyproject.toml
+@@ -36,5 +36,5 @@ trio = ['trio']
+ curio = ['curio', 'sniffio']
+ 
+ [build-system]
+-requires = ["poetry>=0.12"]
+-build-backend = "poetry.masonry.api"
++requires = ["poetry-core>=0.12"]
++build-backend = "poetry.core.masonry.api"
diff --git a/net/py-dnspython/pkg/PLIST b/net/py-dnspython/pkg/PLIST
index 470f032a18c..902013263f6 100644
--- a/net/py-dnspython/pkg/PLIST
+++ b/net/py-dnspython/pkg/PLIST
@@ -1,56 +1,107 @@
 lib/python${MODPY_VERSION}/site-packages/dns/
 lib/python${MODPY_VERSION}/site-packages/dns/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_asyncbackend.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_asyncbackend.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_asyncio_backend.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_asyncio_backend.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_curio_backend.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_curio_backend.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_immutable_attr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_immutable_attr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_immutable_ctx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_immutable_ctx.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_trio_backend.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_trio_backend.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}asyncbackend.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}asyncbackend.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}asyncquery.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}asyncquery.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}asyncresolver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}asyncresolver.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}dnssec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}dnssec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}e164.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}e164.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}edns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}edns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}entropy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}entropy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}enum.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}enum.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}exception.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}exception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}flags.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}flags.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}grange.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}grange.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}immutable.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}immutable.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}inet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}inet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}ipv4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}ipv4.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}ipv6.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}ipv6.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}message.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}message.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}name.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}name.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}namedict.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}namedict.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}node.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}node.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}opcode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}opcode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}query.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}query.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}rcode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}rcode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}rdata.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}rdata.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}rdataclass.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}rdataclass.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}rdataset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}rdataset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}rdatatype.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}rdatatype.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}renderer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}renderer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}resolver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}resolver.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}reversename.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}reversename.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}rrset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}rrset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}serial.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}serial.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}set.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}set.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}tokenizer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}tokenizer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}transaction.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}transaction.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}tsig.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}tsig.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}tsigkeyring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}tsigkeyring.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}ttl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}ttl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}update.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}update.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}versioned.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}versioned.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}wire.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}wire.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}xfr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}xfr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}zone.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}zone.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}zonefile.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}zonefile.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dns/_asyncbackend.py
 lib/python${MODPY_VERSION}/site-packages/dns/_asyncio_backend.py
@@ -131,54 +182,99 @@ lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/URI.py
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/X25.py
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}AFSDB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}AFSDB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}AMTRELAY.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}AMTRELAY.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}AVC.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}AVC.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}CAA.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}CAA.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}CDNSKEY.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}CDNSKEY.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}CDS.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}CDS.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}CERT.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}CERT.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}CNAME.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}CNAME.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}CSYNC.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}CSYNC.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}DLV.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}DLV.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}DNAME.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}DNAME.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}DNSKEY.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}DNSKEY.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}DS.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}DS.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}EUI48.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}EUI48.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}EUI64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}EUI64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}GPOS.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}GPOS.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}HINFO.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}HINFO.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}HIP.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}HIP.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}ISDN.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}ISDN.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}LOC.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}LOC.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}MX.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}MX.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}NINFO.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}NINFO.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}NS.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}NS.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}NSEC.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}NSEC.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}NSEC3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}NSEC3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}NSEC3PARAM.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}NSEC3PARAM.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}OPENPGPKEY.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}OPENPGPKEY.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}OPT.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}OPT.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}PTR.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}PTR.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}RP.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}RP.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}RRSIG.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}RRSIG.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}RT.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}RT.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}SMIMEA.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}SMIMEA.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}SOA.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}SOA.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}SPF.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}SPF.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}SSHFP.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}SSHFP.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}TKEY.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}TKEY.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}TLSA.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}TLSA.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}TSIG.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}TSIG.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}TXT.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}TXT.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}URI.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}URI.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}X25.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}X25.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/CH/
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/CH/A.py
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/CH/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/CH/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/CH/${MODPY_PYCACHE}A.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/CH/${MODPY_PYCACHE}A.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/CH/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/CH/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/A.py
@@ -197,32 +293,57 @@ lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/SVCB.py
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/WKS.py
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}A.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}A.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}AAAA.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}AAAA.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}APL.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}APL.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}DHCID.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}DHCID.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}HTTPS.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}HTTPS.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}IPSECKEY.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}IPSECKEY.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}KX.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}KX.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}NAPTR.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}NAPTR.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}NSAP.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}NSAP.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}NSAP_PTR.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}NSAP_PTR.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}PX.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}PX.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}SRV.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}SRV.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}SVCB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}SVCB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}WKS.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}WKS.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}dnskeybase.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}dnskeybase.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}dsbase.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}dsbase.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}euibase.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}euibase.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}mxbase.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}mxbase.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}nsbase.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}nsbase.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}svcbbase.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}svcbbase.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}tlsabase.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}tlsabase.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}txtbase.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}txtbase.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/dnskeybase.py
 lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/dsbase.py
@@ -251,12 +372,11 @@ lib/python${MODPY_VERSION}/site-packages/dns/wire.py
 lib/python${MODPY_VERSION}/site-packages/dns/xfr.py
 lib/python${MODPY_VERSION}/site-packages/dns/zone.py
 lib/python${MODPY_VERSION}/site-packages/dns/zonefile.py
-lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}.dist-info/WHEEL
 share/examples/${MODPY_PY_PREFIX}dnspython/
 share/examples/${MODPY_PY_PREFIX}dnspython/async_dns.py
 share/examples/${MODPY_PY_PREFIX}dnspython/ddns.py
diff --git a/net/py-eapi/Makefile b/net/py-eapi/Makefile
index 6f5618e7b2d..fa247ad4d19 100644
--- a/net/py-eapi/Makefile
+++ b/net/py-eapi/Makefile
@@ -3,7 +3,7 @@ COMMENT =		Python client for Arista eAPI
 MODPY_EGG_VERSION =	0.8.3
 DISTNAME =		pyeapi-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME:S/py//}
-REVISION =		5
+REVISION =		6
 
 CATEGORIES =		net
 
@@ -15,8 +15,7 @@ FLAVORS =		python3
 FLAVOR =		python3
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools
 MODPY_PYTEST_ARGS =	test/unit
 
 RUN_DEPENDS =		net/py-netaddr${MODPY_FLAVOR}
diff --git a/net/py-eapi/pkg/PLIST b/net/py-eapi/pkg/PLIST
index c7517cdb4d5..d2885245e07 100644
--- a/net/py-eapi/pkg/PLIST
+++ b/net/py-eapi/pkg/PLIST
@@ -1,39 +1,63 @@
 @pkgpath net/py-eapi
 lib/python${MODPY_VERSION}/site-packages/pyeapi/
-lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pyeapi/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyeapi/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pyeapi/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/${MODPY_PYCACHE}eapilib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/${MODPY_PYCACHE}eapilib.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}abstract.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}abstract.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}acl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}acl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}bgp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}bgp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}interfaces.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}interfaces.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}ipinterfaces.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}ipinterfaces.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}mlag.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}mlag.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}ntp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}ntp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}ospf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}ospf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}routemaps.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}routemaps.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}spanningtree.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}spanningtree.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}staticroute.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}staticroute.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}stp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}stp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}switchports.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}switchports.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}users.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}users.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}varp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}varp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}vlans.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}vlans.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}vrfs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}vrfs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}vrrp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/${MODPY_PYCACHE}vrrp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/abstract.py
 lib/python${MODPY_VERSION}/site-packages/pyeapi/api/acl.py
diff --git a/net/py-engineio/Makefile b/net/py-engineio/Makefile
index 402d550f4b9..00f47a2425b 100644
--- a/net/py-engineio/Makefile
+++ b/net/py-engineio/Makefile
@@ -4,7 +4,7 @@ COMMENT=	client/server implementation of Engine.IO
 MODPY_EGG_VERSION= 3.14.2
 DISTNAME=	python-engineio-${MODPY_EGG_VERSION}
 PKGNAME=	${DISTNAME:S/python-/py-/}
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	net
 
@@ -14,7 +14,7 @@ HOMEPAGE=	https://python-engineio.readthedocs.io/en/latest/
 PERMIT_PACKAGE=	Yes
 
 MODULES=	lang/python
-MODPY_SETUPTOOLS= Yes
+MODPY_PYBUILD=	setuptools
 
 MODPY_PI=	Yes
 NO_TEST=	Yes
diff --git a/net/py-engineio/pkg/PLIST b/net/py-engineio/pkg/PLIST
index 0a35fbbbdbd..eb0737e1239 100644
--- a/net/py-engineio/pkg/PLIST
+++ b/net/py-engineio/pkg/PLIST
@@ -1,29 +1,50 @@
 lib/python${MODPY_VERSION}/site-packages/engineio/
 lib/python${MODPY_VERSION}/site-packages/engineio/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}asyncio_client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}asyncio_client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}asyncio_server.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}asyncio_server.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}asyncio_socket.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}asyncio_socket.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}middleware.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}middleware.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}packet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}packet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}payload.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}payload.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}server.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}server.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}socket.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}socket.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}static_files.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}static_files.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/
 lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/${MODPY_PYCACHE}aiohttp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/${MODPY_PYCACHE}aiohttp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/${MODPY_PYCACHE}asgi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/${MODPY_PYCACHE}asgi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/${MODPY_PYCACHE}eventlet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/${MODPY_PYCACHE}eventlet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/${MODPY_PYCACHE}gevent.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/${MODPY_PYCACHE}gevent.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/${MODPY_PYCACHE}gevent_uwsgi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/${MODPY_PYCACHE}gevent_uwsgi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/${MODPY_PYCACHE}sanic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/${MODPY_PYCACHE}sanic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/${MODPY_PYCACHE}threading.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/${MODPY_PYCACHE}threading.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/${MODPY_PYCACHE}tornado.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/${MODPY_PYCACHE}tornado.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/aiohttp.py
 lib/python${MODPY_VERSION}/site-packages/engineio/async_drivers/asgi.py
@@ -44,10 +65,9 @@ lib/python${MODPY_VERSION}/site-packages/engineio/payload.py
 lib/python${MODPY_VERSION}/site-packages/engineio/server.py
 lib/python${MODPY_VERSION}/site-packages/engineio/socket.py
 lib/python${MODPY_VERSION}/site-packages/engineio/static_files.py
-lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_EGG_VERSION}.dist-info/top_level.txt
diff --git a/net/py-ftpdlib/Makefile b/net/py-ftpdlib/Makefile
index 6bb0d67c6a7..34f0ad5f513 100644
--- a/net/py-ftpdlib/Makefile
+++ b/net/py-ftpdlib/Makefile
@@ -3,7 +3,7 @@ COMMENT =		FTP server library for Python
 MODPY_EGG_VERSION =	1.5.6
 DISTNAME =		pyftpdlib-${MODPY_EGG_VERSION}
 PKGNAME =		py-ftpdlib-${MODPY_EGG_VERSION}
-REVISION =		5
+REVISION =		6
 
 CATEGORIES =		net devel
 
@@ -16,7 +16,7 @@ PERMIT_PACKAGE=	Yes
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/net/py-ftpdlib/pkg/PLIST b/net/py-ftpdlib/pkg/PLIST
index 4811a1e989a..62e1796c638 100644
--- a/net/py-ftpdlib/pkg/PLIST
+++ b/net/py-ftpdlib/pkg/PLIST
@@ -1,25 +1,35 @@
-@pkgpath net/py-ftpdlib
 @conflict py-ftpdlib-<1.5.6p1
+@pkgpath net/py-ftpdlib
 bin/ftpbench
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/
-lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/__init__.py
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}authorizers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}authorizers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}filesystems.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}filesystems.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}handlers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}handlers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}ioloop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}ioloop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}prefork.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}prefork.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}servers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}servers.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/_compat.py
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/authorizers.py
@@ -34,15 +44,25 @@ lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/README
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/__init__.py
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/${MODPY_PYCACHE}runner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/${MODPY_PYCACHE}runner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/${MODPY_PYCACHE}test_authorizers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/${MODPY_PYCACHE}test_authorizers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/${MODPY_PYCACHE}test_filesystems.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/${MODPY_PYCACHE}test_filesystems.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/${MODPY_PYCACHE}test_functional.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/${MODPY_PYCACHE}test_functional.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/${MODPY_PYCACHE}test_functional_ssl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/${MODPY_PYCACHE}test_functional_ssl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/${MODPY_PYCACHE}test_ioloop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/${MODPY_PYCACHE}test_ioloop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/${MODPY_PYCACHE}test_misc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/${MODPY_PYCACHE}test_misc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/${MODPY_PYCACHE}test_servers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/${MODPY_PYCACHE}test_servers.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/keycert.pem
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/test/runner.py
diff --git a/net/py-geventhttpclient/Makefile b/net/py-geventhttpclient/Makefile
index cad73f688ec..863fb991bc3 100644
--- a/net/py-geventhttpclient/Makefile
+++ b/net/py-geventhttpclient/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	1.5.3
 DISTNAME =		geventhttpclient-${MODPY_EGG_VERSION}
 PKGNAME =		${MODPY_PY_PREFIX}${DISTNAME}
 CATEGORIES =		net devel
-REVISION =		0
+REVISION =		1
 
 HOMEPAGE =		https://github.com/gwik/geventhttpclient
 
@@ -15,7 +15,7 @@ WANTLIB += pthread ${MODPY_WANTLIB}
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 MODPY_PYTEST_ARGS =	src/geventhttpclient/
 
 FLAVORS =		python3
diff --git a/net/py-geventhttpclient/pkg/PLIST b/net/py-geventhttpclient/pkg/PLIST
index cae0dfa7405..7b95f8caaef 100644
--- a/net/py-geventhttpclient/pkg/PLIST
+++ b/net/py-geventhttpclient/pkg/PLIST
@@ -1,20 +1,28 @@
 @pkgpath net/py-geventhttpclient
 lib/python${MODPY_VERSION}/site-packages/geventhttpclient/
-lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_EGG_VERSION}.dist-info/LICENSE-MIT
+lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/geventhttpclient/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/geventhttpclient/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/geventhttpclient/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/geventhttpclient/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/geventhttpclient/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/geventhttpclient/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/geventhttpclient/${MODPY_PYCACHE}connectionpool.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/geventhttpclient/${MODPY_PYCACHE}connectionpool.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/geventhttpclient/${MODPY_PYCACHE}header.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/geventhttpclient/${MODPY_PYCACHE}header.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/geventhttpclient/${MODPY_PYCACHE}httplib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/geventhttpclient/${MODPY_PYCACHE}httplib.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/geventhttpclient/${MODPY_PYCACHE}response.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/geventhttpclient/${MODPY_PYCACHE}response.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/geventhttpclient/${MODPY_PYCACHE}url.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/geventhttpclient/${MODPY_PYCACHE}url.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/geventhttpclient/${MODPY_PYCACHE}useragent.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/geventhttpclient/${MODPY_PYCACHE}useragent.${MODPY_PYC_MAGIC_TAG}pyc
 @so lib/python${MODPY_VERSION}/site-packages/geventhttpclient/_parser.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/geventhttpclient/client.py
diff --git a/net/py-idna/Makefile b/net/py-idna/Makefile
index 1541f24bf4c..f4d0285e9a5 100644
--- a/net/py-idna/Makefile
+++ b/net/py-idna/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	3.3
 DISTNAME =		idna-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		net
-REVISION =		0
+REVISION =		1
 
 HOMEPAGE =		https://github.com/kjd/idna
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 MODPY_PYTEST =		Yes
 
 FLAVORS =		python3
diff --git a/net/py-idna/pkg/PLIST b/net/py-idna/pkg/PLIST
index 15b179080c3..5cf78f00da6 100644
--- a/net/py-idna/pkg/PLIST
+++ b/net/py-idna/pkg/PLIST
@@ -1,19 +1,28 @@
 @pkgpath net/py-idna
 lib/python${MODPY_VERSION}/site-packages/idna/
-lib/python${MODPY_VERSION}/site-packages/idna-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/idna-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/idna-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/idna-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/idna-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/idna-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/idna-${MODPY_EGG_VERSION}.dist-info/LICENSE.md
+lib/python${MODPY_VERSION}/site-packages/idna-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/idna-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/idna-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/idna-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/idna/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/idna/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/idna/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/idna/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/idna/${MODPY_PYCACHE}codec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/idna/${MODPY_PYCACHE}codec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/idna/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/idna/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/idna/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/idna/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/idna/${MODPY_PYCACHE}idnadata.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/idna/${MODPY_PYCACHE}idnadata.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/idna/${MODPY_PYCACHE}intranges.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/idna/${MODPY_PYCACHE}intranges.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/idna/${MODPY_PYCACHE}package_data.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/idna/${MODPY_PYCACHE}package_data.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/idna/${MODPY_PYCACHE}uts46data.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/idna/${MODPY_PYCACHE}uts46data.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/idna/codec.py
 lib/python${MODPY_VERSION}/site-packages/idna/compat.py
diff --git a/net/py-ifaddr/Makefile b/net/py-ifaddr/Makefile
index 59c1f1c0105..caa41de0761 100644
--- a/net/py-ifaddr/Makefile
+++ b/net/py-ifaddr/Makefile
@@ -3,7 +3,7 @@ COMMENT=		enumerate IP addresses on the local network adapters
 MODPY_EGG_VERSION=	0.1.7
 DISTNAME=		ifaddr-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		net
 
@@ -13,9 +13,8 @@ PERMIT_PACKAGE=	Yes
 MODULES=		lang/python
 
 MODPY_PI=		Yes
-MODPY_SETUPTOOLS=	Yes
-MODPY_PYTEST=		Yes
-MODPY_PYTEST_ARGS =	ifaddr
+MODPY_PYBUILD=		setuptools
+MODPY_PYTEST_ARGS=	ifaddr
 
 FLAVORS=		python3
 FLAVOR=			python3
diff --git a/net/py-ifaddr/pkg/PLIST b/net/py-ifaddr/pkg/PLIST
index 9f3e7886573..81bb1500d0d 100644
--- a/net/py-ifaddr/pkg/PLIST
+++ b/net/py-ifaddr/pkg/PLIST
@@ -1,18 +1,23 @@
-@pkgpath net/py-ifaddr
 @conflict py-ifaddr-*
+@pkgpath net/py-ifaddr
 lib/python${MODPY_VERSION}/site-packages/ifaddr/
-lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/ifaddr/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ifaddr/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ifaddr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ifaddr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ifaddr/${MODPY_PYCACHE}_posix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ifaddr/${MODPY_PYCACHE}_posix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ifaddr/${MODPY_PYCACHE}_shared.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ifaddr/${MODPY_PYCACHE}_shared.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ifaddr/${MODPY_PYCACHE}_win32.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ifaddr/${MODPY_PYCACHE}_win32.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ifaddr/${MODPY_PYCACHE}test_ifaddr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ifaddr/${MODPY_PYCACHE}test_ifaddr.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ifaddr/_posix.py
 lib/python${MODPY_VERSION}/site-packages/ifaddr/_shared.py
diff --git a/net/py-impacket/Makefile b/net/py-impacket/Makefile
index 272129bae15..d1df33107c3 100644
--- a/net/py-impacket/Makefile
+++ b/net/py-impacket/Makefile
@@ -7,7 +7,7 @@ DISTNAME =		impacket-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 EPOCH =			0
 CATEGORIES =		net security
-REVISION =		0
+REVISION =		1
 
 HOMEPAGE =		https://www.secureauth.com/labs/open-source-tools/impacket
 
@@ -17,7 +17,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 MODPY_ADJ_FILES =	impacket/ese.py \
 			impacket/examples/logger.py \
 			impacket/examples/ntlmrelayx/clients/httprelayclient.py \
diff --git a/net/py-impacket/pkg/PLIST b/net/py-impacket/pkg/PLIST
index 68de99f92dd..7fdbf918734 100644
--- a/net/py-impacket/pkg/PLIST
+++ b/net/py-impacket/pkg/PLIST
@@ -1,12 +1,12 @@
 @conflict py-impacket-*
 @pkgpath net/py-impacket
 lib/python${MODPY_VERSION}/site-packages/impacket/
-lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/impacket/Dot11Crypto.py
 lib/python${MODPY_VERSION}/site-packages/impacket/Dot11KeyManager.py
 lib/python${MODPY_VERSION}/site-packages/impacket/ICMP6.py
@@ -18,98 +18,178 @@ lib/python${MODPY_VERSION}/site-packages/impacket/ImpactPacket.py
 lib/python${MODPY_VERSION}/site-packages/impacket/NDP.py
 lib/python${MODPY_VERSION}/site-packages/impacket/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}Dot11Crypto.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}Dot11Crypto.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}Dot11KeyManager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}Dot11KeyManager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}ICMP6.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}ICMP6.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}IP6.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}IP6.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}IP6_Address.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}IP6_Address.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}IP6_Extension_Headers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}IP6_Extension_Headers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}ImpactDecoder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}ImpactDecoder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}ImpactPacket.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}ImpactPacket.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}NDP.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}NDP.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}cdp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}cdp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}crypto.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}crypto.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}dhcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}dhcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}dns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}dns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}dot11.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}dot11.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}dpapi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}dpapi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}eap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}eap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}ese.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}ese.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}hresult_errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}hresult_errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}mapi_constants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}mapi_constants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}mqtt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}mqtt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}nmb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}nmb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}nt_errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}nt_errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}ntlm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}ntlm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}pcap_linktypes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}pcap_linktypes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}pcapfile.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}pcapfile.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}smb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}smb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}smb3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}smb3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}smb3structs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}smb3structs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}smbconnection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}smbconnection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}smbserver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}smbserver.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}spnego.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}spnego.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}structure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}structure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}system_errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}system_errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}tds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}tds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}uuid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}uuid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}winregistry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}winregistry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}wps.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/${MODPY_PYCACHE}wps.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/impacket/cdp.py
 lib/python${MODPY_VERSION}/site-packages/impacket/crypto.py
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}atsvc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}atsvc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}bkrp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}bkrp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}dcomrt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}dcomrt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}dhcpm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}dhcpm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}drsuapi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}drsuapi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}dtypes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}dtypes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}enum.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}enum.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}epm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}epm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}even.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}even.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}even6.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}even6.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}iphlp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}iphlp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}lsad.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}lsad.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}lsat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}lsat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}mgmt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}mgmt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}mimilib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}mimilib.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}ndr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}ndr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}nrpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}nrpc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}nspi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}nspi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}oxabref.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}oxabref.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}par.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}par.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}rpch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}rpch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}rpcrt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}rpcrt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}rprn.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}rprn.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}rrp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}rrp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}samr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}samr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}sasec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}sasec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}scmr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}scmr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}srvs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}srvs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}transport.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}transport.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}tsch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}tsch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}wkst.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/${MODPY_PYCACHE}wkst.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/atsvc.py
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/bkrp.py
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/dcom/
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/dcom/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/dcom/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/dcom/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/dcom/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/dcom/${MODPY_PYCACHE}comev.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/dcom/${MODPY_PYCACHE}comev.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/dcom/${MODPY_PYCACHE}oaut.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/dcom/${MODPY_PYCACHE}oaut.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/dcom/${MODPY_PYCACHE}scmp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/dcom/${MODPY_PYCACHE}scmp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/dcom/${MODPY_PYCACHE}vds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/dcom/${MODPY_PYCACHE}vds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/dcom/${MODPY_PYCACHE}wmi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/dcom/${MODPY_PYCACHE}wmi.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/dcom/comev.py
 lib/python${MODPY_VERSION}/site-packages/impacket/dcerpc/v5/dcom/oaut.py
@@ -154,39 +234,60 @@ lib/python${MODPY_VERSION}/site-packages/impacket/ese.py
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/impacket/examples/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/${MODPY_PYCACHE}ldap_shell.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/${MODPY_PYCACHE}ldap_shell.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/${MODPY_PYCACHE}os_ident.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/${MODPY_PYCACHE}os_ident.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/${MODPY_PYCACHE}remcomsvc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/${MODPY_PYCACHE}remcomsvc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/${MODPY_PYCACHE}rpcdatabase.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/${MODPY_PYCACHE}rpcdatabase.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/${MODPY_PYCACHE}secretsdump.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/${MODPY_PYCACHE}secretsdump.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/${MODPY_PYCACHE}serviceinstall.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/${MODPY_PYCACHE}serviceinstall.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/${MODPY_PYCACHE}smbclient.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/${MODPY_PYCACHE}smbclient.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ldap_shell.py
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/logger.py
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/${MODPY_PYCACHE}dcsyncattack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/${MODPY_PYCACHE}dcsyncattack.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/${MODPY_PYCACHE}httpattack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/${MODPY_PYCACHE}httpattack.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/${MODPY_PYCACHE}imapattack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/${MODPY_PYCACHE}imapattack.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/${MODPY_PYCACHE}ldapattack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/${MODPY_PYCACHE}ldapattack.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/${MODPY_PYCACHE}mssqlattack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/${MODPY_PYCACHE}mssqlattack.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/${MODPY_PYCACHE}rpcattack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/${MODPY_PYCACHE}rpcattack.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/${MODPY_PYCACHE}smbattack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/${MODPY_PYCACHE}smbattack.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/dcsyncattack.py
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/httpattack.py
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/httpattacks/
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/httpattacks/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/httpattacks/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/httpattacks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/httpattacks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/httpattacks/${MODPY_PYCACHE}adcsattack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/httpattacks/${MODPY_PYCACHE}adcsattack.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/httpattacks/adcsattack.py
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/imapattack.py
@@ -197,14 +298,23 @@ lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/attacks/sm
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/${MODPY_PYCACHE}dcsyncclient.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/${MODPY_PYCACHE}dcsyncclient.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/${MODPY_PYCACHE}httprelayclient.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/${MODPY_PYCACHE}httprelayclient.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/${MODPY_PYCACHE}imaprelayclient.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/${MODPY_PYCACHE}imaprelayclient.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/${MODPY_PYCACHE}ldaprelayclient.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/${MODPY_PYCACHE}ldaprelayclient.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/${MODPY_PYCACHE}mssqlrelayclient.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/${MODPY_PYCACHE}mssqlrelayclient.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/${MODPY_PYCACHE}rpcrelayclient.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/${MODPY_PYCACHE}rpcrelayclient.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/${MODPY_PYCACHE}smbrelayclient.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/${MODPY_PYCACHE}smbrelayclient.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/${MODPY_PYCACHE}smtprelayclient.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/${MODPY_PYCACHE}smtprelayclient.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/dcsyncclient.py
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/httprelayclient.py
@@ -217,23 +327,36 @@ lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/clients/sm
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/${MODPY_PYCACHE}httprelayserver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/${MODPY_PYCACHE}httprelayserver.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/${MODPY_PYCACHE}smbrelayserver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/${MODPY_PYCACHE}smbrelayserver.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/${MODPY_PYCACHE}socksserver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/${MODPY_PYCACHE}socksserver.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/${MODPY_PYCACHE}wcfrelayserver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/${MODPY_PYCACHE}wcfrelayserver.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/httprelayserver.py
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/smbrelayserver.py
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/socksplugins/
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/socksplugins/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/socksplugins/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/socksplugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/socksplugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/socksplugins/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/socksplugins/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/socksplugins/${MODPY_PYCACHE}https.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/socksplugins/${MODPY_PYCACHE}https.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/socksplugins/${MODPY_PYCACHE}imap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/socksplugins/${MODPY_PYCACHE}imap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/socksplugins/${MODPY_PYCACHE}imaps.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/socksplugins/${MODPY_PYCACHE}imaps.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/socksplugins/${MODPY_PYCACHE}mssql.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/socksplugins/${MODPY_PYCACHE}mssql.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/socksplugins/${MODPY_PYCACHE}smb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/socksplugins/${MODPY_PYCACHE}smb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/socksplugins/${MODPY_PYCACHE}smtp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/socksplugins/${MODPY_PYCACHE}smtp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/socksplugins/http.py
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/socksplugins/https.py
@@ -247,11 +370,17 @@ lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/servers/wc
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/utils/
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/utils/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/utils/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/utils/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/utils/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/utils/${MODPY_PYCACHE}enum.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/utils/${MODPY_PYCACHE}enum.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/utils/${MODPY_PYCACHE}ssl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/utils/${MODPY_PYCACHE}ssl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/utils/${MODPY_PYCACHE}targetsutils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/utils/${MODPY_PYCACHE}targetsutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/utils/${MODPY_PYCACHE}tcpshell.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/utils/${MODPY_PYCACHE}tcpshell.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/utils/config.py
 lib/python${MODPY_VERSION}/site-packages/impacket/examples/ntlmrelayx/utils/enum.py
@@ -271,15 +400,25 @@ lib/python${MODPY_VERSION}/site-packages/impacket/http.py
 lib/python${MODPY_VERSION}/site-packages/impacket/krb5/
 lib/python${MODPY_VERSION}/site-packages/impacket/krb5/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/impacket/krb5/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/impacket/krb5/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/krb5/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/krb5/${MODPY_PYCACHE}asn1.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/krb5/${MODPY_PYCACHE}asn1.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/krb5/${MODPY_PYCACHE}ccache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/krb5/${MODPY_PYCACHE}ccache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/krb5/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/krb5/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/krb5/${MODPY_PYCACHE}crypto.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/krb5/${MODPY_PYCACHE}crypto.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/krb5/${MODPY_PYCACHE}gssapi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/krb5/${MODPY_PYCACHE}gssapi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/krb5/${MODPY_PYCACHE}kerberosv5.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/krb5/${MODPY_PYCACHE}kerberosv5.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/krb5/${MODPY_PYCACHE}keytab.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/krb5/${MODPY_PYCACHE}keytab.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/krb5/${MODPY_PYCACHE}pac.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/krb5/${MODPY_PYCACHE}pac.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/krb5/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/krb5/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/impacket/krb5/asn1.py
 lib/python${MODPY_VERSION}/site-packages/impacket/krb5/ccache.py
@@ -293,9 +432,13 @@ lib/python${MODPY_VERSION}/site-packages/impacket/krb5/types.py
 lib/python${MODPY_VERSION}/site-packages/impacket/ldap/
 lib/python${MODPY_VERSION}/site-packages/impacket/ldap/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/impacket/ldap/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/impacket/ldap/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/ldap/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/ldap/${MODPY_PYCACHE}ldap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/ldap/${MODPY_PYCACHE}ldap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/ldap/${MODPY_PYCACHE}ldapasn1.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/ldap/${MODPY_PYCACHE}ldapasn1.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/impacket/ldap/${MODPY_PYCACHE}ldaptypes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/impacket/ldap/${MODPY_PYCACHE}ldaptypes.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/impacket/ldap/ldap.py
 lib/python${MODPY_VERSION}/site-packages/impacket/ldap/ldapasn1.py
diff --git a/net/py-irclib/Makefile b/net/py-irclib/Makefile
index 7e84eae46ad..016d7aab111 100644
--- a/net/py-irclib/Makefile
+++ b/net/py-irclib/Makefile
@@ -4,15 +4,15 @@ GH_ACCOUNT=	sixohsix
 GH_PROJECT=	python-irclib
 GH_COMMIT=	acd5aa66f431550bd142e90590b64ff6840e6648
 DISTNAME=	py-irclib-0.4.8.20110306
-REVISION=	2
+REVISION=	3
 
 CATEGORIES=	net
 
 # LGPLv2.1
 PERMIT_PACKAGE=	Yes
 
-MODULES=		lang/python
-MODPY_SETUPTOOLS=	Yes
+MODULES=	lang/python
+MODPY_PYBUILD=	setuptools
 
 FLAVORS=	python3
 FLAVOR=		python3
diff --git a/net/py-irclib/pkg/PLIST b/net/py-irclib/pkg/PLIST
index bdbddb8fcd2..8ab8831e580 100644
--- a/net/py-irclib/pkg/PLIST
+++ b/net/py-irclib/pkg/PLIST
@@ -1,14 +1,18 @@
 @conflict py-irclib-*
 @pkgpath net/py-irclib
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ircbot.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ircbot.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}irclib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}irclib.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ircbot.py
 lib/python${MODPY_VERSION}/site-packages/irclib.py
-lib/python${MODPY_VERSION}/site-packages/python_irclib-0.4.8-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/python_irclib-0.4.8-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/python_irclib-0.4.8-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/python_irclib-0.4.8-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/python_irclib-0.4.8-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/python_irclib-0.4.8.dist-info/
+lib/python${MODPY_VERSION}/site-packages/python_irclib-0.4.8.dist-info/COPYING
+lib/python${MODPY_VERSION}/site-packages/python_irclib-0.4.8.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/python_irclib-0.4.8.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/python_irclib-0.4.8.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/python_irclib-0.4.8.dist-info/top_level.txt
 share/examples/py-irclib/
 share/examples/py-irclib/dccreceive
 share/examples/py-irclib/dccsend
diff --git a/net/py-junos-eznc/Makefile b/net/py-junos-eznc/Makefile
index 3a565eab276..bc7393133fb 100644
--- a/net/py-junos-eznc/Makefile
+++ b/net/py-junos-eznc/Makefile
@@ -1,7 +1,7 @@
 COMMENT =		library for Junos automation
 
 MODPY_EGG_VERSION =	2.2.1
-REVISION =		4
+REVISION =		5
 DISTNAME =		junos-eznc-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 
@@ -15,7 +15,7 @@ FLAVORS =		python3
 FLAVOR =		python3
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 RUN_DEPENDS =		devel/py-serial${MODPY_FLAVOR} \
 			devel/py-six${MODPY_FLAVOR} \
diff --git a/net/py-junos-eznc/pkg/PLIST b/net/py-junos-eznc/pkg/PLIST
index 58cff23e4a1..2cbab0e18e4 100644
--- a/net/py-junos-eznc/pkg/PLIST
+++ b/net/py-junos-eznc/pkg/PLIST
@@ -3,28 +3,45 @@ lib/python${MODPY_VERSION}/site-packages/jnpr/
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jnpr/junos/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/${MODPY_PYCACHE}console.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/${MODPY_PYCACHE}console.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/${MODPY_PYCACHE}device.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/${MODPY_PYCACHE}device.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/${MODPY_PYCACHE}exception.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/${MODPY_PYCACHE}exception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/${MODPY_PYCACHE}factcache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/${MODPY_PYCACHE}factcache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/${MODPY_PYCACHE}jxml.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/${MODPY_PYCACHE}jxml.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/${MODPY_PYCACHE}rpcmeta.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/${MODPY_PYCACHE}rpcmeta.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/${MODPY_PYCACHE}resource.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/${MODPY_PYCACHE}resource.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/${MODPY_PYCACHE}user.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/${MODPY_PYCACHE}user.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/${MODPY_PYCACHE}user_ssh_key.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/${MODPY_PYCACHE}user_ssh_key.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/phyport/
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/phyport/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/phyport/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/phyport/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/phyport/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/phyport/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/phyport/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/phyport/${MODPY_PYCACHE}classic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/phyport/${MODPY_PYCACHE}classic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/phyport/${MODPY_PYCACHE}switch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/phyport/${MODPY_PYCACHE}switch.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/phyport/base.py
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/phyport/classic.py
@@ -35,6 +52,7 @@ lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfg/user_ssh_key.py
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfgro/
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfgro/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfgro/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfgro/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfgro/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/cfgro/srx.yml
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/console.py
@@ -45,14 +63,23 @@ lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factcache.py
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/${MODPY_PYCACHE}cfgtable.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/${MODPY_PYCACHE}cfgtable.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/${MODPY_PYCACHE}factory_cls.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/${MODPY_PYCACHE}factory_cls.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/${MODPY_PYCACHE}factory_loader.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/${MODPY_PYCACHE}factory_loader.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/${MODPY_PYCACHE}optable.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/${MODPY_PYCACHE}optable.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/${MODPY_PYCACHE}table.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/${MODPY_PYCACHE}table.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/${MODPY_PYCACHE}to_json.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/${MODPY_PYCACHE}to_json.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/${MODPY_PYCACHE}view.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/${MODPY_PYCACHE}view.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/${MODPY_PYCACHE}viewfields.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/${MODPY_PYCACHE}viewfields.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/cfgtable.py
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/factory/factory_cls.py
@@ -66,21 +93,37 @@ lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/__example.py
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}__example.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}__example.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}current_re.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}current_re.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}domain.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}domain.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}ethernet_mac_table.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}ethernet_mac_table.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}file_list.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}file_list.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}get_chassis_cluster_status.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}get_chassis_cluster_status.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}get_chassis_inventory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}get_chassis_inventory.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}get_route_engine_information.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}get_route_engine_information.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}get_software_information.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}get_software_information.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}get_virtual_chassis_information.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}get_virtual_chassis_information.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}ifd_style.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}ifd_style.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}iri_mapping.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}iri_mapping.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}is_linux.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}is_linux.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}personality.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}personality.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}swver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/${MODPY_PYCACHE}swver.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/current_re.py
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/facts/domain.py
@@ -100,15 +143,25 @@ lib/python${MODPY_VERSION}/site-packages/jnpr/junos/jxml.py
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/${MODPY_PYCACHE}chassis.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/${MODPY_PYCACHE}chassis.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/${MODPY_PYCACHE}domain.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/${MODPY_PYCACHE}domain.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/${MODPY_PYCACHE}ifd_style.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/${MODPY_PYCACHE}ifd_style.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/${MODPY_PYCACHE}personality.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/${MODPY_PYCACHE}personality.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/${MODPY_PYCACHE}routing_engines.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/${MODPY_PYCACHE}routing_engines.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/${MODPY_PYCACHE}session.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/${MODPY_PYCACHE}session.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/${MODPY_PYCACHE}srx_cluster.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/${MODPY_PYCACHE}srx_cluster.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/${MODPY_PYCACHE}switch_style.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/${MODPY_PYCACHE}switch_style.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/${MODPY_PYCACHE}swver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/${MODPY_PYCACHE}swver.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/chassis.py
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/domain.py
@@ -122,29 +175,53 @@ lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ofacts/swver.py
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}arp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}arp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}bfd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}bfd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}bgp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}bgp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}ccc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}ccc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}ethernetswitchingtable.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}ethernetswitchingtable.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}ethport.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}ethport.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}fpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}fpc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}idpattacks.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}idpattacks.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}intopticdiag.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}intopticdiag.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}inventory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}inventory.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}isis.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}isis.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}l2circuit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}l2circuit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}lacp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}lacp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}ldp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}ldp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}lldp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}lldp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}nd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}nd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}ospf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}ospf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}phyport.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}phyport.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}routes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}routes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}securityzone.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}securityzone.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}teddb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}teddb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}vlan.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}vlan.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}xcvr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/${MODPY_PYCACHE}xcvr.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/arp.py
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/arp.yml
@@ -195,12 +272,19 @@ lib/python${MODPY_VERSION}/site-packages/jnpr/junos/op/xcvr.yml
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/resources/
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/resources/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jnpr/junos/resources/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/resources/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/resources/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/resources/${MODPY_PYCACHE}autosys.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/resources/${MODPY_PYCACHE}autosys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/resources/${MODPY_PYCACHE}bgp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/resources/${MODPY_PYCACHE}bgp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/resources/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/resources/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/resources/${MODPY_PYCACHE}staticroutes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/resources/${MODPY_PYCACHE}staticroutes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/resources/${MODPY_PYCACHE}syslog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/resources/${MODPY_PYCACHE}syslog.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/resources/${MODPY_PYCACHE}user.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/resources/${MODPY_PYCACHE}user.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/resources/autosys.py
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/resources/autosys.yml
@@ -218,11 +302,17 @@ lib/python${MODPY_VERSION}/site-packages/jnpr/junos/rpcmeta.py
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/transport/
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/transport/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jnpr/junos/transport/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/transport/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/transport/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/transport/${MODPY_PYCACHE}tty.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/transport/${MODPY_PYCACHE}tty.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/transport/${MODPY_PYCACHE}tty_netconf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/transport/${MODPY_PYCACHE}tty_netconf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/transport/${MODPY_PYCACHE}tty_serial.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/transport/${MODPY_PYCACHE}tty_serial.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/transport/${MODPY_PYCACHE}tty_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/transport/${MODPY_PYCACHE}tty_ssh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/transport/${MODPY_PYCACHE}tty_telnet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/transport/${MODPY_PYCACHE}tty_telnet.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/transport/tty.py
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/transport/tty_netconf.py
@@ -232,13 +322,21 @@ lib/python${MODPY_VERSION}/site-packages/jnpr/junos/transport/tty_telnet.py
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/${MODPY_PYCACHE}fs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/${MODPY_PYCACHE}fs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/${MODPY_PYCACHE}ftp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/${MODPY_PYCACHE}ftp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/${MODPY_PYCACHE}scp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/${MODPY_PYCACHE}scp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/${MODPY_PYCACHE}start_shell.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/${MODPY_PYCACHE}start_shell.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/${MODPY_PYCACHE}sw.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/${MODPY_PYCACHE}sw.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/config.py
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/fs.py
@@ -249,17 +347,9 @@ lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/sw.py
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/util.py
 lib/python${MODPY_VERSION}/site-packages/jnpr/junos/version.py
 lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}-nspkg.pth
-lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/namespace_packages.txt
-lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/junos_eznc.egg-info/
-lib/python${MODPY_VERSION}/site-packages/junos_eznc.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/junos_eznc.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/junos_eznc.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/junos_eznc.egg-info/namespace_packages.txt
-lib/python${MODPY_VERSION}/site-packages/junos_eznc.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/junos_eznc.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}.dist-info/namespace_packages.txt
+lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}.dist-info/top_level.txt
diff --git a/net/py-libcloud/Makefile b/net/py-libcloud/Makefile
index d81f56a1300..8c5acbcae3b 100644
--- a/net/py-libcloud/Makefile
+++ b/net/py-libcloud/Makefile
@@ -3,7 +3,7 @@ COMMENT=		unified interface for interacting with cloud services
 MODPY_EGG_VERSION=	3.6.1
 DISTNAME=		apache-libcloud-${MODPY_EGG_VERSION}
 PKGNAME=		py-libcloud-${MODPY_EGG_VERSION}
-REVISION=		0
+REVISION=		1
 
 CATEGORIES=		net
 
@@ -18,8 +18,7 @@ MASTER_SITES=		${MASTER_SITE_APACHE:=libcloud/}
 
 MODULES=		lang/python
 
-MODPY_SETUPTOOLS=	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD=		setuptools
 
 FLAVORS=		python3
 FLAVOR=			python3
diff --git a/net/py-libcloud/pkg/PLIST b/net/py-libcloud/pkg/PLIST
index 07da142b2b4..afcbdb7e1f2 100644
--- a/net/py-libcloud/pkg/PLIST
+++ b/net/py-libcloud/pkg/PLIST
@@ -1,35 +1,49 @@
 @conflict py-libcloud-*
 @pkgpath net/py-libcloud,python3
-lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_EGG_VERSION}.dist-info/NOTICE
+lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/libcloud/
 lib/python${MODPY_VERSION}/site-packages/libcloud/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libcloud/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/libcloud/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/${MODPY_PYCACHE}pricing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/${MODPY_PYCACHE}pricing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/${MODPY_PYCACHE}security.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/${MODPY_PYCACHE}security.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/libcloud/backup/
 lib/python${MODPY_VERSION}/site-packages/libcloud/backup/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libcloud/backup/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/libcloud/backup/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/backup/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/backup/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/backup/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/backup/${MODPY_PYCACHE}providers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/backup/${MODPY_PYCACHE}providers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/backup/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/backup/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/libcloud/backup/base.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/backup/drivers/
 lib/python${MODPY_VERSION}/site-packages/libcloud/backup/drivers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libcloud/backup/drivers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/libcloud/backup/drivers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/backup/drivers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/backup/drivers/${MODPY_PYCACHE}dimensiondata.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/backup/drivers/${MODPY_PYCACHE}dimensiondata.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/backup/drivers/${MODPY_PYCACHE}dummy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/backup/drivers/${MODPY_PYCACHE}dummy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/backup/drivers/${MODPY_PYCACHE}ebs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/backup/drivers/${MODPY_PYCACHE}ebs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/backup/drivers/${MODPY_PYCACHE}gce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/backup/drivers/${MODPY_PYCACHE}gce.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/libcloud/backup/drivers/dimensiondata.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/backup/drivers/dummy.py
@@ -41,52 +55,99 @@ lib/python${MODPY_VERSION}/site-packages/libcloud/base.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}abiquo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}abiquo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}aliyun.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}aliyun.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}aws.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}aws.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}azure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}azure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}azure_arm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}azure_arm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}brightbox.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}brightbox.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}buddyns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}buddyns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}cloudsigma.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}cloudsigma.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}cloudstack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}cloudstack.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}digitalocean.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}digitalocean.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}dimensiondata.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}dimensiondata.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}dnsimple.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}dnsimple.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}dnspod.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}dnspod.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}durabledns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}durabledns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}gandi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}gandi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}gandi_live.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}gandi_live.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}gig_g8.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}gig_g8.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}gogrid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}gogrid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}google.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}google.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}gridscale.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}gridscale.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}hostvirtual.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}hostvirtual.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}kubernetes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}kubernetes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}linode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}linode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}liquidweb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}liquidweb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}luadns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}luadns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}maxihost.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}maxihost.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}nfsn.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}nfsn.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}nsone.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}nsone.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}nttcis.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}nttcis.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}onapp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}onapp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}openstack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}openstack.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}openstack_identity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}openstack_identity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}osc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}osc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}ovh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}ovh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}pointdns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}pointdns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}providers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}providers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}rackspace.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}rackspace.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}softlayer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}softlayer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}upcloud.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}upcloud.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}vultr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}vultr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}worldwidedns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}worldwidedns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}xmlrpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}xmlrpc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}zonomi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/${MODPY_PYCACHE}zonomi.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/abiquo.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/common/aliyun.py
@@ -137,20 +198,31 @@ lib/python${MODPY_VERSION}/site-packages/libcloud/common/zonomi.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libcloud/compute/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/${MODPY_PYCACHE}deployment.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/${MODPY_PYCACHE}deployment.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/${MODPY_PYCACHE}deprecated.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/${MODPY_PYCACHE}deprecated.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/${MODPY_PYCACHE}providers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/${MODPY_PYCACHE}providers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/${MODPY_PYCACHE}ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/${MODPY_PYCACHE}ssh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/base.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/constants/
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/constants/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libcloud/compute/constants/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/constants/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/constants/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/constants/${MODPY_PYCACHE}ec2_instance_types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/constants/${MODPY_PYCACHE}ec2_instance_types.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/constants/${MODPY_PYCACHE}ec2_region_details_complete.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/constants/${MODPY_PYCACHE}ec2_region_details_complete.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/constants/${MODPY_PYCACHE}ec2_region_details_partial.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/constants/${MODPY_PYCACHE}ec2_region_details_partial.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/constants/ec2_instance_types.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/constants/ec2_region_details_complete.py
@@ -160,69 +232,133 @@ lib/python${MODPY_VERSION}/site-packages/libcloud/compute/deprecated.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}abiquo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}abiquo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}auroracompute.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}auroracompute.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}azure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}azure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}azure_arm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}azure_arm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}bluebox.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}bluebox.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}brightbox.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}brightbox.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}bsnl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}bsnl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}cloudscale.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}cloudscale.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}cloudsigma.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}cloudsigma.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}cloudstack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}cloudstack.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}cloudwatt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}cloudwatt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}digitalocean.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}digitalocean.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}dimensiondata.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}dimensiondata.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}dummy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}dummy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}ec2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}ec2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}ecp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}ecp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}ecs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}ecs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}elastichosts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}elastichosts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}elasticstack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}elasticstack.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}equinixmetal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}equinixmetal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}exoscale.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}exoscale.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}gandi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}gandi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}gce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}gce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}gig_g8.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}gig_g8.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}gogrid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}gogrid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}gridscale.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}gridscale.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}gridspot.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}gridspot.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}hostvirtual.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}hostvirtual.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}ikoula.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}ikoula.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}indosat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}indosat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}internetsolutions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}internetsolutions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}joyent.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}joyent.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}kamatera.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}kamatera.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}kili.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}kili.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}ktucloud.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}ktucloud.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}kubevirt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}kubevirt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}libvirt_driver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}libvirt_driver.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}linode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}linode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}maxihost.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}maxihost.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}medone.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}medone.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}nephoscale.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}nephoscale.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}ntta.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}ntta.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}nttcis.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}nttcis.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}onapp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}onapp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}oneandone.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}oneandone.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}opennebula.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}opennebula.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}openstack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}openstack.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}outscale.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}outscale.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}ovh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}ovh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}profitbricks.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}profitbricks.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}rackspace.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}rackspace.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}rimuhosting.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}rimuhosting.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}scaleway.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}scaleway.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}serverlove.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}serverlove.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}skalicloud.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}skalicloud.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}softlayer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}softlayer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}upcloud.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}upcloud.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}vcl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}vcl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}vcloud.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}vcloud.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}voxel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}voxel.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}vpsnet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}vpsnet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}vsphere.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}vsphere.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}vultr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/${MODPY_PYCACHE}vultr.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/abiquo.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/compute/drivers/auroracompute.py
@@ -293,22 +429,35 @@ lib/python${MODPY_VERSION}/site-packages/libcloud/compute/types.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libcloud/container/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/libcloud/container/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/container/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/container/${MODPY_PYCACHE}providers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/${MODPY_PYCACHE}providers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/container/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/base.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/${MODPY_PYCACHE}docker.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/${MODPY_PYCACHE}docker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/${MODPY_PYCACHE}dummy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/${MODPY_PYCACHE}dummy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/${MODPY_PYCACHE}ecs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/${MODPY_PYCACHE}ecs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/${MODPY_PYCACHE}gke.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/${MODPY_PYCACHE}gke.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/${MODPY_PYCACHE}joyent.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/${MODPY_PYCACHE}joyent.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/${MODPY_PYCACHE}kubernetes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/${MODPY_PYCACHE}kubernetes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/${MODPY_PYCACHE}lxd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/${MODPY_PYCACHE}lxd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/${MODPY_PYCACHE}rancher.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/${MODPY_PYCACHE}rancher.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/docker.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/drivers/dummy.py
@@ -323,7 +472,9 @@ lib/python${MODPY_VERSION}/site-packages/libcloud/container/types.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/utils/
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/utils/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libcloud/container/utils/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/libcloud/container/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/container/utils/${MODPY_PYCACHE}docker.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/utils/${MODPY_PYCACHE}docker.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/libcloud/container/utils/docker.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/data/
@@ -333,43 +484,77 @@ lib/python${MODPY_VERSION}/site-packages/libcloud/data/pricing.json.sha512
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libcloud/dns/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/${MODPY_PYCACHE}providers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/${MODPY_PYCACHE}providers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/base.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}auroradns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}auroradns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}buddyns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}buddyns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}cloudflare.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}cloudflare.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}digitalocean.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}digitalocean.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}dnsimple.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}dnsimple.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}dnspod.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}dnspod.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}dummy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}dummy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}durabledns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}durabledns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}gandi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}gandi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}gandi_live.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}gandi_live.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}godaddy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}godaddy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}google.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}google.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}hostvirtual.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}hostvirtual.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}linode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}linode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}liquidweb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}liquidweb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}luadns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}luadns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}nfsn.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}nfsn.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}nsone.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}nsone.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}onapp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}onapp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}pointdns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}pointdns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}powerdns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}powerdns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}rackspace.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}rackspace.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}rcodezero.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}rcodezero.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}route53.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}route53.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}softlayer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}softlayer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}vultr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}vultr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}worldwidedns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}worldwidedns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}zerigo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}zerigo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}zonomi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/${MODPY_PYCACHE}zonomi.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/auroradns.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/dns/drivers/buddyns.py
@@ -406,26 +591,43 @@ lib/python${MODPY_VERSION}/site-packages/libcloud/http.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/${MODPY_PYCACHE}providers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/${MODPY_PYCACHE}providers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/base.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}alb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}alb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}brightbox.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}brightbox.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}cloudstack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}cloudstack.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}dimensiondata.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}dimensiondata.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}elb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}elb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}gce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}gce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}gogrid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}gogrid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}ninefold.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}ninefold.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}nttcis.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}nttcis.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}rackspace.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}rackspace.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}slb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}slb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}softlayer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/${MODPY_PYCACHE}softlayer.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/alb.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/loadbalancer/drivers/brightbox.py
@@ -447,32 +649,55 @@ lib/python${MODPY_VERSION}/site-packages/libcloud/security.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libcloud/storage/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/${MODPY_PYCACHE}providers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/${MODPY_PYCACHE}providers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/base.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}atmos.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}atmos.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}auroraobjects.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}auroraobjects.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}azure_blobs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}azure_blobs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}backblaze_b2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}backblaze_b2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}cloudfiles.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}cloudfiles.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}digitalocean_spaces.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}digitalocean_spaces.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}dummy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}dummy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}google_storage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}google_storage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}ktucloud.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}ktucloud.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}local.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}local.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}minio.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}minio.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}nimbus.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}nimbus.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}ninefold.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}ninefold.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}oss.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}oss.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}ovh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}ovh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}rgw.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}rgw.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}s3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}s3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}scaleway.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/${MODPY_PYCACHE}scaleway.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/atmos.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/storage/drivers/auroraobjects.py
@@ -497,20 +722,35 @@ lib/python${MODPY_VERSION}/site-packages/libcloud/storage/types.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/utils/
 lib/python${MODPY_VERSION}/site-packages/libcloud/utils/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}dist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}dist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}escape.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}escape.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}files.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}files.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}iso8601.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}iso8601.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}logging.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}logging.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}loggingconnection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}loggingconnection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}networking.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}networking.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}publickey.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}publickey.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}py3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}py3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}retry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}retry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}xml.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libcloud/utils/${MODPY_PYCACHE}xml.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/libcloud/utils/connection.py
 lib/python${MODPY_VERSION}/site-packages/libcloud/utils/decorators.py
diff --git a/net/py-libknot/Makefile b/net/py-libknot/Makefile
index 8accf03a077..e8523b2e10f 100644
--- a/net/py-libknot/Makefile
+++ b/net/py-libknot/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	3.2.2
 
 DISTNAME =	libknot-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	net
 
@@ -17,7 +17,7 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/net/py-libknot/pkg/PLIST b/net/py-libknot/pkg/PLIST
index 2ebb3e6b003..d6b4e923d27 100644
--- a/net/py-libknot/pkg/PLIST
+++ b/net/py-libknot/pkg/PLIST
@@ -1,13 +1,16 @@
 lib/python${MODPY_VERSION}/site-packages/libknot/
-lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/libknot/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libknot/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/libknot/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libknot/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libknot/${MODPY_PYCACHE}control.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libknot/${MODPY_PYCACHE}control.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libknot/${MODPY_PYCACHE}probe.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libknot/${MODPY_PYCACHE}probe.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/libknot/control.py
 lib/python${MODPY_VERSION}/site-packages/libknot/probe.py
diff --git a/net/py-minimalmodbus/Makefile b/net/py-minimalmodbus/Makefile
index 29f5c349c17..8c008a888cb 100644
--- a/net/py-minimalmodbus/Makefile
+++ b/net/py-minimalmodbus/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION=	2.0.1
 DISTNAME=		minimalmodbus-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
 CATEGORIES=		net
-REVISION=		1
+REVISION=		2
 
 HOMEPAGE=		https://github.com/pyhys/minimalmodbus
 
@@ -13,14 +13,14 @@ MAINTAINER=		Martin Reindl <martin@catai.org>
 # Apache License, Version 2.0
 PERMIT_PACKAGE=		Yes
 
-MODPY_SETUPTOOLS=	Yes
+MODPY_PYBUILD=		setuptools
 MODPY_PI=		Yes
 MODPY_PYTEST=		Yes
 
 MODULES=		lang/python
 
 FLAVORS=		python3
-FLAVOR =		python3
+FLAVOR=			python3
 
 RUN_DEPENDS=		devel/py-serial${MODPY_FLAVOR}
 
diff --git a/net/py-minimalmodbus/pkg/PLIST b/net/py-minimalmodbus/pkg/PLIST
index 83721477d4a..93e22e5bb1c 100644
--- a/net/py-minimalmodbus/pkg/PLIST
+++ b/net/py-minimalmodbus/pkg/PLIST
@@ -1,11 +1,13 @@
 @conflict py-minimalmodbus-*
 @pkgpath net/py-minimalmodbus
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}minimalmodbus.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}minimalmodbus.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_EGG_VERSION}.dist-info/AUTHORS.rst
+lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/minimalmodbus.py
diff --git a/net/py-ncclient/Makefile b/net/py-ncclient/Makefile
index 9c8ceb8ca90..32d4e59ca73 100644
--- a/net/py-ncclient/Makefile
+++ b/net/py-ncclient/Makefile
@@ -3,7 +3,7 @@ COMMENT =		Python library for NETCONF clients
 MODPY_EGG_VERSION =	0.6.12
 DISTNAME =		ncclient-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		net
 
@@ -17,7 +17,7 @@ FLAVORS =		python3
 FLAVOR =		python3
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 NO_TEST =		Yes
 
 RUN_DEPENDS =		security/py-paramiko${MODPY_FLAVOR} \
diff --git a/net/py-ncclient/pkg/PLIST b/net/py-ncclient/pkg/PLIST
index 9c4fdbb7159..741ae2058ff 100644
--- a/net/py-ncclient/pkg/PLIST
+++ b/net/py-ncclient/pkg/PLIST
@@ -1,19 +1,26 @@
 @pkgpath net/py-ncclient
 lib/python${MODPY_VERSION}/site-packages/ncclient/
-lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/ncclient/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ncclient/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ncclient/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/${MODPY_PYCACHE}capabilities.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/${MODPY_PYCACHE}capabilities.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/${MODPY_PYCACHE}debug.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/${MODPY_PYCACHE}debug.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/${MODPY_PYCACHE}logging_.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/${MODPY_PYCACHE}logging_.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/${MODPY_PYCACHE}xml_.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/${MODPY_PYCACHE}xml_.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ncclient/_version.py
 lib/python${MODPY_VERSION}/site-packages/ncclient/capabilities.py
@@ -21,19 +28,33 @@ lib/python${MODPY_VERSION}/site-packages/ncclient/debug.py
 lib/python${MODPY_VERSION}/site-packages/ncclient/devices/
 lib/python${MODPY_VERSION}/site-packages/ncclient/devices/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}alu.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}alu.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}csr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}csr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}default.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}default.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}ericsson.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}ericsson.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}h3c.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}h3c.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}hpcomware.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}hpcomware.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}huawei.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}huawei.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}huaweiyang.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}huaweiyang.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}iosxe.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}iosxe.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}iosxr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}iosxr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}junos.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}junos.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}nexus.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}nexus.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}sros.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/devices/${MODPY_PYCACHE}sros.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ncclient/devices/alu.py
 lib/python${MODPY_VERSION}/site-packages/ncclient/devices/csr.py
@@ -53,15 +74,25 @@ lib/python${MODPY_VERSION}/site-packages/ncclient/manager.py
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ncclient/operations/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/${MODPY_PYCACHE}edit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/${MODPY_PYCACHE}edit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/${MODPY_PYCACHE}flowmon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/${MODPY_PYCACHE}flowmon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/${MODPY_PYCACHE}lock.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/${MODPY_PYCACHE}lock.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/${MODPY_PYCACHE}retrieve.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/${MODPY_PYCACHE}retrieve.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/${MODPY_PYCACHE}session.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/${MODPY_PYCACHE}session.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/${MODPY_PYCACHE}subscribe.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/${MODPY_PYCACHE}subscribe.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/edit.py
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/errors.py
@@ -74,64 +105,87 @@ lib/python${MODPY_VERSION}/site-packages/ncclient/operations/subscribe.py
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/alu/
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/alu/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/alu/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/alu/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/alu/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/alu/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/alu/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/alu/rpc.py
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/h3c/
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/h3c/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/h3c/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/h3c/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/h3c/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/h3c/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/h3c/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/h3c/rpc.py
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/hpcomware/
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/hpcomware/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/hpcomware/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/hpcomware/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/hpcomware/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/hpcomware/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/hpcomware/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/hpcomware/rpc.py
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/huawei/
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/huawei/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/huawei/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/huawei/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/huawei/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/huawei/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/huawei/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/huawei/rpc.py
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/iosxe/
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/iosxe/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/iosxe/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/iosxe/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/iosxe/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/iosxe/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/iosxe/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/iosxe/rpc.py
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/juniper/
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/juniper/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/juniper/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/juniper/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/juniper/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/juniper/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/juniper/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/juniper/rpc.py
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/nexus/
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/nexus/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/nexus/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/nexus/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/nexus/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/nexus/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/nexus/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/nexus/rpc.py
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/sros/
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/sros/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/sros/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/sros/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/sros/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/sros/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/sros/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/third_party/sros/rpc.py
 lib/python${MODPY_VERSION}/site-packages/ncclient/operations/util.py
 lib/python${MODPY_VERSION}/site-packages/ncclient/transport/
 lib/python${MODPY_VERSION}/site-packages/ncclient/transport/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ncclient/transport/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ncclient/transport/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/transport/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/transport/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/transport/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/transport/${MODPY_PYCACHE}notify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/transport/${MODPY_PYCACHE}notify.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/transport/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/transport/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/transport/${MODPY_PYCACHE}session.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/transport/${MODPY_PYCACHE}session.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/transport/${MODPY_PYCACHE}ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/transport/${MODPY_PYCACHE}ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ncclient/transport/errors.py
 lib/python${MODPY_VERSION}/site-packages/ncclient/transport/notify.py
@@ -141,12 +195,16 @@ lib/python${MODPY_VERSION}/site-packages/ncclient/transport/ssh.py
 lib/python${MODPY_VERSION}/site-packages/ncclient/transport/third_party/
 lib/python${MODPY_VERSION}/site-packages/ncclient/transport/third_party/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ncclient/transport/third_party/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ncclient/transport/third_party/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/transport/third_party/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ncclient/transport/third_party/junos/
 lib/python${MODPY_VERSION}/site-packages/ncclient/transport/third_party/junos/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ncclient/transport/third_party/junos/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ncclient/transport/third_party/junos/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/transport/third_party/junos/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/transport/third_party/junos/${MODPY_PYCACHE}ioproc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/transport/third_party/junos/${MODPY_PYCACHE}ioproc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ncclient/transport/third_party/junos/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ncclient/transport/third_party/junos/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ncclient/transport/third_party/junos/ioproc.py
 lib/python${MODPY_VERSION}/site-packages/ncclient/transport/third_party/junos/parser.py
diff --git a/net/py-netaddr/Makefile b/net/py-netaddr/Makefile
index 3cffb8100be..453bf595111 100644
--- a/net/py-netaddr/Makefile
+++ b/net/py-netaddr/Makefile
@@ -3,7 +3,7 @@ COMMENT =		network address representation and manipulation library
 MODPY_EGG_VERSION =	0.8.0
 DISTNAME =		netaddr-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		net
 
@@ -14,8 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools
 
 FLAVOR =		python3
 FLAVORS =		python3
diff --git a/net/py-netaddr/pkg/PLIST b/net/py-netaddr/pkg/PLIST
index 3998eeda071..0fe17c3eb84 100644
--- a/net/py-netaddr/pkg/PLIST
+++ b/net/py-netaddr/pkg/PLIST
@@ -2,33 +2,43 @@
 @pkgpath net/py-netaddr
 bin/netaddr
 lib/python${MODPY_VERSION}/site-packages/netaddr/
-lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}.dist-info/AUTHORS
+lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/netaddr/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netaddr/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netaddr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netaddr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netaddr/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netaddr/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netaddr/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netaddr/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netaddr/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netaddr/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netaddr/${MODPY_PYCACHE}fbsocket.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netaddr/${MODPY_PYCACHE}fbsocket.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netaddr/cli.py
 lib/python${MODPY_VERSION}/site-packages/netaddr/compat.py
 lib/python${MODPY_VERSION}/site-packages/netaddr/contrib/
 lib/python${MODPY_VERSION}/site-packages/netaddr/contrib/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netaddr/contrib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netaddr/contrib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netaddr/contrib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netaddr/contrib/${MODPY_PYCACHE}subnet_splitter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netaddr/contrib/${MODPY_PYCACHE}subnet_splitter.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netaddr/contrib/subnet_splitter.py
 lib/python${MODPY_VERSION}/site-packages/netaddr/core.py
 lib/python${MODPY_VERSION}/site-packages/netaddr/eui/
 lib/python${MODPY_VERSION}/site-packages/netaddr/eui/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netaddr/eui/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netaddr/eui/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netaddr/eui/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netaddr/eui/${MODPY_PYCACHE}ieee.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netaddr/eui/${MODPY_PYCACHE}ieee.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netaddr/eui/iab.idx
 lib/python${MODPY_VERSION}/site-packages/netaddr/eui/iab.txt
@@ -39,11 +49,17 @@ lib/python${MODPY_VERSION}/site-packages/netaddr/fbsocket.py
 lib/python${MODPY_VERSION}/site-packages/netaddr/ip/
 lib/python${MODPY_VERSION}/site-packages/netaddr/ip/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netaddr/ip/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netaddr/ip/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netaddr/ip/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netaddr/ip/${MODPY_PYCACHE}glob.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netaddr/ip/${MODPY_PYCACHE}glob.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netaddr/ip/${MODPY_PYCACHE}iana.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netaddr/ip/${MODPY_PYCACHE}iana.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netaddr/ip/${MODPY_PYCACHE}nmap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netaddr/ip/${MODPY_PYCACHE}nmap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netaddr/ip/${MODPY_PYCACHE}rfc1924.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netaddr/ip/${MODPY_PYCACHE}rfc1924.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netaddr/ip/${MODPY_PYCACHE}sets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netaddr/ip/${MODPY_PYCACHE}sets.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netaddr/ip/glob.py
 lib/python${MODPY_VERSION}/site-packages/netaddr/ip/iana.py
@@ -57,10 +73,15 @@ lib/python${MODPY_VERSION}/site-packages/netaddr/ip/sets.py
 lib/python${MODPY_VERSION}/site-packages/netaddr/strategy/
 lib/python${MODPY_VERSION}/site-packages/netaddr/strategy/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netaddr/strategy/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netaddr/strategy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netaddr/strategy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netaddr/strategy/${MODPY_PYCACHE}eui48.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netaddr/strategy/${MODPY_PYCACHE}eui48.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netaddr/strategy/${MODPY_PYCACHE}eui64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netaddr/strategy/${MODPY_PYCACHE}eui64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netaddr/strategy/${MODPY_PYCACHE}ipv4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netaddr/strategy/${MODPY_PYCACHE}ipv4.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netaddr/strategy/${MODPY_PYCACHE}ipv6.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netaddr/strategy/${MODPY_PYCACHE}ipv6.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netaddr/strategy/eui48.py
 lib/python${MODPY_VERSION}/site-packages/netaddr/strategy/eui64.py
diff --git a/net/py-netifaces/Makefile b/net/py-netifaces/Makefile
index 502184617db..a01f5cbc538 100644
--- a/net/py-netifaces/Makefile
+++ b/net/py-netifaces/Makefile
@@ -5,7 +5,7 @@ CATEGORIES =	net
 MODPY_EGG_VERSION = 0.11.0
 DISTNAME =	netifaces-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	0
+REVISION =	1
 
 # MIT
 PERMIT_PACKAGE =	Yes
@@ -17,8 +17,8 @@ MODULES =	lang/python
 FLAVORS =	python3
 FLAVOR =	python3
 
-MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PI =	Yes
+MODPY_PYBUILD =	setuptools
 
 do-test:
 	 PYTHONPATH=${WRKSRC}/lib.openbsd-${OSREV}-${ARCH}-${MODPY_VERSION} \
diff --git a/net/py-netifaces/pkg/PLIST b/net/py-netifaces/pkg/PLIST
index 908fa81118b..9a01b782c42 100644
--- a/net/py-netifaces/pkg/PLIST
+++ b/net/py-netifaces/pkg/PLIST
@@ -1,8 +1,9 @@
 @pkgpath net/py-netifaces
-lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
+lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}.dist-info/zip-safe
 @so lib/python${MODPY_VERSION}/site-packages/netifaces.${MODPY_PYC_MAGIC_TAG}so
diff --git a/net/py-netmiko/Makefile b/net/py-netmiko/Makefile
index 2d94272d180..ad766024c36 100644
--- a/net/py-netmiko/Makefile
+++ b/net/py-netmiko/Makefile
@@ -3,7 +3,7 @@ COMMENT =		simplify Paramiko connections to network devices
 MODPY_EGG_VERSION =	3.1.1
 DISTNAME=		netmiko-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		net
 
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/net/py-netmiko/pkg/PLIST b/net/py-netmiko/pkg/PLIST
index 2d2bb2a2bfe..b1669428980 100644
--- a/net/py-netmiko/pkg/PLIST
+++ b/net/py-netmiko/pkg/PLIST
@@ -1,31 +1,46 @@
 @conflict py-netmiko-*
 @pkgpath net/py-netmiko
 lib/python${MODPY_VERSION}/site-packages/netmiko/
-lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/netmiko/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}base_connection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}base_connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}cisco_base_connection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}cisco_base_connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}netmiko_globals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}netmiko_globals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}scp_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}scp_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}scp_handler.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}scp_handler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}snmp_autodetect.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}snmp_autodetect.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}ssh_autodetect.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}ssh_autodetect.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}ssh_dispatcher.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}ssh_dispatcher.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}ssh_exception.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}ssh_exception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}utilities.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}utilities.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/_textfsm/
 lib/python${MODPY_VERSION}/site-packages/netmiko/_textfsm/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/_textfsm/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/_textfsm/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/_textfsm/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/_textfsm/${MODPY_PYCACHE}_clitable.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/_textfsm/${MODPY_PYCACHE}_clitable.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/_textfsm/${MODPY_PYCACHE}_terminal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/_textfsm/${MODPY_PYCACHE}_terminal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/_textfsm/${MODPY_PYCACHE}_texttable.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/_textfsm/${MODPY_PYCACHE}_texttable.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/_textfsm/_clitable.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/_textfsm/_terminal.py
@@ -33,68 +48,94 @@ lib/python${MODPY_VERSION}/site-packages/netmiko/_textfsm/_texttable.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/a10/
 lib/python${MODPY_VERSION}/site-packages/netmiko/a10/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/a10/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/a10/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/a10/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/a10/${MODPY_PYCACHE}a10_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/a10/${MODPY_PYCACHE}a10_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/a10/a10_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/accedian/
 lib/python${MODPY_VERSION}/site-packages/netmiko/accedian/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/accedian/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/accedian/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/accedian/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/accedian/${MODPY_PYCACHE}accedian_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/accedian/${MODPY_PYCACHE}accedian_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/accedian/accedian_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/alcatel/
 lib/python${MODPY_VERSION}/site-packages/netmiko/alcatel/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/alcatel/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/alcatel/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/alcatel/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/alcatel/${MODPY_PYCACHE}alcatel_aos_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/alcatel/${MODPY_PYCACHE}alcatel_aos_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/alcatel/alcatel_aos_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/apresia/
 lib/python${MODPY_VERSION}/site-packages/netmiko/apresia/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/apresia/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/apresia/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/apresia/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/apresia/${MODPY_PYCACHE}apresia_aeos.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/apresia/${MODPY_PYCACHE}apresia_aeos.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/apresia/apresia_aeos.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/arista/
 lib/python${MODPY_VERSION}/site-packages/netmiko/arista/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/arista/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/arista/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/arista/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/arista/${MODPY_PYCACHE}arista.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/arista/${MODPY_PYCACHE}arista.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/arista/arista.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/aruba/
 lib/python${MODPY_VERSION}/site-packages/netmiko/aruba/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/aruba/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/aruba/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/aruba/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/aruba/${MODPY_PYCACHE}aruba_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/aruba/${MODPY_PYCACHE}aruba_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/aruba/aruba_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/base_connection.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/calix/
 lib/python${MODPY_VERSION}/site-packages/netmiko/calix/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/calix/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/calix/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/calix/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/calix/${MODPY_PYCACHE}calix_b6.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/calix/${MODPY_PYCACHE}calix_b6.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/calix/calix_b6.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/checkpoint/
 lib/python${MODPY_VERSION}/site-packages/netmiko/checkpoint/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/checkpoint/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/checkpoint/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/checkpoint/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/checkpoint/${MODPY_PYCACHE}checkpoint_gaia_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/checkpoint/${MODPY_PYCACHE}checkpoint_gaia_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/checkpoint/checkpoint_gaia_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/ciena/
 lib/python${MODPY_VERSION}/site-packages/netmiko/ciena/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/ciena/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/ciena/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/ciena/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/ciena/${MODPY_PYCACHE}ciena_saos.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/ciena/${MODPY_PYCACHE}ciena_saos.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/ciena/ciena_saos.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/cisco/
 lib/python${MODPY_VERSION}/site-packages/netmiko/cisco/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/cisco/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/cisco/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/cisco/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/cisco/${MODPY_PYCACHE}cisco_asa_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/cisco/${MODPY_PYCACHE}cisco_asa_ssh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/cisco/${MODPY_PYCACHE}cisco_ios.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/cisco/${MODPY_PYCACHE}cisco_ios.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/cisco/${MODPY_PYCACHE}cisco_nxos_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/cisco/${MODPY_PYCACHE}cisco_nxos_ssh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/cisco/${MODPY_PYCACHE}cisco_s300.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/cisco/${MODPY_PYCACHE}cisco_s300.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/cisco/${MODPY_PYCACHE}cisco_tp_tcce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/cisco/${MODPY_PYCACHE}cisco_tp_tcce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/cisco/${MODPY_PYCACHE}cisco_wlc_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/cisco/${MODPY_PYCACHE}cisco_wlc_ssh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/cisco/${MODPY_PYCACHE}cisco_xr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/cisco/${MODPY_PYCACHE}cisco_xr.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/cisco/cisco_asa_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/cisco/cisco_ios.py
@@ -107,29 +148,41 @@ lib/python${MODPY_VERSION}/site-packages/netmiko/cisco_base_connection.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/citrix/
 lib/python${MODPY_VERSION}/site-packages/netmiko/citrix/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/citrix/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/citrix/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/citrix/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/citrix/${MODPY_PYCACHE}netscaler_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/citrix/${MODPY_PYCACHE}netscaler_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/citrix/netscaler_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/cloudgenix/
 lib/python${MODPY_VERSION}/site-packages/netmiko/cloudgenix/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/cloudgenix/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/cloudgenix/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/cloudgenix/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/cloudgenix/${MODPY_PYCACHE}cloudgenix_ion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/cloudgenix/${MODPY_PYCACHE}cloudgenix_ion.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/cloudgenix/cloudgenix_ion.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/coriant/
 lib/python${MODPY_VERSION}/site-packages/netmiko/coriant/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/coriant/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/coriant/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/coriant/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/coriant/${MODPY_PYCACHE}coriant_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/coriant/${MODPY_PYCACHE}coriant_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/coriant/coriant_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/dell/
 lib/python${MODPY_VERSION}/site-packages/netmiko/dell/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/dell/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/dell/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/dell/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/dell/${MODPY_PYCACHE}dell_dnos6.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/dell/${MODPY_PYCACHE}dell_dnos6.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/dell/${MODPY_PYCACHE}dell_force10_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/dell/${MODPY_PYCACHE}dell_force10_ssh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/dell/${MODPY_PYCACHE}dell_isilon_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/dell/${MODPY_PYCACHE}dell_isilon_ssh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/dell/${MODPY_PYCACHE}dell_os10_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/dell/${MODPY_PYCACHE}dell_os10_ssh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/dell/${MODPY_PYCACHE}dell_powerconnect.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/dell/${MODPY_PYCACHE}dell_powerconnect.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/dell/dell_dnos6.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/dell/dell_force10_ssh.py
@@ -139,39 +192,56 @@ lib/python${MODPY_VERSION}/site-packages/netmiko/dell/dell_powerconnect.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/dlink/
 lib/python${MODPY_VERSION}/site-packages/netmiko/dlink/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/dlink/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/dlink/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/dlink/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/dlink/${MODPY_PYCACHE}dlink_ds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/dlink/${MODPY_PYCACHE}dlink_ds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/dlink/dlink_ds.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/eltex/
 lib/python${MODPY_VERSION}/site-packages/netmiko/eltex/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/eltex/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/eltex/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/eltex/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/eltex/${MODPY_PYCACHE}eltex_esr_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/eltex/${MODPY_PYCACHE}eltex_esr_ssh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/eltex/${MODPY_PYCACHE}eltex_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/eltex/${MODPY_PYCACHE}eltex_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/eltex/eltex_esr_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/eltex/eltex_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/endace/
 lib/python${MODPY_VERSION}/site-packages/netmiko/endace/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/endace/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/endace/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/endace/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/endace/${MODPY_PYCACHE}endace_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/endace/${MODPY_PYCACHE}endace_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/endace/endace_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/enterasys/
 lib/python${MODPY_VERSION}/site-packages/netmiko/enterasys/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/enterasys/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/enterasys/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/enterasys/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/enterasys/${MODPY_PYCACHE}enterasys_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/enterasys/${MODPY_PYCACHE}enterasys_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/enterasys/enterasys_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/
 lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/${MODPY_PYCACHE}extreme_ers_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/${MODPY_PYCACHE}extreme_ers_ssh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/${MODPY_PYCACHE}extreme_exos.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/${MODPY_PYCACHE}extreme_exos.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/${MODPY_PYCACHE}extreme_netiron.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/${MODPY_PYCACHE}extreme_netiron.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/${MODPY_PYCACHE}extreme_nos_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/${MODPY_PYCACHE}extreme_nos_ssh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/${MODPY_PYCACHE}extreme_slx_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/${MODPY_PYCACHE}extreme_slx_ssh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/${MODPY_PYCACHE}extreme_vsp_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/${MODPY_PYCACHE}extreme_vsp_ssh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/${MODPY_PYCACHE}extreme_wing_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/${MODPY_PYCACHE}extreme_wing_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/extreme_ers_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/extreme_exos.py
@@ -183,146 +253,196 @@ lib/python${MODPY_VERSION}/site-packages/netmiko/extreme/extreme_wing_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/f5/
 lib/python${MODPY_VERSION}/site-packages/netmiko/f5/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/f5/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/f5/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/f5/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/f5/${MODPY_PYCACHE}f5_linux_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/f5/${MODPY_PYCACHE}f5_linux_ssh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/f5/${MODPY_PYCACHE}f5_tmsh_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/f5/${MODPY_PYCACHE}f5_tmsh_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/f5/f5_linux_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/f5/f5_tmsh_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/flexvnf/
 lib/python${MODPY_VERSION}/site-packages/netmiko/flexvnf/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/flexvnf/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/flexvnf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/flexvnf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/flexvnf/${MODPY_PYCACHE}flexvnf_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/flexvnf/${MODPY_PYCACHE}flexvnf_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/flexvnf/flexvnf_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/fortinet/
 lib/python${MODPY_VERSION}/site-packages/netmiko/fortinet/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/fortinet/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/fortinet/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/fortinet/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/fortinet/${MODPY_PYCACHE}fortinet_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/fortinet/${MODPY_PYCACHE}fortinet_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/fortinet/fortinet_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/hp/
 lib/python${MODPY_VERSION}/site-packages/netmiko/hp/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/hp/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/hp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/hp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/hp/${MODPY_PYCACHE}hp_comware.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/hp/${MODPY_PYCACHE}hp_comware.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/hp/${MODPY_PYCACHE}hp_procurve.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/hp/${MODPY_PYCACHE}hp_procurve.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/hp/hp_comware.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/hp/hp_procurve.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/huawei/
 lib/python${MODPY_VERSION}/site-packages/netmiko/huawei/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/huawei/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/huawei/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/huawei/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/huawei/${MODPY_PYCACHE}huawei.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/huawei/${MODPY_PYCACHE}huawei.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/huawei/${MODPY_PYCACHE}huawei_smartax.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/huawei/${MODPY_PYCACHE}huawei_smartax.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/huawei/huawei.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/huawei/huawei_smartax.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/ipinfusion/
 lib/python${MODPY_VERSION}/site-packages/netmiko/ipinfusion/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/ipinfusion/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/ipinfusion/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/ipinfusion/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/ipinfusion/${MODPY_PYCACHE}ipinfusion_ocnos.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/ipinfusion/${MODPY_PYCACHE}ipinfusion_ocnos.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/ipinfusion/ipinfusion_ocnos.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/juniper/
 lib/python${MODPY_VERSION}/site-packages/netmiko/juniper/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/juniper/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/juniper/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/juniper/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/juniper/${MODPY_PYCACHE}juniper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/juniper/${MODPY_PYCACHE}juniper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/juniper/${MODPY_PYCACHE}juniper_screenos.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/juniper/${MODPY_PYCACHE}juniper_screenos.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/juniper/juniper.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/juniper/juniper_screenos.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/keymile/
 lib/python${MODPY_VERSION}/site-packages/netmiko/keymile/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/keymile/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/keymile/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/keymile/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/keymile/${MODPY_PYCACHE}keymile_nos_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/keymile/${MODPY_PYCACHE}keymile_nos_ssh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/keymile/${MODPY_PYCACHE}keymile_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/keymile/${MODPY_PYCACHE}keymile_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/keymile/keymile_nos_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/keymile/keymile_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/linux/
 lib/python${MODPY_VERSION}/site-packages/netmiko/linux/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/linux/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/linux/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/linux/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/linux/${MODPY_PYCACHE}linux_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/linux/${MODPY_PYCACHE}linux_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/linux/linux_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/mellanox/
 lib/python${MODPY_VERSION}/site-packages/netmiko/mellanox/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/mellanox/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/mellanox/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/mellanox/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/mellanox/${MODPY_PYCACHE}mellanox_mlnxos_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/mellanox/${MODPY_PYCACHE}mellanox_mlnxos_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/mellanox/mellanox_mlnxos_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/mikrotik/
 lib/python${MODPY_VERSION}/site-packages/netmiko/mikrotik/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/mikrotik/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/mikrotik/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/mikrotik/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/mikrotik/${MODPY_PYCACHE}mikrotik_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/mikrotik/${MODPY_PYCACHE}mikrotik_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/mikrotik/mikrotik_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/mrv/
 lib/python${MODPY_VERSION}/site-packages/netmiko/mrv/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/mrv/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/mrv/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/mrv/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/mrv/${MODPY_PYCACHE}mrv_lx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/mrv/${MODPY_PYCACHE}mrv_lx.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/mrv/${MODPY_PYCACHE}mrv_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/mrv/${MODPY_PYCACHE}mrv_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/mrv/mrv_lx.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/mrv/mrv_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/netapp/
 lib/python${MODPY_VERSION}/site-packages/netmiko/netapp/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/netapp/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/netapp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/netapp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/netapp/${MODPY_PYCACHE}netapp_cdot_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/netapp/${MODPY_PYCACHE}netapp_cdot_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/netapp/netapp_cdot_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/netmiko_globals.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/nokia/
 lib/python${MODPY_VERSION}/site-packages/netmiko/nokia/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/nokia/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/nokia/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/nokia/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/nokia/${MODPY_PYCACHE}nokia_sros_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/nokia/${MODPY_PYCACHE}nokia_sros_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/nokia/nokia_sros_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/oneaccess/
 lib/python${MODPY_VERSION}/site-packages/netmiko/oneaccess/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/oneaccess/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/oneaccess/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/oneaccess/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/oneaccess/${MODPY_PYCACHE}oneaccess_oneos.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/oneaccess/${MODPY_PYCACHE}oneaccess_oneos.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/oneaccess/oneaccess_oneos.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/ovs/
 lib/python${MODPY_VERSION}/site-packages/netmiko/ovs/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/ovs/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/ovs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/ovs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/ovs/${MODPY_PYCACHE}ovs_linux_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/ovs/${MODPY_PYCACHE}ovs_linux_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/ovs/ovs_linux_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/paloalto/
 lib/python${MODPY_VERSION}/site-packages/netmiko/paloalto/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/paloalto/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/paloalto/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/paloalto/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/paloalto/${MODPY_PYCACHE}paloalto_panos.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/paloalto/${MODPY_PYCACHE}paloalto_panos.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/paloalto/paloalto_panos.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/pluribus/
 lib/python${MODPY_VERSION}/site-packages/netmiko/pluribus/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/pluribus/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/pluribus/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/pluribus/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/pluribus/${MODPY_PYCACHE}pluribus_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/pluribus/${MODPY_PYCACHE}pluribus_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/pluribus/pluribus_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/quanta/
 lib/python${MODPY_VERSION}/site-packages/netmiko/quanta/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/quanta/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/quanta/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/quanta/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/quanta/${MODPY_PYCACHE}quanta_mesh_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/quanta/${MODPY_PYCACHE}quanta_mesh_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/quanta/quanta_mesh_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/rad/
 lib/python${MODPY_VERSION}/site-packages/netmiko/rad/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/rad/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/rad/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/rad/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/rad/${MODPY_PYCACHE}rad_etx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/rad/${MODPY_PYCACHE}rad_etx.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/rad/rad_etx.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/ruckus/
 lib/python${MODPY_VERSION}/site-packages/netmiko/ruckus/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/ruckus/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/ruckus/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/ruckus/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/ruckus/${MODPY_PYCACHE}ruckus_fastiron.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/ruckus/${MODPY_PYCACHE}ruckus_fastiron.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/ruckus/ruckus_fastiron.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/ruijie/
 lib/python${MODPY_VERSION}/site-packages/netmiko/ruijie/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/ruijie/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/ruijie/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/ruijie/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/ruijie/${MODPY_PYCACHE}ruijie_os.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/ruijie/${MODPY_PYCACHE}ruijie_os.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/ruijie/ruijie_os.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/scp_functions.py
@@ -331,7 +451,9 @@ lib/python${MODPY_VERSION}/site-packages/netmiko/snmp_autodetect.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/sophos/
 lib/python${MODPY_VERSION}/site-packages/netmiko/sophos/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/sophos/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/sophos/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/sophos/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/sophos/${MODPY_PYCACHE}sophos_sfos_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/sophos/${MODPY_PYCACHE}sophos_sfos_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/sophos/sophos_sfos_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/ssh_autodetect.py
@@ -340,14 +462,19 @@ lib/python${MODPY_VERSION}/site-packages/netmiko/ssh_exception.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/terminal_server/
 lib/python${MODPY_VERSION}/site-packages/netmiko/terminal_server/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/terminal_server/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/terminal_server/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/terminal_server/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/terminal_server/${MODPY_PYCACHE}terminal_server.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/terminal_server/${MODPY_PYCACHE}terminal_server.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/terminal_server/terminal_server.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/ubiquiti/
 lib/python${MODPY_VERSION}/site-packages/netmiko/ubiquiti/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/ubiquiti/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/ubiquiti/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/ubiquiti/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/ubiquiti/${MODPY_PYCACHE}edge_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/ubiquiti/${MODPY_PYCACHE}edge_ssh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/ubiquiti/${MODPY_PYCACHE}unifiswitch_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/ubiquiti/${MODPY_PYCACHE}unifiswitch_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/ubiquiti/edge_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/ubiquiti/unifiswitch_ssh.py
@@ -355,12 +482,16 @@ lib/python${MODPY_VERSION}/site-packages/netmiko/utilities.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/vyos/
 lib/python${MODPY_VERSION}/site-packages/netmiko/vyos/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/vyos/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/vyos/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/vyos/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/vyos/${MODPY_PYCACHE}vyos_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/vyos/${MODPY_PYCACHE}vyos_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/vyos/vyos_ssh.py
 lib/python${MODPY_VERSION}/site-packages/netmiko/watchguard/
 lib/python${MODPY_VERSION}/site-packages/netmiko/watchguard/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/watchguard/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netmiko/watchguard/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/watchguard/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netmiko/watchguard/${MODPY_PYCACHE}fireware_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netmiko/watchguard/${MODPY_PYCACHE}fireware_ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/netmiko/watchguard/fireware_ssh.py
diff --git a/net/py-nxos/Makefile b/net/py-nxos/Makefile
index 6768c97a6b3..307537379a9 100644
--- a/net/py-nxos/Makefile
+++ b/net/py-nxos/Makefile
@@ -1,7 +1,7 @@
 COMMENT =		library for managing Cisco NX-OS devices through NX-API
 
 MODPY_EGG_VERSION =	0.0.5
-REVISION =		5
+REVISION =		6
 DISTNAME =		pynxos-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME:S/py//}
 
@@ -15,7 +15,7 @@ FLAVORS =		python3
 FLAVOR =		python3
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 NO_TEST =		Yes
 
 RUN_DEPENDS =		devel/py-future${MODPY_FLAVOR} \
diff --git a/net/py-nxos/pkg/PLIST b/net/py-nxos/pkg/PLIST
index bc58e7581ec..27dab7b4c6d 100644
--- a/net/py-nxos/pkg/PLIST
+++ b/net/py-nxos/pkg/PLIST
@@ -1,24 +1,30 @@
 @pkgpath net/py-nxos
 lib/python${MODPY_VERSION}/site-packages/pynxos/
-lib/python${MODPY_VERSION}/site-packages/pynxos-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pynxos-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pynxos-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pynxos-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pynxos-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pynxos-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pynxos-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pynxos-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pynxos-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pynxos-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pynxos-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pynxos/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pynxos/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pynxos/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pynxos/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pynxos/${MODPY_PYCACHE}device.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pynxos/${MODPY_PYCACHE}device.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pynxos/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pynxos/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pynxos/device.py
 lib/python${MODPY_VERSION}/site-packages/pynxos/errors.py
 lib/python${MODPY_VERSION}/site-packages/pynxos/features/
 lib/python${MODPY_VERSION}/site-packages/pynxos/features/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pynxos/features/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pynxos/features/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pynxos/features/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pynxos/features/${MODPY_PYCACHE}base_feature.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pynxos/features/${MODPY_PYCACHE}base_feature.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pynxos/features/${MODPY_PYCACHE}file_copy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pynxos/features/${MODPY_PYCACHE}file_copy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pynxos/features/${MODPY_PYCACHE}vlans.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pynxos/features/${MODPY_PYCACHE}vlans.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pynxos/features/base_feature.py
 lib/python${MODPY_VERSION}/site-packages/pynxos/features/file_copy.py
@@ -26,18 +32,24 @@ lib/python${MODPY_VERSION}/site-packages/pynxos/features/vlans.py
 lib/python${MODPY_VERSION}/site-packages/pynxos/lib/
 lib/python${MODPY_VERSION}/site-packages/pynxos/lib/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pynxos/lib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pynxos/lib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pynxos/lib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pynxos/lib/${MODPY_PYCACHE}rpc_client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pynxos/lib/${MODPY_PYCACHE}rpc_client.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pynxos/lib/data_model/
 lib/python${MODPY_VERSION}/site-packages/pynxos/lib/data_model/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pynxos/lib/data_model/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pynxos/lib/data_model/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pynxos/lib/data_model/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pynxos/lib/data_model/${MODPY_PYCACHE}converters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pynxos/lib/data_model/${MODPY_PYCACHE}converters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pynxos/lib/data_model/${MODPY_PYCACHE}key_maps.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pynxos/lib/data_model/${MODPY_PYCACHE}key_maps.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pynxos/lib/data_model/converters.py
 lib/python${MODPY_VERSION}/site-packages/pynxos/lib/data_model/key_maps.py
 lib/python${MODPY_VERSION}/site-packages/pynxos/lib/data_model/schemas/
 lib/python${MODPY_VERSION}/site-packages/pynxos/lib/data_model/schemas/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pynxos/lib/data_model/schemas/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pynxos/lib/data_model/schemas/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pynxos/lib/data_model/schemas/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pynxos/lib/rpc_client.py
diff --git a/net/py-paho-mqtt/Makefile b/net/py-paho-mqtt/Makefile
index 8445b4cf054..9995d7ce20c 100644
--- a/net/py-paho-mqtt/Makefile
+++ b/net/py-paho-mqtt/Makefile
@@ -3,7 +3,7 @@ COMMENT =		MQTT Python client library
 MODPY_EGG_VERSION =	1.6.1
 DISTNAME =		paho-mqtt-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		0
+REVISION =		1
 
 HOMEPAGE =		http://www.eclipse.org/paho/clients/python/
 
@@ -14,10 +14,9 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 # not in pypi tarball.
 #TEST_DEPENDS =		devel/py-test-runner${MODPY_FLAVOR}
-#MODPY_PYTEST =		Yes
 NO_TEST =		Yes
 
 FLAVORS =		python3
diff --git a/net/py-paho-mqtt/pkg/PLIST b/net/py-paho-mqtt/pkg/PLIST
index 32bc065b83f..3e1ab2ce6fc 100644
--- a/net/py-paho-mqtt/pkg/PLIST
+++ b/net/py-paho-mqtt/pkg/PLIST
@@ -2,18 +2,28 @@
 lib/python${MODPY_VERSION}/site-packages/paho/
 lib/python${MODPY_VERSION}/site-packages/paho/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/paho/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/paho/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/paho/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/paho/mqtt/
 lib/python${MODPY_VERSION}/site-packages/paho/mqtt/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/paho/mqtt/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/paho/mqtt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/paho/mqtt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paho/mqtt/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/paho/mqtt/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paho/mqtt/${MODPY_PYCACHE}matcher.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/paho/mqtt/${MODPY_PYCACHE}matcher.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paho/mqtt/${MODPY_PYCACHE}packettypes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/paho/mqtt/${MODPY_PYCACHE}packettypes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paho/mqtt/${MODPY_PYCACHE}properties.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/paho/mqtt/${MODPY_PYCACHE}properties.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paho/mqtt/${MODPY_PYCACHE}publish.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/paho/mqtt/${MODPY_PYCACHE}publish.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paho/mqtt/${MODPY_PYCACHE}reasoncodes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/paho/mqtt/${MODPY_PYCACHE}reasoncodes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paho/mqtt/${MODPY_PYCACHE}subscribe.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/paho/mqtt/${MODPY_PYCACHE}subscribe.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paho/mqtt/${MODPY_PYCACHE}subscribeoptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/paho/mqtt/${MODPY_PYCACHE}subscribeoptions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/paho/mqtt/client.py
 lib/python${MODPY_VERSION}/site-packages/paho/mqtt/matcher.py
@@ -23,13 +33,12 @@ lib/python${MODPY_VERSION}/site-packages/paho/mqtt/publish.py
 lib/python${MODPY_VERSION}/site-packages/paho/mqtt/reasoncodes.py
 lib/python${MODPY_VERSION}/site-packages/paho/mqtt/subscribe.py
 lib/python${MODPY_VERSION}/site-packages/paho/mqtt/subscribeoptions.py
-lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 share/examples/${MODPY_PY_PREFIX}paho-mqtt/
 share/examples/${MODPY_PY_PREFIX}paho-mqtt/aws_iot.py
 share/examples/${MODPY_PY_PREFIX}paho-mqtt/client_logger.py
diff --git a/net/py-pcapy/Makefile b/net/py-pcapy/Makefile
index a8ba53a2422..fdfdaf5664d 100644
--- a/net/py-pcapy/Makefile
+++ b/net/py-pcapy/Makefile
@@ -10,7 +10,7 @@ GH_ACCOUNT =		helpsystems
 GH_PROJECT =		pcapy
 GH_TAGNAME =		${MODPY_EGG_VERSION:S/.dev0//}
 PKGNAME =		py-${DISTNAME}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		net devel
 
@@ -22,7 +22,7 @@ WANTLIB +=		${MODPY_WANTLIB} ${COMPILER_LIBCXX} m pcap
 COMPILER =		base-clang ports-gcc
 
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/net/py-pcapy/pkg/PLIST b/net/py-pcapy/pkg/PLIST
index e44a20c7212..52609988bf6 100644
--- a/net/py-pcapy/pkg/PLIST
+++ b/net/py-pcapy/pkg/PLIST
@@ -1,8 +1,9 @@
-lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 @so lib/python${MODPY_VERSION}/site-packages/pcapy.${MODPY_PYC_MAGIC_TAG}so
 share/doc/pcapy/
 share/doc/pcapy/LICENSE
diff --git a/net/py-portend/Makefile b/net/py-portend/Makefile
index 30e204f3a7b..6f3f9b900c9 100644
--- a/net/py-portend/Makefile
+++ b/net/py-portend/Makefile
@@ -3,7 +3,7 @@ COMMENT =		monitor TCP ports for bound or unbound states
 MODPY_EGG_VERSION =	3.1.0
 DISTNAME =		portend-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		net
 
@@ -17,9 +17,8 @@ FLAVOR =		python3
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools_scm
 
-BUILD_DEPENDS =		devel/py-setuptools_scm${MODPY_FLAVOR}>=1.15.0
 RUN_DEPENDS =		devel/py-tempora${MODPY_FLAVOR}>=1.8
 
 NO_TEST =		Yes
diff --git a/net/py-portend/pkg/PLIST b/net/py-portend/pkg/PLIST
index 098942a5e13..2faf7e8d7ac 100644
--- a/net/py-portend/pkg/PLIST
+++ b/net/py-portend/pkg/PLIST
@@ -1,12 +1,11 @@
 @pkgpath net/py-portend
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}portend.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}portend.${MODPY_PYC_MAGIC_TAG}pyc
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/lib/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/lib/${MODPY_PYCACHE}portend.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/lib/portend.py
-lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/portend.py
diff --git a/net/py-ripe.atlas.cousteau/Makefile b/net/py-ripe.atlas.cousteau/Makefile
index 5ff6f2f3de0..236b870e9cf 100644
--- a/net/py-ripe.atlas.cousteau/Makefile
+++ b/net/py-ripe.atlas.cousteau/Makefile
@@ -1,20 +1,19 @@
 COMMENT =	Python bindings for the RIPE Atlas API
 
+MODPY_EGG_VERSION =	1.5.1
 GH_ACCOUNT =	RIPE-NCC
 GH_PROJECT =	ripe-atlas-cousteau
 GH_TAGNAME =	v${MODPY_EGG_VERSION}
+REVISION =	1
 
-MODPY_EGG_VERSION =	1.5.1
 PKGNAME =	py-ripe.atlas.cousteau-${MODPY_EGG_VERSION}
-REVISION =	0
 
 CATEGORIES =	net
 
 # GPLv3
-PERMIT_PACKAGE =	Yes
+PERMIT_PACKAGE =Yes
 
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =	setuptools
 
 MODULES =	lang/python
 
diff --git a/net/py-ripe.atlas.cousteau/pkg/PLIST b/net/py-ripe.atlas.cousteau/pkg/PLIST
index 67b085c97ec..0f20f27d149 100644
--- a/net/py-ripe.atlas.cousteau/pkg/PLIST
+++ b/net/py-ripe.atlas.cousteau/pkg/PLIST
@@ -1,26 +1,36 @@
 @pkgpath net/py-ripe.atlas.cousteau
 lib/python${MODPY_VERSION}/site-packages/ripe/
 lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}-py${MODPY_VERSION}-nspkg.pth
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/namespace_packages.txt
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}.dist-info/namespace_packages.txt
+lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}api_listing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}api_listing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}api_meta_data.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}api_meta_data.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}measurement.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}measurement.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}measurement_tagging.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}measurement_tagging.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}request.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}request.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}source.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}source.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}stream.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}stream.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/api_listing.py
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/api_meta_data.py
diff --git a/net/py-ripe.atlas.sagan/Makefile b/net/py-ripe.atlas.sagan/Makefile
index d796c77190c..7b529611ea0 100644
--- a/net/py-ripe.atlas.sagan/Makefile
+++ b/net/py-ripe.atlas.sagan/Makefile
@@ -1,22 +1,21 @@
 COMMENT =	parsing library for RIPE Atlas measurement results
 
+MODPY_EGG_VERSION =	1.3.1
 GH_ACCOUNT =	RIPE-NCC
 GH_PROJECT =	ripe-atlas-sagan
 GH_TAGNAME =	v${MODPY_EGG_VERSION}
-
-MODPY_EGG_VERSION =	1.3.1
-PKGNAME =	py-ripe.atlas.sagan-${MODPY_EGG_VERSION}
 REVISION =	0
 
+PKGNAME =	py-ripe.atlas.sagan-${MODPY_EGG_VERSION}
+
 CATEGORIES =	net
 
 HOMEPAGE =	https://github.com/RIPE-NCC/ripe.atlas.sagan
 
 # GPLv3
-PERMIT_PACKAGE =	Yes
+PERMIT_PACKAGE =Yes
 
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =	setuptools
 MODPY_PYTEST_ARGS =	tests/*.py
 
 MODULES =	lang/python
diff --git a/net/py-ripe.atlas.sagan/pkg/PLIST b/net/py-ripe.atlas.sagan/pkg/PLIST
index 0f3e422f656..c1e3a2e1309 100644
--- a/net/py-ripe.atlas.sagan/pkg/PLIST
+++ b/net/py-ripe.atlas.sagan/pkg/PLIST
@@ -1,34 +1,47 @@
 @pkgpath net/py-ripe.atlas.sagan
 lib/python${MODPY_VERSION}/site-packages/ripe/
 lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}-py${MODPY_VERSION}-nspkg.pth
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/namespace_packages.txt
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}.dist-info/namespace_packages.txt
+lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}dns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}dns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}ntp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}ntp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}ping.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}ping.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}ssl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}ssl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}traceroute.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}traceroute.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}wifi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}wifi.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/base.py
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/dns.py
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/${MODPY_PYCACHE}abuf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/${MODPY_PYCACHE}abuf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/${MODPY_PYCACHE}compatibility.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/${MODPY_PYCACHE}compatibility.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/abuf.py
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/compatibility.py
diff --git a/net/py-ripe.atlas.tools/Makefile b/net/py-ripe.atlas.tools/Makefile
index 058732f1be9..0a83bf31d53 100644
--- a/net/py-ripe.atlas.tools/Makefile
+++ b/net/py-ripe.atlas.tools/Makefile
@@ -1,19 +1,19 @@
 COMMENT =		official command-line client for RIPE Atlas
 
+MODPY_EGG_VERSION =	3.0.2
 GH_ACCOUNT =		RIPE-NCC
 GH_PROJECT =		ripe-atlas-tools
 GH_TAGNAME =		v${MODPY_EGG_VERSION}
+REVISION =		1
 
-MODPY_EGG_VERSION =	3.0.2
 PKGNAME =		ripe.atlas.tools-${MODPY_EGG_VERSION}
-REVISION =		0
 
 CATEGORIES =		net
 
 # GPLv3
 PERMIT_PACKAGE =	Yes
 
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 MODPY_PYTEST =		Yes
 MODPY_PYTEST_ARGS =	tests/test*.py tests/*/*.py
 
diff --git a/net/py-ripe.atlas.tools/pkg/PLIST b/net/py-ripe.atlas.tools/pkg/PLIST
index 337c9d06604..fa8cd7e2995 100644
--- a/net/py-ripe.atlas.tools/pkg/PLIST
+++ b/net/py-ripe.atlas.tools/pkg/PLIST
@@ -6,44 +6,65 @@ bin/asslcert
 bin/atraceroute
 bin/ripe-atlas
 lib/python${MODPY_VERSION}/site-packages/ripe.atlas.tools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}-nspkg.pth
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.tools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.tools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.tools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.tools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.tools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/namespace_packages.txt
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.tools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.tools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/ripe.atlas.tools-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/ripe.atlas.tools-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/ripe.atlas.tools-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/ripe.atlas.tools-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/ripe.atlas.tools-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/ripe.atlas.tools-${MODPY_EGG_VERSION}.dist-info/namespace_packages.txt
+lib/python${MODPY_VERSION}/site-packages/ripe.atlas.tools-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}ipdetails.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}ipdetails.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}streaming.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}streaming.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/aggregators/
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/aggregators/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/aggregators/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/aggregators/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/aggregators/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/aggregators/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/aggregators/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/aggregators/base.py
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/cache.py
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}alias.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}alias.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}configure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}configure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}go.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}go.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}measurement_info.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}measurement_info.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}measurement_search.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}measurement_search.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}probe_info.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}probe_info.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}probe_search.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}probe_search.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}report.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}report.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}shibboleet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}shibboleet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}stream.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}stream.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/alias.py
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/base.py
@@ -52,14 +73,23 @@ lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/go.py
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}dns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}dns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}ntp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}ntp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}ping.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}ping.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}sslcert.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}sslcert.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}traceroute.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}traceroute.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/base.py
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/dns.py
@@ -81,11 +111,17 @@ lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/filters.py
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/${MODPY_PYCACHE}actions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/${MODPY_PYCACHE}actions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/${MODPY_PYCACHE}colours.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/${MODPY_PYCACHE}colours.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/${MODPY_PYCACHE}sanitisers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/${MODPY_PYCACHE}sanitisers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/${MODPY_PYCACHE}validators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/${MODPY_PYCACHE}validators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/${MODPY_PYCACHE}xdg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/${MODPY_PYCACHE}xdg.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/actions.py
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/colours.py
@@ -96,18 +132,31 @@ lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/ipdetails.py
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}dns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}dns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}dns_compact.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}dns_compact.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}dst_asn.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}dst_asn.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}ntp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}ntp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}ping.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}ping.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}raw.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}raw.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}ssl_consistency.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}ssl_consistency.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}sslcert.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}sslcert.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}traceroute.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}traceroute.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}traceroute_aspath.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}traceroute_aspath.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/base.py
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/dns.py
@@ -130,6 +179,7 @@ lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/traceroute_a
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/settings/
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/settings/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/settings/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/settings/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/settings/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/settings/templates/
 lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/settings/templates/base.yaml
diff --git a/net/py-rrdtool/Makefile b/net/py-rrdtool/Makefile
index b4bc2c587d6..7fac8acea26 100644
--- a/net/py-rrdtool/Makefile
+++ b/net/py-rrdtool/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	0.1.16
 
 DISTNAME =	rrdtool-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	databases net
 
@@ -18,9 +18,9 @@ WANTLIB += pthread rrd
 MODULES =	lang/python
 LIB_DEPENDS =	net/rrdtool
 
-MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-NO_TEST =		Yes
+MODPY_PI =	Yes
+MODPY_PYBUILD =	setuptools
+NO_TEST =	Yes
 
 FLAVORS =	python3
 FLAVOR =	python3
diff --git a/net/py-rrdtool/pkg/PLIST b/net/py-rrdtool/pkg/PLIST
index 8f1dd4fb145..04f1c9f639b 100644
--- a/net/py-rrdtool/pkg/PLIST
+++ b/net/py-rrdtool/pkg/PLIST
@@ -1,9 +1,10 @@
 @conflict py-rrd-*
 @pkgpath net/rrdtool,-python
 @pkgpath net/py-rrdtool
-lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 @so lib/python${MODPY_VERSION}/site-packages/rrdtool.${MODPY_PYC_MAGIC_TAG}so
diff --git a/net/py-siphon/Makefile b/net/py-siphon/Makefile
index 51d8098635b..eb04d310c21 100644
--- a/net/py-siphon/Makefile
+++ b/net/py-siphon/Makefile
@@ -1,20 +1,20 @@
 COMMENT=	download data from remote data services (such as THREDDS)
 
 MODPY_EGG_VERSION=	0.9
-DISTNAME=		siphon-${MODPY_EGG_VERSION}
-PKGNAME=		py-${DISTNAME}
-CATEGORIES=		net
-REVISION=		2
+DISTNAME=	siphon-${MODPY_EGG_VERSION}
+PKGNAME=	py-${DISTNAME}
+CATEGORIES=	net
+REVISION=	3
 
-HOMEPAGE=		https://unidata.github.io/siphon/
+HOMEPAGE=	https://unidata.github.io/siphon/
 
-MAINTAINER=		Martin Reindl <martin@catai.org>
+MAINTAINER=	Martin Reindl <martin@catai.org>
 
 # BSD
 PERMIT_PACKAGE=	Yes
 
-MODPY_SETUPTOOLS=	Yes
-MODPY_PI=		Yes
+MODPY_PYBUILD=	setuptools
+MODPY_PI=	Yes
 
 MODULES=	lang/python
 
diff --git a/net/py-siphon/pkg/PLIST b/net/py-siphon/pkg/PLIST
index 3b34b5a89fe..85c3851380f 100644
--- a/net/py-siphon/pkg/PLIST
+++ b/net/py-siphon/pkg/PLIST
@@ -1,23 +1,34 @@
 @conflict py-siphon-*
 @pkgpath net/py-siphon
 lib/python${MODPY_VERSION}/site-packages/siphon/
-lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_EGG_VERSION}.dist-info/AUTHORS.txt
+lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/siphon/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}_tools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}_tools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}catalog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}catalog.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}http_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}http_util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}metadata.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}metadata.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}ncss.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}ncss.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}ncss_dataset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}ncss_dataset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}radarserver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}radarserver.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}testing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}testing.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/siphon/_tools.py
 lib/python${MODPY_VERSION}/site-packages/siphon/_version.py
@@ -25,14 +36,23 @@ lib/python${MODPY_VERSION}/site-packages/siphon/catalog.py
 lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/
 lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/${MODPY_PYCACHE}cdmremote.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/${MODPY_PYCACHE}cdmremote.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/${MODPY_PYCACHE}cdmremotefeature.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/${MODPY_PYCACHE}cdmremotefeature.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/${MODPY_PYCACHE}cdmrfeature_pb2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/${MODPY_PYCACHE}cdmrfeature_pb2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/${MODPY_PYCACHE}coveragedataset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/${MODPY_PYCACHE}coveragedataset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/${MODPY_PYCACHE}dataset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/${MODPY_PYCACHE}dataset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/${MODPY_PYCACHE}ncStream_pb2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/${MODPY_PYCACHE}ncStream_pb2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/${MODPY_PYCACHE}ncstream.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/${MODPY_PYCACHE}ncstream.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/${MODPY_PYCACHE}xarray_support.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/${MODPY_PYCACHE}xarray_support.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/cdmremote.py
 lib/python${MODPY_VERSION}/site-packages/siphon/cdmr/cdmremotefeature.py
@@ -50,11 +70,17 @@ lib/python${MODPY_VERSION}/site-packages/siphon/radarserver.py
 lib/python${MODPY_VERSION}/site-packages/siphon/simplewebservice/
 lib/python${MODPY_VERSION}/site-packages/siphon/simplewebservice/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/siphon/simplewebservice/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/siphon/simplewebservice/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/simplewebservice/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/simplewebservice/${MODPY_PYCACHE}acis.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/simplewebservice/${MODPY_PYCACHE}acis.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/simplewebservice/${MODPY_PYCACHE}iastate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/simplewebservice/${MODPY_PYCACHE}iastate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/simplewebservice/${MODPY_PYCACHE}igra2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/simplewebservice/${MODPY_PYCACHE}igra2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/simplewebservice/${MODPY_PYCACHE}ndbc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/simplewebservice/${MODPY_PYCACHE}ndbc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/siphon/simplewebservice/${MODPY_PYCACHE}wyoming.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/siphon/simplewebservice/${MODPY_PYCACHE}wyoming.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/siphon/simplewebservice/acis.py
 lib/python${MODPY_VERSION}/site-packages/siphon/simplewebservice/iastate.py
diff --git a/net/py-smbc/Makefile b/net/py-smbc/Makefile
index f202f4c358d..7459ff281ba 100644
--- a/net/py-smbc/Makefile
+++ b/net/py-smbc/Makefile
@@ -3,7 +3,7 @@ COMMENT=		Python bindings to wrap the libsmbclient API
 MODPY_EGG_VERSION=	1.0.23
 DISTNAME=		pysmbc-${MODPY_EGG_VERSION}
 PKGNAME=		py-smbc-${MODPY_EGG_VERSION}
-REVISION=		3
+REVISION=		4
 
 CATEGORIES=		net devel
 
@@ -19,7 +19,7 @@ WANTLIB += smbclient pthread
 MODULES=		lang/python
 
 MODPY_PI=		Yes
-MODPY_SETUPTOOLS=	Yes
+MODPY_PYBUILD=		setuptools
 
 FLAVORS=		python3
 FLAVOR=			python3
diff --git a/net/py-smbc/pkg/PLIST b/net/py-smbc/pkg/PLIST
index 1585b06fb71..d7eedf8a921 100644
--- a/net/py-smbc/pkg/PLIST
+++ b/net/py-smbc/pkg/PLIST
@@ -1,14 +1,17 @@
 @conflict py-smbc-*
 @pkgpath net/py-smbc
 @so lib/python${MODPY_VERSION}/site-packages/_smbc.${MODPY_PYC_MAGIC_TAG}so
-lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_EGG_VERSION}.dist-info/COPYING
+lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/smbc/
 lib/python${MODPY_VERSION}/site-packages/smbc/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/smbc/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/smbc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/smbc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/smbc/${MODPY_PYCACHE}xattr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/smbc/${MODPY_PYCACHE}xattr.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/smbc/xattr.py
diff --git a/net/py-snmp/Makefile b/net/py-snmp/Makefile
index b1d63a2d5e6..31477b5d6b0 100644
--- a/net/py-snmp/Makefile
+++ b/net/py-snmp/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	4.4.12
 DISTNAME =	pysnmp-${MODPY_EGG_VERSION}
 PKGNAME =	${DISTNAME:S/py/py-/}
 CATEGORIES =	net
-REVISION =	4
+REVISION =	5
 
 HOMEPAGE =	http://snmplabs.com/
 
@@ -15,8 +15,8 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =	lang/python
 
-MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PI =	Yes
+MODPY_PYBUILD =	setuptools
 
 BUILD_DEPENDS =	${RUN_DEPENDS}
 RUN_DEPENDS =	security/py-cryptodome${MODPY_FLAVOR} \
diff --git a/net/py-snmp/pkg/PLIST b/net/py-snmp/pkg/PLIST
index 5f185e1daba..4507bbf6237 100644
--- a/net/py-snmp/pkg/PLIST
+++ b/net/py-snmp/pkg/PLIST
@@ -1,433 +1,607 @@
 @pkgpath net/py-snmp
 lib/python${MODPY_VERSION}/site-packages/pysnmp/
-lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
+lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_EGG_VERSION}.dist-info/LICENSE.rst
+lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_EGG_VERSION}.dist-info/zip-safe
 lib/python${MODPY_VERSION}/site-packages/pysnmp/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/cache.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/${MODPY_PYCACHE}debug.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/${MODPY_PYCACHE}debug.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/${MODPY_PYCACHE}nextid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/${MODPY_PYCACHE}nextid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/cache.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/${MODPY_PYCACHE}sockfix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/${MODPY_PYCACHE}sockfix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/${MODPY_PYCACHE}sockmsg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/${MODPY_PYCACHE}sockmsg.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/base.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/base.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/dgram/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/dgram/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/dgram/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/dgram/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/dgram/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/dgram/base.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/dgram/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/dgram/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/dgram/udp.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/dgram/${MODPY_PYCACHE}udp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/dgram/${MODPY_PYCACHE}udp.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/dgram/udp6.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/dgram/${MODPY_PYCACHE}udp6.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/dgram/${MODPY_PYCACHE}udp6.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/dgram/base.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/dgram/udp.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/dgram/udp6.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/dispatch.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncio/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/base.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/base.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dgram/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dgram/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dgram/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dgram/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dgram/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dgram/base.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dgram/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dgram/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dgram/udp.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dgram/${MODPY_PYCACHE}udp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dgram/${MODPY_PYCACHE}udp.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dgram/udp6.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dgram/${MODPY_PYCACHE}udp6.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dgram/${MODPY_PYCACHE}udp6.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dgram/unix.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dgram/${MODPY_PYCACHE}unix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dgram/${MODPY_PYCACHE}unix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dgram/base.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dgram/udp.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dgram/udp6.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dgram/unix.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/dispatch.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asyncore/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/dgram/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/dgram/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/dgram/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/dgram/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/dgram/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/dgram/udp.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/dgram/${MODPY_PYCACHE}udp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/dgram/${MODPY_PYCACHE}udp.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/dgram/udp6.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/dgram/${MODPY_PYCACHE}udp6.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/dgram/${MODPY_PYCACHE}udp6.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/dgram/unix.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/dgram/${MODPY_PYCACHE}unix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/dgram/${MODPY_PYCACHE}unix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/dgram/udp.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/dgram/udp6.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/dgram/unix.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/dispatch.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/asynsock/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/base.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/error.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/sockfix.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/${MODPY_PYCACHE}sockfix.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/sockmsg.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/${MODPY_PYCACHE}sockmsg.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/base.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/base.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/dgram/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/dgram/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/dgram/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/dgram/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/dgram/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/dgram/base.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/dgram/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/dgram/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/dgram/udp.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/dgram/${MODPY_PYCACHE}udp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/dgram/${MODPY_PYCACHE}udp.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/dgram/unix.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/dgram/${MODPY_PYCACHE}unix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/dgram/${MODPY_PYCACHE}unix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/dgram/base.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/dgram/udp.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/dgram/unix.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/dispatch.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/carrier/twisted/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/debug.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/${MODPY_PYCACHE}debug.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/config.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/engine.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/${MODPY_PYCACHE}engine.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/${MODPY_PYCACHE}engine.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/observer.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/${MODPY_PYCACHE}observer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/${MODPY_PYCACHE}observer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/config.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/engine.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/observer.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/cmdgen.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/${MODPY_PYCACHE}cmdgen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/${MODPY_PYCACHE}cmdgen.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/cmdrsp.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/${MODPY_PYCACHE}cmdrsp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/${MODPY_PYCACHE}cmdrsp.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/config.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/context.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/${MODPY_PYCACHE}context.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/${MODPY_PYCACHE}context.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/mibvar.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/${MODPY_PYCACHE}mibvar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/${MODPY_PYCACHE}mibvar.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/ntforg.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/${MODPY_PYCACHE}ntforg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/${MODPY_PYCACHE}ntforg.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/ntfrcv.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/${MODPY_PYCACHE}ntfrcv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/${MODPY_PYCACHE}ntfrcv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/cmdgen.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/cmdrsp.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/config.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/context.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/mibvar.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/ntforg.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/ntfrcv.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/oneliner/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/oneliner/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/oneliner/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/oneliner/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/oneliner/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/oneliner/cmdgen.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/oneliner/${MODPY_PYCACHE}cmdgen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/oneliner/${MODPY_PYCACHE}cmdgen.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/oneliner/ntforg.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/oneliner/${MODPY_PYCACHE}ntforg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/oneliner/${MODPY_PYCACHE}ntforg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/oneliner/cmdgen.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/entity/rfc3413/oneliner/ntforg.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/error.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/${MODPY_PYCACHE}context.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/${MODPY_PYCACHE}context.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/${MODPY_PYCACHE}lcd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/${MODPY_PYCACHE}lcd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/${MODPY_PYCACHE}transport.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/${MODPY_PYCACHE}transport.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/${MODPY_PYCACHE}varbinds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/${MODPY_PYCACHE}varbinds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncio/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncio/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncio/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncio/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncio/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncio/cmdgen.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncio/${MODPY_PYCACHE}cmdgen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncio/${MODPY_PYCACHE}cmdgen.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncio/ntforg.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncio/${MODPY_PYCACHE}ntforg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncio/${MODPY_PYCACHE}ntforg.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncio/transport.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncio/${MODPY_PYCACHE}transport.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncio/${MODPY_PYCACHE}transport.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncio/cmdgen.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncio/ntforg.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncio/transport.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/cmdgen.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/${MODPY_PYCACHE}cmdgen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/${MODPY_PYCACHE}cmdgen.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/ntforg.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/${MODPY_PYCACHE}ntforg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/${MODPY_PYCACHE}ntforg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/${MODPY_PYCACHE}transport.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/${MODPY_PYCACHE}transport.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/cmdgen.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/ntforg.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/cmdgen.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/${MODPY_PYCACHE}cmdgen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/${MODPY_PYCACHE}cmdgen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/${MODPY_PYCACHE}ntforg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/${MODPY_PYCACHE}ntforg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/cmdgen.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/compat/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/compat/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/compat/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/compat/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/compat/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/compat/cmdgen.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/compat/${MODPY_PYCACHE}cmdgen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/compat/${MODPY_PYCACHE}cmdgen.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/compat/ntforg.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/compat/${MODPY_PYCACHE}ntforg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/compat/${MODPY_PYCACHE}ntforg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/compat/cmdgen.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/compat/ntforg.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/ntforg.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/sync/${MODPY_PYCACHE}ntforg.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/transport.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/asyncore/${MODPY_PYCACHE}transport.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/auth.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/context.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/${MODPY_PYCACHE}context.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/lcd.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/${MODPY_PYCACHE}lcd.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/transport.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/${MODPY_PYCACHE}transport.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/twisted/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/twisted/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/twisted/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/twisted/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/twisted/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/twisted/cmdgen.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/twisted/${MODPY_PYCACHE}cmdgen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/twisted/${MODPY_PYCACHE}cmdgen.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/twisted/ntforg.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/twisted/${MODPY_PYCACHE}ntforg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/twisted/${MODPY_PYCACHE}ntforg.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/twisted/transport.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/twisted/${MODPY_PYCACHE}transport.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/twisted/${MODPY_PYCACHE}transport.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/twisted/cmdgen.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/twisted/ntforg.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/twisted/transport.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/varbinds.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/hlapi/${MODPY_PYCACHE}varbinds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/nextid.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/${MODPY_PYCACHE}nextid.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}errind.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}errind.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}rfc1155.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}rfc1155.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}rfc1157.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}rfc1157.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}rfc1901.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}rfc1901.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}rfc1902.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}rfc1902.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}rfc1905.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}rfc1905.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}rfc3411.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}rfc3411.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}rfc3412.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}rfc3412.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/acmod/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/acmod/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/acmod/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/acmod/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/acmod/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/acmod/rfc3415.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/acmod/${MODPY_PYCACHE}rfc3415.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/acmod/${MODPY_PYCACHE}rfc3415.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/acmod/void.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/acmod/${MODPY_PYCACHE}void.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/acmod/${MODPY_PYCACHE}void.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/acmod/rfc3415.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/acmod/void.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/api/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/api/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/api/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/api/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/api/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/api/v1.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/api/${MODPY_PYCACHE}v1.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/api/${MODPY_PYCACHE}v1.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/api/v2c.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/api/${MODPY_PYCACHE}v2c.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/api/${MODPY_PYCACHE}v2c.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/api/verdec.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/api/${MODPY_PYCACHE}verdec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/api/${MODPY_PYCACHE}verdec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/api/v1.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/api/v2c.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/api/verdec.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/cache.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/errind.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}errind.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/error.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/mpmod/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/mpmod/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/mpmod/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/mpmod/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/mpmod/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/mpmod/base.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/mpmod/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/mpmod/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/mpmod/cache.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/mpmod/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/mpmod/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/mpmod/rfc2576.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/mpmod/${MODPY_PYCACHE}rfc2576.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/mpmod/${MODPY_PYCACHE}rfc2576.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/mpmod/rfc3412.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/mpmod/${MODPY_PYCACHE}rfc3412.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/mpmod/${MODPY_PYCACHE}rfc3412.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/mpmod/base.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/mpmod/cache.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/mpmod/rfc2576.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/mpmod/rfc3412.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/proxy/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/proxy/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/proxy/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/proxy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/proxy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/proxy/rfc2576.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/proxy/${MODPY_PYCACHE}rfc2576.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/proxy/${MODPY_PYCACHE}rfc2576.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/proxy/rfc2576.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/rfc1155.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}rfc1155.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/rfc1157.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}rfc1157.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/rfc1901.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}rfc1901.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/rfc1902.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}rfc1902.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/rfc1905.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}rfc1905.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/rfc3411.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}rfc3411.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/rfc3412.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/${MODPY_PYCACHE}rfc3412.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/base.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/cache.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/${MODPY_PYCACHE}rfc2576.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/${MODPY_PYCACHE}rfc2576.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/base.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/cache.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/priv/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/priv/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/priv/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/priv/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/priv/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/priv/aes192.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/priv/${MODPY_PYCACHE}aes192.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/priv/${MODPY_PYCACHE}aes192.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/priv/aes256.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/priv/${MODPY_PYCACHE}aes256.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/priv/${MODPY_PYCACHE}aes256.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/priv/aesbase.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/priv/${MODPY_PYCACHE}aesbase.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/priv/${MODPY_PYCACHE}aesbase.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/priv/des3.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/priv/${MODPY_PYCACHE}des3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/priv/${MODPY_PYCACHE}des3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/priv/aes192.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/priv/aes256.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/priv/aesbase.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/eso/priv/des3.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc2576.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/${MODPY_PYCACHE}rfc2576.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/${MODPY_PYCACHE}localkey.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/${MODPY_PYCACHE}localkey.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/${MODPY_PYCACHE}service.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/${MODPY_PYCACHE}service.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/auth/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/auth/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/auth/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/auth/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/auth/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/auth/base.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/auth/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/auth/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/auth/hmacmd5.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/auth/${MODPY_PYCACHE}hmacmd5.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/auth/${MODPY_PYCACHE}hmacmd5.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/auth/hmacsha.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/auth/${MODPY_PYCACHE}hmacsha.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/auth/${MODPY_PYCACHE}hmacsha.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/auth/noauth.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/auth/${MODPY_PYCACHE}noauth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/auth/${MODPY_PYCACHE}noauth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/auth/base.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/auth/hmacmd5.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/auth/hmacsha.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/auth/noauth.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/localkey.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/${MODPY_PYCACHE}localkey.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/priv/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/priv/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/priv/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/priv/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/priv/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/priv/base.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/priv/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/priv/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/priv/des.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/priv/${MODPY_PYCACHE}des.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/priv/${MODPY_PYCACHE}des.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/priv/nopriv.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/priv/${MODPY_PYCACHE}nopriv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/priv/${MODPY_PYCACHE}nopriv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/priv/base.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/priv/des.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/priv/nopriv.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/service.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3414/${MODPY_PYCACHE}service.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3826/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3826/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3826/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3826/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3826/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3826/priv/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3826/priv/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3826/priv/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3826/priv/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3826/priv/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3826/priv/aes.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3826/priv/${MODPY_PYCACHE}aes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3826/priv/${MODPY_PYCACHE}aes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc3826/priv/aes.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc7860/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc7860/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc7860/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc7860/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc7860/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc7860/auth/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc7860/auth/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc7860/auth/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc7860/auth/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc7860/auth/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc7860/auth/hmacsha2.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc7860/auth/${MODPY_PYCACHE}hmacsha2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc7860/auth/${MODPY_PYCACHE}hmacsha2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/proto/secmod/rfc7860/auth/hmacsha2.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/builder.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/${MODPY_PYCACHE}builder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/${MODPY_PYCACHE}builder.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/compiler.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/${MODPY_PYCACHE}compiler.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/${MODPY_PYCACHE}compiler.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/error.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/exval.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/${MODPY_PYCACHE}exval.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/${MODPY_PYCACHE}exval.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/indices.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/${MODPY_PYCACHE}indices.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/${MODPY_PYCACHE}indices.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/instrum.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/${MODPY_PYCACHE}instrum.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/${MODPY_PYCACHE}instrum.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/${MODPY_PYCACHE}rfc1902.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/${MODPY_PYCACHE}rfc1902.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/${MODPY_PYCACHE}view.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/${MODPY_PYCACHE}view.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/builder.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/compiler.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/error.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/exval.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/indices.py
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/instrum.py
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/ASN1-ENUMERATION.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}ASN1-ENUMERATION.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/ASN1-REFINEMENT.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}ASN1-REFINEMENT.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/ASN1.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}ASN1.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/INET-ADDRESS-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}INET-ADDRESS-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/PYSNMP-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}PYSNMP-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/PYSNMP-SOURCE-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}PYSNMP-SOURCE-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/PYSNMP-USM-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}PYSNMP-USM-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/RFC1158-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}RFC1158-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/RFC1213-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}RFC1213-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/SNMP-COMMUNITY-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-COMMUNITY-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/SNMP-FRAMEWORK-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-FRAMEWORK-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/SNMP-MPD-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-MPD-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/SNMP-NOTIFICATION-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-NOTIFICATION-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/SNMP-PROXY-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-PROXY-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/SNMP-TARGET-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-TARGET-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/SNMP-USER-BASED-SM-3DES-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-USER-BASED-SM-3DES-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/SNMP-USER-BASED-SM-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-USER-BASED-SM-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/SNMP-USM-AES-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-USM-AES-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/SNMP-USM-HMAC-SHA2-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-USM-HMAC-SHA2-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/SNMP-VIEW-BASED-ACM-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-VIEW-BASED-ACM-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/SNMPv2-CONF.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMPv2-CONF.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/SNMPv2-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMPv2-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/SNMPv2-SMI.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMPv2-SMI.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/SNMPv2-TC.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMPv2-TC.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/SNMPv2-TM.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMPv2-TM.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/TRANSPORT-ADDRESS-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}TRANSPORT-ADDRESS-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}ASN1-ENUMERATION.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}ASN1-ENUMERATION.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}ASN1-REFINEMENT.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}ASN1-REFINEMENT.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}ASN1.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}ASN1.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}INET-ADDRESS-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}INET-ADDRESS-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}PYSNMP-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}PYSNMP-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}PYSNMP-SOURCE-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}PYSNMP-SOURCE-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}PYSNMP-USM-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}PYSNMP-USM-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}RFC1158-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}RFC1158-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}RFC1213-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}RFC1213-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-COMMUNITY-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-COMMUNITY-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-FRAMEWORK-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-FRAMEWORK-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-MPD-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-MPD-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-NOTIFICATION-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-NOTIFICATION-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-PROXY-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-PROXY-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-TARGET-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-TARGET-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-USER-BASED-SM-3DES-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-USER-BASED-SM-3DES-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-USER-BASED-SM-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-USER-BASED-SM-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-USM-AES-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-USM-AES-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-USM-HMAC-SHA2-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-USM-HMAC-SHA2-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-VIEW-BASED-ACM-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMP-VIEW-BASED-ACM-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMPv2-CONF.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMPv2-CONF.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMPv2-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMPv2-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMPv2-SMI.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMPv2-SMI.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMPv2-TC.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMPv2-TC.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMPv2-TM.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}SNMPv2-TM.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}TRANSPORT-ADDRESS-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}TRANSPORT-ADDRESS-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/__PYSNMP-USM-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__PYSNMP-USM-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/__SNMP-FRAMEWORK-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__SNMP-FRAMEWORK-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/__SNMP-MPD-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__SNMP-MPD-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/__SNMP-TARGET-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__SNMP-TARGET-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/__SNMP-USER-BASED-SM-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__SNMP-USER-BASED-SM-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/__SNMP-VIEW-BASED-ACM-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__SNMP-VIEW-BASED-ACM-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/__SNMPv2-MIB.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__SNMPv2-MIB.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__PYSNMP-USM-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__PYSNMP-USM-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__SNMP-FRAMEWORK-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__SNMP-FRAMEWORK-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__SNMP-MPD-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__SNMP-MPD-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__SNMP-TARGET-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__SNMP-TARGET-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__SNMP-USER-BASED-SM-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__SNMP-USER-BASED-SM-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__SNMP-VIEW-BASED-ACM-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__SNMP-VIEW-BASED-ACM-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__SNMPv2-MIB.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__SNMPv2-MIB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/mibs/instances/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/rfc1902.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/${MODPY_PYCACHE}rfc1902.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/view.py
-lib/python${MODPY_VERSION}/site-packages/pysnmp/smi/${MODPY_PYCACHE}view.${MODPY_PYC_MAGIC_TAG}pyc
 share/doc/${MODPY_PY_PREFIX}snmp/
 share/doc/${MODPY_PY_PREFIX}snmp/Makefile
 share/doc/${MODPY_PY_PREFIX}snmp/mibs/
diff --git a/net/py-socketio-client/Makefile b/net/py-socketio-client/Makefile
index d20f67376ef..64e5dbd9f92 100644
--- a/net/py-socketio-client/Makefile
+++ b/net/py-socketio-client/Makefile
@@ -3,7 +3,7 @@ COMMENT =		python socket.io client library
 MODPY_EGG_VERSION =	0.6.7
 DISTNAME =		socketIO_client-${MODPY_EGG_VERSION}
 PKGNAME =		py-socketIO-client-${MODPY_EGG_VERSION}
-REVISION =		9
+REVISION =		10
 
 CATEGORIES =		net
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 MODPY_PI =		Yes
 MODPY_PI_DIR =		s/socketIO-client
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 MODULES =		lang/python
 FLAVORS =		python3
diff --git a/net/py-socketio-client/pkg/PLIST b/net/py-socketio-client/pkg/PLIST
index 3a692f4de01..59b4c232406 100644
--- a/net/py-socketio-client/pkg/PLIST
+++ b/net/py-socketio-client/pkg/PLIST
@@ -1,21 +1,27 @@
 @pkgpath net/py-socketio-client
 lib/python${MODPY_VERSION}/site-packages/socketIO_client/
-lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/socketIO_client/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/socketIO_client/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/socketIO_client/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketIO_client/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketIO_client/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketIO_client/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketIO_client/${MODPY_PYCACHE}heartbeats.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketIO_client/${MODPY_PYCACHE}heartbeats.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketIO_client/${MODPY_PYCACHE}logs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketIO_client/${MODPY_PYCACHE}logs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketIO_client/${MODPY_PYCACHE}namespaces.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketIO_client/${MODPY_PYCACHE}namespaces.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketIO_client/${MODPY_PYCACHE}parsers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketIO_client/${MODPY_PYCACHE}parsers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketIO_client/${MODPY_PYCACHE}symmetries.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketIO_client/${MODPY_PYCACHE}symmetries.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketIO_client/${MODPY_PYCACHE}transports.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketIO_client/${MODPY_PYCACHE}transports.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/socketIO_client/exceptions.py
 lib/python${MODPY_VERSION}/site-packages/socketIO_client/heartbeats.py
@@ -26,6 +32,7 @@ lib/python${MODPY_VERSION}/site-packages/socketIO_client/symmetries.py
 lib/python${MODPY_VERSION}/site-packages/socketIO_client/tests/
 lib/python${MODPY_VERSION}/site-packages/socketIO_client/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/socketIO_client/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/socketIO_client/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketIO_client/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/socketIO_client/tests/index.html
 lib/python${MODPY_VERSION}/site-packages/socketIO_client/tests/proxy.js
diff --git a/net/py-socketio/Makefile b/net/py-socketio/Makefile
index 52ae7b7053e..5c33a75d8f2 100644
--- a/net/py-socketio/Makefile
+++ b/net/py-socketio/Makefile
@@ -4,7 +4,7 @@ COMMENT=	client/server implementation of Socket.IO
 MODPY_EGG_VERSION= 4.6.1
 DISTNAME=	python-socketio-${MODPY_EGG_VERSION}
 PKGNAME=	${DISTNAME:S/python-/py-/}
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	net
 
@@ -14,7 +14,7 @@ HOMEPAGE=	https://python-socketio.readthedocs.io/en/latest/
 PERMIT_PACKAGE=	Yes
 
 MODULES=	lang/python
-MODPY_SETUPTOOLS= Yes
+MODPY_PYBUILD=	setuptools
 
 MODPY_PI=	Yes
 NO_TEST=	Yes
diff --git a/net/py-socketio/pkg/PLIST b/net/py-socketio/pkg/PLIST
index 22c8a83c61d..ede214c7f2f 100644
--- a/net/py-socketio/pkg/PLIST
+++ b/net/py-socketio/pkg/PLIST
@@ -1,34 +1,55 @@
-lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/socketio/
 lib/python${MODPY_VERSION}/site-packages/socketio/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}asgi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}asgi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}asyncio_aiopika_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}asyncio_aiopika_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}asyncio_client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}asyncio_client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}asyncio_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}asyncio_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}asyncio_namespace.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}asyncio_namespace.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}asyncio_pubsub_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}asyncio_pubsub_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}asyncio_redis_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}asyncio_redis_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}asyncio_server.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}asyncio_server.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}base_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}base_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}kafka_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}kafka_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}kombu_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}kombu_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}middleware.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}middleware.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}namespace.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}namespace.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}packet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}packet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}pubsub_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}pubsub_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}redis_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}redis_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}server.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}server.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}tornado.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}tornado.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}zmq_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}zmq_manager.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/socketio/asgi.py
 lib/python${MODPY_VERSION}/site-packages/socketio/asyncio_aiopika_manager.py
diff --git a/net/py-socks/Makefile b/net/py-socks/Makefile
index 716e08c0d23..54f1adb6873 100644
--- a/net/py-socks/Makefile
+++ b/net/py-socks/Makefile
@@ -3,7 +3,7 @@ COMMENT =		Python module for working with SOCKS proxies
 MODPY_EGG_VERSION =	1.7.1
 DISTNAME =		PySocks-${MODPY_EGG_VERSION}
 PKGNAME =		py-socks-${MODPY_EGG_VERSION}
-REVISION =		4
+REVISION =		5
 
 CATEGORIES =		net
 
@@ -17,7 +17,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/net/py-socks/pkg/PLIST b/net/py-socks/pkg/PLIST
index a412c55562d..2fd5f448d02 100644
--- a/net/py-socks/pkg/PLIST
+++ b/net/py-socks/pkg/PLIST
@@ -1,10 +1,14 @@
 @pkgpath net/py-socks
-lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}socks.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}socks.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}sockshandler.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}sockshandler.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/socks.py
 lib/python${MODPY_VERSION}/site-packages/sockshandler.py
diff --git a/net/py-tinytuya/Makefile b/net/py-tinytuya/Makefile
index 6cce208032d..6d9969fcd47 100644
--- a/net/py-tinytuya/Makefile
+++ b/net/py-tinytuya/Makefile
@@ -1,9 +1,13 @@
 COMMENT =		interface with Tuya WiFi smart devices
 
 MODPY_EGG_VERSION =	1.7.0
+GH_ACCOUNT =		jasonacox
+GH_PROJECT =		tinytuya
+GH_TAGNAME =		v${MODPY_EGG_VERSION}
+
 DISTNAME =		tinytuya-${MODPY_EGG_VERSION}
 PKGNAME =		py-tinytuya-${MODPY_EGG_VERSION}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		net
 
@@ -14,12 +18,8 @@ MAINTAINER =		Martin Reindl <martin@catai.org>
 # MIT
 PERMIT_PACKAGE =	Yes
 
-GH_ACCOUNT =		jasonacox
-GH_PROJECT =		tinytuya
-GH_TAGNAME =		v${MODPY_EGG_VERSION}
-
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/net/py-tinytuya/pkg/PLIST b/net/py-tinytuya/pkg/PLIST
index 7a19ff873d8..9f8ceef9888 100644
--- a/net/py-tinytuya/pkg/PLIST
+++ b/net/py-tinytuya/pkg/PLIST
@@ -1,10 +1,10 @@
 lib/python${MODPY_VERSION}/site-packages/tinytuya/
-lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/tinytuya/BulbDevice.py
 lib/python${MODPY_VERSION}/site-packages/tinytuya/Cloud.py
 lib/python${MODPY_VERSION}/site-packages/tinytuya/Contrib/
@@ -14,25 +14,40 @@ lib/python${MODPY_VERSION}/site-packages/tinytuya/Contrib/SocketDevice.py
 lib/python${MODPY_VERSION}/site-packages/tinytuya/Contrib/ThermostatDevice.py
 lib/python${MODPY_VERSION}/site-packages/tinytuya/Contrib/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tinytuya/Contrib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/tinytuya/Contrib/${MODPY_PYCACHE}DoorbellDevice.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tinytuya/Contrib/${MODPY_PYCACHE}DoorbellDevice.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tinytuya/Contrib/${MODPY_PYCACHE}IRRemoteControlDevice.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tinytuya/Contrib/${MODPY_PYCACHE}IRRemoteControlDevice.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tinytuya/Contrib/${MODPY_PYCACHE}SocketDevice.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tinytuya/Contrib/${MODPY_PYCACHE}SocketDevice.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tinytuya/Contrib/${MODPY_PYCACHE}ThermostatDevice.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tinytuya/Contrib/${MODPY_PYCACHE}ThermostatDevice.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tinytuya/Contrib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tinytuya/Contrib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/tinytuya/CoverDevice.py
 lib/python${MODPY_VERSION}/site-packages/tinytuya/OutletDevice.py
 lib/python${MODPY_VERSION}/site-packages/tinytuya/__init__.py
 lib/python${MODPY_VERSION}/site-packages/tinytuya/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tinytuya/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/tinytuya/${MODPY_PYCACHE}BulbDevice.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tinytuya/${MODPY_PYCACHE}BulbDevice.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tinytuya/${MODPY_PYCACHE}Cloud.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tinytuya/${MODPY_PYCACHE}Cloud.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tinytuya/${MODPY_PYCACHE}CoverDevice.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tinytuya/${MODPY_PYCACHE}CoverDevice.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tinytuya/${MODPY_PYCACHE}OutletDevice.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tinytuya/${MODPY_PYCACHE}OutletDevice.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tinytuya/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tinytuya/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tinytuya/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tinytuya/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tinytuya/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tinytuya/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tinytuya/${MODPY_PYCACHE}scanner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tinytuya/${MODPY_PYCACHE}scanner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tinytuya/${MODPY_PYCACHE}ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tinytuya/${MODPY_PYCACHE}ui.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tinytuya/${MODPY_PYCACHE}wizard.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tinytuya/${MODPY_PYCACHE}wizard.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/tinytuya/core.py
 lib/python${MODPY_VERSION}/site-packages/tinytuya/scanner.py
diff --git a/net/py-tld/Makefile b/net/py-tld/Makefile
index 473ccd3cea4..c2302aa125c 100644
--- a/net/py-tld/Makefile
+++ b/net/py-tld/Makefile
@@ -3,7 +3,7 @@ COMMENT =	extracts the top level domain (TLD) from the URL given
 MODPY_EGG_VERSION =	0.9.3
 DISTNAME =	tld-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	5
+REVISION =	6
 
 CATEGORIES =	net
 
@@ -13,7 +13,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/net/py-tld/pkg/PLIST b/net/py-tld/pkg/PLIST
index 3a915f5bd0f..a8745dec5d8 100644
--- a/net/py-tld/pkg/PLIST
+++ b/net/py-tld/pkg/PLIST
@@ -1,22 +1,31 @@
-@pkgpath net/py-tld
 @conflict py-tld-<0.9.3p1
+@pkgpath net/py-tld
 bin/update-tld-names
 lib/python${MODPY_VERSION}/site-packages/tld/
-lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_EGG_VERSION}.dist-info/LICENSE_GPL2.0.txt
+lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_EGG_VERSION}.dist-info/LICENSE_LGPL_2.1.txt
+lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/tld/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tld/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/tld/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tld/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tld/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tld/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tld/${MODPY_PYCACHE}bench.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tld/${MODPY_PYCACHE}bench.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tld/${MODPY_PYCACHE}conf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tld/${MODPY_PYCACHE}conf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tld/${MODPY_PYCACHE}defaults.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tld/${MODPY_PYCACHE}defaults.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tld/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tld/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tld/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tld/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tld/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tld/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/tld/base.py
 lib/python${MODPY_VERSION}/site-packages/tld/bench.py
@@ -25,7 +34,9 @@ lib/python${MODPY_VERSION}/site-packages/tld/bin/update-tld-names
 lib/python${MODPY_VERSION}/site-packages/tld/commands/
 lib/python${MODPY_VERSION}/site-packages/tld/commands/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tld/commands/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/tld/commands/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tld/commands/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tld/commands/${MODPY_PYCACHE}update_tld_names.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tld/commands/${MODPY_PYCACHE}update_tld_names.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/tld/commands/update_tld_names.py
 lib/python${MODPY_VERSION}/site-packages/tld/conf.py
@@ -41,15 +52,21 @@ lib/python${MODPY_VERSION}/site-packages/tld/res/old/effective_tld_names-2015-11
 lib/python${MODPY_VERSION}/site-packages/tld/sources/
 lib/python${MODPY_VERSION}/site-packages/tld/sources/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tld/sources/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/tld/sources/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tld/sources/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tld/sources/${MODPY_PYCACHE}mozilla.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tld/sources/${MODPY_PYCACHE}mozilla.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/tld/sources/mozilla.py
 lib/python${MODPY_VERSION}/site-packages/tld/tests/
 lib/python${MODPY_VERSION}/site-packages/tld/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tld/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/tld/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tld/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tld/tests/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tld/tests/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tld/tests/${MODPY_PYCACHE}test_commands.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tld/tests/${MODPY_PYCACHE}test_commands.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tld/tests/${MODPY_PYCACHE}test_core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tld/tests/${MODPY_PYCACHE}test_core.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/tld/tests/base.py
 lib/python${MODPY_VERSION}/site-packages/tld/tests/test_commands.py
diff --git a/net/py-transmissionrpc-ng/Makefile b/net/py-transmissionrpc-ng/Makefile
index ed2762337dc..e7c2f58d14c 100644
--- a/net/py-transmissionrpc-ng/Makefile
+++ b/net/py-transmissionrpc-ng/Makefile
@@ -3,7 +3,7 @@ COMMENT =		json-rpc client library for Transmission
 MODPY_EGG_VERSION =	0.14.1
 DISTNAME =		transmissionrpc-ng-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		net
 
@@ -16,8 +16,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools
 MODPY_PYTEST_ARGS =	test/*.py
 
 FLAVORS =		python3
diff --git a/net/py-transmissionrpc-ng/pkg/PLIST b/net/py-transmissionrpc-ng/pkg/PLIST
index dd91aee66ed..89afae956da 100644
--- a/net/py-transmissionrpc-ng/pkg/PLIST
+++ b/net/py-transmissionrpc-ng/pkg/PLIST
@@ -2,13 +2,21 @@
 lib/python${MODPY_VERSION}/site-packages/transmissionrpc/
 lib/python${MODPY_VERSION}/site-packages/transmissionrpc/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/transmissionrpc/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/transmissionrpc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/transmissionrpc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/transmissionrpc/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/transmissionrpc/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/transmissionrpc/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/transmissionrpc/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/transmissionrpc/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/transmissionrpc/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/transmissionrpc/${MODPY_PYCACHE}httphandler.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/transmissionrpc/${MODPY_PYCACHE}httphandler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/transmissionrpc/${MODPY_PYCACHE}session.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/transmissionrpc/${MODPY_PYCACHE}session.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/transmissionrpc/${MODPY_PYCACHE}torrent.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/transmissionrpc/${MODPY_PYCACHE}torrent.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/transmissionrpc/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/transmissionrpc/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/transmissionrpc/client.py
 lib/python${MODPY_VERSION}/site-packages/transmissionrpc/constants.py
@@ -17,9 +25,9 @@ lib/python${MODPY_VERSION}/site-packages/transmissionrpc/httphandler.py
 lib/python${MODPY_VERSION}/site-packages/transmissionrpc/session.py
 lib/python${MODPY_VERSION}/site-packages/transmissionrpc/torrent.py
 lib/python${MODPY_VERSION}/site-packages/transmissionrpc/utils.py
-lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
+lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_EGG_VERSION}.dist-info/zip-safe
diff --git a/net/py-twitter/Makefile b/net/py-twitter/Makefile
index 7fd22479e39..c655fdaf0b1 100644
--- a/net/py-twitter/Makefile
+++ b/net/py-twitter/Makefile
@@ -1,28 +1,28 @@
-COMMENT=		twitter python module
+COMMENT=	twitter python module
 
 MODPY_EGG_VERSION=	1.18.0
-DISTNAME=		twitter-${MODPY_EGG_VERSION}
-PKGNAME=		py-twitter-${MODPY_EGG_VERSION}
-REVISION=		2
+DISTNAME=	twitter-${MODPY_EGG_VERSION}
+PKGNAME=	py-twitter-${MODPY_EGG_VERSION}
+REVISION=	2
 
-CATEGORIES=		net www
+CATEGORIES=	net www
 
-HOMEPAGE=		https://mike.verdone.ca/twitter/
-MAINTAINER=		Daniel Winters <daniel@tydirium.org>
+HOMEPAGE=	https://mike.verdone.ca/twitter/
+MAINTAINER=	Daniel Winters <daniel@tydirium.org>
 
 # MIT
 PERMIT_PACKAGE=	Yes
 
-MODPY_PI=		Yes
+MODPY_PI=	Yes
 
-MODULES=		lang/python
+MODULES=	lang/python
 
-MODPY_SETUPTOOLS=	Yes
-FLAVORS=		python3
-FLAVOR=			python3
+MODPY_PYBUILD=	setuptools
+FLAVORS=	python3
+FLAVOR=		python3
 
-RUN_DEPENDS=		net/py-irclib${MODPY_FLAVOR}
-BUILD_DEPENDS=		${RUN_DEPENDS}
-TEST_DEPENDS=		devel/py-nose${MODPY_FLAVOR}
+RUN_DEPENDS=	net/py-irclib${MODPY_FLAVOR}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+TEST_DEPENDS=	devel/py-nose${MODPY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/net/py-twitter/pkg/PLIST b/net/py-twitter/pkg/PLIST
index 97447aca44f..b909e8461f2 100644
--- a/net/py-twitter/pkg/PLIST
+++ b/net/py-twitter/pkg/PLIST
@@ -7,32 +7,52 @@ bin/twitter-log
 bin/twitter-stream-example
 bin/twitterbot
 lib/python${MODPY_VERSION}/site-packages/twitter/
-lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
+lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}.dist-info/AUTHORS
+lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}.dist-info/zip-safe
 lib/python${MODPY_VERSION}/site-packages/twitter/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}ansi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}ansi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}archiver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}archiver.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}cmdline.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}cmdline.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}corrupt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}corrupt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}follow.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}follow.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}ircbot.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}ircbot.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}oauth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}oauth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}oauth2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}oauth2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}oauth_dance.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}oauth_dance.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}stream.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}stream.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}stream_example.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}stream_example.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}timezones.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}timezones.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}twitter_globals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}twitter_globals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/twitter/ansi.py
 lib/python${MODPY_VERSION}/site-packages/twitter/api.py
diff --git a/net/py-txtorcon/Makefile b/net/py-txtorcon/Makefile
index e38e3869e5d..db72b576915 100644
--- a/net/py-txtorcon/Makefile
+++ b/net/py-txtorcon/Makefile
@@ -3,7 +3,7 @@ COMMENT =		control-spec implementation for Tor
 MODPY_EGG_VERSION =	22.0.0
 DISTNAME =		txtorcon-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		0
+REVISION =		1
 
 HOMEPAGE =		https://txtorcon.readthedocs.org
 
@@ -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/net/py-txtorcon/pkg/PLIST b/net/py-txtorcon/pkg/PLIST
index 929c5092cfc..f1adc1df733 100644
--- a/net/py-txtorcon/pkg/PLIST
+++ b/net/py-txtorcon/pkg/PLIST
@@ -1,36 +1,60 @@
+lib/python${MODPY_VERSION}/site-packages/twisted/plugins/${MODPY_PYCACHE}txtorcon_endpoint_parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/twisted/plugins/${MODPY_PYCACHE}txtorcon_endpoint_parser.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/twisted/plugins/txtorcon_endpoint_parser.py
 lib/python${MODPY_VERSION}/site-packages/txtorcon/
-lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/txtorcon/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}_metadata.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}_metadata.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}_microdesc_parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}_microdesc_parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}addrmap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}addrmap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}attacher.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}attacher.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}circuit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}circuit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}controller.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}controller.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}controller_py3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}controller_py3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}endpoints.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}endpoints.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}onion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}onion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}router.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}router.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}socks.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}socks.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}spaghetti.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}spaghetti.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}stream.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}stream.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}testutil.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}testutil.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}torconfig.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}torconfig.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}torcontrolprotocol.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}torcontrolprotocol.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}torinfo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}torinfo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}torstate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}torstate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}web.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}web.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/txtorcon/_metadata.py
 lib/python${MODPY_VERSION}/site-packages/txtorcon/_microdesc_parser.py
diff --git a/net/py-u-msgpack/Makefile b/net/py-u-msgpack/Makefile
index ab24af6628e..7517784b4fe 100644
--- a/net/py-u-msgpack/Makefile
+++ b/net/py-u-msgpack/Makefile
@@ -3,7 +3,7 @@ COMMENT =		portable, lightweight MessagePack (de)serializer
 MODPY_EGG_VERSION =	2.7.1
 DISTNAME =		u-msgpack-python-${MODPY_EGG_VERSION}
 PKGNAME =		py-u-msgpack-${MODPY_EGG_VERSION}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		net textproc
 
@@ -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/net/py-u-msgpack/pkg/PLIST b/net/py-u-msgpack/pkg/PLIST
index bb8d5298f2a..7e24216fec0 100644
--- a/net/py-u-msgpack/pkg/PLIST
+++ b/net/py-u-msgpack/pkg/PLIST
@@ -1,8 +1,10 @@
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}umsgpack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}umsgpack.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/umsgpack.py
diff --git a/net/py-websocket-client/Makefile b/net/py-websocket-client/Makefile
index f7dea76a036..d9a1d9be0b3 100644
--- a/net/py-websocket-client/Makefile
+++ b/net/py-websocket-client/Makefile
@@ -3,7 +3,7 @@ COMMENT =		WebSocket client for Python
 MODPY_EGG_VERSION =	0.37.0
 DISTNAME =		websocket_client-${MODPY_EGG_VERSION}
 PKGNAME =		py-websocket-client-${MODPY_EGG_VERSION}
-REVISION =		8
+REVISION =		9
 
 CATEGORIES =		net
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 MODPY_PI =		Yes
 MODPY_PI_DIR =		w/websocket-client
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 MODULES =		lang/python
 FLAVORS =		python3
diff --git a/net/py-websocket-client/pkg/PLIST b/net/py-websocket-client/pkg/PLIST
index bc880c9cd22..e02ba24fba9 100644
--- a/net/py-websocket-client/pkg/PLIST
+++ b/net/py-websocket-client/pkg/PLIST
@@ -4,17 +4,29 @@ bin/wsdump.py
 lib/python${MODPY_VERSION}/site-packages/websocket/
 lib/python${MODPY_VERSION}/site-packages/websocket/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_abnf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_abnf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_app.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_app.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_handshake.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_handshake.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_http.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_logging.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_logging.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_socket.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_socket.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_ssl_compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_ssl_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_url.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_url.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websocket/${MODPY_PYCACHE}_utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/websocket/_abnf.py
 lib/python${MODPY_VERSION}/site-packages/websocket/_app.py
@@ -31,15 +43,17 @@ lib/python${MODPY_VERSION}/site-packages/websocket/cacert.pem
 lib/python${MODPY_VERSION}/site-packages/websocket/tests/
 lib/python${MODPY_VERSION}/site-packages/websocket/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/websocket/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/websocket/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websocket/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websocket/tests/${MODPY_PYCACHE}test_websocket.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websocket/tests/${MODPY_PYCACHE}test_websocket.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/websocket/tests/data/
 lib/python${MODPY_VERSION}/site-packages/websocket/tests/data/header01.txt
 lib/python${MODPY_VERSION}/site-packages/websocket/tests/data/header02.txt
 lib/python${MODPY_VERSION}/site-packages/websocket/tests/test_websocket.py
-lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_EGG_VERSION}.dist-info/top_level.txt
diff --git a/net/py-zeroconf/Makefile b/net/py-zeroconf/Makefile
index 22c39ab678a..19de178ad3d 100644
--- a/net/py-zeroconf/Makefile
+++ b/net/py-zeroconf/Makefile
@@ -3,7 +3,7 @@ COMMENT =		pure Python Multicast DNS Service Discovery Library
 MODPY_EGG_VERSION =	0.28.8
 DISTNAME =		zeroconf-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		net
 
@@ -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/net/py-zeroconf/pkg/PLIST b/net/py-zeroconf/pkg/PLIST
index dbf758dc090..7bd59961687 100644
--- a/net/py-zeroconf/pkg/PLIST
+++ b/net/py-zeroconf/pkg/PLIST
@@ -1,15 +1,16 @@
 @pkgpath net/py-zeroconf
 lib/python${MODPY_VERSION}/site-packages/zeroconf/
-lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}.dist-info/COPYING
+lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/zeroconf/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/zeroconf/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/zeroconf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/zeroconf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zeroconf/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/zeroconf/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/zeroconf/py.typed
 lib/python${MODPY_VERSION}/site-packages/zeroconf/test.py
diff --git a/net/scapy/Makefile b/net/scapy/Makefile
index eed631d22e1..6940d264fea 100644
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -1,7 +1,7 @@
 COMMENT =	powerful interactive packet manipulation in python
 
 MODPY_EGG_VERSION =	2.4.4
-REVISION =	3
+REVISION =	4
 
 DISTNAME =	scapy-${MODPY_EGG_VERSION}
 
@@ -20,7 +20,7 @@ EXTRACT_ONLY =		${DISTNAME}${EXTRACT_SUFX}
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 UPDATE_PLIST_ARGS =	-i MODPY_PY_PREFIX
 
 .include <bsd.port.arch.mk>
diff --git a/net/scapy/pkg/PLIST b/net/scapy/pkg/PLIST
index e861463e880..94c6ebd3b58 100644
--- a/net/scapy/pkg/PLIST
+++ b/net/scapy/pkg/PLIST
@@ -5,68 +5,110 @@
 bin/UTscapy
 bin/scapy
 lib/python${MODPY_VERSION}/site-packages/scapy/
-lib/python${MODPY_VERSION}/site-packages/scapy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/scapy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/scapy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/scapy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/scapy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/scapy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/scapy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/scapy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/scapy-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/scapy-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/scapy-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/scapy-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/scapy-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/scapy-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/scapy-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/scapy/VERSION
 lib/python${MODPY_VERSION}/site-packages/scapy/__init__.py
 lib/python${MODPY_VERSION}/site-packages/scapy/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}all.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}all.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}ansmachine.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}ansmachine.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}as_resolvers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}as_resolvers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}asn1fields.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}asn1fields.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}asn1packet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}asn1packet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}automaton.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}automaton.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}autorun.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}autorun.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}base_classes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}base_classes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}consts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}consts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}dadict.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}dadict.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}data.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}data.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}extlib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}extlib.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}fields.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}fields.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}packet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}packet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}pipetool.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}pipetool.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}plist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}plist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}pton_ntop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}pton_ntop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}route.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}route.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}route6.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}route6.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}scapypipes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}scapypipes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}sendrecv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}sendrecv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}sessions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}sessions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}supersocket.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}supersocket.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}themes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}themes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}utils6.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}utils6.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}volatile.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}volatile.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/all.py
 lib/python${MODPY_VERSION}/site-packages/scapy/ansmachine.py
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}linux.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}linux.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}pcapdnet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}pcapdnet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}solaris.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}solaris.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}unix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}unix.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/bpf/
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/bpf/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/arch/bpf/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/arch/bpf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/bpf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/arch/bpf/${MODPY_PYCACHE}consts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/bpf/${MODPY_PYCACHE}consts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/arch/bpf/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/bpf/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/arch/bpf/${MODPY_PYCACHE}supersocket.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/bpf/${MODPY_PYCACHE}supersocket.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/bpf/consts.py
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/bpf/core.py
@@ -79,8 +121,11 @@ lib/python${MODPY_VERSION}/site-packages/scapy/arch/unix.py
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/windows/
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/windows/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/arch/windows/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/arch/windows/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/windows/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/arch/windows/${MODPY_PYCACHE}native.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/windows/${MODPY_PYCACHE}native.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/arch/windows/${MODPY_PYCACHE}structures.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/windows/${MODPY_PYCACHE}structures.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/windows/native.py
 lib/python${MODPY_VERSION}/site-packages/scapy/arch/windows/structures.py
@@ -88,9 +133,13 @@ lib/python${MODPY_VERSION}/site-packages/scapy/as_resolvers.py
 lib/python${MODPY_VERSION}/site-packages/scapy/asn1/
 lib/python${MODPY_VERSION}/site-packages/scapy/asn1/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/asn1/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/asn1/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/asn1/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/asn1/${MODPY_PYCACHE}asn1.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/asn1/${MODPY_PYCACHE}asn1.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/asn1/${MODPY_PYCACHE}ber.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/asn1/${MODPY_PYCACHE}ber.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/asn1/${MODPY_PYCACHE}mib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/asn1/${MODPY_PYCACHE}mib.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/asn1/asn1.py
 lib/python${MODPY_VERSION}/site-packages/scapy/asn1/ber.py
@@ -106,109 +155,205 @@ lib/python${MODPY_VERSION}/site-packages/scapy/consts.py
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}altbeacon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}altbeacon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}aoe.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}aoe.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}avs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}avs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}bfd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}bfd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}bgp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}bgp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}bier.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}bier.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}bp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}bp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}cansocket.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}cansocket.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}cansocket_native.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}cansocket_native.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}cansocket_python_can.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}cansocket_python_can.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}carp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}carp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}cdp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}cdp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}chdlc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}chdlc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}coap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}coap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}concox.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}concox.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}dce_rpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}dce_rpc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}diameter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}diameter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}dtp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}dtp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}eddystone.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}eddystone.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}eigrp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}eigrp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}enipTCP.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}enipTCP.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}erspan.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}erspan.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ethercat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ethercat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}etherip.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}etherip.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}exposure_notification.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}exposure_notification.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}geneve.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}geneve.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}gtp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}gtp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}gtp_v2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}gtp_v2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}homeplugav.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}homeplugav.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}homepluggp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}homepluggp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}homeplugsg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}homeplugsg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}http2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}http2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ibeacon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ibeacon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}icmp_extensions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}icmp_extensions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ife.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ife.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}igmp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}igmp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}igmpv3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}igmpv3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ikev2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ikev2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}isis.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}isis.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}isotp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}isotp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}lacp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}lacp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ldp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ldp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}lldp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}lldp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}loraphy2wan.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}loraphy2wan.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ltp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ltp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}mac_control.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}mac_control.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}macsec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}macsec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}modbus.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}modbus.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}mount.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}mount.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}mpls.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}mpls.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}mqtt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}mqtt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}mqttsn.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}mqttsn.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}nfs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}nfs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}nlm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}nlm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}nsh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}nsh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}oncrpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}oncrpc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}opc_da.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}opc_da.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}openflow.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}openflow.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}openflow3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}openflow3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ospf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ospf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}pfcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}pfcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}pnio.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}pnio.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}pnio_dcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}pnio_dcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}pnio_rpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}pnio_rpc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}portmap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}portmap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ppi_cace.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ppi_cace.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ppi_geotag.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ppi_geotag.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ripng.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ripng.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}roce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}roce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}rpl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}rpl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}rpl_metrics.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}rpl_metrics.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}rsvp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}rsvp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}rtr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}rtr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}sdnv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}sdnv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}sebek.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}sebek.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}send.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}send.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}skinny.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}skinny.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}socks.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}socks.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}spbm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}spbm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}tacacs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}tacacs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}tzsp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}tzsp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ubberlogger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}ubberlogger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}vqp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}vqp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}vtp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}vtp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}wireguard.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}wireguard.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}wpa_eapol.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/${MODPY_PYCACHE}wpa_eapol.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/altbeacon.py
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/aoe.py
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}ccp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}ccp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}ecu.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}ecu.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}enumerator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}enumerator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}someip.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}someip.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}uds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/${MODPY_PYCACHE}uds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/bmw/
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/bmw/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/bmw/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/bmw/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/bmw/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/bmw/${MODPY_PYCACHE}definitions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/bmw/${MODPY_PYCACHE}definitions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/bmw/${MODPY_PYCACHE}enet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/bmw/${MODPY_PYCACHE}enet.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/bmw/definitions.py
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/bmw/enet.py
@@ -218,29 +363,41 @@ lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/enumerator.py
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/${MODPY_PYCACHE}gmlan.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/${MODPY_PYCACHE}gmlan.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/${MODPY_PYCACHE}gmlanutils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/${MODPY_PYCACHE}gmlanutils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/gmlan.py
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/gm/gmlanutils.py
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/${MODPY_PYCACHE}obd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/${MODPY_PYCACHE}obd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/${MODPY_PYCACHE}packet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/${MODPY_PYCACHE}packet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/${MODPY_PYCACHE}scanner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/${MODPY_PYCACHE}scanner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/${MODPY_PYCACHE}services.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/${MODPY_PYCACHE}services.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/iid/
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/iid/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/iid/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/iid/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/iid/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/iid/${MODPY_PYCACHE}iids.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/iid/${MODPY_PYCACHE}iids.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/iid/iids.py
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/mid/
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/mid/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/mid/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/mid/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/mid/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/mid/${MODPY_PYCACHE}mids.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/mid/${MODPY_PYCACHE}mids.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/mid/mids.py
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/obd.py
@@ -248,13 +405,21 @@ lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/packet.py
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/pid/
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/pid/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/pid/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/pid/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/pid/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/pid/${MODPY_PYCACHE}pids.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/pid/${MODPY_PYCACHE}pids.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/pid/${MODPY_PYCACHE}pids_00_1F.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/pid/${MODPY_PYCACHE}pids_00_1F.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/pid/${MODPY_PYCACHE}pids_20_3F.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/pid/${MODPY_PYCACHE}pids_20_3F.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/pid/${MODPY_PYCACHE}pids_40_5F.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/pid/${MODPY_PYCACHE}pids_40_5F.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/pid/${MODPY_PYCACHE}pids_60_7F.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/pid/${MODPY_PYCACHE}pids_60_7F.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/pid/${MODPY_PYCACHE}pids_80_9F.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/pid/${MODPY_PYCACHE}pids_80_9F.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/pid/${MODPY_PYCACHE}pids_A0_C0.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/pid/${MODPY_PYCACHE}pids_A0_C0.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/pid/pids.py
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/pid/pids_00_1F.py
@@ -268,7 +433,9 @@ lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/services.p
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/tid/
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/tid/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/tid/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/tid/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/tid/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/tid/${MODPY_PYCACHE}tids.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/tid/${MODPY_PYCACHE}tids.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/obd/tid/tids.py
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/someip.py
@@ -276,7 +443,9 @@ lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/uds.py
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/volkswagen/
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/volkswagen/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/volkswagen/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/volkswagen/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/volkswagen/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/volkswagen/${MODPY_PYCACHE}definitions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/volkswagen/${MODPY_PYCACHE}definitions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/automotive/volkswagen/definitions.py
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/avs.py
@@ -353,14 +522,20 @@ lib/python${MODPY_VERSION}/site-packages/scapy/contrib/rtr.py
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/scada/
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/scada/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/contrib/scada/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/scada/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/scada/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/scada/${MODPY_PYCACHE}pcom.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/scada/${MODPY_PYCACHE}pcom.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/scada/iec104/
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/scada/iec104/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/contrib/scada/iec104/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/scada/iec104/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/scada/iec104/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/scada/iec104/${MODPY_PYCACHE}iec104_fields.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/scada/iec104/${MODPY_PYCACHE}iec104_fields.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/scada/iec104/${MODPY_PYCACHE}iec104_information_elements.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/scada/iec104/${MODPY_PYCACHE}iec104_information_elements.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/contrib/scada/iec104/${MODPY_PYCACHE}iec104_information_objects.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/scada/iec104/${MODPY_PYCACHE}iec104_information_objects.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/scada/iec104/iec104_fields.py
 lib/python${MODPY_VERSION}/site-packages/scapy/contrib/scada/iec104/iec104_information_elements.py
@@ -387,53 +562,101 @@ lib/python${MODPY_VERSION}/site-packages/scapy/fields.py
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}all.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}all.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}bluetooth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}bluetooth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}bluetooth4LE.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}bluetooth4LE.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}can.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}can.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}clns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}clns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}dhcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}dhcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}dhcp6.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}dhcp6.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}dns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}dns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}dot11.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}dot11.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}dot15d4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}dot15d4.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}eap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}eap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}gprs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}gprs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}hsrp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}hsrp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}inet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}inet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}inet6.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}inet6.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}ipsec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}ipsec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}ir.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}ir.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}isakmp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}isakmp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}l2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}l2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}l2tp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}l2tp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}llmnr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}llmnr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}lltd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}lltd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}mgcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}mgcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}mobileip.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}mobileip.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}netbios.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}netbios.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}netflow.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}netflow.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}ntp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}ntp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}pflog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}pflog.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}ppi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}ppi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}ppp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}ppp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}pptp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}pptp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}radius.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}radius.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}rip.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}rip.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}rtp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}rtp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}sctp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}sctp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}sixlowpan.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}sixlowpan.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}skinny.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}skinny.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}smb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}smb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}smb2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}smb2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}snmp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}snmp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}tftp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}tftp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}usb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}usb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}vrrp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}vrrp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}vxlan.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}vxlan.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}x509.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}x509.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}zigbee.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/${MODPY_PYCACHE}zigbee.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/all.py
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/bluetooth.py
@@ -480,22 +703,39 @@ lib/python${MODPY_VERSION}/site-packages/scapy/layers/tftp.py
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}all.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}all.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}automaton.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}automaton.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}automaton_cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}automaton_cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}automaton_srv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}automaton_srv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}basefields.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}basefields.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}cert.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}cert.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}extensions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}extensions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}handshake.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}handshake.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}handshake_sslv2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}handshake_sslv2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}keyexchange.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}keyexchange.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}keyexchange_tls13.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}keyexchange_tls13.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}record.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}record.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}record_sslv2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}record_sslv2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}record_tls13.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}record_tls13.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}session.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}session.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}tools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/${MODPY_PYCACHE}tools.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/all.py
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/automaton.py
@@ -506,21 +746,37 @@ lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/cert.py
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}all.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}all.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}cipher_aead.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}cipher_aead.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}cipher_block.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}cipher_block.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}cipher_stream.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}cipher_stream.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}ciphers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}ciphers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}compression.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}compression.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}groups.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}groups.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}h_mac.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}h_mac.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}hash.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}hash.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}hkdf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}hkdf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}kx_algs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}kx_algs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}pkcs1.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}pkcs1.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}prf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}prf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}suites.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/${MODPY_PYCACHE}suites.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/all.py
 lib/python${MODPY_VERSION}/site-packages/scapy/layers/tls/crypto/cipher_aead.py
@@ -555,9 +811,13 @@ lib/python${MODPY_VERSION}/site-packages/scapy/layers/zigbee.py
 lib/python${MODPY_VERSION}/site-packages/scapy/libs/
 lib/python${MODPY_VERSION}/site-packages/scapy/libs/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/libs/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/libs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/libs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/libs/${MODPY_PYCACHE}ethertypes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/libs/${MODPY_PYCACHE}ethertypes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/libs/${MODPY_PYCACHE}structures.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/libs/${MODPY_PYCACHE}structures.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/libs/${MODPY_PYCACHE}winpcapy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/libs/${MODPY_PYCACHE}winpcapy.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/libs/ethertypes.py
 lib/python${MODPY_VERSION}/site-packages/scapy/libs/structures.py
@@ -566,16 +826,24 @@ lib/python${MODPY_VERSION}/site-packages/scapy/main.py
 lib/python${MODPY_VERSION}/site-packages/scapy/modules/
 lib/python${MODPY_VERSION}/site-packages/scapy/modules/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/modules/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/modules/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/modules/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/modules/${MODPY_PYCACHE}nmap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/modules/${MODPY_PYCACHE}nmap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/modules/${MODPY_PYCACHE}p0f.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/modules/${MODPY_PYCACHE}p0f.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/modules/${MODPY_PYCACHE}six.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/modules/${MODPY_PYCACHE}six.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/modules/${MODPY_PYCACHE}voip.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/modules/${MODPY_PYCACHE}voip.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/modules/krack/
 lib/python${MODPY_VERSION}/site-packages/scapy/modules/krack/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/modules/krack/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/modules/krack/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/modules/krack/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/modules/krack/${MODPY_PYCACHE}automaton.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/modules/krack/${MODPY_PYCACHE}automaton.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/modules/krack/${MODPY_PYCACHE}crypto.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/modules/krack/${MODPY_PYCACHE}crypto.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/modules/krack/automaton.py
 lib/python${MODPY_VERSION}/site-packages/scapy/modules/krack/crypto.py
@@ -598,16 +866,24 @@ lib/python${MODPY_VERSION}/site-packages/scapy/tools/
 lib/python${MODPY_VERSION}/site-packages/scapy/tools/UTscapy.py
 lib/python${MODPY_VERSION}/site-packages/scapy/tools/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/tools/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/tools/${MODPY_PYCACHE}UTscapy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/tools/${MODPY_PYCACHE}UTscapy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/tools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/tools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/tools/${MODPY_PYCACHE}check_asdis.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/tools/${MODPY_PYCACHE}check_asdis.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/tools/${MODPY_PYCACHE}generate_ethertypes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/tools/${MODPY_PYCACHE}generate_ethertypes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/tools/${MODPY_PYCACHE}scapy_pyannotate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/tools/${MODPY_PYCACHE}scapy_pyannotate.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/tools/automotive/
 lib/python${MODPY_VERSION}/site-packages/scapy/tools/automotive/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scapy/tools/automotive/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scapy/tools/automotive/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/tools/automotive/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/tools/automotive/${MODPY_PYCACHE}isotpscanner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/tools/automotive/${MODPY_PYCACHE}isotpscanner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scapy/tools/automotive/${MODPY_PYCACHE}obdscanner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scapy/tools/automotive/${MODPY_PYCACHE}obdscanner.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scapy/tools/automotive/isotpscanner.py
 lib/python${MODPY_VERSION}/site-packages/scapy/tools/automotive/obdscanner.py
diff --git a/net/sshuttle/Makefile b/net/sshuttle/Makefile
index 846c6a57bbd..8d6c6878cf3 100644
--- a/net/sshuttle/Makefile
+++ b/net/sshuttle/Makefile
@@ -2,7 +2,7 @@ COMMENT=		VPN over an SSH tunnel
 
 MODPY_EGG_VERSION=	1.1.1
 DISTNAME=		sshuttle-${MODPY_EGG_VERSION}
-REVISION=		1
+REVISION=		2
 
 FIX_EXTRACT_PERMISSIONS=Yes
 
@@ -19,13 +19,11 @@ FLAVORS=		python3
 FLAVOR=			python3
 
 MODPY_PI=		Yes
-MODPY_PYTEST=		Yes
-MODPY_SETUPTOOLS=	Yes
+MODPY_PYBUILD=		setuptools_scm
 
 USE_GMAKE=		Yes
 
-BUILD_DEPENDS=		devel/py-setuptools_scm${MODPY_FLAVOR} \
-			textproc/py-sphinx${MODPY_FLAVOR}
+BUILD_DEPENDS=		textproc/py-sphinx${MODPY_FLAVOR}
 TEST_DEPENDS=		devel/py-test-cov${MODPY_FLAVOR}
 
 post-build:
diff --git a/net/sshuttle/pkg/PLIST b/net/sshuttle/pkg/PLIST
index f5000406e6b..9f91f9edba7 100644
--- a/net/sshuttle/pkg/PLIST
+++ b/net/sshuttle/pkg/PLIST
@@ -1,30 +1,48 @@
 bin/sshuttle
 lib/python${MODPY_VERSION}/site-packages/sshuttle/
-lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/sshuttle/__init__.py
 lib/python${MODPY_VERSION}/site-packages/sshuttle/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}assembler.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}assembler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}cmdline.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}cmdline.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}firewall.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}firewall.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}hostwatch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}hostwatch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}linux.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}linux.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}sdnotify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}sdnotify.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}server.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}server.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}ssh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}ssnet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}ssnet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}ssyslog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}ssyslog.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}sudoers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}sudoers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sshuttle/assembler.py
 lib/python${MODPY_VERSION}/site-packages/sshuttle/client.py
@@ -36,11 +54,17 @@ lib/python${MODPY_VERSION}/site-packages/sshuttle/linux.py
 lib/python${MODPY_VERSION}/site-packages/sshuttle/methods/
 lib/python${MODPY_VERSION}/site-packages/sshuttle/methods/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sshuttle/methods/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sshuttle/methods/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/methods/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sshuttle/methods/${MODPY_PYCACHE}ipfw.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/methods/${MODPY_PYCACHE}ipfw.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sshuttle/methods/${MODPY_PYCACHE}nat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/methods/${MODPY_PYCACHE}nat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sshuttle/methods/${MODPY_PYCACHE}nft.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/methods/${MODPY_PYCACHE}nft.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sshuttle/methods/${MODPY_PYCACHE}pf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/methods/${MODPY_PYCACHE}pf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sshuttle/methods/${MODPY_PYCACHE}tproxy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sshuttle/methods/${MODPY_PYCACHE}tproxy.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sshuttle/methods/ipfw.py
 lib/python${MODPY_VERSION}/site-packages/sshuttle/methods/nat.py
diff --git a/net/tg/Makefile b/net/tg/Makefile
index ea4c8ca1c2b..b6273d25a33 100644
--- a/net/tg/Makefile
+++ b/net/tg/Makefile
@@ -3,7 +3,7 @@ COMMENT =	ncurses Telegram client
 MODPY_EGG_VERSION =	0.19.0
 
 DISTNAME =	tg-${MODPY_EGG_VERSION}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	net
 
@@ -15,7 +15,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 NO_TEST =		Yes
 
 RUN_DEPENDS =		net/py-telegram${MODPY_FLAVOR}
diff --git a/net/tg/pkg/PLIST b/net/tg/pkg/PLIST
index 7738e06752a..63d1a5d1cfa 100644
--- a/net/tg/pkg/PLIST
+++ b/net/tg/pkg/PLIST
@@ -1,25 +1,34 @@
 bin/tg
 lib/python${MODPY_VERSION}/site-packages/tg/
-lib/python${MODPY_VERSION}/site-packages/tg-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/tg-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/tg-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/tg-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/tg-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/tg-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/tg-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/tg-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/tg-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/tg-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/tg-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/tg-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
 lib/python${MODPY_VERSION}/site-packages/tg/__init__.py
 lib/python${MODPY_VERSION}/site-packages/tg/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}colors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}colors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}controllers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}controllers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}models.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}models.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}msg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}msg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}tdlib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}tdlib.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}update_handlers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}update_handlers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}views.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tg/${MODPY_PYCACHE}views.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/tg/colors.py
 lib/python${MODPY_VERSION}/site-packages/tg/config.py
diff --git a/net/toot/Makefile b/net/toot/Makefile
index e9c99f5f259..6e07ad0cc85 100644
--- a/net/toot/Makefile
+++ b/net/toot/Makefile
@@ -2,7 +2,7 @@ COMMENT =		interact with Mastodon social networks from the command line
 
 MODPY_EGG_VERSION =	0.28.0
 DISTNAME =		toot-${MODPY_EGG_VERSION}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		net
 
@@ -14,8 +14,7 @@ MASTER_SITES =		https://github.com/ihabunek/toot/releases/download/${MODPY_EGG_V
 PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools
 
 RUN_DEPENDS =		devel/py-future${MODPY_FLAVOR}>=0.16 \
 			devel/py-wcwidth${MODPY_FLAVOR}>=0.1.7 \
diff --git a/net/toot/pkg/PLIST b/net/toot/pkg/PLIST
index c9b5a792423..d393c322950 100644
--- a/net/toot/pkg/PLIST
+++ b/net/toot/pkg/PLIST
@@ -1,25 +1,36 @@
 bin/toot
 lib/python${MODPY_VERSION}/site-packages/toot/
-lib/python${MODPY_VERSION}/site-packages/toot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/toot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/toot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/toot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/toot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/toot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/toot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/toot-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/toot-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/toot-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/toot-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/toot-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/toot-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/toot/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}commands.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}commands.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}console.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}console.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}logging.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}logging.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}output.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}output.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}wcstring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}wcstring.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/toot/api.py
 lib/python${MODPY_VERSION}/site-packages/toot/auth.py
@@ -33,14 +44,23 @@ lib/python${MODPY_VERSION}/site-packages/toot/output.py
 lib/python${MODPY_VERSION}/site-packages/toot/tui/
 lib/python${MODPY_VERSION}/site-packages/toot/tui/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/toot/tui/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/toot/tui/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/toot/tui/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/tui/${MODPY_PYCACHE}app.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/toot/tui/${MODPY_PYCACHE}app.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/tui/${MODPY_PYCACHE}compose.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/toot/tui/${MODPY_PYCACHE}compose.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/tui/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/toot/tui/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/tui/${MODPY_PYCACHE}entities.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/toot/tui/${MODPY_PYCACHE}entities.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/tui/${MODPY_PYCACHE}overlays.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/toot/tui/${MODPY_PYCACHE}overlays.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/tui/${MODPY_PYCACHE}timeline.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/toot/tui/${MODPY_PYCACHE}timeline.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/tui/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/toot/tui/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/tui/${MODPY_PYCACHE}widgets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/toot/tui/${MODPY_PYCACHE}widgets.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/toot/tui/app.py
 lib/python${MODPY_VERSION}/site-packages/toot/tui/compose.py
diff --git a/net/vf1/Makefile b/net/vf1/Makefile
index 42cada991e6..3198e25e667 100644
--- a/net/vf1/Makefile
+++ b/net/vf1/Makefile
@@ -3,7 +3,7 @@ COMMENT =		command line gopher client
 MODPY_EGG_VERSION =	0.0.11
 DISTNAME =		VF-1-${MODPY_EGG_VERSION}
 PKGNAME =		vf1-${MODPY_EGG_VERSION}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		net
 
@@ -16,7 +16,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vf1/
diff --git a/net/vf1/pkg/PLIST b/net/vf1/pkg/PLIST
index d0a6b8590fb..372aa480617 100644
--- a/net/vf1/pkg/PLIST
+++ b/net/vf1/pkg/PLIST
@@ -1,10 +1,13 @@
 bin/vf1
-lib/python${MODPY_VERSION}/site-packages/VF_1-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/VF_1-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/VF_1-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/VF_1-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/VF_1-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/VF_1-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/VF_1-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/VF_1-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/VF_1-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/VF_1-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/VF_1-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/VF_1-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/VF_1-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}vf1.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}vf1.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/vf1.py
 share/doc/pkg-readmes/${PKGSTEM}
diff --git a/net/websockify/Makefile b/net/websockify/Makefile
index 077e6664fa9..9f9d10e85b7 100644
--- a/net/websockify/Makefile
+++ b/net/websockify/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION= 0.9.0
 GH_ACCOUNT=	novnc
 GH_PROJECT=	websockify
 GH_TAGNAME=	v${MODPY_EGG_VERSION}
-REVISION=	2
+REVISION=	3
 
 CATEGORIES=	net
 
@@ -12,7 +12,7 @@ CATEGORIES=	net
 PERMIT_PACKAGE=	Yes
 
 MODULES=	lang/python
-MODPY_SETUPTOOLS= Yes
+MODPY_PYBUILD=	setuptools
 
 RUN_DEPENDS=	math/py-numpy${MODPY_FLAVOR}
 
diff --git a/net/websockify/pkg/PLIST b/net/websockify/pkg/PLIST
index 7ada93941fd..be86be10668 100644
--- a/net/websockify/pkg/PLIST
+++ b/net/websockify/pkg/PLIST
@@ -1,24 +1,32 @@
 bin/websockify
 lib/python${MODPY_VERSION}/site-packages/websockify/
-lib/python${MODPY_VERSION}/site-packages/websockify-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/websockify-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/websockify-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/websockify-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/websockify-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/websockify-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/websockify-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/websockify-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/websockify-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/websockify-${MODPY_EGG_VERSION}.dist-info/COPYING
+lib/python${MODPY_VERSION}/site-packages/websockify-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/websockify-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/websockify-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/websockify-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/websockify-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/websockify/__init__.py
 lib/python${MODPY_VERSION}/site-packages/websockify/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}auth_plugins.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}auth_plugins.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}sysloghandler.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}sysloghandler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}token_plugins.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}token_plugins.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}websocket.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}websocket.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}websocketproxy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}websocketproxy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}websocketserver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}websocketserver.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}websockifyserver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}websockifyserver.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/websockify/auth_plugins.py
 lib/python${MODPY_VERSION}/site-packages/websockify/sysloghandler.py