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@)

2 files changed, 125 insertions, 107 deletions

diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 13165431ba52..e4e14bc8d96c 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	gedit-plugins
 PORTVERSION=	3.14.1
+PORTREVISION=	1
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -28,6 +29,8 @@ INSTALL_TARGET=	install-strip
 GLIB_SCHEMAS=	org.gnome.gedit.plugins.drawspaces.gschema.xml \
 		org.gnome.gedit.plugins.wordcompletion.gschema.xml
 
+PLIST_SUB+=	PYVER=${PYTHON_VER:S/.//}
+
 OPTIONS_DEFINE=	PYTHON
 OPTIONS_DEFAULT=PYTHON
 PYTHON_DESC=	Build plugins that depend on python
@@ -37,9 +40,11 @@ PYTHON_DESC=	Build plugins that depend on python
 .if ${PORT_OPTIONS:MPYTHON}
 USES+=		python
 BUILD_DEPENDS+=	py3?-dbus>=0:${PORTSDIR}/devel/py3-dbus
+LIB_DEPENDS+=	libgucharmap_2_90.so:${PORTSDIR}/deskutils/gucharmap
 RUN_DEPENDS+=	py3?-dbus>=0:${PORTSDIR}/devel/py3-dbus
-# the charmap plugin doesn't work, missing py-gucharmap stuff
+USE_GNOME+=	vte3
 CONFIGURE_ARGS+=--enable-python
+GLIB_SCHEMAS+=	org.gnome.gedit.plugins.terminal.gschema.xml
 PLIST_SUB+=	PYTHON=""
 .else
 CONFIGURE_ARGS+=--disable-python
diff --git a/editors/gedit-plugins/pkg-plist b/editors/gedit-plugins/pkg-plist
index 472cee4425ef..62b2a4b3d336 100644
--- a/editors/gedit-plugins/pkg-plist
+++ b/editors/gedit-plugins/pkg-plist
@@ -4,72 +4,81 @@ lib/gedit/plugins/libbookmarks.so
 lib/gedit/plugins/libdrawspaces.so
 lib/gedit/plugins/libwordcompletion.so
 lib/gedit/plugins/wordcompletion.plugin
-%%PYTHON%%lib/gedit/plugins/__pycache__/bracketcompletion.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/__pycache__/bracketcompletion.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/__pycache__/codecomment.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/__pycache__/codecomment.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/__pycache__/colorpicker.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/__pycache__/colorpicker.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/__pycache__/gpdefs.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/__pycache__/gpdefs.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/__pycache__/joinlines.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/__pycache__/joinlines.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/__pycache__/smartspaces.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/__pycache__/smartspaces.cpython-33.pyo
+%%PYTHON%%lib/gedit/plugins/__pycache__/bracketcompletion.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/__pycache__/bracketcompletion.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/__pycache__/codecomment.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/__pycache__/codecomment.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/__pycache__/colorpicker.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/__pycache__/colorpicker.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/__pycache__/gpdefs.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/__pycache__/gpdefs.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/__pycache__/joinlines.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/__pycache__/joinlines.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/__pycache__/smartspaces.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/__pycache__/smartspaces.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/__pycache__/terminal.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/__pycache__/terminal.cpython-%%PYVER%%.pyo
 %%PYTHON%%lib/gedit/plugins/bracketcompletion.plugin
 %%PYTHON%%lib/gedit/plugins/bracketcompletion.py
+%%PYTHON%%lib/gedit/plugins/charmap.plugin
+%%PYTHON%%lib/gedit/plugins/charmap/__init__.py
+%%PYTHON%%lib/gedit/plugins/charmap/__pycache__/__init__.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/charmap/__pycache__/__init__.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/charmap/__pycache__/panel.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/charmap/__pycache__/panel.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/charmap/panel.py
 %%PYTHON%%lib/gedit/plugins/codecomment.plugin
 %%PYTHON%%lib/gedit/plugins/codecomment.py
 %%PYTHON%%lib/gedit/plugins/colorpicker.plugin
 %%PYTHON%%lib/gedit/plugins/colorpicker.py
 %%PYTHON%%lib/gedit/plugins/colorschemer.plugin
 %%PYTHON%%lib/gedit/plugins/colorschemer/__init__.py
-%%PYTHON%%lib/gedit/plugins/colorschemer/__pycache__/__init__.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/colorschemer/__pycache__/__init__.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/colorschemer/__pycache__/languages.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/colorschemer/__pycache__/languages.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/colorschemer/__pycache__/schemer.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/colorschemer/__pycache__/schemer.cpython-33.pyo
+%%PYTHON%%lib/gedit/plugins/colorschemer/__pycache__/__init__.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/colorschemer/__pycache__/__init__.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/colorschemer/__pycache__/languages.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/colorschemer/__pycache__/languages.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/colorschemer/__pycache__/schemer.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/colorschemer/__pycache__/schemer.cpython-%%PYVER%%.pyo
 %%PYTHON%%lib/gedit/plugins/colorschemer/languages.py
 %%PYTHON%%lib/gedit/plugins/colorschemer/schemer.py
 %%PYTHON%%lib/gedit/plugins/commander.plugin
 %%PYTHON%%lib/gedit/plugins/commander/__init__.py
-%%PYTHON%%lib/gedit/plugins/commander/__pycache__/__init__.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/commander/__pycache__/__init__.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/commander/__pycache__/appactivatable.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/commander/__pycache__/appactivatable.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/commander/__pycache__/entry.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/commander/__pycache__/entry.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/commander/__pycache__/history.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/commander/__pycache__/history.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/commander/__pycache__/info.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/commander/__pycache__/info.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/commander/__pycache__/modules.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/commander/__pycache__/modules.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/commander/__pycache__/utils.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/commander/__pycache__/utils.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/commander/__pycache__/windowactivatable.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/commander/__pycache__/windowactivatable.cpython-33.pyo
+%%PYTHON%%lib/gedit/plugins/commander/__pycache__/__init__.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/commander/__pycache__/__init__.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/commander/__pycache__/appactivatable.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/commander/__pycache__/appactivatable.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/commander/__pycache__/entry.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/commander/__pycache__/entry.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/commander/__pycache__/history.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/commander/__pycache__/history.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/commander/__pycache__/info.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/commander/__pycache__/info.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/commander/__pycache__/modules.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/commander/__pycache__/modules.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/commander/__pycache__/utils.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/commander/__pycache__/utils.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/commander/__pycache__/windowactivatable.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/commander/__pycache__/windowactivatable.cpython-%%PYVER%%.pyo
 %%PYTHON%%lib/gedit/plugins/commander/appactivatable.py
 %%PYTHON%%lib/gedit/plugins/commander/commands/__init__.py
-%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/__init__.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/__init__.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/accel_group.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/accel_group.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/completion.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/completion.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/exceptions.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/exceptions.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/metamodule.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/metamodule.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/method.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/method.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/module.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/module.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/result.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/result.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/rollbackimporter.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/rollbackimporter.cpython-33.pyo
+%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/__init__.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/__init__.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/accel_group.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/accel_group.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/completion.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/completion.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/exceptions.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/exceptions.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/metamodule.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/metamodule.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/method.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/method.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/module.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/module.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/result.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/result.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/rollbackimporter.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/commander/commands/__pycache__/rollbackimporter.cpython-%%PYVER%%.pyo
 %%PYTHON%%lib/gedit/plugins/commander/commands/accel_group.py
 %%PYTHON%%lib/gedit/plugins/commander/commands/completion.py
 %%PYTHON%%lib/gedit/plugins/commander/commands/exceptions.py
@@ -89,16 +98,16 @@ lib/gedit/plugins/wordcompletion.plugin
 %%PYTHON%%lib/gedit/plugins/joinlines.py
 %%PYTHON%%lib/gedit/plugins/multiedit.plugin
 %%PYTHON%%lib/gedit/plugins/multiedit/__init__.py
-%%PYTHON%%lib/gedit/plugins/multiedit/__pycache__/__init__.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/multiedit/__pycache__/__init__.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/multiedit/__pycache__/appactivatable.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/multiedit/__pycache__/appactivatable.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/multiedit/__pycache__/signals.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/multiedit/__pycache__/signals.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/multiedit/__pycache__/viewactivatable.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/multiedit/__pycache__/viewactivatable.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/multiedit/__pycache__/windowactivatable.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/multiedit/__pycache__/windowactivatable.cpython-33.pyo
+%%PYTHON%%lib/gedit/plugins/multiedit/__pycache__/__init__.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/multiedit/__pycache__/__init__.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/multiedit/__pycache__/appactivatable.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/multiedit/__pycache__/appactivatable.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/multiedit/__pycache__/signals.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/multiedit/__pycache__/signals.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/multiedit/__pycache__/viewactivatable.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/multiedit/__pycache__/viewactivatable.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/multiedit/__pycache__/windowactivatable.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/multiedit/__pycache__/windowactivatable.cpython-%%PYVER%%.pyo
 %%PYTHON%%lib/gedit/plugins/multiedit/appactivatable.py
 %%PYTHON%%lib/gedit/plugins/multiedit/signals.py
 %%PYTHON%%lib/gedit/plugins/multiedit/viewactivatable.py
@@ -107,73 +116,77 @@ lib/gedit/plugins/wordcompletion.plugin
 %%PYTHON%%lib/gedit/plugins/smartspaces.py
 %%PYTHON%%lib/gedit/plugins/synctex.plugin
 %%PYTHON%%lib/gedit/plugins/synctex/__init__.py
-%%PYTHON%%lib/gedit/plugins/synctex/__pycache__/__init__.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/synctex/__pycache__/__init__.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/synctex/__pycache__/evince_dbus.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/synctex/__pycache__/evince_dbus.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/synctex/__pycache__/synctex.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/synctex/__pycache__/synctex.cpython-33.pyo
+%%PYTHON%%lib/gedit/plugins/synctex/__pycache__/__init__.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/synctex/__pycache__/__init__.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/synctex/__pycache__/evince_dbus.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/synctex/__pycache__/evince_dbus.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/synctex/__pycache__/synctex.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/synctex/__pycache__/synctex.cpython-%%PYVER%%.pyo
 %%PYTHON%%lib/gedit/plugins/synctex/evince_dbus.py
 %%PYTHON%%lib/gedit/plugins/synctex/synctex.py
+%%PYTHON%%lib/gedit/plugins/terminal.plugin
+%%PYTHON%%lib/gedit/plugins/terminal.py
 %%PYTHON%%lib/gedit/plugins/textsize.plugin
 %%PYTHON%%lib/gedit/plugins/textsize/__init__.py
-%%PYTHON%%lib/gedit/plugins/textsize/__pycache__/__init__.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/textsize/__pycache__/__init__.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/textsize/__pycache__/signals.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/textsize/__pycache__/signals.cpython-33.pyo
-%%PYTHON%%lib/gedit/plugins/textsize/__pycache__/viewactivatable.cpython-33.pyc
-%%PYTHON%%lib/gedit/plugins/textsize/__pycache__/viewactivatable.cpython-33.pyo
+%%PYTHON%%lib/gedit/plugins/textsize/__pycache__/__init__.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/textsize/__pycache__/__init__.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/textsize/__pycache__/signals.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/textsize/__pycache__/signals.cpython-%%PYVER%%.pyo
+%%PYTHON%%lib/gedit/plugins/textsize/__pycache__/viewactivatable.cpython-%%PYVER%%.pyc
+%%PYTHON%%lib/gedit/plugins/textsize/__pycache__/viewactivatable.cpython-%%PYVER%%.pyo
 %%PYTHON%%lib/gedit/plugins/textsize/signals.py
 %%PYTHON%%lib/gedit/plugins/textsize/viewactivatable.py
 share/appdata/gedit-bookmarks.metainfo.xml
-share/appdata/gedit-drawspaces.metainfo.xml
-share/appdata/gedit-wordcompletion.metainfo.xml
 %%PYTHON%%share/appdata/gedit-bracketcompletion.metainfo.xml
+%%PYTHON%%share/appdata/gedit-charmap.metainfo.xml
 %%PYTHON%%share/appdata/gedit-codecomment.metainfo.xml
 %%PYTHON%%share/appdata/gedit-colorpicker.metainfo.xml
 %%PYTHON%%share/appdata/gedit-colorschemer.metainfo.xml
 %%PYTHON%%share/appdata/gedit-commander.metainfo.xml
+share/appdata/gedit-drawspaces.metainfo.xml
 %%PYTHON%%share/appdata/gedit-joinlines.metainfo.xml
 %%PYTHON%%share/appdata/gedit-multiedit.metainfo.xml
 %%PYTHON%%share/appdata/gedit-smartspaces.metainfo.xml
 %%PYTHON%%share/appdata/gedit-synctex.metainfo.xml
+%%PYTHON%%share/appdata/gedit-terminal.metainfo.xml
 %%PYTHON%%share/appdata/gedit-textsize.metainfo.xml
+share/appdata/gedit-wordcompletion.metainfo.xml
 %%PYTHON%%share/gedit/plugins/colorschemer/ui/schemer.ui
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/align.cpython-33.pyc
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/align.cpython-33.pyo
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/bookmark.cpython-33.pyc
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/bookmark.cpython-33.pyo
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/doc.cpython-33.pyc
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/doc.cpython-33.pyo
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/edit.cpython-33.pyc
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/edit.cpython-33.pyo
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/format.cpython-33.pyc
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/format.cpython-33.pyo
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/goto.cpython-33.pyc
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/goto.cpython-33.pyo
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/grep.cpython-33.pyc
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/grep.cpython-33.pyo
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/help.cpython-33.pyc
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/help.cpython-33.pyo
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/move.cpython-33.pyc
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/move.cpython-33.pyo
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/reload.cpython-33.pyc
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/reload.cpython-33.pyo
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/set.cpython-33.pyc
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/set.cpython-33.pyo
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/shell.cpython-33.pyc
-%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/shell.cpython-33.pyo
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/align.cpython-%%PYVER%%.pyc
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/align.cpython-%%PYVER%%.pyo
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/bookmark.cpython-%%PYVER%%.pyc
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/bookmark.cpython-%%PYVER%%.pyo
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/doc.cpython-%%PYVER%%.pyc
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/doc.cpython-%%PYVER%%.pyo
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/edit.cpython-%%PYVER%%.pyc
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/edit.cpython-%%PYVER%%.pyo
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/format.cpython-%%PYVER%%.pyc
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/format.cpython-%%PYVER%%.pyo
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/goto.cpython-%%PYVER%%.pyc
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/goto.cpython-%%PYVER%%.pyo
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/grep.cpython-%%PYVER%%.pyc
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/grep.cpython-%%PYVER%%.pyo
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/help.cpython-%%PYVER%%.pyc
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/help.cpython-%%PYVER%%.pyo
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/move.cpython-%%PYVER%%.pyc
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/move.cpython-%%PYVER%%.pyo
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/reload.cpython-%%PYVER%%.pyc
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/reload.cpython-%%PYVER%%.pyo
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/set.cpython-%%PYVER%%.pyc
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/set.cpython-%%PYVER%%.pyo
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/shell.cpython-%%PYVER%%.pyc
+%%PYTHON%%share/gedit/plugins/commander/modules/__pycache__/shell.cpython-%%PYVER%%.pyo
 %%PYTHON%%share/gedit/plugins/commander/modules/align.py
 %%PYTHON%%share/gedit/plugins/commander/modules/bookmark.py
 %%PYTHON%%share/gedit/plugins/commander/modules/doc.py
 %%PYTHON%%share/gedit/plugins/commander/modules/edit.py
 %%PYTHON%%share/gedit/plugins/commander/modules/find/__init__.py
-%%PYTHON%%share/gedit/plugins/commander/modules/find/__pycache__/__init__.cpython-33.pyc
-%%PYTHON%%share/gedit/plugins/commander/modules/find/__pycache__/__init__.cpython-33.pyo
-%%PYTHON%%share/gedit/plugins/commander/modules/find/__pycache__/finder.cpython-33.pyc
-%%PYTHON%%share/gedit/plugins/commander/modules/find/__pycache__/finder.cpython-33.pyo
-%%PYTHON%%share/gedit/plugins/commander/modules/find/__pycache__/regex.cpython-33.pyc
-%%PYTHON%%share/gedit/plugins/commander/modules/find/__pycache__/regex.cpython-33.pyo
+%%PYTHON%%share/gedit/plugins/commander/modules/find/__pycache__/__init__.cpython-%%PYVER%%.pyc
+%%PYTHON%%share/gedit/plugins/commander/modules/find/__pycache__/__init__.cpython-%%PYVER%%.pyo
+%%PYTHON%%share/gedit/plugins/commander/modules/find/__pycache__/finder.cpython-%%PYVER%%.pyc
+%%PYTHON%%share/gedit/plugins/commander/modules/find/__pycache__/finder.cpython-%%PYVER%%.pyo
+%%PYTHON%%share/gedit/plugins/commander/modules/find/__pycache__/regex.cpython-%%PYVER%%.pyc
+%%PYTHON%%share/gedit/plugins/commander/modules/find/__pycache__/regex.cpython-%%PYVER%%.pyo
 %%PYTHON%%share/gedit/plugins/commander/modules/find/finder.py
 %%PYTHON%%share/gedit/plugins/commander/modules/find/regex.py
 %%PYTHON%%share/gedit/plugins/commander/modules/format.py