Let gnome3 stack be built with python 3.5

This mostly fixing packaging for python3.5, but there is
also py35 waf fix for py3-cairo, that was obtained from Ubuntu
repository.

PR:		204075
Approved by:	maintainer timeout (22 days)

2 files changed, 74 insertions, 65 deletions

diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 1b6690dca71b..971c2bd87374 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -31,8 +31,6 @@ INSTALL_TARGET=	install-strip
 GLIB_SCHEMAS=	org.gnome.gedit.plugins.drawspaces.gschema.xml \
 		org.gnome.gedit.plugins.wordcompletion.gschema.xml
 
-PLIST_SUB+=	PYVER=${PYTHON_VER:S/.//}
-
 USES+=		python
 BUILD_DEPENDS+=	py3?-dbus>=0:${PORTSDIR}/devel/py3-dbus
 LIB_DEPENDS+=	libgucharmap_2_90.so:${PORTSDIR}/deskutils/gucharmap
@@ -46,4 +44,15 @@ post-patch:
 	@${REINPLACE_CMD} -e 's| \\t\\r\\n\\f|[:space:]|g' \
 	    	${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.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>
diff --git a/editors/gedit-plugins/pkg-plist b/editors/gedit-plugins/pkg-plist
index 4ceb1e8dc61b..86e0de14e821 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%%.pyo
+lib/gedit/plugins/__pycache__/bracketcompletion.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/__pycache__/codecomment.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/__pycache__/codecomment.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/__pycache__/codecomment.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/__pycache__/colorpicker.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/__pycache__/colorpicker.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/__pycache__/colorpicker.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/__pycache__/gpdefs.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/__pycache__/gpdefs.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/__pycache__/gpdefs.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/__pycache__/joinlines.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/__pycache__/joinlines.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/__pycache__/joinlines.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/__pycache__/smartspaces.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/__pycache__/smartspaces.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/__pycache__/smartspaces.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/__pycache__/terminal.cpython-%%PYVER%%.pyc
-lib/gedit/plugins/__pycache__/terminal.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/__pycache__/terminal.cpython-%%PYVER%%.%%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%%.pyo
+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%%.pyo
+lib/gedit/plugins/charmap/__pycache__/panel.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/charmap/panel.py
 lib/gedit/plugins/codecomment.plugin
 lib/gedit/plugins/codecomment.py
@@ -29,51 +29,51 @@ 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%%.pyo
+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%%.pyo
+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%%.pyo
+lib/gedit/plugins/colorschemer/__pycache__/schemer.cpython-%%PYVER%%.%%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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+lib/gedit/plugins/commander/__pycache__/windowactivatable.cpython-%%PYVER%%.%%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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+lib/gedit/plugins/commander/commands/__pycache__/rollbackimporter.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/commander/commands/accel_group.py
 lib/gedit/plugins/commander/commands/completion.py
 lib/gedit/plugins/commander/commands/exceptions.py
@@ -92,19 +92,19 @@ lib/gedit/plugins/drawspaces.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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+lib/gedit/plugins/git/__pycache__/workerthread.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/git/appactivatable.py
 lib/gedit/plugins/git/debug.py
 lib/gedit/plugins/git/diffrenderer.py
@@ -120,15 +120,15 @@ lib/gedit/plugins/libwordcompletion.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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+lib/gedit/plugins/multiedit/__pycache__/windowactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/multiedit/appactivatable.py
 lib/gedit/plugins/multiedit/signals.py
 lib/gedit/plugins/multiedit/viewactivatable.py
@@ -138,11 +138,11 @@ 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%%.pyo
+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%%.pyo
+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%%.pyo
+lib/gedit/plugins/synctex/__pycache__/synctex.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/synctex/evince_dbus.py
 lib/gedit/plugins/synctex/synctex.py
 lib/gedit/plugins/terminal.plugin
@@ -150,11 +150,11 @@ 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%%.pyo
+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%%.pyo
+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%%.pyo
+lib/gedit/plugins/textsize/__pycache__/viewactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/gedit/plugins/textsize/signals.py
 lib/gedit/plugins/textsize/viewactivatable.py
 lib/gedit/plugins/wordcompletion.plugin
@@ -176,40 +176,40 @@ share/appdata/gedit-textsize.metainfo.xml
 share/appdata/gedit-wordcompletion.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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+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%%.pyo
+share/gedit/plugins/commander/modules/__pycache__/shell.cpython-%%PYVER%%.%%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%%.pyo
+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%%.pyo
+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%%.pyo
+share/gedit/plugins/commander/modules/find/__pycache__/regex.cpython-%%PYVER%%.%%PYOEXTENSION%%
 share/gedit/plugins/commander/modules/find/finder.py
 share/gedit/plugins/commander/modules/find/regex.py
 share/gedit/plugins/commander/modules/format.py