diff --git a/math/convertall/pkg-plist b/math/convertall/pkg-plist
index 5728cb53fcc4..1c69817987f0 100644
--- a/math/convertall/pkg-plist
+++ b/math/convertall/pkg-plist
@@ -1,36 +1,36 @@
 bin/convertall
 share/applications/convertall.desktop
-%%DATADIR%%/__pycache__/cmdline.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/cmdline.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/cmdline.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/convertall.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/convertall.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/convertall.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/convertdlg.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/convertdlg.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/convertdlg.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/numedit.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/numedit.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/numedit.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/recentunits.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/recentunits.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/recentunits.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/unitatom.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/unitatom.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/unitatom.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/unitdata.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/unitdata.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/unitdata.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/unitedit.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/unitedit.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/unitedit.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/unitgroup.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/unitgroup.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/unitgroup.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/unitlistview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/unitlistview.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/unitlistview.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/cmdline.py
 %%DATADIR%%/convertall.pro
diff --git a/math/py-spot/pkg-plist b/math/py-spot/pkg-plist
index cb35aa8c7449..ff998e3ca3b2 100644
--- a/math/py-spot/pkg-plist
+++ b/math/py-spot/pkg-plist
@@ -1,19 +1,19 @@
-%%PYTHON_SITELIBDIR%%/__pycache__/buddy.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/__pycache__/buddy.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/__pycache__/buddy.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/_buddy.so
 %%PYTHON_SITELIBDIR%%/buddy.py
 %%PYTHON_SITELIBDIR%%/spot/__init__.py
-%%PYTHON_SITELIBDIR%%/spot/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/spot/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/spot/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/spot/__pycache__/aux.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/spot/__pycache__/aux.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/spot/__pycache__/aux.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/spot/__pycache__/gen.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/spot/__pycache__/gen.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/spot/__pycache__/gen.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/spot/__pycache__/impl.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/spot/__pycache__/impl.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/spot/__pycache__/impl.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/spot/__pycache__/jupyter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/spot/__pycache__/jupyter.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/spot/__pycache__/jupyter.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/spot/__pycache__/ltsmin.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/spot/__pycache__/ltsmin.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/spot/__pycache__/ltsmin.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/spot/_gen.so
 %%PYTHON_SITELIBDIR%%/spot/_impl.so
diff --git a/math/rpcalc/pkg-plist b/math/rpcalc/pkg-plist
index d9678163eb97..4c63039b2326 100644
--- a/math/rpcalc/pkg-plist
+++ b/math/rpcalc/pkg-plist
@@ -2,33 +2,33 @@ bin/rpcalc
 share/applications/rpcalc.desktop
 share/icons/hicolor/scalable/apps/rpcalc-icon.svg
 %%DATADIR%%/__pycache__/altbasedialog.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/altbasedialog.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/altbasedialog.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/calcbutton.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/calcbutton.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/calcbutton.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/calccore.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/calccore.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/calccore.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/calcdlg.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/calcdlg.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/calcdlg.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/calclcd.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/calclcd.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/calclcd.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/calcstack.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/calcstack.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/calcstack.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/extradisplay.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/extradisplay.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/extradisplay.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/rpcalc.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/rpcalc.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/rpcalc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%DATADIR%%/altbasedialog.py
 %%DATADIR%%/calcbutton.py
 %%DATADIR%%/calccore.py
diff --git a/multimedia/gstreamer1-editing-services/pkg-plist b/multimedia/gstreamer1-editing-services/pkg-plist
index 953362bf8c1a..398180722602 100644
--- a/multimedia/gstreamer1-editing-services/pkg-plist
+++ b/multimedia/gstreamer1-editing-services/pkg-plist
@@ -66,7 +66,7 @@ lib/libges-%%VERSION%%.so
 lib/libges-%%VERSION%%.so.0
 lib/libges-%%VERSION%%.so.%%SOVERSION%%
 %%PYTHON_SITELIBDIR%%/gstreamer-editing-services/GES.py
-%%PYTHON_SITELIBDIR%%/gstreamer-editing-services/__pycache__/GES.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gstreamer-editing-services/__pycache__/GES.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/gstreamer-editing-services/__pycache__/GES.cpython-%%PYTHON_SUFFIX%%.pyc
 libdata/pkgconfig/gst-editing-services-%%VERSION%%.pc
 man/man1/ges-launch-%%VERSION%%.1.gz
diff --git a/security/py-pass-audit/pkg-plist b/security/py-pass-audit/pkg-plist
index 267c4aa81bd9..d7ef751612f6 100644
--- a/security/py-pass-audit/pkg-plist
+++ b/security/py-pass-audit/pkg-plist
@@ -1,4 +1,4 @@
-%%PYTHON_SITELIBDIR%%/__pycache__/pass_audit.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/__pycache__/pass_audit.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/__pycache__/pass_audit.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/pass_audit.py
 libexec/password-store/extensions/audit.bash
diff --git a/sysutils/py-salt/pkg-plist b/sysutils/py-salt/pkg-plist
index 533d5c0c29d5..8af3d8958fa3 100644
--- a/sysutils/py-salt/pkg-plist
+++ b/sysutils/py-salt/pkg-plist
@@ -4,4 +4,4 @@
 %%PYTHON2%%%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyc
 %%PYTHON2%%%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyo
 %%PYTHON3%%%%PYTHON_SITELIBDIR%%/salt/__pycache__/_syspaths.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/salt/__pycache__/_syspaths.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/salt/__pycache__/_syspaths.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc