2021-07-31 00:36:12 UTC

31 files changed, 75 insertions, 143 deletions

diff --git a/metadata/md5-cache/app-admin/pass-1.7.3 b/metadata/md5-cache/app-admin/pass-1.7.3-r1
index 9970bd3c8eb4..bb0e47366857 100644
--- a/metadata/md5-cache/app-admin/pass-1.7.3
+++ b/metadata/md5-cache/app-admin/pass-1.7.3-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm prepare
 DESCRIPTION=Stores, retrieves, generates, and synchronizes passwords securely
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.passwordstore.org/
 INHERIT=bash-completion-r1 elisp-common
-IUSE=+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin
+IUSE=+git X emacs dmenu importers elibc_Darwin
 KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~x64-macos
 LICENSE=GPL-2
-RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) zsh-completion? ( app-shells/gentoo-zsh-completions ) fish-completion? ( app-shells/fish ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
+RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
 SLOT=0
 SRC_URI=https://git.zx2c4.com/password-store/snapshot/password-store-1.7.3.tar.xz
-_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=c212f1491880a9837abab79581527ec3
+_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_md5_=718c5fbc3df792188606e7dae61177bc
diff --git a/metadata/md5-cache/app-admin/pass-1.7.4 b/metadata/md5-cache/app-admin/pass-1.7.4-r1
index 3ef7df23f766..b8fbec51e5dd 100644
--- a/metadata/md5-cache/app-admin/pass-1.7.4
+++ b/metadata/md5-cache/app-admin/pass-1.7.4-r1
@@ -3,11 +3,11 @@ DESCRIPTION=Stores, retrieves, generates, and synchronizes passwords securely
 EAPI=7
 HOMEPAGE=https://www.passwordstore.org/
 INHERIT=bash-completion-r1 elisp-common
-IUSE=+git wayland X zsh-completion fish-completion emacs dmenu importers elibc_Darwin
+IUSE=+git wayland X emacs dmenu importers elibc_Darwin
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
 LICENSE=GPL-2
-RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) wayland? ( gui-apps/wl-clipboard ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) zsh-completion? ( app-shells/gentoo-zsh-completions ) fish-completion? ( app-shells/fish ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
+RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) wayland? ( gui-apps/wl-clipboard ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
 SLOT=0
 SRC_URI=https://git.zx2c4.com/password-store/snapshot/password-store-1.7.4.tar.xz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=bf37ed6d6733cc0532f40e0850633f2a
+_md5_=3c574e0a8b13fc2e37eb0d8a1940242e
diff --git a/metadata/md5-cache/app-admin/pass-9999 b/metadata/md5-cache/app-admin/pass-9999
index b339275dfdaa..c86870d5c4d1 100644
--- a/metadata/md5-cache/app-admin/pass-9999
+++ b/metadata/md5-cache/app-admin/pass-9999
@@ -4,10 +4,10 @@ DESCRIPTION=Stores, retrieves, generates, and synchronizes passwords securely
 EAPI=7
 HOMEPAGE=https://www.passwordstore.org/
 INHERIT=bash-completion-r1 elisp-common git-r3
-IUSE=+git wayland X zsh-completion fish-completion emacs dmenu importers elibc_Darwin
+IUSE=+git wayland X emacs dmenu importers elibc_Darwin
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) wayland? ( gui-apps/wl-clipboard ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) zsh-completion? ( app-shells/gentoo-zsh-completions ) fish-completion? ( app-shells/fish ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
+RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) wayland? ( gui-apps/wl-clipboard ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
 SLOT=0
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=ed702abb271fde06b8d455b7ba503d19
+_md5_=0e941046218616952550029113c92d2f
diff --git a/metadata/md5-cache/app-misc/khal-0.10.1-r1 b/metadata/md5-cache/app-misc/khal-0.10.1-r2
index 8fc57f1eea8e..0866a26c44ce 100644
--- a/metadata/md5-cache/app-misc/khal-0.10.1-r1
+++ b/metadata/md5-cache/app-misc/khal-0.10.1-r2
@@ -1,16 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+BDEPEND=>dev-python/setuptools_scm-1.12.0[python_targets_python3_8(-)?] dev-python/vdirsyncer[python_targets_python3_8(-)?] dev-python/freezegun[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>dev-python/setuptools_scm-1.12.0[python_targets_python3_8(-)?] dev-python/vdirsyncer[python_targets_python3_8(-)?] dev-python/freezegun[python_targets_python3_8(-)?]
 DESCRIPTION=A CalDAV based calendar
 EAPI=7
 HOMEPAGE=http://lostpackets.de/khal/
 INHERIT=distutils-r1
-IUSE=zsh-completion python_targets_python3_8
+IUSE=python_targets_python3_8
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/click-3.2[python_targets_python3_8(-)?] >=dev-python/click-log-0.2.0[python_targets_python3_8(-)?] >=dev-python/icalendar-4.0.3[python_targets_python3_8(-)?] dev-python/urwid[python_targets_python3_8(-)?] dev-python/pyxdg[python_targets_python3_8(-)?] dev-python/pytz[python_targets_python3_8(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?] dev-python/configobj[python_targets_python3_8(-)?] >=dev-python/atomicwrites-0.1.7[python_targets_python3_8(-)?] >=dev-python/tzlocal-1.0[python_targets_python3_8(-)?] dev-python/setproctitle[python_targets_python3_8(-)?] zsh-completion? ( app-shells/zsh ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
+RDEPEND=>=dev-python/click-3.2[python_targets_python3_8(-)?] >=dev-python/click-log-0.2.0[python_targets_python3_8(-)?] >=dev-python/icalendar-4.0.3[python_targets_python3_8(-)?] dev-python/urwid[python_targets_python3_8(-)?] dev-python/pyxdg[python_targets_python3_8(-)?] dev-python/pytz[python_targets_python3_8(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?] dev-python/configobj[python_targets_python3_8(-)?] >=dev-python/atomicwrites-0.1.7[python_targets_python3_8(-)?] >=dev-python/tzlocal-1.0[python_targets_python3_8(-)?] dev-python/setproctitle[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/k/khal/khal-0.10.1.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9
-_md5_=6277a3587d9fd18b5c20ede0081b89e3
+_md5_=5ae411fef56c5e0509564cbcbf07503c
diff --git a/metadata/md5-cache/app-misc/khal-0.10.2 b/metadata/md5-cache/app-misc/khal-0.10.2-r1
index 39b0fa1a8221..a54ba120170f 100644
--- a/metadata/md5-cache/app-misc/khal-0.10.2
+++ b/metadata/md5-cache/app-misc/khal-0.10.2-r1
@@ -1,16 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=>dev-python/setuptools_scm-1.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/vdirsyncer[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>dev-python/setuptools_scm-1.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/vdirsyncer[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DESCRIPTION=A CalDAV based calendar
 EAPI=7
 HOMEPAGE=https://lostpackets.de/khal/
 INHERIT=distutils-r1
-IUSE=zsh-completion python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click-log[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/icalendar-4.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/urwid-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyxdg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/configobj[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/atomicwrites-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tzlocal-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setproctitle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] zsh-completion? ( app-shells/zsh ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click-log[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/icalendar-4.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/urwid-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyxdg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/configobj[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/atomicwrites-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tzlocal-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setproctitle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/k/khal/khal-0.10.2.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9
-_md5_=203b55a92b7fd96e52955dca196a742a
+_md5_=b4b6eea0f3dcf46bbded9af5b7cf7fd3
diff --git a/metadata/md5-cache/app-misc/khard-0.13.0 b/metadata/md5-cache/app-misc/khard-0.13.0-r1
index 2b49b9af38dd..a44b52380f60 100644
--- a/metadata/md5-cache/app-misc/khard-0.13.0
+++ b/metadata/md5-cache/app-misc/khard-0.13.0-r1
@@ -1,11 +1,10 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+BDEPEND=test? ( dev-python/atomicwrites[python_targets_python3_8(-)?] dev-python/configobj[python_targets_python3_8(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?] dev-python/unidecode[python_targets_python3_8(-)?] >dev-python/vobject-0.9.3[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?] test? ( dev-python/atomicwrites[python_targets_python3_8(-)?] dev-python/configobj[python_targets_python3_8(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?] dev-python/unidecode[python_targets_python3_8(-)?] >dev-python/vobject-0.9.3[python_targets_python3_8(-)?] )
 DESCRIPTION=Console CardDAV client
 EAPI=7
 HOMEPAGE=https://github.com/scheibler/khard
 INHERIT=distutils-r1
-IUSE=test zsh-completion python_targets_python3_8
+IUSE=test python_targets_python3_8
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/atomicwrites[python_targets_python3_8(-)?] dev-python/configobj[python_targets_python3_8(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?] dev-python/unidecode[python_targets_python3_8(-)?] >dev-python/vobject-0.9.3[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
@@ -14,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/khard/khard-0.13.0.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9
-_md5_=ceda5cda580c0d4ef41b3f9bf6be91e8
+_md5_=aa355425c2faf974137ea534b6822b60
diff --git a/metadata/md5-cache/app-misc/khard-0.17.0 b/metadata/md5-cache/app-misc/khard-0.17.0-r1
index e84b97d6389a..ed4f9eb400fc 100644
--- a/metadata/md5-cache/app-misc/khard-0.17.0
+++ b/metadata/md5-cache/app-misc/khard-0.17.0-r1
@@ -1,11 +1,10 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/atomicwrites[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/configobj[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml-clib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unidecode[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/atomicwrites[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/configobj[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml-clib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unidecode[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
 DESCRIPTION=Console CardDAV client
 EAPI=7
 HOMEPAGE=https://github.com/scheibler/khard
 INHERIT=distutils-r1
-IUSE=test zsh-completion python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 arm arm64 x86
 LICENSE=GPL-3
 RDEPEND=dev-python/atomicwrites[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/configobj[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml-clib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unidecode[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
@@ -14,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/khard/khard-0.17.0.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9
-_md5_=9c0b59eb37cd8c0bd4e71ed63808e057
+_md5_=dcc1f0a909f65dd9928f0ba21a6576be
diff --git a/metadata/md5-cache/app-misc/tmux-xpanes-4.1.2 b/metadata/md5-cache/app-misc/tmux-xpanes-4.1.2-r1
index c680042be1f6..095546fda056 100644
--- a/metadata/md5-cache/app-misc/tmux-xpanes-4.1.2
+++ b/metadata/md5-cache/app-misc/tmux-xpanes-4.1.2-r1
@@ -1,13 +1,11 @@
 DEFINED_PHASES=install
-DEPEND=app-misc/tmux dev-lang/perl dev-libs/openssl:0= zsh-completion? ( app-shells/zsh )
 DESCRIPTION=tmux-based terminal divider
 EAPI=7
 HOMEPAGE=https://github.com/greymd/tmux-xpanes
-IUSE=zsh-completion
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=app-misc/tmux dev-lang/perl dev-libs/openssl:0= zsh-completion? ( app-shells/zsh )
+RDEPEND=app-misc/tmux dev-lang/perl dev-libs/openssl:0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/greymd/tmux-xpanes/archive/v4.1.2.tar.gz -> tmux-xpanes-4.1.2.tar.gz
-_md5_=81fe5cb614547959ac728de411b0ebf1
+_md5_=460a65951e0a9cd7d358a9c9202b12b2
diff --git a/metadata/md5-cache/app-misc/tmux-xpanes-4.1.3 b/metadata/md5-cache/app-misc/tmux-xpanes-4.1.3-r1
index 53e8bc264084..ba0948a87f25 100644
--- a/metadata/md5-cache/app-misc/tmux-xpanes-4.1.3
+++ b/metadata/md5-cache/app-misc/tmux-xpanes-4.1.3-r1
@@ -1,12 +1,11 @@
 DEFINED_PHASES=install
-DEPEND=app-misc/tmux dev-lang/perl dev-libs/openssl:0=
 DESCRIPTION=tmux-based terminal divider
 EAPI=7
 HOMEPAGE=https://github.com/greymd/tmux-xpanes
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=app-misc/tmux dev-lang/perl dev-libs/openssl:0=
+RDEPEND=app-misc/tmux dev-lang/perl dev-libs/openssl:0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/greymd/tmux-xpanes/archive/v4.1.3.tar.gz -> tmux-xpanes-4.1.3.tar.gz
-_md5_=4ac39dd7bbee56aea2429f9d5f2dce4c
+_md5_=22848f312572ff908f7f3b8e5e65bf70
diff --git a/metadata/md5-cache/dev-libs/pcc-libs-1.1.0 b/metadata/md5-cache/dev-libs/pcc-libs-1.1.0
index cc593bbf2637..ecb5a3c70eb1 100644
--- a/metadata/md5-cache/dev-libs/pcc-libs-1.1.0
+++ b/metadata/md5-cache/dev-libs/pcc-libs-1.1.0
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile
 DESCRIPTION=pcc compiler support libs
-EAPI=5
+EAPI=8
 HOMEPAGE=http://pcc.ludd.ltu.se
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=ftp://pcc.ludd.ltu.se/pub/pcc-releases/pcc-libs-1.1.0.tgz
-_md5_=de097444e874a8e47fa96d46fc634d52
+_md5_=813c9867f2edc459dd89b6cda392e66f
diff --git a/metadata/md5-cache/dev-libs/pcc-libs-9999 b/metadata/md5-cache/dev-libs/pcc-libs-9999
deleted file mode 100644
index 2740b67a18ba..000000000000
--- a/metadata/md5-cache/dev-libs/pcc-libs-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile unpack
-DEPEND=dev-vcs/cvs
-DESCRIPTION=pcc compiler support libs
-EAPI=5
-HOMEPAGE=http://pcc.ludd.ltu.se
-INHERIT=cvs
-LICENSE=BSD
-PROPERTIES=live
-SLOT=0
-_eclasses_=cvs	8f8740beb4ce1deaae8393cfc28d2ed1
-_md5_=fa94f9728bf1258945bc8a668e5625e7
diff --git a/metadata/md5-cache/dev-util/uftrace-0.10 b/metadata/md5-cache/dev-util/uftrace-0.10-r1
index b8727ce81991..96d091486740 100644
--- a/metadata/md5-cache/dev-util/uftrace-0.10
+++ b/metadata/md5-cache/dev-util/uftrace-0.10-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Function (graph) tracer for user-space
 EAPI=7
 HOMEPAGE=https://github.com/namhyung/uftrace
 INHERIT=bash-completion-r1 lua-single toolchain-funcs
-IUSE=bash-completion capstone lua +lua_single_target_luajit
+IUSE=capstone lua +lua_single_target_luajit
 KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:= virtual/libelf:= capstone? ( dev-libs/capstone:0= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/namhyung/uftrace/archive/v0.10.tar.gz -> uftrace-0.10.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	bash-completion-r1	d3a60385655d9b402be765a6de333245	lua-utils	b2a391a6023bd5e1245bf27407f2f684	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18
-_md5_=69a7259bae43476a52f90027e0638aa1
+_md5_=390c3c1a6530e5608134ce8a9062dbd3
diff --git a/metadata/md5-cache/games-fps/chocolate-doom-3.0.1 b/metadata/md5-cache/games-fps/chocolate-doom-3.0.1-r1
index b2394547f8ae..f92dff7344d5 100644
--- a/metadata/md5-cache/games-fps/chocolate-doom-3.0.1
+++ b/metadata/md5-cache/games-fps/chocolate-doom-3.0.1-r1
@@ -1,15 +1,15 @@
-BDEPEND=bash-completion? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) ) doc? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) doc? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
 DEPEND=media-libs/libsdl2[video] media-libs/sdl2-mixer[midi?,vorbis?] media-libs/sdl2-net libsamplerate? ( media-libs/libsamplerate ) png? ( media-libs/libpng:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A Doom source port that is minimalist and historically accurate
 EAPI=7
 HOMEPAGE=https://www.chocolate-doom.org
 INHERIT=autotools prefix python-any-r1 xdg
-IUSE=bash-completion doc libsamplerate +midi png vorbis
+IUSE=doc libsamplerate +midi png vorbis
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD GPL-2+
 RDEPEND=media-libs/libsdl2[video] media-libs/sdl2-mixer[midi?,vorbis?] media-libs/sdl2-net libsamplerate? ( media-libs/libsamplerate ) png? ( media-libs/libpng:= )
 SLOT=0
 SRC_URI=https://github.com/chocolate-doom/chocolate-doom/archive/chocolate-doom-3.0.1.tar.gz https://gist.githubusercontent.com/vilhelmgray/28d4713cb6387ad62ab76cfac1443355/raw/f7600d93ca45a5102969b8f89974a3c36a3563f5/chocolate-doom-3.0.1-overhaul-manpages-add-parameters.patch
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	2a36908d5f63f41614b450a2459567da	prefix	d04f14b297013ad1410550c0757f14f8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-any-r1	901d9e22c7a848a1196502edf060f330	xdg-utils	27f9a2f19502b925ac117bd657aa2979	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=8b0725a5853e3db368fbcc6b8d6fc557
+_md5_=3997d3d3001807416e4a9c638921d066
diff --git a/metadata/md5-cache/gui-apps/swayidle-1.6 b/metadata/md5-cache/gui-apps/swayidle-1.6
index dbb610599ff1..48b567dceec0 100644
--- a/metadata/md5-cache/gui-apps/swayidle-1.6
+++ b/metadata/md5-cache/gui-apps/swayidle-1.6
@@ -5,7 +5,7 @@ DESCRIPTION=Idle management daemon for Wayland
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/swayidle
 INHERIT=meson
-IUSE=elogind fish-completion +man systemd zsh-completion
+IUSE=elogind +man systemd
 KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland elogind? ( >=sys-auth/elogind-237[policykit] ) systemd? ( >=sys-apps/systemd-237[policykit] )
@@ -13,4 +13,4 @@ REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/swaywm/swayidle/archive/1.6.tar.gz -> swayidle-1.6.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	meson	5bc3f1b890f90cc00cf1d1dddc10233e
-_md5_=f1e7afa4ac0963d5245f7e9bd3692a24
+_md5_=cd8191bab3eb578b2f2792d09bac6b77
diff --git a/metadata/md5-cache/gui-apps/swayidle-9999 b/metadata/md5-cache/gui-apps/swayidle-9999
index 46fe682232c7..a9337fd37140 100644
--- a/metadata/md5-cache/gui-apps/swayidle-9999
+++ b/metadata/md5-cache/gui-apps/swayidle-9999
@@ -5,11 +5,11 @@ DESCRIPTION=Idle management daemon for Wayland
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/swayidle
 INHERIT=meson git-r3
-IUSE=elogind fish-completion +man systemd zsh-completion
+IUSE=elogind +man systemd
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/wayland elogind? ( >=sys-auth/elogind-237[policykit] ) systemd? ( >=sys-apps/systemd-237[policykit] )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	meson	5bc3f1b890f90cc00cf1d1dddc10233e	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=fdc5e92bb5ee020cab30fb6deed4c25d
+_md5_=694eabe2de1c9aecf67df84b29ab06c4
diff --git a/metadata/md5-cache/gui-apps/swaylock-1.3 b/metadata/md5-cache/gui-apps/swaylock-1.3-r1
index 901479976a68..cdb17c34eab9 100644
--- a/metadata/md5-cache/gui-apps/swaylock-1.3
+++ b/metadata/md5-cache/gui-apps/swaylock-1.3-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Screen locker for Wayland
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/swaylock
 INHERIT=fcaps meson
-IUSE=fish-completion +gdk-pixbuf +man +pam zsh-completion +filecaps
+IUSE=+gdk-pixbuf +man +pam +filecaps
 KEYWORDS=amd64 arm64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( sys-libs/pam ) !<=gui-libs/sway-1.0_beta2[swaylock] filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/swaywm/swaylock/archive/1.3.tar.gz -> swaylock-1.3.tar.gz
 _eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	meson	5bc3f1b890f90cc00cf1d1dddc10233e
-_md5_=8196096243bbd814af7f9659c002e2ea
+_md5_=e5e089c692966591cada851c4cd0f22c
diff --git a/metadata/md5-cache/gui-apps/swaylock-1.5 b/metadata/md5-cache/gui-apps/swaylock-1.5-r1
index 920cac641fb6..370a07e765c4 100644
--- a/metadata/md5-cache/gui-apps/swaylock-1.5
+++ b/metadata/md5-cache/gui-apps/swaylock-1.5-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Screen locker for Wayland
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/swaylock
 INHERIT=fcaps meson
-IUSE=fish-completion +gdk-pixbuf +man +pam zsh-completion +filecaps
+IUSE=+gdk-pixbuf +man +pam +filecaps
 KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( sys-libs/pam ) filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/swaywm/swaylock/archive/1.5.tar.gz -> swaylock-1.5.tar.gz
 _eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	meson	5bc3f1b890f90cc00cf1d1dddc10233e
-_md5_=5c5e855f8e8e30defb976fc035855625
+_md5_=751c8c89477c068a3fc19ac01df6e062
diff --git a/metadata/md5-cache/gui-apps/swaylock-9999 b/metadata/md5-cache/gui-apps/swaylock-9999
index c7e3cd9d7ab3..77aedb103b76 100644
--- a/metadata/md5-cache/gui-apps/swaylock-9999
+++ b/metadata/md5-cache/gui-apps/swaylock-9999
@@ -5,10 +5,10 @@ DESCRIPTION=Screen locker for Wayland
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/swaylock
 INHERIT=fcaps meson git-r3
-IUSE=fish-completion +gdk-pixbuf +man +pam zsh-completion +filecaps
+IUSE=+gdk-pixbuf +man +pam +filecaps
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( sys-libs/pam ) filecaps? ( sys-libs/libcap )
 SLOT=0
 _eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	meson	5bc3f1b890f90cc00cf1d1dddc10233e	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=ceb549221daafcc71d45ff0cfa19ad7f
+_md5_=172b75e66c9eee9a6353691b2fa0ec04
diff --git a/metadata/md5-cache/gui-wm/sway-1.6 b/metadata/md5-cache/gui-wm/sway-1.6-r1
index 6f739c5b7d5c..c100772e0c10 100644
--- a/metadata/md5-cache/gui-wm/sway-1.6
+++ b/metadata/md5-cache/gui-wm/sway-1.6-r1
@@ -5,7 +5,7 @@ DESCRIPTION=i3-compatible Wayland window manager
 EAPI=7
 HOMEPAGE=https://swaywm.org
 INHERIT=meson
-IUSE=elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd systemd tray wallpapers X zsh-completion
+IUSE=elogind +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd systemd tray wallpapers X
 KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239[policykit] ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.13:=[elogind=,seatd=,systemd=,X=] <gui-libs/wlroots-0.14:=[elogind=,seatd=,systemd=,X=]
@@ -13,4 +13,4 @@ REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind seatd systemd ) )
 SLOT=0
 SRC_URI=https://github.com/swaywm/sway/archive/1.6.tar.gz -> sway-1.6.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	meson	5bc3f1b890f90cc00cf1d1dddc10233e
-_md5_=a11227fae8953732fc0f293be58b009a
+_md5_=07dedc3909fc180fe49311a6413e192b
diff --git a/metadata/md5-cache/gui-wm/sway-1.6.1 b/metadata/md5-cache/gui-wm/sway-1.6.1-r1
index 4ef706b9a4fc..ba7b3ffaec63 100644
--- a/metadata/md5-cache/gui-wm/sway-1.6.1
+++ b/metadata/md5-cache/gui-wm/sway-1.6.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=i3-compatible Wayland window manager
 EAPI=7
 HOMEPAGE=https://swaywm.org
 INHERIT=meson
-IUSE=fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X zsh-completion
+IUSE=+man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X
 KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= sys-auth/seatd:= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.14:=[X=] <gui-libs/wlroots-0.15:=[X=]
 SLOT=0
 SRC_URI=https://github.com/swaywm/sway/archive/1.6.1.tar.gz -> sway-1.6.1.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	meson	5bc3f1b890f90cc00cf1d1dddc10233e
-_md5_=f735935e521d19c471421a6e51b6dda4
+_md5_=0b63b8226e57d657bd50850507807727
diff --git a/metadata/md5-cache/gui-wm/sway-9999 b/metadata/md5-cache/gui-wm/sway-9999
index 3d89a035156c..7d62f010673f 100644
--- a/metadata/md5-cache/gui-wm/sway-9999
+++ b/metadata/md5-cache/gui-wm/sway-9999
@@ -5,10 +5,10 @@ DESCRIPTION=i3-compatible Wayland window manager
 EAPI=7
 HOMEPAGE=https://swaywm.org
 INHERIT=meson git-r3
-IUSE=fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X zsh-completion
+IUSE=+man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= sys-auth/seatd:= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[X=]
 SLOT=0
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	meson	5bc3f1b890f90cc00cf1d1dddc10233e	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=486f657cc9d267b68046976395c2590a
+_md5_=2481149f56011714e13fac935ed1927f
diff --git a/metadata/md5-cache/net-misc/plowshare-2.1.6 b/metadata/md5-cache/net-misc/plowshare-2.1.6-r1
index 7aa82860fb7e..052f58ba0e23 100644
--- a/metadata/md5-cache/net-misc/plowshare-2.1.6
+++ b/metadata/md5-cache/net-misc/plowshare-2.1.6-r1
@@ -1,13 +1,11 @@
 DEFINED_PHASES=compile install postinst prepare test
 DESCRIPTION=Command-line downloader and uploader for file-sharing websites
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/mcrapet/plowshare
-INHERIT=bash-completion-r1
-IUSE=bash-completion +javascript view-captcha
+IUSE=+javascript view-captcha
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-3
 RDEPEND=>=app-shells/bash-4 || ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) ) dev-vcs/git net-misc/curl sys-apps/util-linux virtual/imagemagick-tools[tiff] javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )
 SLOT=0
 SRC_URI=https://github.com/mcrapet/plowshare/archive/v2.1.6.tar.gz -> plowshare-2.1.6.tar.gz
-_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	bash-completion-r1	d3a60385655d9b402be765a6de333245
-_md5_=788c9538bf926fc5e498de081e2619a5
+_md5_=5193bfc049cbd0a7cd419067d9756c04
diff --git a/metadata/md5-cache/net-misc/plowshare-2.1.7 b/metadata/md5-cache/net-misc/plowshare-2.1.7-r1
index 719d87e1f927..5fea2cac3e2a 100644
--- a/metadata/md5-cache/net-misc/plowshare-2.1.7
+++ b/metadata/md5-cache/net-misc/plowshare-2.1.7-r1
@@ -1,13 +1,11 @@
 DEFINED_PHASES=compile install postinst prepare test
 DESCRIPTION=Command-line downloader and uploader for file-sharing websites
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/mcrapet/plowshare
-INHERIT=bash-completion-r1
-IUSE=bash-completion +javascript view-captcha
+IUSE=+javascript view-captcha
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-3
 RDEPEND=>=app-shells/bash-4 || ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) ) dev-vcs/git net-misc/curl sys-apps/util-linux virtual/imagemagick-tools[tiff] javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )
 SLOT=0
 SRC_URI=https://github.com/mcrapet/plowshare/archive/v2.1.7.tar.gz -> plowshare-2.1.7.tar.gz
-_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	bash-completion-r1	d3a60385655d9b402be765a6de333245
-_md5_=788c9538bf926fc5e498de081e2619a5
+_md5_=5193bfc049cbd0a7cd419067d9756c04
diff --git a/metadata/md5-cache/net-misc/plowshare-9999 b/metadata/md5-cache/net-misc/plowshare-9999
index 19a65e088871..7ab95ed66aba 100644
--- a/metadata/md5-cache/net-misc/plowshare-9999
+++ b/metadata/md5-cache/net-misc/plowshare-9999
@@ -1,13 +1,13 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Command-line downloader and uploader for file-sharing websites
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/mcrapet/plowshare
-INHERIT=bash-completion-r1 git-r3
-IUSE=bash-completion +javascript view-captcha
+INHERIT=git-r3
+IUSE=+javascript view-captcha
 LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=>=app-shells/bash-4 || ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) ) dev-vcs/git net-misc/curl sys-apps/util-linux virtual/imagemagick-tools[tiff] javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )
 SLOT=0
-_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=97da2cdac07789df3d93ee5855978237
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
+_md5_=f1ef7b5e75fd4b7938a58992cdf0bcfb
diff --git a/metadata/md5-cache/sys-apps/usbguard-0.7.6-r1 b/metadata/md5-cache/sys-apps/usbguard-0.7.6-r1
deleted file mode 100644
index ce72b00bf1d1..000000000000
--- a/metadata/md5-cache/sys-apps/usbguard-0.7.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( >=dev-libs/dbus-glib-0.100 dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) app-text/asciidoc dev-cpp/catch:1 dbus? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gdbus-codegen )
-DESCRIPTION=Daemon protecting your computer against BadUSB
-EAPI=7
-HOMEPAGE=https://github.com/USBGuard/usbguard
-IUSE=bash-completion dbus ldap policykit systemd
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( >=dev-libs/dbus-glib-0.100 dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) virtual/udev
-REQUIRED_USE=policykit? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/USBGuard/usbguard/releases/download/usbguard-0.7.6/usbguard-0.7.6.tar.gz
-_md5_=09013264e89f028677e6ab975b24f2f9
diff --git a/metadata/md5-cache/sys-apps/usbguard-0.7.8 b/metadata/md5-cache/sys-apps/usbguard-0.7.8
deleted file mode 100644
index 1011c5c5eb42..000000000000
--- a/metadata/md5-cache/sys-apps/usbguard-0.7.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) app-text/asciidoc dev-cpp/catch:1 dbus? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gdbus-codegen )
-DESCRIPTION=Daemon protecting your computer against BadUSB
-EAPI=7
-HOMEPAGE=https://github.com/USBGuard/usbguard
-INHERIT=autotools
-IUSE=bash-completion dbus ldap policykit static-libs systemd
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) virtual/udev
-REQUIRED_USE=policykit? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/USBGuard/usbguard/releases/download/usbguard-0.7.8/usbguard-0.7.8.tar.gz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	2a36908d5f63f41614b450a2459567da
-_md5_=8d5fc419ad60e4942c92820e12b3b624
diff --git a/metadata/md5-cache/sys-apps/usbguard-1.0.0-r1 b/metadata/md5-cache/sys-apps/usbguard-1.0.0-r1
deleted file mode 100644
index ecd3ffa206d7..000000000000
--- a/metadata/md5-cache/sys-apps/usbguard-1.0.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) umockdev? ( dev-util/umockdev ) app-text/asciidoc dev-cpp/catch:1 dbus? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gdbus-codegen )
-DESCRIPTION=Daemon protecting your computer against BadUSB
-EAPI=7
-HOMEPAGE=https://github.com/USBGuard/usbguard
-INHERIT=autotools
-IUSE=bash-completion dbus ldap policykit static-libs systemd test umockdev
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) umockdev? ( dev-util/umockdev ) virtual/udev
-REQUIRED_USE=policykit? ( dbus ) test? ( static-libs )
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=https://github.com/USBGuard/usbguard/releases/download/usbguard-1.0.0/usbguard-1.0.0.tar.gz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	2a36908d5f63f41614b450a2459567da
-_md5_=a8540dadec9ab88e3bd167740c262750
diff --git a/metadata/md5-cache/sys-apps/usbguard-1.0.0 b/metadata/md5-cache/sys-apps/usbguard-1.0.0-r2
index b35fb61ec071..620b129549b7 100644
--- a/metadata/md5-cache/sys-apps/usbguard-1.0.0
+++ b/metadata/md5-cache/sys-apps/usbguard-1.0.0-r2
@@ -1,17 +1,17 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) app-text/asciidoc dev-cpp/catch:1 dbus? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gdbus-codegen )
+DEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) umockdev? ( dev-util/umockdev ) app-text/asciidoc dev-cpp/catch:1 dbus? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gdbus-codegen )
 DESCRIPTION=Daemon protecting your computer against BadUSB
 EAPI=7
 HOMEPAGE=https://github.com/USBGuard/usbguard
-INHERIT=autotools
-IUSE=bash-completion dbus ldap policykit static-libs systemd test
+INHERIT=autotools bash-completion-r1
+IUSE=dbus ldap policykit static-libs systemd test umockdev
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) virtual/udev
+RDEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) umockdev? ( dev-util/umockdev ) virtual/udev
 REQUIRED_USE=policykit? ( dbus ) test? ( static-libs )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/USBGuard/usbguard/releases/download/usbguard-1.0.0/usbguard-1.0.0.tar.gz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	2a36908d5f63f41614b450a2459567da
-_md5_=ef1de997173c33d225da8c67e79c5383
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245
+_md5_=0b9cf9c0208df0a03075996af59c2338
diff --git a/metadata/md5-cache/sys-block/ndctl-71.1-r1 b/metadata/md5-cache/sys-block/ndctl-71.1-r2
index 8ffe60e47a05..216865693445 100644
--- a/metadata/md5-cache/sys-block/ndctl-71.1-r1
+++ b/metadata/md5-cache/sys-block/ndctl-71.1-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) test
 SLOT=0/6
 SRC_URI=https://github.com/pmem/ndctl/archive/v71.1.tar.gz -> ndctl-71.1.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245
-_md5_=b450382c5ae418498128f40e4139ff32
+_md5_=79900f1c4c4f3aa92d16e91ec4485656
diff --git a/metadata/md5-cache/www-client/pybugz-0.13 b/metadata/md5-cache/www-client/pybugz-0.13-r1
index 384f568c28de..ab0aff3e5359 100644
--- a/metadata/md5-cache/www-client/pybugz-0.13
+++ b/metadata/md5-cache/www-client/pybugz-0.13-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Command line interface to (Gentoo) Bugzilla
 EAPI=7
 HOMEPAGE=https://github.com/williamh/pybugz
 INHERIT=bash-completion-r1 distutils-r1
-IUSE=zsh-completion python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[readline(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/williamh/pybugz/archive/0.13.tar.gz -> pybugz-0.13.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	bash-completion-r1	d3a60385655d9b402be765a6de333245	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9
-_md5_=590f7589c2591269843379af9f2a6213
+_md5_=c01a4c162a336841215c2e3a83e26549
diff --git a/metadata/md5-cache/www-client/pybugz-9999 b/metadata/md5-cache/www-client/pybugz-9999
index e370d43be164..6cf2d69bae12 100644
--- a/metadata/md5-cache/www-client/pybugz-9999
+++ b/metadata/md5-cache/www-client/pybugz-9999
@@ -5,11 +5,11 @@ DESCRIPTION=Command line interface to (Gentoo) Bugzilla
 EAPI=7
 HOMEPAGE=https://github.com/williamh/pybugz
 INHERIT=git-r3 bash-completion-r1 distutils-r1
-IUSE=zsh-completion python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[readline(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	bash-completion-r1	d3a60385655d9b402be765a6de333245	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9
-_md5_=b7c838a38c4913472a74caec4bf48e1d
+_md5_=13516933e729312922274ad2b76fb2e4