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)

17 files changed, 441 insertions, 359 deletions

diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile
index 9a087c74b0f3..3e220c059025 100644
--- a/accessibility/accerciser/Makefile
+++ b/accessibility/accerciser/Makefile
@@ -28,6 +28,15 @@ SHEBANG_FILES=	plugins/ipython_view.py
 
 GLIB_SCHEMAS=	org.a11y.Accerciser.gschema.xml
 
-PLIST_SUB+=	PYVER=${PYTHON_VER:S/.//}
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.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/accessibility/accerciser/pkg-plist b/accessibility/accerciser/pkg-plist
index 312d4e40d293..a64a6e73cbde 100644
--- a/accessibility/accerciser/pkg-plist
+++ b/accessibility/accerciser/pkg-plist
@@ -14,46 +14,46 @@ man/man1/accerciser.1.gz
 %%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/about_dialog.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accerciser.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accerciser.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accessible_treeview.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/accerciser/__pycache__/bookmarks.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/bookmarks.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/hotkey_manager.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/accerciser/__pycache__/i18n.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/i18n.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/i18n.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/accerciser/__pycache__/icons.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/icons.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/main_window.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/accerciser/__pycache__/node.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/node.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/prefs_dialog.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/accerciser/__pycache__/tools.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/tools.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/ui_manager.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/view.cpython-%%PYVER%%.%%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 7138bbfc1570..cd77a567cda1 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -32,10 +32,19 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-PLIST_SUB+=	PYVER=${PYTHON_VER:S/.//}
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 	    	${WRKSRC}/src/orca/orca_i18n.py
 
-.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/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist
index 33ee5462dc8c..7bcc879f398a 100644
--- a/accessibility/orca/pkg-plist
+++ b/accessibility/orca/pkg-plist
@@ -2,137 +2,137 @@ 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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/acss.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/acss.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/acss.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/bookmarks.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/bookmarks.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/bookmarks.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/braille.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_rolenames.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/brlmon.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/brlmon.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/brlmon.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/brltablenames.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/brltablenames.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/brltablenames.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/chat.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/chat.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/chat.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/chnames.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/chnames.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/chnames.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/cmdnames.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/cmdnames.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/cmdnames.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/colornames.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/colornames.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/common_keyboardmap.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/debug.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/debug.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/event_manager.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/eventsynthesizer.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/eventsynthesizer.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/eventsynthesizer.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/find.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/find.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/flat_review.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/formatting.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/formatting.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/formatting.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/generator.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/guilabels.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/guilabels.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/input_event.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/keybindings.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/keybindings.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/keybindings.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/keynames.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/keynames.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/laptop_keyboardmap.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/liveregions.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/liveregions.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/liveregions.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/logger.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/logger.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/logger.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/mathsymbols.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/mathsymbols.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/mathsymbols.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/messages.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/messages.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/object_properties.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/orca.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_state.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/phonnames.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/phonnames.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/punctuation_settings.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/script.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/settings.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings_manager.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/sound.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/sound.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/sound.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/speech.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/speechdispatcherfactory.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechdispatcherfactory.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechdispatcherfactory.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/speechserver.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechserver.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechserver.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/spellcheck.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/spellcheck.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/where_am_I.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/json_backend.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/backends/json_backend.py
 %%PYTHON_SITELIBDIR%%/orca/bookmarks.py
 %%PYTHON_SITELIBDIR%%/orca/braille.py
@@ -185,57 +185,57 @@ etc/xdg/autostart/orca-autostart.desktop
 %%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/self_voicing.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/script_utilities.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/script_utilities.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/formatting.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/formatting.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/formatting.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script_utilities.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script_utilities.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script_utilities.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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/spellcheck.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/formatting.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script_utilities.py
@@ -243,235 +243,235 @@ etc/xdg/autostart/orca-autostart.desktop
 %%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/__pycache__/__init__.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/script_utilities.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/speech_generator.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdm-simple-greeter/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/spellcheck.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/speech_generator.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/speech_generator.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/script_utilities.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/speech_generator.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/speech_generator.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/speech_generator.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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/structural_navigation.cpython-%%PYVER%%.%%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
@@ -480,42 +480,42 @@ etc/xdg/autostart/orca-autostart.desktop
 %%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/script_utilities.cpython-%%PYVER%%.%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/bookmarks.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/bookmarks.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/bookmarks.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/braille_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/braille_generator.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/braille_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/formatting.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/formatting.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/formatting.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/keymaps.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/keymaps.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/keymaps.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script.cpython-%%PYVER%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/speech_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/speech_generator.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/speech_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/structural_navigation.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/structural_navigation.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/structural_navigation.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/tutorial_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/tutorial_generator.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/tutorial_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/bookmarks.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/braille_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/formatting.py
@@ -527,39 +527,39 @@ etc/xdg/autostart/orca-autostart.desktop
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/tutorial_generator.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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/speech_generator.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/__pycache__/script.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/speech_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/structural_navigation.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/structural_navigation.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/structural_navigation.cpython-%%PYVER%%.%%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
@@ -567,25 +567,25 @@ etc/xdg/autostart/orca-autostart.desktop
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/structural_navigation.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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/__init__.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/script_utilities.cpython-%%PYVER%%.%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/script_utilities.py
 %%PYTHON_SITELIBDIR%%/orca/settings.py
diff --git a/accessibility/py3-atspi/Makefile b/accessibility/py3-atspi/Makefile
index 84352c72c38a..d9d390311e37 100644
--- a/accessibility/py3-atspi/Makefile
+++ b/accessibility/py3-atspi/Makefile
@@ -23,6 +23,15 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-PLIST_SUB+=	PYVER=${PYTHON_VER:S/.//}
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.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/accessibility/py3-atspi/pkg-plist b/accessibility/py3-atspi/pkg-plist
index 0b671f3a8881..ced81fa8d2fc 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%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/Accessibility.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/__init__.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/__init__.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/action.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/action.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/action.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/appevent.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/appevent.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/appevent.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/application.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/application.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/application.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/collection.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/collection.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/collection.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/component.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/component.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/component.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/constants.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/constants.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/constants.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/deviceevent.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/deviceevent.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/deviceevent.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/document.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/document.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/document.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/editabletext.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/editabletext.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/editabletext.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/enum.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/enum.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/enum.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/hypertext.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/hypertext.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/hypertext.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/image.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/image.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/image.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/interface.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/interface.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/interface.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/registry.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/registry.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/registry.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/role.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/role.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/role.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/selection.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/selection.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/selection.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/state.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/state.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/state.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/table.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/table.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/table.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/tablecell.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/tablecell.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/tablecell.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/text.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/text.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/text.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/utils.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/utils.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/utils.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/value.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/value.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/value.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pyatspi/action.py
 %%PYTHON_SITELIBDIR%%/pyatspi/appevent.py
 %%PYTHON_SITELIBDIR%%/pyatspi/application.py
diff --git a/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile
index 4e4ee2dc0891..c6629205fbb9 100644
--- a/deskutils/alacarte/Makefile
+++ b/deskutils/alacarte/Makefile
@@ -22,12 +22,21 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-PLIST_SUB+=	PYVER=${PYTHON_VER:S/.//}
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|from gi._glib import|from gi.repository.GLib import|g' \
 		${WRKSRC}/Alacarte/util.py
 	@${REINPLACE_CMD} -e "s|ron\['XDG_MENU_PREFIX'\]|ron.get('XDG_MENU_PREFIX', '')|g" \
 		${WRKSRC}/Alacarte/MenuEditor.py
 
-.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/deskutils/alacarte/pkg-plist b/deskutils/alacarte/pkg-plist
index 84371dec08a5..d1e149adc44b 100644
--- a/deskutils/alacarte/pkg-plist
+++ b/deskutils/alacarte/pkg-plist
@@ -6,15 +6,15 @@ lib/python/site-packages/Alacarte/__init__.py
 lib/python/site-packages/Alacarte/config.py
 lib/python/site-packages/Alacarte/util.py
 lib/python/site-packages/Alacarte/__pycache__/ItemEditor.cpython-%%PYVER%%.pyc
-lib/python/site-packages/Alacarte/__pycache__/ItemEditor.cpython-%%PYVER%%.pyo
+lib/python/site-packages/Alacarte/__pycache__/ItemEditor.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/python/site-packages/Alacarte/__pycache__/MenuEditor.cpython-%%PYVER%%.pyc
-lib/python/site-packages/Alacarte/__pycache__/MenuEditor.cpython-%%PYVER%%.pyo
+lib/python/site-packages/Alacarte/__pycache__/MenuEditor.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/python/site-packages/Alacarte/__pycache__/__init__.cpython-%%PYVER%%.pyc
-lib/python/site-packages/Alacarte/__pycache__/__init__.cpython-%%PYVER%%.pyo
+lib/python/site-packages/Alacarte/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/python/site-packages/Alacarte/__pycache__/config.cpython-%%PYVER%%.pyc
-lib/python/site-packages/Alacarte/__pycache__/config.cpython-%%PYVER%%.pyo
+lib/python/site-packages/Alacarte/__pycache__/config.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/python/site-packages/Alacarte/__pycache__/util.cpython-%%PYVER%%.pyc
-lib/python/site-packages/Alacarte/__pycache__/util.cpython-%%PYVER%%.pyo
+lib/python/site-packages/Alacarte/__pycache__/util.cpython-%%PYVER%%.%%PYOEXTENSION%%
 man/man1/alacarte.1.gz
 share/alacarte/alacarte.ui
 share/alacarte/directory-editor.ui
diff --git a/devel/py3-gobject3/pkg-plist b/devel/py3-gobject3/pkg-plist
index 245ef54cd91d..70e6ddb9cfe9 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%%.pyo
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-%%PYTVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTVER%%.pyo
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-%%PYTVER%%.pyo
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-%%PYTVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-%%PYTVER%%.pyo
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-%%PYTVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-%%PYTVER%%.pyo
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-%%PYTVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-%%PYTVER%%.pyo
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-%%PYTVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-%%PYTVER%%.pyo
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-%%PYTVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-%%PYTVER%%.pyo
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-%%PYTVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-%%PYTVER%%.pyo
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-%%PYTVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-%%PYTVER%%.pyo
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-%%PYTVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-%%PYTVER%%.pyo
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-%%PYTVER%%.%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/gi/_gobject/__pycache__/__init__.cpython-%%PYTVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gi/_option.py
 %%PYTHON_SITELIBDIR%%/gi/_propertyhelper.py
 %%PYTHON_SITELIBDIR%%/gi/_signalhelper.py
@@ -43,36 +43,36 @@
 %%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-%%PYTVER%%.%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-%%PYTVER%%.%%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%%.pyo
+%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-%%PYTVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-%%PYTVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-%%PYTVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-%%PYTVER%%.pyc
-%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-%%PYTVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-%%PYTVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.py
 %%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.py
diff --git a/devel/pygobject3-common/Makefile b/devel/pygobject3-common/Makefile
index 53dcf1ba13a9..43d6dc0bd2f4 100644
--- a/devel/pygobject3-common/Makefile
+++ b/devel/pygobject3-common/Makefile
@@ -74,6 +74,13 @@ 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/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
diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
index f20682e75089..337a250159ff 100644
--- a/graphics/eog-plugins/Makefile
+++ b/graphics/eog-plugins/Makefile
@@ -63,4 +63,14 @@ post-patch:
 		${WRKSRC}/configure
 .endif
 
-.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}
+
+.include <bsd.port.post.mk>
diff --git a/graphics/eog-plugins/pkg-plist b/graphics/eog-plugins/pkg-plist
index ba39eda38006..3a7668908ba2 100644
--- a/graphics/eog-plugins/pkg-plist
+++ b/graphics/eog-plugins/pkg-plist
@@ -2,14 +2,14 @@ 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%%.pyo
+%%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%%.pyo
+%%PYTHON%%lib/eog/plugins/__pycache__/maximize-windows.cpython-%%PYVER%%.%%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%%.pyo
+%%PYTHON%%lib/eog/plugins/__pycache__/fullscreenbg.cpython-%%PYVER%%.%%PYOEXTENSION%%
 lib/eog/plugins/hide-titlebar.plugin
 lib/eog/plugins/libexif-display.so
 lib/eog/plugins/libfit-to-width.so
@@ -26,18 +26,18 @@ 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%%.pyo
+%%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%%.pyo
+%%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%%.pyo
+%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/console.cpython-%%PYVER%%.%%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%%.pyo
+%%PYTHON%%lib/eog/plugins/__pycache__/slideshowshuffle.cpython-%%PYVER%%.%%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 34c4b3e61fdd..9fa022fdf211 100644
--- a/graphics/py3-cairo/Makefile
+++ b/graphics/py3-cairo/Makefile
@@ -20,7 +20,16 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 SHEBANG_FILES=	examples/*.py examples/*/*.py test/*.py
 
-PLIST_SUB+=	PYTVER=${PYTHON_VER:S/.//}
+.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' \
@@ -30,7 +39,8 @@ pre-configure:
 # Run waf configure twice, once to extract waflib and patch and then actual configure
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} || :
 	@cd ${WRKSRC}/.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/ && \
-		${PATCH} -p1 < ${FILESDIR}/pycairo-1.10.0-waf-py3_4.patch
+		${PATCH} -p1 < ${FILESDIR}/pycairo-1.10.0-waf-py3_4.patch && \
+		${PATCH} -p1 < ${FILESDIR}/pycairo-1.10.0-waf-py3_5.patch
 
 post-install:
 	@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/cairo/__init__.py[co]
@@ -40,4 +50,4 @@ post-install:
 		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cairo/_cairo.so
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/py3-cairo/files/pycairo-1.10.0-waf-py3_5.patch b/graphics/py3-cairo/files/pycairo-1.10.0-waf-py3_5.patch
new file mode 100644
index 000000000000..dcfdbea2fbdc
--- /dev/null
+++ b/graphics/py3-cairo/files/pycairo-1.10.0-waf-py3_5.patch
@@ -0,0 +1,10 @@
+--- a/waflib/Build.py
++++ b/waflib/Build.py
+@@ -151,6 +151,7 @@ class BuildContext(Context.Context):
+ 				f.close()
+ 		self.init_dirs()
+ 	def store(self):
++		return
+ 		data={}
+ 		for x in SAVED_ATTRS:
+ 			data[x]=getattr(self,x)
diff --git a/graphics/py3-cairo/pkg-plist b/graphics/py3-cairo/pkg-plist
index 433916acfb52..b720e36e0691 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%%.pyo
+%%PYTHON_SITELIBDIR%%/cairo/__pycache__/__init__.cpython-%%PYTVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/cairo/__init__.py
 %%PYTHON_SITELIBDIR%%/cairo/_cairo.so
 libdata/pkgconfig/py3cairo.pc