4 files changed, 202 insertions, 224 deletions

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