Index: editors/pluma/pkg-plist
===================================================================
--- editors/pluma/pkg-plist
+++ editors/pluma/pkg-plist
@@ -25,16 +25,16 @@
 lib/pluma/plugins/docinfo.plugin
 lib/pluma/plugins/externaltools.plugin
 lib/pluma/plugins/externaltools/__init__.py
-lib/pluma/plugins/externaltools/__pycache__/__init__.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/externaltools/__pycache__/__init__.cpython-36.pyc
-lib/pluma/plugins/externaltools/__pycache__/filelookup.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/externaltools/__pycache__/filelookup.cpython-36.pyc
-lib/pluma/plugins/externaltools/__pycache__/linkparsing.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/externaltools/__pycache__/linkparsing.cpython-36.pyc
-lib/pluma/plugins/externaltools/__pycache__/manager.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/externaltools/__pycache__/manager.cpython-36.pyc
-lib/pluma/plugins/externaltools/__pycache__/outputpanel.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/externaltools/__pycache__/outputpanel.cpython-36.pyc
+lib/pluma/plugins/externaltools/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/externaltools/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/externaltools/__pycache__/filelookup.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/externaltools/__pycache__/filelookup.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/externaltools/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/externaltools/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/pluma/plugins/externaltools/capture.py
 lib/pluma/plugins/externaltools/filelookup.py
 lib/pluma/plugins/externaltools/functions.py
@@ -55,22 +55,22 @@
 lib/pluma/plugins/modelines.plugin
 lib/pluma/plugins/pythonconsole.plugin
 lib/pluma/plugins/pythonconsole/__init__.py
-lib/pluma/plugins/pythonconsole/__pycache__/__init__.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/pythonconsole/__pycache__/__init__.cpython-36.pyc
-lib/pluma/plugins/pythonconsole/__pycache__/config.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/pythonconsole/__pycache__/config.cpython-36.pyc
+lib/pluma/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/pythonconsole/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/pythonconsole/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/pluma/plugins/pythonconsole/config.py
 lib/pluma/plugins/pythonconsole/console.py
 lib/pluma/plugins/quickopen.plugin
 lib/pluma/plugins/quickopen/__init__.py
-lib/pluma/plugins/quickopen/__pycache__/__init__.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/quickopen/__pycache__/__init__.cpython-36.pyc
-lib/pluma/plugins/quickopen/__pycache__/popup.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/quickopen/__pycache__/popup.cpython-36.pyc
-lib/pluma/plugins/quickopen/__pycache__/virtualdirs.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/quickopen/__pycache__/virtualdirs.cpython-36.pyc
-lib/pluma/plugins/quickopen/__pycache__/windowhelper.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/quickopen/__pycache__/windowhelper.cpython-36.pyc
+lib/pluma/plugins/quickopen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/quickopen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/quickopen/__pycache__/popup.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/quickopen/__pycache__/popup.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/quickopen/__pycache__/windowhelper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/quickopen/__pycache__/windowhelper.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/pluma/plugins/quickopen/popup.py
 lib/pluma/plugins/quickopen/virtualdirs.py
 lib/pluma/plugins/quickopen/windowhelper.py
@@ -89,30 +89,30 @@
 lib/pluma/plugins/snippets/SubstitutionParser.py
 lib/pluma/plugins/snippets/WindowHelper.py
 lib/pluma/plugins/snippets/__init__.py
-lib/pluma/plugins/snippets/__pycache__/Completion.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/snippets/__pycache__/Completion.cpython-36.pyc
-lib/pluma/plugins/snippets/__pycache__/Document.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/snippets/__pycache__/Document.cpython-36.pyc
-lib/pluma/plugins/snippets/__pycache__/Exporter.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/snippets/__pycache__/Exporter.cpython-36.pyc
-lib/pluma/plugins/snippets/__pycache__/Helper.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/snippets/__pycache__/Helper.cpython-36.pyc
-lib/pluma/plugins/snippets/__pycache__/Importer.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/snippets/__pycache__/Importer.cpython-36.pyc
-lib/pluma/plugins/snippets/__pycache__/LanguageManager.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/snippets/__pycache__/LanguageManager.cpython-36.pyc
-lib/pluma/plugins/snippets/__pycache__/Manager.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/snippets/__pycache__/Manager.cpython-36.pyc
-lib/pluma/plugins/snippets/__pycache__/Parser.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/snippets/__pycache__/Parser.cpython-36.pyc
-lib/pluma/plugins/snippets/__pycache__/Snippet.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/snippets/__pycache__/Snippet.cpython-36.pyc
-lib/pluma/plugins/snippets/__pycache__/SubstitutionParser.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/snippets/__pycache__/SubstitutionParser.cpython-36.pyc
-lib/pluma/plugins/snippets/__pycache__/WindowHelper.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/snippets/__pycache__/WindowHelper.cpython-36.pyc
-lib/pluma/plugins/snippets/__pycache__/__init__.cpython-36.%%PYTHON_PYOEXTENSION%%
-lib/pluma/plugins/snippets/__pycache__/__init__.cpython-36.pyc
+lib/pluma/plugins/snippets/__pycache__/Completion.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/Completion.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/Document.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/Document.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/Exporter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/Exporter.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/Helper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/Helper.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/Importer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/Importer.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/LanguageManager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/LanguageManager.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/Manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/Manager.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/Parser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/Parser.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/Snippet.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/Snippet.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/SubstitutionParser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/SubstitutionParser.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/WindowHelper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/WindowHelper.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/pluma/plugins/snippets/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/pluma/plugins/snippets/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/pluma/plugins/sort.plugin
 lib/pluma/plugins/spell.plugin
 lib/pluma/plugins/taglist.plugin