Clean up plist

5 files changed, 133 insertions, 133 deletions

diff --git a/textproc/gtk-doc/pkg-plist b/textproc/gtk-doc/pkg-plist
index a107b2ee23c4..c1af4029e1e9 100644
--- a/textproc/gtk-doc/pkg-plist
+++ b/textproc/gtk-doc/pkg-plist
@@ -30,33 +30,33 @@ share/aclocal/gtk-doc.m4
 %%DATADIR%%/data/up.png
 %%DATADIR%%/data/version-greater-or-equal.xsl
 %%DATADIR%%/python/gtkdoc/__init__.py
-%%DATADIR%%/python/gtkdoc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/python/gtkdoc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/python/gtkdoc/__pycache__/check.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/check.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/python/gtkdoc/__pycache__/check.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/python/gtkdoc/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/python/gtkdoc/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/python/gtkdoc/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/python/gtkdoc/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/python/gtkdoc/__pycache__/fixxref.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/fixxref.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/python/gtkdoc/__pycache__/fixxref.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/python/gtkdoc/__pycache__/md_to_db.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/md_to_db.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/python/gtkdoc/__pycache__/md_to_db.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/python/gtkdoc/__pycache__/mkdb.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/mkdb.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/python/gtkdoc/__pycache__/mkdb.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/python/gtkdoc/__pycache__/mkhtml.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/mkhtml.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/python/gtkdoc/__pycache__/mkhtml.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/python/gtkdoc/__pycache__/mkhtml2.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/mkhtml2.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/python/gtkdoc/__pycache__/mkhtml2.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/python/gtkdoc/__pycache__/mkman.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/mkman.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/python/gtkdoc/__pycache__/mkman.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/python/gtkdoc/__pycache__/mkpdf.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/mkpdf.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/python/gtkdoc/__pycache__/mkpdf.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/python/gtkdoc/__pycache__/rebase.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/rebase.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/python/gtkdoc/__pycache__/rebase.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/python/gtkdoc/__pycache__/scan.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/scan.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/python/gtkdoc/__pycache__/scan.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/python/gtkdoc/__pycache__/scangobj.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/scangobj.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/python/gtkdoc/__pycache__/scangobj.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/python/gtkdoc/check.py
 %%DATADIR%%/python/gtkdoc/common.py
diff --git a/textproc/ibus-typing-booster/pkg-plist b/textproc/ibus-typing-booster/pkg-plist
index 3dcd559be7d0..8a85c829fc22 100644
--- a/textproc/ibus-typing-booster/pkg-plist
+++ b/textproc/ibus-typing-booster/pkg-plist
@@ -857,29 +857,29 @@ share/applications/ibus-setup-typing-booster.desktop
 %%DATADIR%%/data/emoji-variation-sequences.txt
 %%DATADIR%%/data/emoji-zwj-sequences.txt
 %%DATADIR%%/data/emojione.json
-%%DATADIR%%/engine/__pycache__/emoji_picker.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/emoji_picker.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/engine/__pycache__/emoji_picker.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/engine/__pycache__/factory.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/factory.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/engine/__pycache__/factory.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/engine/__pycache__/hunspell_suggest.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/hunspell_suggest.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/engine/__pycache__/hunspell_suggest.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/engine/__pycache__/hunspell_table.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/hunspell_table.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/engine/__pycache__/hunspell_table.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/engine/__pycache__/itb_emoji.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/itb_emoji.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/engine/__pycache__/itb_emoji.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/engine/__pycache__/itb_nltk.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/itb_nltk.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/engine/__pycache__/itb_nltk.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/engine/__pycache__/itb_pango.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/itb_pango.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/engine/__pycache__/itb_pango.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/engine/__pycache__/itb_util.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/itb_util.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/engine/__pycache__/itb_util.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/engine/__pycache__/m17n_translit.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/m17n_translit.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/engine/__pycache__/m17n_translit.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/engine/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/engine/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/engine/__pycache__/tabsqlitedb.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/tabsqlitedb.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/engine/__pycache__/tabsqlitedb.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/engine/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/engine/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/engine/emoji_picker.py
 %%DATADIR%%/engine/factory.py
@@ -894,13 +894,13 @@ share/applications/ibus-setup-typing-booster.desktop
 %%DATADIR%%/engine/tabsqlitedb.py
 %%DATADIR%%/engine/version.py
 %%DATADIR%%/icons/ibus-typing-booster.svg
-%%DATADIR%%/setup/__pycache__/i18n.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/setup/__pycache__/i18n.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/setup/__pycache__/i18n.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/setup/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/setup/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/setup/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/setup/__pycache__/pkginstall.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/setup/__pycache__/pkginstall.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/setup/__pycache__/pkginstall.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/setup/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/setup/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/setup/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/setup/i18n.py
 %%DATADIR%%/setup/main.py
diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist
index 5747dd7c5a36..b5f57f3e1367 100644
--- a/textproc/meld/pkg-plist
+++ b/textproc/meld/pkg-plist
@@ -1,64 +1,64 @@
 bin/meld
 %%PYTHON_SITELIBDIR%%/meld/__init__.py
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/build_helpers.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/build_helpers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/build_helpers.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/conf.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/conf.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/conf.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/const.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/const.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/const.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/diffgrid.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/diffgrid.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/diffgrid.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/diffmap.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/diffmap.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/diffmap.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/dirdiff.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/dirdiff.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/dirdiff.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/filediff.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/filediff.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/filediff.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/filemerge.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/filemerge.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/filemerge.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/filters.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/filters.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/filters.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/gutterrendererchunk.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/gutterrendererchunk.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/gutterrendererchunk.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/iohelpers.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/iohelpers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/iohelpers.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/linkmap.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/linkmap.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/linkmap.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldapp.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldapp.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/meldapp.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldbuffer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldbuffer.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/meldbuffer.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/melddoc.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/melddoc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/melddoc.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldwindow.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldwindow.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/meldwindow.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/misc.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/misc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/misc.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/newdifftab.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/newdifftab.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/newdifftab.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/patchdialog.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/patchdialog.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/patchdialog.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/preferences.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/preferences.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/preferences.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/recent.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/recent.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/recent.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/sourceview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/sourceview.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/sourceview.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/task.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/task.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/task.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/tree.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/tree.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/tree.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/treehelpers.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/treehelpers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/treehelpers.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/undo.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/undo.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/undo.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/vcview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/vcview.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/vcview.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/windowstate.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/windowstate.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/__pycache__/windowstate.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/meld/build_helpers.py
 %%PYTHON_SITELIBDIR%%/meld/conf.py
@@ -73,15 +73,15 @@ bin/meld
 %%PYTHON_SITELIBDIR%%/meld/iohelpers.py
 %%PYTHON_SITELIBDIR%%/meld/linkmap.py
 %%PYTHON_SITELIBDIR%%/meld/matchers/__init__.py
-%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/diffutil.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/diffutil.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/diffutil.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/helpers.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/helpers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/helpers.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/merge.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/merge.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/merge.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/myers.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/myers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/myers.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/meld/matchers/diffutil.py
 %%PYTHON_SITELIBDIR%%/meld/matchers/helpers.py
@@ -102,41 +102,41 @@ bin/meld
 %%PYTHON_SITELIBDIR%%/meld/tree.py
 %%PYTHON_SITELIBDIR%%/meld/treehelpers.py
 %%PYTHON_SITELIBDIR%%/meld/ui/__init__.py
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/bufferselectors.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/bufferselectors.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/bufferselectors.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/cellrenderers.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/cellrenderers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/cellrenderers.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/emblemcellrenderer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/emblemcellrenderer.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/emblemcellrenderer.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/filechooser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/filechooser.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/filechooser.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/findbar.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/findbar.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/findbar.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gladesupport.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gladesupport.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gladesupport.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gnomeglade.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gnomeglade.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gnomeglade.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gtkcompat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gtkcompat.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/historyentry.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/historyentry.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/historyentry.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listselector.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listselector.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listselector.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listwidget.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listwidget.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listwidget.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/msgarea.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/msgarea.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/msgarea.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebook.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebook.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebook.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebooklabel.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebooklabel.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebooklabel.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/statusbar.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/statusbar.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/statusbar.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/vcdialogs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/vcdialogs.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/vcdialogs.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/bufferselectors.py
 %%PYTHON_SITELIBDIR%%/meld/ui/cellrenderers.py
@@ -159,21 +159,21 @@ bin/meld
 %%PYTHON_SITELIBDIR%%/meld/vc/COPYING
 %%PYTHON_SITELIBDIR%%/meld/vc/README
 %%PYTHON_SITELIBDIR%%/meld/vc/__init__.py
-%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/_null.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/_null.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/_null.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/_vc.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/_vc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/_vc.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/bzr.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/bzr.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/bzr.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/darcs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/darcs.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/darcs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/git.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/git.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/git.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/mercurial.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/mercurial.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/mercurial.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/svn.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/svn.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/svn.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/meld/vc/_null.py
 %%PYTHON_SITELIBDIR%%/meld/vc/_vc.py
diff --git a/x11/guake/pkg-plist b/x11/guake/pkg-plist
index 0ec59b09fe62..a8bfd882bd14 100644
--- a/x11/guake/pkg-plist
+++ b/x11/guake/pkg-plist
@@ -130,59 +130,59 @@ share/pixmaps/guake.png
 %%PYTHON_SITELIBDIR%%/Guake-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/requires.txt
 %%PYTHON_SITELIBDIR%%/Guake-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/top_level.txt
 %%PYTHON_SITELIBDIR%%/guake/__init__.py
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/about.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/about.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/about.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/boxes.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/boxes.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/boxes.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/callbacks.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/callbacks.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/callbacks.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/customcommands.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/customcommands.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/customcommands.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/dbusiface.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/dbusiface.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/dbusiface.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/globals.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/globals.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/globals.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/gsettings.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/gsettings.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/gsettings.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/guake_app.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/guake_app.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/guake_app.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/guake_logging.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/guake_logging.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/guake_logging.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/guake_toggle.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/guake_toggle.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/guake_toggle.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/keybindings.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/keybindings.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/keybindings.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/menus.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/menus.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/menus.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/notebook.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/notebook.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/notebook.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/notifier.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/notifier.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/notifier.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/palettes.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/palettes.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/palettes.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/paths.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/paths.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/paths.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/prefs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/prefs.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/prefs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/simplegladeapp.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/simplegladeapp.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/simplegladeapp.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/split_utils.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/split_utils.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/split_utils.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/terminal.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/terminal.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/terminal.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/theme.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/theme.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/theme.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/guake/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/guake/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/guake/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/guake/about.py
 %%PYTHON_SITELIBDIR%%/guake/boxes.py
diff --git a/x11/menulibre/pkg-plist b/x11/menulibre/pkg-plist
index 2f8de4a01ed0..351859fdf3d7 100644
--- a/x11/menulibre/pkg-plist
+++ b/x11/menulibre/pkg-plist
@@ -11,37 +11,37 @@ bin/menulibre-menu-validate
 %%PYTHON_SITELIBDIR%%/menulibre/MenulibreXdg.py
 %%PYTHON_SITELIBDIR%%/menulibre/XmlMenuElementTree.py
 %%PYTHON_SITELIBDIR%%/menulibre/__init__.py
-%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/Dialogs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/Dialogs.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/Dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenuEditor.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenuEditor.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenuEditor.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreApplication.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreApplication.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreApplication.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreHistory.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreHistory.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreHistory.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreIconSelection.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreIconSelection.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreIconSelection.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreLog.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreLog.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreLog.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreStackSwitcher.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreStackSwitcher.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreStackSwitcher.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreTreeview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreTreeview.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreTreeview.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreXdg.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreXdg.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreXdg.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/XmlMenuElementTree.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/XmlMenuElementTree.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/XmlMenuElementTree.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/menulibre/util.py
 %%PYTHON_SITELIBDIR%%/menulibre_lib/__init__.py
-%%PYTHON_SITELIBDIR%%/menulibre_lib/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/menulibre_lib/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/menulibre_lib/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/menulibre_lib/__pycache__/helpers.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/menulibre_lib/__pycache__/helpers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/menulibre_lib/__pycache__/helpers.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/menulibre_lib/__pycache__/menulibreconfig.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/menulibre_lib/__pycache__/menulibreconfig.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/menulibre_lib/__pycache__/menulibreconfig.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/menulibre_lib/helpers.py
 %%PYTHON_SITELIBDIR%%/menulibre_lib/menulibreconfig.py