svn commit: r401900 - in head: accessibility/accerciser accessibility/orca accessibility/py3-atspi deskutils/alacarte devel/py3-gobject3 devel/pygobject3-common editors/gedit-plugins graphics/eog-p...

Ruslan Makhmatkhanov rm at FreeBSD.org
Wed Nov 18 22:13:56 UTC 2015


Author: rm
Date: Wed Nov 18 22:13:53 2015
New Revision: 401900
URL: https://svnweb.freebsd.org/changeset/ports/401900

Log:
  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)

Added:
  head/graphics/py3-cairo/files/pycairo-1.10.0-waf-py3_5.patch   (contents, props changed)
Modified:
  head/accessibility/accerciser/Makefile
  head/accessibility/accerciser/pkg-plist
  head/accessibility/orca/Makefile
  head/accessibility/orca/pkg-plist
  head/accessibility/py3-atspi/Makefile
  head/accessibility/py3-atspi/pkg-plist
  head/deskutils/alacarte/Makefile
  head/deskutils/alacarte/pkg-plist
  head/devel/py3-gobject3/pkg-plist
  head/devel/pygobject3-common/Makefile
  head/editors/gedit-plugins/Makefile
  head/editors/gedit-plugins/pkg-plist
  head/graphics/eog-plugins/Makefile
  head/graphics/eog-plugins/pkg-plist
  head/graphics/py3-cairo/Makefile
  head/graphics/py3-cairo/pkg-plist

Modified: head/accessibility/accerciser/Makefile
==============================================================================
--- head/accessibility/accerciser/Makefile	Wed Nov 18 21:48:05 2015	(r401899)
+++ head/accessibility/accerciser/Makefile	Wed Nov 18 22:13:53 2015	(r401900)
@@ -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>

Modified: head/accessibility/accerciser/pkg-plist
==============================================================================
--- head/accessibility/accerciser/pkg-plist	Wed Nov 18 21:48:05 2015	(r401899)
+++ head/accessibility/accerciser/pkg-plist	Wed Nov 18 22:13:53 2015	(r401900)
@@ -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

Modified: head/accessibility/orca/Makefile
==============================================================================
--- head/accessibility/orca/Makefile	Wed Nov 18 21:48:05 2015	(r401899)
+++ head/accessibility/orca/Makefile	Wed Nov 18 22:13:53 2015	(r401900)
@@ -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>

Modified: head/accessibility/orca/pkg-plist
==============================================================================
--- head/accessibility/orca/pkg-plist	Wed Nov 18 21:48:05 2015	(r401899)
+++ head/accessibility/orca/pkg-plist	Wed Nov 18 22:13:53 2015	(r401900)
@@ -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

Modified: head/accessibility/py3-atspi/Makefile
==============================================================================
--- head/accessibility/py3-atspi/Makefile	Wed Nov 18 21:48:05 2015	(r401899)
+++ head/accessibility/py3-atspi/Makefile	Wed Nov 18 22:13:53 2015	(r401900)
@@ -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>

Modified: head/accessibility/py3-atspi/pkg-plist
==============================================================================
--- head/accessibility/py3-atspi/pkg-plist	Wed Nov 18 21:48:05 2015	(r401899)
+++ head/accessibility/py3-atspi/pkg-plist	Wed Nov 18 22:13:53 2015	(r401900)
@@ -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

Modified: head/deskutils/alacarte/Makefile
==============================================================================
--- head/deskutils/alacarte/Makefile	Wed Nov 18 21:48:05 2015	(r401899)
+++ head/deskutils/alacarte/Makefile	Wed Nov 18 22:13:53 2015	(r401900)
@@ -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>

Modified: head/deskutils/alacarte/pkg-plist
==============================================================================
--- head/deskutils/alacarte/pkg-plist	Wed Nov 18 21:48:05 2015	(r401899)
+++ head/deskutils/alacarte/pkg-plist	Wed Nov 18 22:13:53 2015	(r401900)
@@ -6,15 +6,15 @@ lib/python/site-packages/Alacarte/__init
 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

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-ports-all mailing list