Don't hardcode python version.

While here:
Add vala as build depend to gedit.
Gedit-plugins: builds vte3 and gucharmap bindings. Register the depends
and package the files.

PR:		196618
Submitted by:	python3 default to 3.4 exp-run (via antoine@)

6 files changed, 480 insertions, 474 deletions

diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile
index 73fb04b4ca2b..a80586ed4b5b 100644
--- a/accessibility/accerciser/Makefile
+++ b/accessibility/accerciser/Makefile
@@ -27,4 +27,6 @@ SHEBANG_FILES=	plugins/ipython_view.py
 
 GLIB_SCHEMAS=	org.a11y.Accerciser.gschema.xml
 
+PLIST_SUB+=	PYVER=${PYTHON_VER:S/.//}
+
 .include <bsd.port.mk>
diff --git a/accessibility/accerciser/pkg-plist b/accessibility/accerciser/pkg-plist
index 7d4ad208e974..312d4e40d293 100644
--- a/accessibility/accerciser/pkg-plist
+++ b/accessibility/accerciser/pkg-plist
@@ -13,47 +13,47 @@ man/man1/accerciser.1.gz
 %%PYTHON_SITELIBDIR%%/accerciser/prefs_dialog.py
 %%PYTHON_SITELIBDIR%%/accerciser/tools.py
 %%PYTHON_SITELIBDIR%%/accerciser/ui_manager.py
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/about_dialog.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/about_dialog.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accerciser.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accerciser.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accessible_treeview.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accessible_treeview.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/bookmarks.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/bookmarks.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/hotkey_manager.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/hotkey_manager.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/i18n.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/i18n.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/icons.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/icons.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/main_window.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/main_window.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/node.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/node.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/prefs_dialog.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/prefs_dialog.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/tools.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/tools.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/ui_manager.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/ui_manager.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/__init__.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/__init__.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/about_dialog.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/about_dialog.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accerciser.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accerciser.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accessible_treeview.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/accessible_treeview.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/bookmarks.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/bookmarks.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/hotkey_manager.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/hotkey_manager.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/i18n.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/i18n.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/icons.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/icons.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/main_window.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/main_window.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/node.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/node.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/prefs_dialog.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/prefs_dialog.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/tools.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/tools.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/ui_manager.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/__pycache__/ui_manager.cpython-%%PYVER%%.pyo
 %%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-33.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/base_plugin.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/base_plugin.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/message.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/message.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/plugin_manager.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/plugin_manager.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/view.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/view.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/__init__.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/__init__.cpython-%%PYVER%%.pyo
+%%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__/message.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/message.cpython-%%PYVER%%.pyo
+%%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__/view.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/accerciser/plugin/__pycache__/view.cpython-%%PYVER%%.pyo
 %%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 f71933079554..2648d818a7a7 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -32,6 +32,8 @@ 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
diff --git a/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist
index 96d9bcb9d4cb..7f6c650a07f9 100644
--- a/accessibility/orca/pkg-plist
+++ b/accessibility/orca/pkg-plist
@@ -2,136 +2,136 @@ bin/orca
 etc/xdg/autostart/orca-autostart.desktop
 man/man1/orca.1.gz
 %%PYTHON_SITELIBDIR%%/orca/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/acss.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/acss.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/bookmarks.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/bookmarks.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_generator.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_generator.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_rolenames.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_rolenames.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/brlmon.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/brlmon.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/brltablenames.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/brltablenames.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/chat.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/chat.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/chnames.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/chnames.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/cmdnames.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/cmdnames.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/colornames.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/colornames.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/common_keyboardmap.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/common_keyboardmap.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/debug.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/debug.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/desktop_keyboardmap.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/desktop_keyboardmap.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/event_manager.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/event_manager.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/eventsynthesizer.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/eventsynthesizer.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/find.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/find.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/flat_review.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/flat_review.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/formatting.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/formatting.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/generator.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/generator.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/guilabels.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/guilabels.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/input_event.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/input_event.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/keybindings.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/keybindings.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/keynames.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/keynames.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/label_inference.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/label_inference.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/laptop_keyboardmap.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/laptop_keyboardmap.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/liveregions.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/liveregions.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/logger.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/logger.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/mouse_review.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/mouse_review.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/notification_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/notification_messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/object_properties.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/object_properties.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_console_prefs.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_console_prefs.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gtkbuilder.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gtkbuilder.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_commandlist.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_commandlist.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_find.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_find.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_navlist.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_navlist.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_prefs.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_prefs.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_profile.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_profile.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_i18n.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_i18n.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_platform.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_platform.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_state.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_state.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/phonnames.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/phonnames.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/pronunciation_dict.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/pronunciation_dict.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/punctuation_settings.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/punctuation_settings.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/script.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_manager.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_manager.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_utilities.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_utilities.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings_manager.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings_manager.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/sound.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/sound.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech_generator.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech_generator.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechdispatcherfactory.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechdispatcherfactory.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechserver.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechserver.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/spellcheck.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/spellcheck.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/structural_navigation.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/structural_navigation.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/text_attribute_names.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/text_attribute_names.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/tutorialgenerator.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/tutorialgenerator.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/where_am_I.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/where_am_I.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/__init__.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/__init__.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/acss.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/acss.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/bookmarks.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/bookmarks.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_generator.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_generator.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_rolenames.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_rolenames.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/brlmon.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/brlmon.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/brltablenames.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/brltablenames.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/chat.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/chat.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/chnames.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/chnames.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/cmdnames.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/cmdnames.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/colornames.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/colornames.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/common_keyboardmap.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/common_keyboardmap.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/debug.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/debug.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/desktop_keyboardmap.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/desktop_keyboardmap.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/event_manager.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/event_manager.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/eventsynthesizer.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/eventsynthesizer.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/find.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/find.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/flat_review.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/flat_review.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/formatting.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/formatting.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/generator.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/generator.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/guilabels.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/guilabels.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/input_event.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/input_event.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/keybindings.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/keybindings.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/keynames.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/keynames.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/label_inference.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/label_inference.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/laptop_keyboardmap.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/laptop_keyboardmap.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/liveregions.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/liveregions.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/logger.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/logger.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/messages.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/messages.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/mouse_review.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/mouse_review.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/notification_messages.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/notification_messages.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/object_properties.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/object_properties.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca.cpython-%%PYVER%%.pyo
+%%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_gtkbuilder.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gtkbuilder.cpython-%%PYVER%%.pyo
+%%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_find.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_find.cpython-%%PYVER%%.pyo
+%%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_prefs.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_prefs.cpython-%%PYVER%%.pyo
+%%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_i18n.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_i18n.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_platform.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_platform.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_state.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_state.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/phonnames.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/phonnames.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/pronunciation_dict.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/pronunciation_dict.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/punctuation_settings.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/punctuation_settings.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/script.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_manager.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_manager.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_utilities.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_utilities.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings_manager.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings_manager.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/sound.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/sound.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech_generator.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech_generator.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechdispatcherfactory.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechdispatcherfactory.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechserver.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechserver.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/spellcheck.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/spellcheck.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/structural_navigation.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/structural_navigation.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/text_attribute_names.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/text_attribute_names.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/tutorialgenerator.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/tutorialgenerator.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/where_am_I.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/where_am_I.cpython-%%PYVER%%.pyo
 %%PYTHON_SITELIBDIR%%/orca/acss.py
 %%PYTHON_SITELIBDIR%%/orca/backends/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/json_backend.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/json_backend.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/__init__.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/__init__.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/json_backend.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/json_backend.cpython-%%PYVER%%.pyo
 %%PYTHON_SITELIBDIR%%/orca/backends/json_backend.py
 %%PYTHON_SITELIBDIR%%/orca/bookmarks.py
 %%PYTHON_SITELIBDIR%%/orca/braille.py
@@ -182,282 +182,282 @@ man/man1/orca.1.gz
 %%PYTHON_SITELIBDIR%%/orca/script_manager.py
 %%PYTHON_SITELIBDIR%%/orca/script_utilities.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/default.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/default.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/self_voicing.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/self_voicing.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/__init__.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/__init__.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/default.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/default.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/self_voicing.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/self_voicing.cpython-%%PYVER%%.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/script.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/script_utilities.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/script_utilities.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/script.cpython-%%PYVER%%.pyo
+%%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/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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__pycache__/script.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__pycache__/script.cpython-%%PYVER%%.pyo
 %%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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/chat.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/chat.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/script.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/script_utilities.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/script_utilities.cpython-33.pyo
+%%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__/chat.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/chat.cpython-%%PYVER%%.pyo
+%%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_utilities.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/script_utilities.cpython-%%PYVER%%.pyo
 %%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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__pycache__/script.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__pycache__/script.cpython-%%PYVER%%.pyo
 %%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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/formatting.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/formatting.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script_utilities.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script_utilities.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/speech_generator.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/speech_generator.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/spellcheck.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/spellcheck.cpython-33.pyo
+%%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__/formatting.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/formatting.cpython-%%PYVER%%.pyo
+%%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_utilities.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script_utilities.cpython-%%PYVER%%.pyo
+%%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__/spellcheck.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/spellcheck.cpython-%%PYVER%%.pyo
 %%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
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/speech_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/spellcheck.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/__pycache__/__init__.cpython-33.pyo
+%%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/ekiga/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__pycache__/script.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__pycache__/script.cpython-%%PYVER%%.pyo
 %%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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/script.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/script_utilities.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/script_utilities.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/script.cpython-%%PYVER%%.pyo
+%%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/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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/__pycache__/script.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/__pycache__/script.cpython-%%PYVER%%.pyo
 %%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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/__pycache__/script.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/__pycache__/script.cpython-%%PYVER%%.pyo
 %%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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/script.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/script.cpython-%%PYVER%%.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__pycache__/script.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__pycache__/script.cpython-%%PYVER%%.pyo
 %%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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__pycache__/script.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__pycache__/script.cpython-%%PYVER%%.pyo
 %%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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdm-simple-greeter/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdm-simple-greeter/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdm-simple-greeter/__pycache__/script.cpython-33.pyo
+%%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__/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/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__pycache__/script.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__pycache__/script.cpython-%%PYVER%%.pyo
 %%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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/script.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/spellcheck.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/spellcheck.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/script.cpython-%%PYVER%%.pyo
+%%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/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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/script.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/script_utilities.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/script_utilities.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/speech_generator.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/speech_generator.cpython-33.pyo
+%%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__/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_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__/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/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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__pycache__/script.cpython-33.pyo
+%%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__/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/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__pycache__/script.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__pycache__/script.cpython-%%PYVER%%.pyo
 %%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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/script.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/speech_generator.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/speech_generator.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/script.cpython-%%PYVER%%.pyo
+%%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/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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__pycache__/script.cpython-33.pyo
+%%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__/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/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__pycache__/script.cpython-33.pyo
+%%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__/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/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/formatting.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/formatting.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/script.cpython-33.pyo
+%%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__/formatting.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/formatting.cpython-%%PYVER%%.pyo
+%%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/formatting.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__pycache__/script.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__pycache__/script.cpython-%%PYVER%%.pyo
 %%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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/formatting.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/formatting.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/script.cpython-33.pyo
+%%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__/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__/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/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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__pycache__/script.cpython-33.pyo
+%%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__/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/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__pycache__/script.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__pycache__/script.cpython-%%PYVER%%.pyo
 %%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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__pycache__/script.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__pycache__/script.cpython-%%PYVER%%.pyo
 %%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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__pycache__/script.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__pycache__/script.cpython-%%PYVER%%.pyo
 %%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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__pycache__/script.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__pycache__/script.cpython-%%PYVER%%.pyo
 %%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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/chat.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/chat.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/script.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/script_utilities.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/script_utilities.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/speech_generator.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/speech_generator.cpython-33.pyo
+%%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__/chat.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/chat.cpython-%%PYVER%%.pyo
+%%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_utilities.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/script_utilities.cpython-%%PYVER%%.pyo
+%%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/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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/braille_generator.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/braille_generator.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/script.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/speech_generator.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/speech_generator.cpython-33.pyo
+%%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__/braille_generator.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/braille_generator.cpython-%%PYVER%%.pyo
+%%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__/speech_generator.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/speech_generator.cpython-%%PYVER%%.pyo
 %%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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/formatting.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/formatting.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/script.cpython-33.pyo
+%%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__/formatting.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/formatting.cpython-%%PYVER%%.pyo
+%%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/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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/braille_generator.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/braille_generator.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/formatting.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/formatting.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/script.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/script_utilities.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/script_utilities.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/speech_generator.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/speech_generator.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/structural_navigation.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/structural_navigation.cpython-33.pyo
+%%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__/braille_generator.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/braille_generator.cpython-%%PYVER%%.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/script.cpython-%%PYVER%%.pyo
+%%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__/speech_generator.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/speech_generator.cpython-%%PYVER%%.pyo
+%%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/braille_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/formatting.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script.py
@@ -465,43 +465,43 @@ man/man1/orca.1.gz
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/speech_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/structural_navigation.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__pycache__/script.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__pycache__/script.cpython-%%PYVER%%.pyo
 %%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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/script.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/script_utilities.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/script_utilities.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/script.cpython-%%PYVER%%.pyo
+%%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/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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/bookmarks.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/bookmarks.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/braille_generator.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/braille_generator.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/formatting.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/formatting.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/keymaps.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/keymaps.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script_utilities.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script_utilities.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/speech_generator.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/speech_generator.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/structural_navigation.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/structural_navigation.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/tutorial_generator.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/tutorial_generator.cpython-33.pyo
+%%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__/bookmarks.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/bookmarks.cpython-%%PYVER%%.pyo
+%%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__/formatting.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/formatting.cpython-%%PYVER%%.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script.cpython-%%PYVER%%.pyo
+%%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__/speech_generator.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/speech_generator.cpython-%%PYVER%%.pyo
+%%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__/tutorial_generator.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/tutorial_generator.cpython-%%PYVER%%.pyo
 %%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
@@ -512,66 +512,66 @@ man/man1/orca.1.gz
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/structural_navigation.py
 %%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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/formatting.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/formatting.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/script.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/script_utilities.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/script_utilities.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/speech_generator.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/speech_generator.cpython-33.pyo
+%%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__/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__/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_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__/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/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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/__pycache__/script.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/__pycache__/script.cpython-%%PYVER%%.pyo
 %%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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/braille_generator.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/braille_generator.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/script.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/script_utilities.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/script_utilities.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/speech_generator.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/speech_generator.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/structural_navigation.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/structural_navigation.cpython-33.pyo
+%%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__/braille_generator.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/braille_generator.cpython-%%PYVER%%.pyo
+%%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_utilities.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/script_utilities.cpython-%%PYVER%%.pyo
+%%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__/structural_navigation.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/structural_navigation.cpython-%%PYVER%%.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/braille_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/script_utilities.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/speech_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/structural_navigation.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/VCL.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/VCL.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/__init__.cpython-33.pyo
+%%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__/__init__.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/__init__.cpython-%%PYVER%%.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/script.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/script_utilities.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/script_utilities.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/script.cpython-%%PYVER%%.pyo
+%%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/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-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/script.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/script.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/script_utilities.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/script_utilities.cpython-33.pyo
+%%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__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/script.cpython-%%PYVER%%.pyo
+%%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/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 88c50e2a1e4c..0ef5fc814270 100644
--- a/accessibility/py3-atspi/Makefile
+++ b/accessibility/py3-atspi/Makefile
@@ -25,4 +25,6 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+PLIST_SUB+=	PYVER=${PYTHON_VER:S/.//}
+
 .include <bsd.port.mk>
diff --git a/accessibility/py3-atspi/pkg-plist b/accessibility/py3-atspi/pkg-plist
index 12ee36f0db4a..0b671f3a8881 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-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/Accessibility.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/action.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/action.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/appevent.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/appevent.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/application.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/application.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/collection.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/collection.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/component.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/component.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/constants.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/constants.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/deviceevent.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/deviceevent.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/document.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/document.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/editabletext.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/editabletext.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/enum.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/enum.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/hypertext.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/hypertext.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/image.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/image.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/interface.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/interface.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/registry.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/registry.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/role.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/role.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/selection.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/selection.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/state.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/state.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/table.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/table.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/tablecell.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/tablecell.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/text.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/text.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/utils.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/utils.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/value.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/value.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/Accessibility.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/Accessibility.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/__init__.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/__init__.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/action.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/action.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/appevent.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/appevent.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/application.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/application.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/collection.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/collection.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/component.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/component.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/constants.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/constants.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/deviceevent.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/deviceevent.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/document.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/document.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/editabletext.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/editabletext.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/enum.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/enum.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/hypertext.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/hypertext.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/image.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/image.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/interface.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/interface.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/registry.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/registry.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/role.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/role.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/selection.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/selection.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/state.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/state.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/table.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/table.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/tablecell.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/tablecell.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/text.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/text.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/utils.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/utils.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/value.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/value.cpython-%%PYVER%%.pyo
 %%PYTHON_SITELIBDIR%%/pyatspi/action.py
 %%PYTHON_SITELIBDIR%%/pyatspi/appevent.py
 %%PYTHON_SITELIBDIR%%/pyatspi/application.py