aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2017-01-07 21:42:28 +0000
committerSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2017-01-07 21:42:28 +0000
commite730d999d3dd8305cbcbc35b739703175d0c2d68 (patch)
tree34ed59c815a96dcd021876d917ebc81830b5dedf
parent2660d9ede27778db5ed22c2ab82560b9533cdf86 (diff)
downloadports-e730d999d3dd8305cbcbc35b739703175d0c2d68.tar.gz
ports-e730d999d3dd8305cbcbc35b739703175d0c2d68.zip
Add more PLIST_SUB to Mk/Uses/python.mk
- Add PYTHON_PYOEXTENSION and PYTHON_SUFFIX - Add PYTHON2 and PYTHON3 - Respect PYTHON_VERSION - Rename PYOEXTENSION to PYTHON_PYOEXTENSION This change would help: - Build databases/postgresql*-plpython with Python 3 (It has PLIST issue since bsd.python.mk to Uses/python.mk transition) - Simplify Makefile PR: 205807 Differential Revision: https://reviews.FreeBSD.org/D4758 Exp-run by: antoine
Notes
Notes: svn path=/head/; revision=430839
-rw-r--r--Mk/Uses/python.mk29
-rw-r--r--accessibility/accerciser/Makefile14
-rw-r--r--accessibility/accerciser/pkg-plist72
-rw-r--r--accessibility/orca/Makefile14
-rw-r--r--accessibility/orca/pkg-plist792
-rw-r--r--accessibility/py3-atspi/Makefile14
-rw-r--r--accessibility/py3-atspi/pkg-plist96
-rw-r--r--accessibility/py3-speech-dispatcher/pkg-plist28
-rw-r--r--accessibility/speech-dispatcher/Makefile15
-rw-r--r--astro/weather/Makefile7
-rw-r--r--audio/gnome-music/Makefile13
-rw-r--r--audio/gnome-music/pkg-plist56
-rw-r--r--audio/rhythmbox/Makefile7
-rw-r--r--audio/rhythmbox/pkg-plist148
-rw-r--r--databases/postgresql92-server/pkg-plist-plpython10
-rw-r--r--databases/postgresql93-server/pkg-plist-plpython10
-rw-r--r--databases/postgresql94-server/pkg-plist-plpython10
-rw-r--r--databases/postgresql95-plpython/Makefile6
-rw-r--r--databases/postgresql95-server/pkg-plist-plpython10
-rw-r--r--databases/postgresql96-server/pkg-plist-plpython10
-rw-r--r--devel/gitg/Makefile15
-rw-r--r--devel/gitg/pkg-plist2
-rw-r--r--devel/py3-gobject3/pkg-plist100
-rw-r--r--devel/pygobject3-common/Makefile8
-rw-r--r--dns/bundy/Makefile14
-rw-r--r--dns/bundy/pkg-plist356
-rw-r--r--editors/gedit-plugins/Makefile13
-rw-r--r--editors/gedit-plugins/pkg-plist260
-rw-r--r--editors/gedit/Makefile13
-rw-r--r--editors/gedit/pkg-plist140
-rw-r--r--graphics/eog-plugins/Makefile46
-rw-r--r--graphics/eog-plugins/pkg-plist28
-rw-r--r--graphics/py3-cairo/Makefile13
-rw-r--r--graphics/py3-cairo/pkg-plist4
-rw-r--r--math/convertall/Makefile9
-rw-r--r--math/convertall/pkg-plist36
-rw-r--r--math/rpcalc/Makefile9
-rw-r--r--math/rpcalc/pkg-plist28
-rw-r--r--multimedia/py3-gstreamer1/Makefile13
-rw-r--r--multimedia/py3-gstreamer1/pkg-plist8
40 files changed, 1148 insertions, 1328 deletions
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
index 078b39951f55..fe6799a8870c 100644
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -193,10 +193,16 @@
# PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;}
# PYTHON_LIBDIR=${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;}
# PYTHON_PLATFORM=${PYTHON_PLATFORM}
+# PYTHON_PYOEXTENSION=${PYTHON_PYOEXTENSION}
# PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
+# PYTHON_SUFFIX=${PYTHON_SUFFIX}
# PYTHON_VER=${PYTHON_VER}
# PYTHON_VERSION=${PYTHON_VERSION}
#
+# and PYTHON2 and PYTHON3 will be set according to the Python version:
+#
+# PYTHON2="" PYTHON3="@comment " for Python 2.x
+# PYTHON2="@comment " PYTHON3="" for Python 3.x
#
# Deprecated variables, which exist for compatibility and will be removed
# soon:
@@ -433,6 +439,13 @@ PYTHONPREFIX_SITELIBDIR= ${PYTHON_SITELIBDIR:S;${PYTHONBASE};${PREFIX};}
# Used for recording the installed files.
_PYTHONPKGLIST= ${WRKDIR}/.PLIST.pymodtmp
+# PEP 0488 (https://www.python.org/dev/peps/pep-0488/)
+.if ${PYTHON_REL} < 3500
+PYTHON_PYOEXTENSION= pyo
+.else
+PYTHON_PYOEXTENSION= opt-1.pyc
+.endif
+
# Ports bound to a certain python version SHOULD
# - use the PYTHON_PKGNAMEPREFIX
# - use directories using the PYTHON_PKGNAMEPREFIX
@@ -529,11 +542,6 @@ add-plist-pymod:
# of TMPPLIST that end with .py[co], so that they conform
# to PEP 3147 (see http://www.python.org/dev/peps/pep-3147/)
PYMAGICTAG= ${PYTHON_CMD} -c 'import imp; print(imp.get_tag())'
-.if ${PYTHON_REL} < 3500
-PYOEXTENSION= pyo
-.else
-PYOEXTENSION= opt-1.pyc
-.endif
_USES_stage+= 935:add-plist-python
add-plist-python:
@${AWK} '\
@@ -542,7 +550,7 @@ add-plist-python:
/^@dirrmtry / {d = substr($$0, 11); if (d in dirs) {print $$0 "/" pc}; print $$0; next} \
{print} \
' \
- pc="__pycache__" mt="$$(${PYMAGICTAG})" pyo="${PYOEXTENSION}" \
+ pc="__pycache__" mt="$$(${PYMAGICTAG})" pyo="${PYTHON_PYOEXTENSION}" \
${TMPPLIST} > ${TMPPLIST}.pyc_tmp
@${MV} ${TMPPLIST}.pyc_tmp ${TMPPLIST}
.endif # ${PYTHON_REL} >= 3200 && defined(_PYTHON_FEATURE_PY3KPLIST)
@@ -591,9 +599,16 @@ PREFIX= ${PYTHONBASE}
PLIST_SUB+= PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} \
PYTHON_LIBDIR=${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;} \
PYTHON_PLATFORM=${PYTHON_PLATFORM} \
+ PYTHON_PYOEXTENSION=${PYTHON_PYOEXTENSION} \
PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} \
+ PYTHON_SUFFIX=${PYTHON_SUFFIX} \
PYTHON_VER=${PYTHON_VER} \
- PYTHON_VERSION=python${_PYTHON_VERSION}
+ PYTHON_VERSION=${PYTHON_VERSION}
+.if ${PYTHON_REL} < 3000
+PLIST_SUB+= PYTHON2="" PYTHON3="@comment "
+.else
+PLIST_SUB+= PYTHON2="@comment " PYTHON3=""
+.endif
_USES_POST+= python
.endif # _INCLUDE_USES_PYTHON_MK
diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile
index df37ce36e325..71b78d5ffce1 100644
--- a/accessibility/accerciser/Makefile
+++ b/accessibility/accerciser/Makefile
@@ -18,6 +18,7 @@ BUILD_DEPENDS= gsettings-desktop-schemas>=3.2.0:devel/gsettings-desktop-schemas
RUN_DEPENDS= gsettings-desktop-schemas>=3.2.0:devel/gsettings-desktop-schemas \
at-spi2-core>=2.1.5:accessibility/at-spi2-core
+NO_ARCH= yes
USES= gettext gmake pkgconfig python:3 shebangfix tar:xz
USE_GNOME= gtk30 intlhack py3gobject3
INSTALLS_ICONS= yes
@@ -28,15 +29,4 @@ SHEBANG_FILES= plugins/ipython_view.py
GLIB_SCHEMAS= org.a11y.Accerciser.gschema.xml
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-PYOEXTENSION= pyo
-.else
-PYOEXTENSION= opt-1.pyc
-.endif
-
-PLIST_SUB+= PYOEXTENSION=${PYOEXTENSION} \
- PYVER=${PYTHON_VER:S/.//}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/accessibility/accerciser/pkg-plist b/accessibility/accerciser/pkg-plist
index a64a6e73cbde..7c099c411e6a 100644
--- a/accessibility/accerciser/pkg-plist
+++ b/accessibility/accerciser/pkg-plist
@@ -13,47 +13,47 @@ man/man1/accerciser.1.gz
%%PYTHON_SITELIBDIR%%/accerciser/prefs_dialog.py
%%PYTHON_SITELIBDIR%%/accerciser/tools.py
%%PYTHON_SITELIBDIR%%/accerciser/ui_manager.py
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/about_dialog.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/about_dialog.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accerciser.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accerciser.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accessible_treeview.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accessible_treeview.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/bookmarks.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/bookmarks.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/hotkey_manager.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/hotkey_manager.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/i18n.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/i18n.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/icons.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/icons.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/main_window.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/main_window.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/node.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/node.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/prefs_dialog.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/prefs_dialog.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/tools.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/tools.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/ui_manager.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/ui_manager.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/about_dialog.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/about_dialog.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accerciser.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accerciser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accessible_treeview.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accessible_treeview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/bookmarks.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/bookmarks.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/hotkey_manager.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/hotkey_manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/i18n.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/i18n.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/icons.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/icons.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/main_window.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/main_window.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/node.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/node.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/prefs_dialog.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/prefs_dialog.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/tools.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/tools.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/ui_manager.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/ui_manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/accerciser/plugin/__init__.py
%%PYTHON_SITELIBDIR%%/accerciser/plugin/base_plugin.py
%%PYTHON_SITELIBDIR%%/accerciser/plugin/message.py
%%PYTHON_SITELIBDIR%%/accerciser/plugin/plugin_manager.py
%%PYTHON_SITELIBDIR%%/accerciser/plugin/view.py
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/base_plugin.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/base_plugin.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/message.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/message.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/plugin_manager.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/plugin_manager.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/view.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/view.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/base_plugin.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/base_plugin.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/message.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/message.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/plugin_manager.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/plugin_manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/view.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/view.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/pixmaps/hicolor/22x22/acceleratorlabel.png
%%DATADIR%%/pixmaps/hicolor/22x22/alert.png
%%DATADIR%%/pixmaps/hicolor/22x22/animation.png
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index ca303e7fd721..d817d3a7a600 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -26,6 +26,7 @@ RUN_DEPENDS= py3?-dbus>=0:devel/py3-dbus \
CONFLICTS= py*-json-py-[0-9]*
PORTSCOUT= limitw:1,even
+NO_ARCH= yes
USES= gettext gmake gnome pathfix pkgconfig python:3 tar:xz
USE_GNOME= gtk30 py3gobject3 intlhack
INSTALLS_ICONS= yes
@@ -37,15 +38,4 @@ post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/src/orca/orca_i18n.py
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-PYOEXTENSION= pyo
-.else
-PYOEXTENSION= opt-1.pyc
-.endif
-
-PLIST_SUB+= PYOEXTENSION=${PYOEXTENSION} \
- PYVER=${PYTHON_VER:S/.//}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist
index 74c41c6e0254..7dd694b877a5 100644
--- a/accessibility/orca/pkg-plist
+++ b/accessibility/orca/pkg-plist
@@ -1,138 +1,138 @@
bin/orca
etc/xdg/autostart/orca-autostart.desktop
%%PYTHON_SITELIBDIR%%/orca/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/acss.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/acss.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/bookmarks.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/bookmarks.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_rolenames.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_rolenames.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/brlmon.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/brlmon.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/brltablenames.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/brltablenames.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/caret_navigation.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/caret_navigation.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/chat.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/chat.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/chnames.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/chnames.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/cmdnames.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/cmdnames.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/colornames.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/colornames.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/common_keyboardmap.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/common_keyboardmap.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/debug.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/debug.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/desktop_keyboardmap.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/desktop_keyboardmap.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/event_manager.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/event_manager.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/eventsynthesizer.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/eventsynthesizer.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/find.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/find.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/flat_review.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/flat_review.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/formatting.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/formatting.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/guilabels.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/guilabels.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/input_event.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/input_event.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/keybindings.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/keybindings.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/keynames.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/keynames.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/label_inference.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/label_inference.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/laptop_keyboardmap.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/laptop_keyboardmap.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/liveregions.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/liveregions.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/logger.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/logger.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/mathsymbols.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/mathsymbols.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/messages.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/messages.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/mouse_review.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/mouse_review.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/notification_messages.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/notification_messages.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/object_properties.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/object_properties.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_console_prefs.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_console_prefs.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gtkbuilder.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gtkbuilder.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_commandlist.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_commandlist.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_find.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_find.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_navlist.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_navlist.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_prefs.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_prefs.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_profile.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_profile.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_i18n.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_i18n.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_platform.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_platform.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_state.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_state.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/phonnames.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/phonnames.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/pronunciation_dict.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/pronunciation_dict.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/punctuation_settings.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/punctuation_settings.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_manager.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_manager.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_utilities.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings_manager.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings_manager.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechdispatcherfactory.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechdispatcherfactory.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechserver.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechserver.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/spellcheck.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/spellcheck.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/structural_navigation.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/structural_navigation.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/text_attribute_names.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/text_attribute_names.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/tutorialgenerator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/tutorialgenerator.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/where_am_I.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/where_am_I.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/acss.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/acss.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/bookmarks.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/bookmarks.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_rolenames.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_rolenames.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/brlmon.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/brlmon.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/brltablenames.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/brltablenames.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/caret_navigation.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/caret_navigation.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/chat.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/chat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/chnames.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/chnames.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/cmdnames.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/cmdnames.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/colornames.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/colornames.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/common_keyboardmap.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/common_keyboardmap.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/debug.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/debug.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/desktop_keyboardmap.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/desktop_keyboardmap.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/event_manager.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/event_manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/eventsynthesizer.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/eventsynthesizer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/find.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/find.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/flat_review.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/flat_review.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/guilabels.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/guilabels.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/input_event.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/input_event.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/keybindings.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/keybindings.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/keynames.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/keynames.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/label_inference.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/label_inference.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/laptop_keyboardmap.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/laptop_keyboardmap.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/liveregions.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/liveregions.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/logger.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/logger.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/mathsymbols.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/mathsymbols.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/mouse_review.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/mouse_review.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/notification_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/notification_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/object_properties.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/object_properties.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_console_prefs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_console_prefs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gtkbuilder.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gtkbuilder.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_commandlist.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_commandlist.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_find.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_find.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_navlist.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_navlist.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_prefs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_prefs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_profile.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_profile.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_i18n.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_i18n.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_platform.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_platform.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_state.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_state.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/phonnames.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/phonnames.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/pronunciation_dict.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/pronunciation_dict.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/punctuation_settings.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/punctuation_settings.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_manager.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings_manager.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings_manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechdispatcherfactory.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechdispatcherfactory.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechserver.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechserver.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/spellcheck.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/spellcheck.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/structural_navigation.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/structural_navigation.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/text_attribute_names.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/text_attribute_names.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/tutorialgenerator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/tutorialgenerator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/where_am_I.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/where_am_I.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/acss.py
%%PYTHON_SITELIBDIR%%/orca/backends/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/json_backend.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/json_backend.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/json_backend.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/json_backend.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/backends/json_backend.py
%%PYTHON_SITELIBDIR%%/orca/bookmarks.py
%%PYTHON_SITELIBDIR%%/orca/braille.py
@@ -185,290 +185,290 @@ etc/xdg/autostart/orca-autostart.desktop
%%PYTHON_SITELIBDIR%%/orca/script_manager.py
%%PYTHON_SITELIBDIR%%/orca/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/default.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/default.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/self_voicing.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/self_voicing.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/default.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/default.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/self_voicing.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/self_voicing.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/script_utilities.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/chat.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/chat.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/script_utilities.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/chat.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/chat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/chat.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/speech_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/speech_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/spellcheck.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/spellcheck.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/spellcheck.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/spellcheck.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/spellcheck.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/script_utilities.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/braille_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/braille_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/script_utilities.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/speech_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/speech_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/braille_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdm-simple-greeter/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdm-simple-greeter/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdm-simple-greeter/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdm-simple-greeter/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdm-simple-greeter/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdm-simple-greeter/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdm-simple-greeter/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdm-simple-greeter/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdm-simple-greeter/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdm-simple-greeter/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/spellcheck.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/spellcheck.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/spellcheck.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/spellcheck.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/spellcheck.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/script_utilities.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/speech_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/speech_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/speech_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/speech_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/formatting.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/formatting.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/script_utilities.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/formatting.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/formatting.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/formatting.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/formatting.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/chat.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/chat.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/script_utilities.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/speech_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/speech_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/chat.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/chat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/chat.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/braille_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/braille_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/speech_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/speech_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/braille_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/formatting.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/formatting.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/formatting.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/braille_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/braille_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/formatting.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/formatting.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/script_utilities.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/speech_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/speech_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/spellcheck.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/spellcheck.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/structural_navigation.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/structural_navigation.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/spellcheck.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/spellcheck.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/structural_navigation.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/structural_navigation.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/braille_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/formatting.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script.py
@@ -477,106 +477,106 @@ etc/xdg/autostart/orca-autostart.desktop
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/spellcheck.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/structural_navigation.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/default.py
%%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/script_utilities.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script_utilities.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/formatting.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/formatting.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/script_utilities.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/speech_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/speech_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/formatting.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/VCL.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/braille_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/braille_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/script_utilities.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/speech_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/speech_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/braille_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/VCL.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/VCL.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/VCL.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/VCL.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/script_utilities.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/script_utilities.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/web/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/bookmarks.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/bookmarks.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/braille_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/braille_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/script_utilities.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/speech_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/speech_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/tutorial_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/tutorial_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/bookmarks.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/bookmarks.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/tutorial_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/tutorial_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/orca/scripts/web/bookmarks.py
%%PYTHON_SITELIBDIR%%/orca/scripts/web/braille_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/web/script.py
diff --git a/accessibility/py3-atspi/Makefile b/accessibility/py3-atspi/Makefile
index 450b168e2b87..c06a23538014 100644
--- a/accessibility/py3-atspi/Makefile
+++ b/accessibility/py3-atspi/Makefile
@@ -17,21 +17,11 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/at-spi2-registryd:accessibility/at-spi2-core
CONFLICTS= at-spi-1.[0-9]*
PORTSCOUT= limitw:1,even
+NO_ARCH= yes
USES= gettext gmake gnome pathfix pkgconfig python:3 tar:xz
USE_GNOME= intlhack py3gobject3
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-PYOEXTENSION= pyo
-.else
-PYOEXTENSION= opt-1.pyc
-.endif
-
-PLIST_SUB+= PYOEXTENSION=${PYOEXTENSION} \
- PYVER=${PYTHON_VER:S/.//}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/accessibility/py3-atspi/pkg-plist b/accessibility/py3-atspi/pkg-plist
index ced81fa8d2fc..3f05d7db386c 100644
--- a/accessibility/py3-atspi/pkg-plist
+++ b/accessibility/py3-atspi/pkg-plist
@@ -1,53 +1,53 @@
%%PYTHON_SITELIBDIR%%/pyatspi/Accessibility.py
%%PYTHON_SITELIBDIR%%/pyatspi/__init__.py
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/Accessibility.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/Accessibility.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/action.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/action.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/appevent.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/appevent.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/application.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/application.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/collection.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/collection.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/component.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/component.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/constants.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/constants.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/deviceevent.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/deviceevent.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/document.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/document.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/editabletext.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/editabletext.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/enum.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/enum.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/hypertext.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/hypertext.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/image.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/image.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/interface.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/interface.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/registry.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/registry.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/role.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/role.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/selection.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/selection.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/state.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/state.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/table.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/table.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/tablecell.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/tablecell.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/text.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/text.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/utils.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/utils.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/value.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/value.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/Accessibility.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/Accessibility.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/action.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/action.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/appevent.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/appevent.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/application.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/application.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/collection.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/collection.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/component.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/component.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/constants.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/constants.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/deviceevent.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/deviceevent.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/document.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/document.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/editabletext.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/editabletext.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/enum.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/enum.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/hypertext.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/hypertext.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/image.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/image.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/interface.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/interface.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/registry.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/registry.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/role.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/role.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/selection.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/selection.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/state.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/state.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/table.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/table.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/tablecell.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/tablecell.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/text.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/text.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/value.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/value.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/pyatspi/action.py
%%PYTHON_SITELIBDIR%%/pyatspi/appevent.py
%%PYTHON_SITELIBDIR%%/pyatspi/application.py
diff --git a/accessibility/py3-speech-dispatcher/pkg-plist b/accessibility/py3-speech-dispatcher/pkg-plist
index 8641af42baa3..303d9074311f 100644
--- a/accessibility/py3-speech-dispatcher/pkg-plist
+++ b/accessibility/py3-speech-dispatcher/pkg-plist
@@ -1,23 +1,23 @@
bin/spd-conf
%%PYTHON_SITELIBDIR%%/speechd/__init__.py
-%%PYTHON_SITELIBDIR%%/speechd/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/speechd/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/speechd/__pycache__/_test.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/speechd/__pycache__/_test.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/speechd/__pycache__/client.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/speechd/__pycache__/client.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/speechd/__pycache__/paths.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/speechd/__pycache__/paths.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/_test.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/_test.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/client.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/client.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/paths.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/paths.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/speechd/_test.py
%%PYTHON_SITELIBDIR%%/speechd/client.py
%%PYTHON_SITELIBDIR%%/speechd/paths.py
%%PYTHON_SITELIBDIR%%/speechd_config/__init__.py
-%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/config.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/config.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/paths.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/paths.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/paths.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/paths.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/speechd_config/config.py
%%PYTHON_SITELIBDIR%%/speechd_config/paths.py
share/sounds/speech-dispatcher/test.wav
diff --git a/accessibility/speech-dispatcher/Makefile b/accessibility/speech-dispatcher/Makefile
index cfd9607c41b4..47e84916fa30 100644
--- a/accessibility/speech-dispatcher/Makefile
+++ b/accessibility/speech-dispatcher/Makefile
@@ -70,7 +70,6 @@ NAS_CONFIGURE_WITH= nas
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
PULSEAUDIO_CONFIGURE_WITH=pulse
-.include <bsd.port.pre.mk>
post-patch:
@${REINPLACE_CMD} -e '/SUBDIRS/ s/tests//' \
${WRKSRC}/src/Makefile.in
@@ -87,7 +86,6 @@ post-install:
${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-
.else
PORTSCOUT= ignore:1
@@ -97,17 +95,6 @@ USES+= python:3.3+
LIB_DEPENDS+= libspeechd.so:accessibility/speech-dispatcher
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py3-xdg
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-PYOEXTENSION= pyo
-.else
-PYOEXTENSION= opt-1.pyc
-.endif
-
-PLIST_SUB+= PYOEXTENSION=${PYOEXTENSION} \
- PYVER=${PYTHON_VER:S/.//}
-
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/astro/weather/Makefile b/astro/weather/Makefile
index bc86b77b57d6..06b7366f2c54 100644
--- a/astro/weather/Makefile
+++ b/astro/weather/Makefile
@@ -13,6 +13,7 @@ COMMENT= Utility to provide current weather conditions and forecasts
LICENSE= ISCL
LICENSE_FILE= ${WRKSRC}/LICENSE
+NO_ARCH= yes
USES= python shebangfix tar:xz
PLIST_FILES= bin/${PORTNAME} \
@@ -35,12 +36,6 @@ PYCACHE_DIR= __pycache__/
PYCACHE_FILE= ${PORTNAME}.cpython-${PYTHON_SUFFIX}
.endif
-.if ${PYTHON_REL} < 3500
-PYTHON_PYOEXTENSION= pyo
-.else
-PYTHON_PYOEXTENSION= opt-1.pyc
-.endif
-
do-build:
@${PYTHON_CMD} -m compileall ${WRKSRC}/${PORTNAME}.py
@${PYTHON_CMD} -O -m compileall ${WRKSRC}/${PORTNAME}.py
diff --git a/audio/gnome-music/Makefile b/audio/gnome-music/Makefile
index 3286df8c5c4a..70062870fabe 100644
--- a/audio/gnome-music/Makefile
+++ b/audio/gnome-music/Makefile
@@ -29,15 +29,4 @@ INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.gnome.Music.gschema.xml
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-PYOEXTENSION= pyo
-.else
-PYOEXTENSION= opt-1.pyc
-.endif
-
-PLIST_SUB+= PYOEXTENSION=${PYOEXTENSION} \
- PYVER=${PYTHON_VER:S/.//}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/gnome-music/pkg-plist b/audio/gnome-music/pkg-plist
index c41720c4547c..ed3743403d20 100644
--- a/audio/gnome-music/pkg-plist
+++ b/audio/gnome-music/pkg-plist
@@ -15,34 +15,34 @@ lib/gnome-music/girepository-1.0/Gd-1.0.typelib
%%PYTHON_SITELIBDIR%%/gnomemusic/view.py
%%PYTHON_SITELIBDIR%%/gnomemusic/widgets.py
%%PYTHON_SITELIBDIR%%/gnomemusic/window.py
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/albumArtCache.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/albumArtCache.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/application.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/application.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/grilo.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/grilo.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/mpris.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/mpris.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/notification.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/notification.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/player.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/player.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/playlists.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/playlists.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/query.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/query.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/searchbar.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/searchbar.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/toolbar.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/toolbar.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/view.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/view.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/widgets.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/widgets.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/window.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/window.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/albumArtCache.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/albumArtCache.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/application.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/application.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/grilo.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/grilo.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/mpris.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/mpris.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/notification.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/notification.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/player.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/player.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/playlists.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/playlists.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/query.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/query.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/searchbar.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/searchbar.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/toolbar.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/toolbar.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/view.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/view.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/widgets.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/widgets.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/window.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/window.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
man/man1/gnome-music.1.gz
share/appdata/gnome-music.appdata.xml
share/applications/gnome-music.desktop
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index a6b7faf98df2..b588d2eed781 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -69,7 +69,6 @@ MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp \
libhal.so:sysutils/hal
PYTHON_CONFIGURE_ENABLE= python
PYTHON_USES= python:3.3+
-PYTHON_PLIST_SUB+= PYTVER=${PYTHON_SUFFIX} PYOEXTENSION=${PYOEXTENSION}
PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas
# context plugin
# webkit is for the context plugin, which is broken because
@@ -80,12 +79,6 @@ PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas
.include <bsd.port.pre.mk>
-.if ${PYTHON_REL} < 3500
-PYOEXTENSION= pyo
-.else
-PYOEXTENSION= opt-1.pyc
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|{MOZILLA_PLUGINDIR|{MOZILLA_PLUGINDIR}|g' \
${WRKSRC}/configure
diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist
index c24a2eb2ac20..0edf5755de5b 100644
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@@ -88,20 +88,20 @@ lib/librhythmbox-core.so.9.0.0
%%PYTHON%%lib/rhythmbox/plugins/artsearch/musicbrainz.py
%%PYTHON%%lib/rhythmbox/plugins/artsearch/oldcache.py
%%PYTHON%%lib/rhythmbox/plugins/artsearch/songinfo.py
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/artsearch.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/artsearch.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/embedded.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/embedded.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/lastfm.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/lastfm.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/local.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/local.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/musicbrainz.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/musicbrainz.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/oldcache.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/oldcache.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/songinfo.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/songinfo.cpython-%%PYTVER%%.%%PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/artsearch.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/artsearch.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/embedded.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/embedded.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/lastfm.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/lastfm.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/local.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/local.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/musicbrainz.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/musicbrainz.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/oldcache.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/oldcache.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/songinfo.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/songinfo.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/rhythmbox/plugins/audiocd/audiocd.plugin
lib/rhythmbox/plugins/audiocd/libaudiocd.so
lib/rhythmbox/plugins/audioscrobbler/audioscrobbler.plugin
@@ -122,8 +122,8 @@ lib/rhythmbox/plugins/generic-player/libgeneric-player.so
%%IPOD%%lib/rhythmbox/plugins/ipod/libipod.so
%%PYTHON%%lib/rhythmbox/plugins/im-status/im-status.plugin
%%PYTHON%%lib/rhythmbox/plugins/im-status/im-status.py
-%%PYTHON%%lib/rhythmbox/plugins/im-status/__pycache__/im-status.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/im-status/__pycache__/im-status.cpython-%%PYTVER%%.%%PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/im-status/__pycache__/im-status.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/im-status/__pycache__/im-status.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/rhythmbox/plugins/iradio/iradio.plugin
lib/rhythmbox/plugins/iradio/libiradio.so
%%PYTHON%%lib/rhythmbox/plugins/lyrics/AstrawebParser.py
@@ -138,44 +138,44 @@ lib/rhythmbox/plugins/iradio/libiradio.so
%%PYTHON%%lib/rhythmbox/plugins/lyrics/WinampcnParser.py
%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.plugin
%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.py
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/AstrawebParser.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/AstrawebParser.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/DarkLyricsParser.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/DarkLyricsParser.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/JetlyricsParser.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/JetlyricsParser.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/JlyricParser.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/JlyricParser.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricWikiParser.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricWikiParser.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsConfigureDialog.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsConfigureDialog.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsParse.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsParse.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsSites.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsSites.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/TerraParser.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/TerraParser.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/WinampcnParser.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/WinampcnParser.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/lyrics.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/lyrics.cpython-%%PYTVER%%.%%PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/AstrawebParser.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/AstrawebParser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/DarkLyricsParser.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/DarkLyricsParser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/JetlyricsParser.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/JetlyricsParser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/JlyricParser.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/JlyricParser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricWikiParser.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricWikiParser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsConfigureDialog.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsConfigureDialog.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsParse.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsParse.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsSites.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsSites.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/TerraParser.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/TerraParser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/WinampcnParser.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/WinampcnParser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/lyrics.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/lyrics.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON%%lib/rhythmbox/plugins/magnatune/DownloadAlbumHandler.py
%%PYTHON%%lib/rhythmbox/plugins/magnatune/MagnatuneAccount.py
%%PYTHON%%lib/rhythmbox/plugins/magnatune/MagnatuneSource.py
%%PYTHON%%lib/rhythmbox/plugins/magnatune/TrackListHandler.py
%%PYTHON%%lib/rhythmbox/plugins/magnatune/magnatune.plugin
%%PYTHON%%lib/rhythmbox/plugins/magnatune/magnatune.py
-%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/DownloadAlbumHandler.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/DownloadAlbumHandler.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/MagnatuneAccount.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/MagnatuneAccount.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/MagnatuneSource.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/MagnatuneSource.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/TrackListHandler.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/TrackListHandler.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/magnatune.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/magnatune.cpython-%%PYTVER%%.%%PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/DownloadAlbumHandler.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/DownloadAlbumHandler.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/MagnatuneAccount.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/MagnatuneAccount.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/MagnatuneSource.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/MagnatuneSource.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/TrackListHandler.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/TrackListHandler.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/magnatune.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/magnatune.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/rhythmbox/plugins/mmkeys/libmmkeys.so
lib/rhythmbox/plugins/mmkeys/mmkeys.plugin
lib/rhythmbox/plugins/mpris/libmpris.so
@@ -188,8 +188,8 @@ lib/rhythmbox/plugins/power-manager/libpower-manager.so
lib/rhythmbox/plugins/power-manager/power-manager.plugin
%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.plugin
%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.py
-%%PYTHON%%lib/rhythmbox/plugins/python-console/__pycache__/pythonconsole.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/python-console/__pycache__/pythonconsole.cpython-%%PYTVER%%.%%PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/python-console/__pycache__/pythonconsole.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/python-console/__pycache__/pythonconsole.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON%%lib/rhythmbox/plugins/rb/Coroutine.py
%%PYTHON%%lib/rhythmbox/plugins/rb/Loader.py
%%PYTHON%%lib/rhythmbox/plugins/rb/URLCache.py
@@ -197,44 +197,44 @@ lib/rhythmbox/plugins/power-manager/power-manager.plugin
%%PYTHON%%lib/rhythmbox/plugins/rb/rb.py
%%PYTHON%%lib/rhythmbox/plugins/rb/rbconfig.py
%%PYTHON%%lib/rhythmbox/plugins/rb/stringmatch.py
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/Coroutine.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/Coroutine.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/Loader.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/Loader.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/URLCache.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/URLCache.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/rb.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/rb.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/rbconfig.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/rbconfig.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/stringmatch.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/stringmatch.cpython-%%PYTVER%%.%%PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/Coroutine.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/Coroutine.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/Loader.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/Loader.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/URLCache.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/URLCache.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/rb.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/rb.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/rbconfig.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/rbconfig.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/stringmatch.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/stringmatch.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%LIRC%%lib/rhythmbox/plugins/rblirc/librblirc.so
%%LIRC%%lib/rhythmbox/plugins/rblirc/rblirc.plugin
%%PYTHON%%lib/rhythmbox/plugins/replaygain/config.py
%%PYTHON%%lib/rhythmbox/plugins/replaygain/player.py
%%PYTHON%%lib/rhythmbox/plugins/replaygain/replaygain.plugin
%%PYTHON%%lib/rhythmbox/plugins/replaygain/replaygain.py
-%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/config.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/config.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/player.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/player.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/replaygain.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/replaygain.cpython-%%PYTVER%%.%%PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/player.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/player.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/replaygain.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/replaygain.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/rhythmbox/sample-plugins/sample/libsample.so
lib/rhythmbox/sample-plugins/sample/sample.plugin
lib/rhythmbox/sample-plugins/sample-vala/libsample-vala.so
lib/rhythmbox/sample-plugins/sample-vala/sample-vala.plugin
%%PYTHON%%lib/rhythmbox/plugins/sendto/sendto.plugin
%%PYTHON%%lib/rhythmbox/plugins/sendto/sendto.py
-%%PYTHON%%lib/rhythmbox/plugins/sendto/__pycache__/sendto.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/sendto/__pycache__/sendto.cpython-%%PYTVER%%.%%PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/sendto/__pycache__/sendto.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/sendto/__pycache__/sendto.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON%%lib/rhythmbox/sample-plugins/sample-python/sample-python.plugin
%%PYTHON%%lib/rhythmbox/sample-plugins/sample-python/sample-python.py
-%%PYTHON%%lib/rhythmbox/sample-plugins/sample-python/__pycache__/sample-python.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/sample-plugins/sample-python/__pycache__/sample-python.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/rhythmbox/plugins/soundcloud/__pycache__/soundcloud.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/soundcloud/__pycache__/soundcloud.cpython-%%PYTVER%%.%%PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/sample-plugins/sample-python/__pycache__/sample-python.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/sample-plugins/sample-python/__pycache__/sample-python.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/rhythmbox/plugins/soundcloud/__pycache__/soundcloud.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/rhythmbox/plugins/soundcloud/__pycache__/soundcloud.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON%%lib/rhythmbox/plugins/soundcloud/soundcloud.plugin
%%PYTHON%%lib/rhythmbox/plugins/soundcloud/soundcloud.py
libdata/pkgconfig/rhythmbox.pc
diff --git a/databases/postgresql92-server/pkg-plist-plpython b/databases/postgresql92-server/pkg-plist-plpython
index 083d330d22c4..c1db0a70dff6 100644
--- a/databases/postgresql92-server/pkg-plist-plpython
+++ b/databases/postgresql92-server/pkg-plist-plpython
@@ -1,12 +1,12 @@
%%DOCSDIR%%/README-plpython
%%PYTHON2%%lib/postgresql/plpython2.so
%%PYTHON3%%lib/postgresql/plpython3.so
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
%%PYTHON2%%%%DATADIR%%/extension/plpython2u--1.0.sql
%%PYTHON2%%%%DATADIR%%/extension/plpython2u--unpackaged--1.0.sql
-%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
+%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
diff --git a/databases/postgresql93-server/pkg-plist-plpython b/databases/postgresql93-server/pkg-plist-plpython
index 083d330d22c4..c1db0a70dff6 100644
--- a/databases/postgresql93-server/pkg-plist-plpython
+++ b/databases/postgresql93-server/pkg-plist-plpython
@@ -1,12 +1,12 @@
%%DOCSDIR%%/README-plpython
%%PYTHON2%%lib/postgresql/plpython2.so
%%PYTHON3%%lib/postgresql/plpython3.so
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
%%PYTHON2%%%%DATADIR%%/extension/plpython2u--1.0.sql
%%PYTHON2%%%%DATADIR%%/extension/plpython2u--unpackaged--1.0.sql
-%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
+%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
diff --git a/databases/postgresql94-server/pkg-plist-plpython b/databases/postgresql94-server/pkg-plist-plpython
index 083d330d22c4..c1db0a70dff6 100644
--- a/databases/postgresql94-server/pkg-plist-plpython
+++ b/databases/postgresql94-server/pkg-plist-plpython
@@ -1,12 +1,12 @@
%%DOCSDIR%%/README-plpython
%%PYTHON2%%lib/postgresql/plpython2.so
%%PYTHON3%%lib/postgresql/plpython3.so
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
%%PYTHON2%%%%DATADIR%%/extension/plpython2u--1.0.sql
%%PYTHON2%%%%DATADIR%%/extension/plpython2u--unpackaged--1.0.sql
-%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
+%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
diff --git a/databases/postgresql95-plpython/Makefile b/databases/postgresql95-plpython/Makefile
index 115b776bde4c..ce1cfde53acc 100644
--- a/databases/postgresql95-plpython/Makefile
+++ b/databases/postgresql95-plpython/Makefile
@@ -18,12 +18,6 @@ WANT_PYTHON_USE?= python
CONFIGURE_ARGS= --with-python
COMPONENT= -plpython
-.if defined(PYTHON_VER) && ${PYTHON_VER:R} == 3
-PLIST_SUB+= PYTHON2="@comment " PYTHON3=""
-.else
-PLIST_SUB+= PYTHON2="" PYTHON3="@comment "
-.endif
-
BUILD_DIRS= src/backend src/pl/plpython
INSTALL_DIRS= src/pl/plpython
SLAVE_ONLY= yes
diff --git a/databases/postgresql95-server/pkg-plist-plpython b/databases/postgresql95-server/pkg-plist-plpython
index d24ff23fffe7..49d2377e4136 100644
--- a/databases/postgresql95-server/pkg-plist-plpython
+++ b/databases/postgresql95-server/pkg-plist-plpython
@@ -3,12 +3,12 @@ include/postgresql/server/plpython.h
%%DOCSDIR%%/README-plpython
%%PYTHON2%%lib/postgresql/plpython2.so
%%PYTHON3%%lib/postgresql/plpython3.so
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
%%PYTHON2%%%%DATADIR%%/extension/plpython2u--1.0.sql
%%PYTHON2%%%%DATADIR%%/extension/plpython2u--unpackaged--1.0.sql
-%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
+%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
diff --git a/databases/postgresql96-server/pkg-plist-plpython b/databases/postgresql96-server/pkg-plist-plpython
index d24ff23fffe7..49d2377e4136 100644
--- a/databases/postgresql96-server/pkg-plist-plpython
+++ b/databases/postgresql96-server/pkg-plist-plpython
@@ -3,12 +3,12 @@ include/postgresql/server/plpython.h
%%DOCSDIR%%/README-plpython
%%PYTHON2%%lib/postgresql/plpython2.so
%%PYTHON3%%lib/postgresql/plpython3.so
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
%%PYTHON2%%%%DATADIR%%/extension/plpython2u--1.0.sql
%%PYTHON2%%%%DATADIR%%/extension/plpython2u--unpackaged--1.0.sql
-%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
+%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
diff --git a/devel/gitg/Makefile b/devel/gitg/Makefile
index 148f64255bcf..d3022f043738 100644
--- a/devel/gitg/Makefile
+++ b/devel/gitg/Makefile
@@ -47,22 +47,9 @@ NLS_CONFIGURE_ENABLE= nls
PYTHON_USES= python:3
PYTHON_CONFIGURE_ENABLE= python
PYTHON_USE= GNOME=py3gobject3
-PYTHON_PLIST_SUB= PYTHON_SUFFIX=${PYTHON_SUFFIX}
-
-.include <bsd.port.pre.mk>
-
-.if defined(PYTHON_REL)
-.if ${PYTHON_REL} < 3500
-PYOEXTENSION= pyo
-.else
-PYOEXTENSION= opt-1.pyc
-.endif
-.endif
-
-PLIST_SUB+= PYOEXTENSION=${PYOEXTENSION}
post-patch:
@${REINPLACE_CMD} -e 's|0.24.0|0.25.0|g' \
${WRKSRC}/configure
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/gitg/pkg-plist b/devel/gitg/pkg-plist
index ced443d64c6c..4fe342425c4f 100644
--- a/devel/gitg/pkg-plist
+++ b/devel/gitg/pkg-plist
@@ -15,7 +15,7 @@ lib/libgitg-ext-1.0.so.0
lib/libgitg-ext-1.0.so.0.0.0
%%PYTHON%%%%PYTHON_SITELIBDIR%%/gi/overrides/GitgExt.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GitgExt.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GitgExt.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GitgExt.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
libdata/pkgconfig/libgitg-1.0.pc
libdata/pkgconfig/libgitg-ext-1.0.pc
man/man1/gitg.1.gz
diff --git a/devel/py3-gobject3/pkg-plist b/devel/py3-gobject3/pkg-plist
index 70e6ddb9cfe9..210fa58ba17c 100644
--- a/devel/py3-gobject3/pkg-plist
+++ b/devel/py3-gobject3/pkg-plist
@@ -1,33 +1,33 @@
%%PYTHON_SITELIBDIR%%/gi/__init__.py
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-%%PYTVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/_constants.py
%%PYTHON_SITELIBDIR%%/gi/_error.py
%%PYTHON_SITELIBDIR%%/gi/_gi.so
%%PYTHON_SITELIBDIR%%/gi/_gi_cairo.so
%%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.py
-%%PYTHON_SITELIBDIR%%/gi/_gobject/__pycache__/__init__.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/_gobject/__pycache__/__init__.cpython-%%PYTVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/_gobject/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/_gobject/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/_option.py
%%PYTHON_SITELIBDIR%%/gi/_propertyhelper.py
%%PYTHON_SITELIBDIR%%/gi/_signalhelper.py
@@ -42,37 +42,37 @@
%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.py
%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.py
%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-%%PYTVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.py
%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.py
%%PYTHON_SITELIBDIR%%/gi/repository/__init__.py
-%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-%%PYTVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/types.py
%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-py%%PYTHON_VER%%-%%OPSYS%%-%%UNAME_R%%-%%UNAME_M%%.egg-info
%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.py
-%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-%%PYTVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-%%PYTVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.py
%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.py
diff --git a/devel/pygobject3-common/Makefile b/devel/pygobject3-common/Makefile
index a2e81ac6b8fc..edebf02ff597 100644
--- a/devel/pygobject3-common/Makefile
+++ b/devel/pygobject3-common/Makefile
@@ -65,7 +65,6 @@ RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo
USES+= python:3
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:graphics/py3-cairo
RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:graphics/py3-cairo
-PLIST_SUB+= PYTVER=${PYTHON_VER:S/.//}
.endif
post-install:
@@ -75,13 +74,6 @@ post-install:
.include <bsd.port.pre.mk>
-.if ${PYTHON_REL} < 3500
-PYOEXTENSION= pyo
-.else
-PYOEXTENSION= opt-1.pyc
-.endif
-PLIST_SUB+= PYOEXTENSION=${PYOEXTENSION}
-
UNAME_R!= ${UNAME} -r
UNAME_M!= ${UNAME} -m
diff --git a/dns/bundy/Makefile b/dns/bundy/Makefile
index b20671ba0be3..18a310b7de96 100644
--- a/dns/bundy/Makefile
+++ b/dns/bundy/Makefile
@@ -45,20 +45,8 @@ CPPFLAGS+= -I${WRKDIR}/boost_1_55_0
OPTIONS_DEFINE= DOCS
-PLIST_SUB= PYTHON_SUFFIX=cpython-${PYTHON_SUFFIX}
-
post-install:
${MV} ${STAGEDIR}${ETCDIR}/cmdctl-certfile.pem ${STAGEDIR}${ETCDIR}/cmdctl-certfile.pem.sample
${MV} ${STAGEDIR}${ETCDIR}/cmdctl-keyfile.pem ${STAGEDIR}${ETCDIR}/cmdctl-keyfile.pem.sample
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-PYOEXTENSION= pyo
-.else
-PYOEXTENSION= opt-1.pyc
-.endif
-
-PLIST_SUB+= PYOEXTENSION=${PYOEXTENSION}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/dns/bundy/pkg-plist b/dns/bundy/pkg-plist
index 9471b064cf27..b74b1623f06d 100644
--- a/dns/bundy/pkg-plist
+++ b/dns/bundy/pkg-plist
@@ -464,139 +464,139 @@ lib/libbundy-util.a
lib/libbundy-util.so
lib/libbundy-util.so.0
lib/libbundy-util.so.0.0.0
-%%PYTHON_SITELIBDIR%%/__pycache__/bundy_config.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/__pycache__/bundy_config.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/__pycache__/bundy_config.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/__pycache__/bundy_config.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/bundy/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/bundy/acl/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/dns.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/dns.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/dns.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/dns.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/bundy/acl/_dns.a
%%PYTHON_SITELIBDIR%%/bundy/acl/_dns.so
%%PYTHON_SITELIBDIR%%/bundy/acl/acl.a
%%PYTHON_SITELIBDIR%%/bundy/acl/acl.so
%%PYTHON_SITELIBDIR%%/bundy/acl/dns.py
%%PYTHON_SITELIBDIR%%/bundy/bundy/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/component.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/component.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/sockcreator.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/sockcreator.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/socket_cache.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/socket_cache.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/special_component.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/special_component.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/component.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/component.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/sockcreator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/sockcreator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/socket_cache.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/socket_cache.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/special_component.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/special_component.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/bundy/bundy/component.py
%%PYTHON_SITELIBDIR%%/bundy/bundy/sockcreator.py
%%PYTHON_SITELIBDIR%%/bundy/bundy/socket_cache.py
%%PYTHON_SITELIBDIR%%/bundy/bundy/special_component.py
%%PYTHON_SITELIBDIR%%/bundy/cc/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/data.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/data.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/logger.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/logger.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/message.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/message.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/proto_defs.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/proto_defs.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/session.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/session.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/data.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/data.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/logger.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/logger.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/message.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/message.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/proto_defs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/proto_defs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/session.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/session.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/bundy/cc/data.py
%%PYTHON_SITELIBDIR%%/bundy/cc/logger.py
%%PYTHON_SITELIBDIR%%/bundy/cc/message.py
%%PYTHON_SITELIBDIR%%/bundy/cc/proto_defs.py
%%PYTHON_SITELIBDIR%%/bundy/cc/session.py
%%PYTHON_SITELIBDIR%%/bundy/config/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/ccsession.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/ccsession.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/cfgmgr.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/cfgmgr.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/config_data.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/config_data.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/module_spec.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/module_spec.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/ccsession.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/ccsession.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/cfgmgr.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/cfgmgr.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/config_data.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/config_data.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/module_spec.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/module_spec.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/bundy/config/ccsession.py
%%PYTHON_SITELIBDIR%%/bundy/config/cfgmgr.py
%%PYTHON_SITELIBDIR%%/bundy/config/config_data.py
%%PYTHON_SITELIBDIR%%/bundy/config/module_spec.py
%%PYTHON_SITELIBDIR%%/bundy/datasrc/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/sqlite3_ds.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/sqlite3_ds.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/sqlite3_ds.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/sqlite3_ds.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/bundy/datasrc/datasrc.a
%%PYTHON_SITELIBDIR%%/bundy/datasrc/datasrc.so
%%PYTHON_SITELIBDIR%%/bundy/datasrc/sqlite3_ds.py
%%PYTHON_SITELIBDIR%%/bundy/ddns/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/logger.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/logger.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/session.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/session.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/zone_config.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/zone_config.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/logger.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/logger.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/session.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/session.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/zone_config.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/zone_config.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/bundy/ddns/logger.py
%%PYTHON_SITELIBDIR%%/bundy/ddns/session.py
%%PYTHON_SITELIBDIR%%/bundy/ddns/zone_config.py
%%PYTHON_SITELIBDIR%%/bundy/dns/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/dns/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/dns/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/dns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/dns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/bundy/log.a
%%PYTHON_SITELIBDIR%%/bundy/log.so
%%PYTHON_SITELIBDIR%%/bundy/log_messages/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cfgmgr_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cfgmgr_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cmdctl_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cmdctl_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/config_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/config_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/dbutil_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/dbutil_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/ddns_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/ddns_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/init_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/init_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libddns_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libddns_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libmemmgr_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libmemmgr_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libxfrin_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libxfrin_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/loadzone_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/loadzone_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/memmgr_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/memmgr_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/msgq_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/msgq_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/notify_out_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/notify_out_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/pycc_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/pycc_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/server_common_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/server_common_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_httpd_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_httpd_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/util_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/util_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrin_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrin_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrout_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrout_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/zonemgr_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/zonemgr_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cfgmgr_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cfgmgr_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cmdctl_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cmdctl_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/config_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/config_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/dbutil_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/dbutil_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/ddns_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/ddns_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/init_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/init_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libddns_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libddns_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libmemmgr_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libmemmgr_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libxfrin_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libxfrin_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/loadzone_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/loadzone_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/memmgr_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/memmgr_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/msgq_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/msgq_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/notify_out_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/notify_out_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/pycc_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/pycc_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/server_common_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/server_common_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_httpd_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_httpd_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/util_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/util_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrin_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrin_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrout_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrout_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/zonemgr_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/zonemgr_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/bundy/log_messages/cfgmgr_messages.py
%%PYTHON_SITELIBDIR%%/bundy/log_messages/cmdctl_messages.py
%%PYTHON_SITELIBDIR%%/bundy/log_messages/config_messages.py
@@ -619,47 +619,47 @@ lib/libbundy-util.so.0.0.0
%%PYTHON_SITELIBDIR%%/bundy/log_messages/xfrout_messages.py
%%PYTHON_SITELIBDIR%%/bundy/log_messages/zonemgr_messages.py
%%PYTHON_SITELIBDIR%%/bundy/memmgr/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/builder.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/builder.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/datasrc_info.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/datasrc_info.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/logger.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/logger.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/builder.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/builder.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/datasrc_info.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/datasrc_info.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/logger.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/logger.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/bundy/memmgr/builder.py
%%PYTHON_SITELIBDIR%%/bundy/memmgr/datasrc_info.py
%%PYTHON_SITELIBDIR%%/bundy/memmgr/logger.py
%%PYTHON_SITELIBDIR%%/bundy/net/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/addr.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/addr.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/parse.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/parse.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/addr.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/addr.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/parse.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/parse.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/bundy/net/addr.py
%%PYTHON_SITELIBDIR%%/bundy/net/parse.py
%%PYTHON_SITELIBDIR%%/bundy/notify/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/notify_out.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/notify_out.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/notify_out.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/notify_out.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/bundy/notify/notify_out.py
%%PYTHON_SITELIBDIR%%/bundy/server_common/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/auth_command.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/auth_command.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/bundy_server.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/bundy_server.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/datasrc_clients_mgr.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/datasrc_clients_mgr.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/dns_tcp.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/dns_tcp.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/logger.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/logger.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/tsig_keyring.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/tsig_keyring.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/auth_command.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/auth_command.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/bundy_server.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/bundy_server.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/datasrc_clients_mgr.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/datasrc_clients_mgr.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/dns_tcp.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/dns_tcp.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/logger.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/logger.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/tsig_keyring.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/tsig_keyring.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/bundy/server_common/auth_command.py
%%PYTHON_SITELIBDIR%%/bundy/server_common/bundy_server.py
%%PYTHON_SITELIBDIR%%/bundy/server_common/datasrc_clients_mgr.py
@@ -667,37 +667,37 @@ lib/libbundy-util.so.0.0.0
%%PYTHON_SITELIBDIR%%/bundy/server_common/logger.py
%%PYTHON_SITELIBDIR%%/bundy/server_common/tsig_keyring.py
%%PYTHON_SITELIBDIR%%/bundy/statistics/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/counters.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/counters.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/dns.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/dns.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/counters.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/counters.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/dns.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/dns.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/bundy/statistics/counters.py
%%PYTHON_SITELIBDIR%%/bundy/statistics/dns.py
%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/sysinfo.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/sysinfo.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/sysinfo.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/sysinfo.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/bundy/sysinfo/sysinfo.py
%%PYTHON_SITELIBDIR%%/bundy/util/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/address_formatter.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/address_formatter.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/file.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/file.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/process.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/process.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/socketserver_mixin.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/socketserver_mixin.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/traceback_handler.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/traceback_handler.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/address_formatter.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/address_formatter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/file.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/file.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/process.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/process.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/socketserver_mixin.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/socketserver_mixin.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/traceback_handler.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/traceback_handler.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/bundy/util/address_formatter.py
%%PYTHON_SITELIBDIR%%/bundy/util/cio/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/util/cio/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/cio/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/util/cio/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/util/cio/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/bundy/util/cio/socketsession.a
%%PYTHON_SITELIBDIR%%/bundy/util/cio/socketsession.so
%%PYTHON_SITELIBDIR%%/bundy/util/file.py
@@ -705,27 +705,27 @@ lib/libbundy-util.so.0.0.0
%%PYTHON_SITELIBDIR%%/bundy/util/socketserver_mixin.py
%%PYTHON_SITELIBDIR%%/bundy/util/traceback_handler.py
%%PYTHON_SITELIBDIR%%/bundy/xfrin/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/diff.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/diff.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/diff.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/diff.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/bundy/xfrin/diff.py
%%PYTHON_SITELIBDIR%%/bundy_config.py
%%PYTHON_SITELIBDIR%%/bundyctl/__init__.py
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/bindcmd.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/bindcmd.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/cmdparse.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/cmdparse.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/command_sets.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/command_sets.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/exception.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/exception.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/moduleinfo.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/moduleinfo.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/mycollections.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/mycollections.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/bindcmd.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/bindcmd.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/cmdparse.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/cmdparse.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/command_sets.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/command_sets.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/exception.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/exception.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/moduleinfo.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/moduleinfo.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/mycollections.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/mycollections.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/bundyctl/bindcmd.py
%%PYTHON_SITELIBDIR%%/bundyctl/cmdparse.py
%%PYTHON_SITELIBDIR%%/bundyctl/command_sets.py
@@ -783,12 +783,12 @@ sbin/bundy
sbin/bundy-cmdctl-usermgr
%%DATADIR%%/auth.spec
%%DATADIR%%/cmdctl.spec
-%%DATADIR%%/config_plugins/__pycache__/bundylogging.%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/config_plugins/__pycache__/bundylogging.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%DATADIR%%/config_plugins/__pycache__/datasrc_config_plugin.%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/config_plugins/__pycache__/datasrc_config_plugin.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%DATADIR%%/config_plugins/__pycache__/tsig_keys.%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/config_plugins/__pycache__/tsig_keys.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/config_plugins/__pycache__/bundylogging.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/config_plugins/__pycache__/bundylogging.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/config_plugins/__pycache__/datasrc_config_plugin.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/config_plugins/__pycache__/datasrc_config_plugin.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/config_plugins/__pycache__/tsig_keys.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/config_plugins/__pycache__/tsig_keys.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/config_plugins/bundylogging.py
%%DATADIR%%/config_plugins/datasrc.spec
%%DATADIR%%/config_plugins/datasrc_config_plugin.py
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 05a4c7cbd84c..15e3548e4267 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -45,15 +45,4 @@ post-patch:
@${REINPLACE_CMD} -e 's| \\t\\r\\n\\f|[:space:]|g' \
${WRKSRC}/configure
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-PYOEXTENSION= pyo
-.else
-PYOEXTENSION= opt-1.pyc
-.endif
-
-PLIST_SUB+= PYOEXTENSION=${PYOEXTENSION} \
- PYVER=${PYTHON_VER:S/.//}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/gedit-plugins/pkg-plist b/editors/gedit-plugins/pkg-plist
index 9913d244d349..7fe39e5c244e 100644
--- a/editors/gedit-plugins/pkg-plist
+++ b/editors/gedit-plugins/pkg-plist
@@ -1,26 +1,26 @@
-lib/gedit/plugins/__pycache__/bracketcompletion.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/__pycache__/bracketcompletion.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/__pycache__/codecomment.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/__pycache__/codecomment.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/__pycache__/colorpicker.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/__pycache__/colorpicker.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/__pycache__/gpdefs.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/__pycache__/gpdefs.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/__pycache__/joinlines.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/__pycache__/joinlines.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/__pycache__/smartspaces.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/__pycache__/smartspaces.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/__pycache__/terminal.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/__pycache__/terminal.cpython-%%PYVER%%.%%PYOEXTENSION%%
+lib/gedit/plugins/__pycache__/bracketcompletion.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/__pycache__/bracketcompletion.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/__pycache__/codecomment.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/__pycache__/codecomment.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/__pycache__/colorpicker.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/__pycache__/colorpicker.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/__pycache__/gpdefs.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/__pycache__/gpdefs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/__pycache__/joinlines.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/__pycache__/joinlines.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/__pycache__/smartspaces.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/__pycache__/smartspaces.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/__pycache__/terminal.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/__pycache__/terminal.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/gedit/plugins/bookmarks.plugin
lib/gedit/plugins/bracketcompletion.plugin
lib/gedit/plugins/bracketcompletion.py
lib/gedit/plugins/charmap.plugin
lib/gedit/plugins/charmap/__init__.py
-lib/gedit/plugins/charmap/__pycache__/__init__.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/charmap/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/charmap/__pycache__/panel.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/charmap/__pycache__/panel.cpython-%%PYVER%%.%%PYOEXTENSION%%
+lib/gedit/plugins/charmap/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/charmap/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/charmap/__pycache__/panel.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/charmap/__pycache__/panel.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/gedit/plugins/charmap/panel.py
lib/gedit/plugins/codecomment.plugin
lib/gedit/plugins/codecomment.py
@@ -28,52 +28,52 @@ lib/gedit/plugins/colorpicker.plugin
lib/gedit/plugins/colorpicker.py
lib/gedit/plugins/colorschemer.plugin
lib/gedit/plugins/colorschemer/__init__.py
-lib/gedit/plugins/colorschemer/__pycache__/__init__.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/colorschemer/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/colorschemer/__pycache__/languages.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/colorschemer/__pycache__/languages.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/colorschemer/__pycache__/schemer.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/colorschemer/__pycache__/schemer.cpython-%%PYVER%%.%%PYOEXTENSION%%
+lib/gedit/plugins/colorschemer/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/colorschemer/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/colorschemer/__pycache__/languages.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/colorschemer/__pycache__/languages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/colorschemer/__pycache__/schemer.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/colorschemer/__pycache__/schemer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/gedit/plugins/colorschemer/languages.py
lib/gedit/plugins/colorschemer/schemer.py
lib/gedit/plugins/commander.plugin
lib/gedit/plugins/commander/__init__.py
-lib/gedit/plugins/commander/__pycache__/__init__.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/commander/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/commander/__pycache__/appactivatable.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/commander/__pycache__/appactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/commander/__pycache__/entry.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/commander/__pycache__/entry.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/commander/__pycache__/history.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/commander/__pycache__/history.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/commander/__pycache__/info.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/commander/__pycache__/info.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/commander/__pycache__/modules.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/commander/__pycache__/modules.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/commander/__pycache__/utils.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/commander/__pycache__/utils.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/commander/__pycache__/windowactivatable.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/commander/__pycache__/windowactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%%
+lib/gedit/plugins/commander/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/commander/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/commander/__pycache__/entry.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/entry.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/commander/__pycache__/history.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/history.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/commander/__pycache__/info.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/info.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/commander/__pycache__/modules.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/modules.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/commander/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/commander/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/gedit/plugins/commander/appactivatable.py
lib/gedit/plugins/commander/commands/__init__.py
-lib/gedit/plugins/commander/commands/__pycache__/__init__.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/commander/commands/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/accel_group.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/commander/commands/__pycache__/accel_group.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/completion.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/commander/commands/__pycache__/completion.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/exceptions.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/commander/commands/__pycache__/exceptions.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/metamodule.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/commander/commands/__pycache__/metamodule.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/method.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/commander/commands/__pycache__/method.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/module.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/commander/commands/__pycache__/module.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/result.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/commander/commands/__pycache__/result.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/rollbackimporter.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/commander/commands/__pycache__/rollbackimporter.cpython-%%PYVER%%.%%PYOEXTENSION%%
+lib/gedit/plugins/commander/commands/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/commander/commands/__pycache__/accel_group.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/accel_group.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/commander/commands/__pycache__/completion.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/completion.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/commander/commands/__pycache__/exceptions.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/exceptions.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/commander/commands/__pycache__/metamodule.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/metamodule.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/commander/commands/__pycache__/method.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/method.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/commander/commands/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/commander/commands/__pycache__/result.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/result.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/commander/commands/__pycache__/rollbackimporter.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/rollbackimporter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/gedit/plugins/commander/commands/accel_group.py
lib/gedit/plugins/commander/commands/completion.py
lib/gedit/plugins/commander/commands/exceptions.py
@@ -90,32 +90,32 @@ lib/gedit/plugins/commander/utils.py
lib/gedit/plugins/commander/windowactivatable.py
lib/gedit/plugins/dashboard.plugin
lib/gedit/plugins/dashboard/__init__.py
-lib/gedit/plugins/dashboard/__pycache__/__init__.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/dashboard/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/dashboard/__pycache__/dashboard.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/dashboard/__pycache__/dashboard.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/dashboard/__pycache__/utils.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/dashboard/__pycache__/utils.cpython-%%PYVER%%.%%PYOEXTENSION%%
+lib/gedit/plugins/dashboard/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/dashboard/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/dashboard/__pycache__/dashboard.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/dashboard/__pycache__/dashboard.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/dashboard/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/dashboard/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/gedit/plugins/dashboard/dashboard.py
lib/gedit/plugins/dashboard/utils.py
lib/gedit/plugins/drawspaces.plugin
lib/gedit/plugins/findinfiles.plugin
lib/gedit/plugins/git.plugin
lib/gedit/plugins/git/__init__.py
-lib/gedit/plugins/git/__pycache__/__init__.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/git/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/git/__pycache__/appactivatable.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/git/__pycache__/appactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/git/__pycache__/debug.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/git/__pycache__/debug.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/git/__pycache__/diffrenderer.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/git/__pycache__/diffrenderer.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/git/__pycache__/viewactivatable.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/git/__pycache__/viewactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/git/__pycache__/windowactivatable.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/git/__pycache__/windowactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/git/__pycache__/workerthread.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/git/__pycache__/workerthread.cpython-%%PYVER%%.%%PYOEXTENSION%%
+lib/gedit/plugins/git/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/git/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/git/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/git/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/git/__pycache__/debug.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/git/__pycache__/debug.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/git/__pycache__/diffrenderer.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/git/__pycache__/diffrenderer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/git/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/git/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/git/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/git/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/git/__pycache__/workerthread.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/git/__pycache__/workerthread.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/gedit/plugins/git/appactivatable.py
lib/gedit/plugins/git/debug.py
lib/gedit/plugins/git/diffrenderer.py
@@ -132,16 +132,16 @@ lib/gedit/plugins/libwordcompletion.so
lib/gedit/plugins/libzeitgeist.so
lib/gedit/plugins/multiedit.plugin
lib/gedit/plugins/multiedit/__init__.py
-lib/gedit/plugins/multiedit/__pycache__/__init__.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/multiedit/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/multiedit/__pycache__/appactivatable.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/multiedit/__pycache__/appactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/multiedit/__pycache__/signals.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/multiedit/__pycache__/signals.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/multiedit/__pycache__/viewactivatable.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/multiedit/__pycache__/viewactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/multiedit/__pycache__/windowactivatable.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/multiedit/__pycache__/windowactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%%
+lib/gedit/plugins/multiedit/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/multiedit/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/multiedit/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/multiedit/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/multiedit/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/multiedit/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/multiedit/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/multiedit/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/multiedit/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/multiedit/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/gedit/plugins/multiedit/appactivatable.py
lib/gedit/plugins/multiedit/signals.py
lib/gedit/plugins/multiedit/viewactivatable.py
@@ -150,24 +150,24 @@ lib/gedit/plugins/smartspaces.plugin
lib/gedit/plugins/smartspaces.py
lib/gedit/plugins/synctex.plugin
lib/gedit/plugins/synctex/__init__.py
-lib/gedit/plugins/synctex/__pycache__/__init__.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/synctex/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/synctex/__pycache__/evince_dbus.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/synctex/__pycache__/evince_dbus.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/synctex/__pycache__/synctex.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/synctex/__pycache__/synctex.cpython-%%PYVER%%.%%PYOEXTENSION%%
+lib/gedit/plugins/synctex/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/synctex/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/synctex/__pycache__/evince_dbus.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/synctex/__pycache__/evince_dbus.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/synctex/__pycache__/synctex.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/synctex/__pycache__/synctex.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/gedit/plugins/synctex/evince_dbus.py
lib/gedit/plugins/synctex/synctex.py
lib/gedit/plugins/terminal.plugin
lib/gedit/plugins/terminal.py
lib/gedit/plugins/textsize.plugin
lib/gedit/plugins/textsize/__init__.py
-lib/gedit/plugins/textsize/__pycache__/__init__.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/textsize/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/textsize/__pycache__/signals.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/textsize/__pycache__/signals.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/textsize/__pycache__/viewactivatable.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/textsize/__pycache__/viewactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%%
+lib/gedit/plugins/textsize/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/textsize/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/textsize/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/textsize/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/textsize/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/textsize/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/gedit/plugins/textsize/signals.py
lib/gedit/plugins/textsize/viewactivatable.py
lib/gedit/plugins/wordcompletion.plugin
@@ -192,41 +192,41 @@ share/appdata/gedit-textsize.metainfo.xml
share/appdata/gedit-wordcompletion.metainfo.xml
share/appdata/gedit-zeitgeist.metainfo.xml
share/gedit/plugins/colorschemer/ui/schemer.ui
-share/gedit/plugins/commander/modules/__pycache__/align.cpython-%%PYVER%%.pyc
-share/gedit/plugins/commander/modules/__pycache__/align.cpython-%%PYVER%%.%%PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/bookmark.cpython-%%PYVER%%.pyc
-share/gedit/plugins/commander/modules/__pycache__/bookmark.cpython-%%PYVER%%.%%PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/doc.cpython-%%PYVER%%.pyc
-share/gedit/plugins/commander/modules/__pycache__/doc.cpython-%%PYVER%%.%%PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/edit.cpython-%%PYVER%%.pyc
-share/gedit/plugins/commander/modules/__pycache__/edit.cpython-%%PYVER%%.%%PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/format.cpython-%%PYVER%%.pyc
-share/gedit/plugins/commander/modules/__pycache__/format.cpython-%%PYVER%%.%%PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/goto.cpython-%%PYVER%%.pyc
-share/gedit/plugins/commander/modules/__pycache__/goto.cpython-%%PYVER%%.%%PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/grep.cpython-%%PYVER%%.pyc
-share/gedit/plugins/commander/modules/__pycache__/grep.cpython-%%PYVER%%.%%PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/help.cpython-%%PYVER%%.pyc
-share/gedit/plugins/commander/modules/__pycache__/help.cpython-%%PYVER%%.%%PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/move.cpython-%%PYVER%%.pyc
-share/gedit/plugins/commander/modules/__pycache__/move.cpython-%%PYVER%%.%%PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/reload.cpython-%%PYVER%%.pyc
-share/gedit/plugins/commander/modules/__pycache__/reload.cpython-%%PYVER%%.%%PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/set.cpython-%%PYVER%%.pyc
-share/gedit/plugins/commander/modules/__pycache__/set.cpython-%%PYVER%%.%%PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/shell.cpython-%%PYVER%%.pyc
-share/gedit/plugins/commander/modules/__pycache__/shell.cpython-%%PYVER%%.%%PYOEXTENSION%%
+share/gedit/plugins/commander/modules/__pycache__/align.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/align.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+share/gedit/plugins/commander/modules/__pycache__/bookmark.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/bookmark.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+share/gedit/plugins/commander/modules/__pycache__/doc.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/doc.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+share/gedit/plugins/commander/modules/__pycache__/edit.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/edit.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+share/gedit/plugins/commander/modules/__pycache__/format.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/format.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+share/gedit/plugins/commander/modules/__pycache__/goto.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/goto.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+share/gedit/plugins/commander/modules/__pycache__/grep.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/grep.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+share/gedit/plugins/commander/modules/__pycache__/help.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/help.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+share/gedit/plugins/commander/modules/__pycache__/move.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/move.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+share/gedit/plugins/commander/modules/__pycache__/reload.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/reload.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+share/gedit/plugins/commander/modules/__pycache__/set.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/set.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+share/gedit/plugins/commander/modules/__pycache__/shell.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/shell.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
share/gedit/plugins/commander/modules/align.py
share/gedit/plugins/commander/modules/bookmark.py
share/gedit/plugins/commander/modules/doc.py
share/gedit/plugins/commander/modules/edit.py
share/gedit/plugins/commander/modules/find/__init__.py
-share/gedit/plugins/commander/modules/find/__pycache__/__init__.cpython-%%PYVER%%.pyc
-share/gedit/plugins/commander/modules/find/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-share/gedit/plugins/commander/modules/find/__pycache__/finder.cpython-%%PYVER%%.pyc
-share/gedit/plugins/commander/modules/find/__pycache__/finder.cpython-%%PYVER%%.%%PYOEXTENSION%%
-share/gedit/plugins/commander/modules/find/__pycache__/regex.cpython-%%PYVER%%.pyc
-share/gedit/plugins/commander/modules/find/__pycache__/regex.cpython-%%PYVER%%.%%PYOEXTENSION%%
+share/gedit/plugins/commander/modules/find/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/find/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+share/gedit/plugins/commander/modules/find/__pycache__/finder.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/find/__pycache__/finder.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+share/gedit/plugins/commander/modules/find/__pycache__/regex.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/find/__pycache__/regex.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
share/gedit/plugins/commander/modules/find/finder.py
share/gedit/plugins/commander/modules/find/regex.py
share/gedit/plugins/commander/modules/format.py
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index f0aac383d2de..4bdaa7417c9c 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -47,19 +47,8 @@ GLIB_SCHEMAS= org.gnome.gedit.enums.xml \
org.gnome.gedit.plugins.time.enums.xml \
org.gnome.gedit.plugins.time.gschema.xml
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-PYOEXTENSION= pyo
-.else
-PYOEXTENSION= opt-1.pyc
-.endif
-
-PLIST_SUB+= PYOEXTENSION=${PYOEXTENSION} \
- PYVER=${PYTHON_VER:S/.//}
-
post-patch:
@${REINPLACE_CMD} -e 's|=python|=${PYTHON_CMD}|g' \
${WRKSRC}/py-compile
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index fa1fe18349a3..7fb1042f6032 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -22,26 +22,26 @@ lib/gedit/libgedit.so
lib/gedit/plugins/docinfo.plugin
lib/gedit/plugins/externaltools.plugin
lib/gedit/plugins/externaltools/__init__.py
-lib/gedit/plugins/externaltools/__pycache__/__init__.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/capture.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/capture.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/functions.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/functions.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/library.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/library.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/manager.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/manager.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/windowactivatable.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/windowactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%%
+lib/gedit/plugins/externaltools/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/externaltools/__pycache__/capture.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/capture.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/externaltools/__pycache__/functions.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/functions.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/externaltools/__pycache__/library.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/library.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/externaltools/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/externaltools/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/gedit/plugins/externaltools/appactivatable.py
lib/gedit/plugins/externaltools/capture.py
lib/gedit/plugins/externaltools/filelookup.py
@@ -61,62 +61,62 @@ lib/gedit/plugins/libtime.so
lib/gedit/plugins/modelines.plugin
lib/gedit/plugins/pythonconsole.plugin
lib/gedit/plugins/pythonconsole/__init__.py
-lib/gedit/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/pythonconsole/__pycache__/console.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/pythonconsole/__pycache__/console.cpython-%%PYVER%%.%%PYOEXTENSION%%
+lib/gedit/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/pythonconsole/__pycache__/console.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/pythonconsole/__pycache__/console.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/gedit/plugins/pythonconsole/config.py
lib/gedit/plugins/pythonconsole/console.py
lib/gedit/plugins/quickopen.plugin
lib/gedit/plugins/quickopen/__init__.py
-lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/quickopen/__pycache__/popup.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/quickopen/__pycache__/popup.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYVER%%.%%PYOEXTENSION%%
+lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/quickopen/__pycache__/popup.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/quickopen/__pycache__/popup.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/gedit/plugins/quickopen/popup.py
lib/gedit/plugins/quickopen/virtualdirs.py
lib/gedit/plugins/snippets.plugin
lib/gedit/plugins/snippets/__init__.py
-lib/gedit/plugins/snippets/__pycache__/__init__.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/completion.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/completion.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/document.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/document.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/exporter.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/exporter.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/helper.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/helper.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/importer.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/importer.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/library.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/library.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/manager.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/manager.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/parser.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/parser.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/signals.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/signals.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/singleton.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/singleton.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/snippet.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/snippet.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-%%PYVER%%.%%PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/windowactivatable.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/snippets/__pycache__/windowactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%%
+lib/gedit/plugins/snippets/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/snippets/__pycache__/completion.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/completion.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/snippets/__pycache__/document.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/document.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/snippets/__pycache__/exporter.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/exporter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/snippets/__pycache__/helper.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/helper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/snippets/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/snippets/__pycache__/library.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/library.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/snippets/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/snippets/__pycache__/parser.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/parser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/snippets/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/snippets/__pycache__/singleton.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/singleton.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/snippets/__pycache__/snippet.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/snippet.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/snippets/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/gedit/plugins/snippets/appactivatable.py
lib/gedit/plugins/snippets/completion.py
lib/gedit/plugins/snippets/document.py
@@ -138,8 +138,8 @@ lib/gedit/plugins/sort.plugin
lib/gedit/plugins/spell.plugin
lib/gedit/plugins/time.plugin
%%PYTHON_SITELIBDIR%%/gi/overrides/Gedit.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gedit.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gedit.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gedit.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gedit.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
libdata/pkgconfig/gedit.pc
libexec/gedit/gedit-bugreport.sh
man/man1/gedit.1.gz
diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
index 44c8aedee2e8..6899629de1de 100644
--- a/graphics/eog-plugins/Makefile
+++ b/graphics/eog-plugins/Makefile
@@ -29,48 +29,20 @@ GLIB_SCHEMAS= org.gnome.eog.plugins.exif-display.gschema.xml
OPTIONS_DEFINE= CHAMPLAIN PYTHON
OPTIONS_DEFAULT=CHAMPLAIN PYTHON
+OPTIONS_SUB= yes
CHAMPLAIN_DESC= Champlain map plugin
-.include <bsd.port.options.mk>
+CHAMPLAIN_LIB_DEPENDS= libchamplain-0.12.so:graphics/libchamplain
+CHAMPLAIN_USE= GL=gl
+PYTHON_CONFIGURE_ENABLE=python
+PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas
+PYTHON_USES= python:3
+PYTHON_VARS= GLIB_SCHEMAS+="org.gnome.eog.plugins.export-to-folder.gschema.xml org.gnome.eog.plugins.fullscreenbg.gschema.xml org.gnome.eog.plugins.pythonconsole.gschema.xml"
-.if ${PORT_OPTIONS:MCHAMPLAIN}
-USE_GL= gl
-LIB_DEPENDS+= libchamplain-0.12.so:graphics/libchamplain
-PLIST_SUB+= CHAMPLAIN=""
-.else
-PLIST_SUB+= CHAMPLAIN="@comment "
-.endif
-
-PLIST_SUB+= PYVER=${PYTHON_VER:S|.||}
-.if ${PORT_OPTIONS:MPYTHON}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas
-CONFIGURE_ARGS+=--enable-python
-USES+= python:3
-PLIST_SUB+= PYTHON=""
-GLIB_SCHEMAS+= org.gnome.eog.plugins.export-to-folder.gschema.xml \
- org.gnome.eog.plugins.fullscreenbg.gschema.xml \
- org.gnome.eog.plugins.pythonconsole.gschema.xml
-.else
-CONFIGURE_ARGS+=--disable-python
-PLIST_SUB+= PYTHON="@comment "
-.endif
-
-.if ! ${PORT_OPTIONS:MCHAMPLAIN}
-post-patch:
+post-patch-CHAMPLAIN-off:
@${REINPLACE_CMD} -e 's|champlain-gtk|disabled-champlain-gtk|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} '/^DEFAULT_PLUGINS=/,/^$$/ s/map//' \
${WRKSRC}/configure
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-PYOEXTENSION= pyo
-.else
-PYOEXTENSION= opt-1.pyc
-.endif
-
-PLIST_SUB+= PYOEXTENSION=${PYOEXTENSION}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/eog-plugins/pkg-plist b/graphics/eog-plugins/pkg-plist
index 3a7668908ba2..bf05a3ab3cdd 100644
--- a/graphics/eog-plugins/pkg-plist
+++ b/graphics/eog-plugins/pkg-plist
@@ -1,15 +1,15 @@
lib/eog/plugins/exif-display.plugin
%%PYTHON%%lib/eog/plugins/export-to-folder.plugin
%%PYTHON%%lib/eog/plugins/export-to-folder.py
-%%PYTHON%%lib/eog/plugins/__pycache__/export-to-folder.cpython-%%PYVER%%.pyc
-%%PYTHON%%lib/eog/plugins/__pycache__/export-to-folder.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/eog/plugins/__pycache__/maximize-windows.cpython-%%PYVER%%.pyc
-%%PYTHON%%lib/eog/plugins/__pycache__/maximize-windows.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON%%lib/eog/plugins/__pycache__/export-to-folder.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/eog/plugins/__pycache__/export-to-folder.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/eog/plugins/__pycache__/maximize-windows.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/eog/plugins/__pycache__/maximize-windows.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/eog/plugins/fit-to-width.plugin
%%PYTHON%%lib/eog/plugins/fullscreenbg.plugin
%%PYTHON%%lib/eog/plugins/fullscreenbg.py
-%%PYTHON%%lib/eog/plugins/__pycache__/fullscreenbg.cpython-%%PYVER%%.pyc
-%%PYTHON%%lib/eog/plugins/__pycache__/fullscreenbg.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON%%lib/eog/plugins/__pycache__/fullscreenbg.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/eog/plugins/__pycache__/fullscreenbg.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/eog/plugins/hide-titlebar.plugin
lib/eog/plugins/libexif-display.so
lib/eog/plugins/libfit-to-width.so
@@ -25,19 +25,19 @@ lib/eog/plugins/light-theme.plugin
lib/eog/plugins/postasa.plugin
%%PYTHON%%lib/eog/plugins/pythonconsole.plugin
%%PYTHON%%lib/eog/plugins/pythonconsole/__init__.py
-%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/config.cpython-%%PYVER%%.pyc
-%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/config.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/console.cpython-%%PYVER%%.pyc
-%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/console.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/console.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/console.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON%%lib/eog/plugins/pythonconsole/config.py
%%PYTHON%%lib/eog/plugins/pythonconsole/console.py
lib/eog/plugins/send-by-mail.plugin
%%PYTHON%%lib/eog/plugins/slideshowshuffle.plugin
%%PYTHON%%lib/eog/plugins/slideshowshuffle.py
-%%PYTHON%%lib/eog/plugins/__pycache__/slideshowshuffle.cpython-%%PYVER%%.pyc
-%%PYTHON%%lib/eog/plugins/__pycache__/slideshowshuffle.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON%%lib/eog/plugins/__pycache__/slideshowshuffle.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/eog/plugins/__pycache__/slideshowshuffle.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
share/appdata/eog-exif-display.metainfo.xml
%%PYTHON%%share/appdata/eog-export-to-folder.metainfo.xml
share/appdata/eog-fit-to-width.metainfo.xml
diff --git a/graphics/py3-cairo/Makefile b/graphics/py3-cairo/Makefile
index 9fa022fdf211..2a38080603f1 100644
--- a/graphics/py3-cairo/Makefile
+++ b/graphics/py3-cairo/Makefile
@@ -20,17 +20,6 @@ LDFLAGS+= -L${LOCALBASE}/lib
SHEBANG_FILES= examples/*.py examples/*/*.py test/*.py
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-PYOEXTENSION= pyo
-.else
-PYOEXTENSION= opt-1.pyc
-.endif
-
-PLIST_SUB+= PYTVER=${PYTHON_VER:S/.//} \
- PYOEXTENSION=${PYOEXTENSION}
-
post-patch:
@${REINPLACE_CMD} -e 's|python %s|${PYTHON_CMD} %s|g' \
${WRKSRC}/test/examples_test.py
@@ -50,4 +39,4 @@ post-install:
-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cairo/_cairo.so
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/py3-cairo/pkg-plist b/graphics/py3-cairo/pkg-plist
index b720e36e0691..bb026ea4c0d8 100644
--- a/graphics/py3-cairo/pkg-plist
+++ b/graphics/py3-cairo/pkg-plist
@@ -1,6 +1,6 @@
include/pycairo/py3cairo.h
-%%PYTHON_SITELIBDIR%%/cairo/__pycache__/__init__.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/cairo/__pycache__/__init__.cpython-%%PYTVER%%.%%PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/cairo/__init__.py
+%%PYTHON_SITELIBDIR%%/cairo/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/cairo/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/cairo/_cairo.so
libdata/pkgconfig/py3cairo.pc
diff --git a/math/convertall/Makefile b/math/convertall/Makefile
index 4042d742a7ca..8453cbb651ee 100644
--- a/math/convertall/Makefile
+++ b/math/convertall/Makefile
@@ -41,15 +41,6 @@ do-install:
.include <bsd.port.pre.mk>
-.if ${PYTHON_REL} < 3500
-PYOEXTENSION= pyo
-.else
-PYOEXTENSION= opt-1.pyc
-.endif
-
-PLIST_SUB+= PYTHON_SUFFIX="${PYTHON_SUFFIX}" \
- PYOEXTENSION="${PYOEXTENSION}"
-
.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
.endif
diff --git a/math/convertall/pkg-plist b/math/convertall/pkg-plist
index b327b8b66b39..a24361d4540d 100644
--- a/math/convertall/pkg-plist
+++ b/math/convertall/pkg-plist
@@ -1,40 +1,40 @@
bin/convertall
%%DATADIR%%/__pycache__/cmdline.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/cmdline.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/cmdline.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/convertall.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/convertall.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/convertall.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/convertdlg.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/convertdlg.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/convertdlg.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/finddlg.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/finddlg.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/finddlg.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/modbutton.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/modbutton.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/modbutton.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/numedit.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/numedit.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/numedit.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/recentunits.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/recentunits.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/recentunits.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/unitatom.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/unitatom.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/unitatom.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/unitdata.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/unitdata.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/unitdata.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/unitedit.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/unitedit.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/unitedit.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/unitgroup.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/unitgroup.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/unitgroup.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/unitlistview.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/unitlistview.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/unitlistview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/cmdline.py
%%DATADIR%%/convertall.pro
%%DATADIR%%/convertall.py
diff --git a/math/rpcalc/Makefile b/math/rpcalc/Makefile
index f4c4ba47c3ad..ab158bdb1199 100644
--- a/math/rpcalc/Makefile
+++ b/math/rpcalc/Makefile
@@ -36,15 +36,6 @@ do-install:
.include <bsd.port.pre.mk>
-.if ${PYTHON_REL} < 3500
-PYOEXTENSION= pyo
-.else
-PYOEXTENSION= opt-1.pyc
-.endif
-
-PLIST_SUB+= PYTHON_SUFFIX="${PYTHON_SUFFIX}" \
- PYOEXTENSION="${PYOEXTENSION}"
-
.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
.endif
diff --git a/math/rpcalc/pkg-plist b/math/rpcalc/pkg-plist
index de0494b8b9f1..cc38c95d6f2a 100644
--- a/math/rpcalc/pkg-plist
+++ b/math/rpcalc/pkg-plist
@@ -1,32 +1,32 @@
bin/rpcalc
%%DATADIR%%/__pycache__/altbasedialog.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/altbasedialog.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/altbasedialog.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/calcbutton.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/calcbutton.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/calcbutton.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/calccore.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/calccore.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/calccore.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/calcdlg.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/calcdlg.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/calcdlg.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/calclcd.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/calclcd.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/calclcd.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/calcstack.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/calcstack.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/calcstack.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/extradisplay.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/extradisplay.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/extradisplay.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/rpcalc.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/rpcalc.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/rpcalc.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%DATADIR%%/altbasedialog.py
%%DATADIR%%/calcbutton.py
%%DATADIR%%/calccore.py
diff --git a/multimedia/py3-gstreamer1/Makefile b/multimedia/py3-gstreamer1/Makefile
index d89bca4b2f1a..45e941faf8f9 100644
--- a/multimedia/py3-gstreamer1/Makefile
+++ b/multimedia/py3-gstreamer1/Makefile
@@ -26,15 +26,4 @@ CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-PYOEXTENSION= pyo
-.else
-PYOEXTENSION= opt-1.pyc
-.endif
-
-PLIST_SUB+= PYOEXTENSION=${PYOEXTENSION} \
- PYVER=${PYTHON_VER:S/.//}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/py3-gstreamer1/pkg-plist b/multimedia/py3-gstreamer1/pkg-plist
index fc83b1c3165b..8c84c64e48dc 100644
--- a/multimedia/py3-gstreamer1/pkg-plist
+++ b/multimedia/py3-gstreamer1/pkg-plist
@@ -1,8 +1,8 @@
lib/gstreamer-1.0/libgstpythonplugin.so
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gst.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gst.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GstPbutils.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GstPbutils.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gst.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gst.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GstPbutils.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GstPbutils.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/overrides/Gst.py
%%PYTHON_SITELIBDIR%%/gi/overrides/GstPbutils.py
%%PYTHON_SITELIBDIR%%/gi/overrides/_gi_gst.so