2021-07-01 09:36:57 UTC

37 files changed, 84 insertions, 82 deletions

diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.18 b/metadata/md5-cache/app-emulation/virtualbox-6.1.18
index 838474c025e4..599aa1ebbbe4 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.18
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.18
@@ -1,11 +1,11 @@
 BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( >=virtual/jdk-1.6 ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !app-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.18 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama opengl? ( virtual/opengl ) ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !app-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.18 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama opengl? ( virtual/opengl ) ) pam? ( sys-libs/pam ) pax-kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
 INHERIT=desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
-IUSE=alsa debug doc dtrace headless java lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux +python_single_target_python3_8
+IUSE=alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux +python_single_target_python3_8
 KEYWORDS=amd64
 LICENSE=GPL-2 dtrace? ( CDDL )
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !app-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.18 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
@@ -13,4 +13,4 @@ REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_sing
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.18/VirtualBox-6.1.18.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-utils-2	b5e6ac3113ad5ad2b604a72029a9969f	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	pax-utils	74cd9920d64148719fb62c462935c1b5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=51ab751893bd9141a9a501658dac9718
+_md5_=05e8f3e1886402e5ef6a9e718c3a026b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.20-r1 b/metadata/md5-cache/app-emulation/virtualbox-6.1.20-r1
index d05ed88a997e..f5fbcca0e17c 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.20-r1
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.20-r1
@@ -1,11 +1,11 @@
 BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( >=virtual/jdk-1.8 ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !app-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.20 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama opengl? ( virtual/opengl ) ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !app-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.20 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama opengl? ( virtual/opengl ) ) pam? ( sys-libs/pam ) pax-kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
 INHERIT=desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
-IUSE=alsa debug doc dtrace headless java lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_single_target_python3_8 python_single_target_python3_9
+IUSE=alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64
 LICENSE=GPL-2 dtrace? ( CDDL )
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !app-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.20 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
@@ -13,4 +13,4 @@ REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_sing
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.20/VirtualBox-6.1.20.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-utils-2	b5e6ac3113ad5ad2b604a72029a9969f	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	pax-utils	74cd9920d64148719fb62c462935c1b5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=5d488db95558c21ff0af90696cb4f1ac
+_md5_=cd8ea824db83cec0f08c9aca7a5da9c0
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.22 b/metadata/md5-cache/app-emulation/virtualbox-6.1.22
index 566426cfa4ac..ba9fced456ba 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.22
@@ -1,11 +1,11 @@
 BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( >=virtual/jdk-1.8 ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !app-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.22 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama opengl? ( virtual/opengl ) ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !app-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.22 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama opengl? ( virtual/opengl ) ) pam? ( sys-libs/pam ) pax-kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
 INHERIT=desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
-IUSE=alsa debug doc dtrace headless java lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_single_target_python3_8 python_single_target_python3_9
+IUSE=alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64
 LICENSE=GPL-2 dtrace? ( CDDL )
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !app-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.22 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
@@ -13,4 +13,4 @@ REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_sing
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.22/VirtualBox-6.1.22.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-utils-2	b5e6ac3113ad5ad2b604a72029a9969f	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	pax-utils	74cd9920d64148719fb62c462935c1b5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=333ffb5dbcc74e8c2e7d47149a05da74
+_md5_=7842f423d34c991f09c420cccbd5a740
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.18 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.18
index 1907f6a595d9..b19e88c169e6 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.18
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.18
@@ -4,11 +4,11 @@ DESCRIPTION=Kernel Modules for Virtualbox
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
 INHERIT=linux-mod toolchain-funcs
-IUSE=pax_kernel kernel_linux kernel_linux dist-kernel
+IUSE=pax-kernel kernel_linux kernel_linux dist-kernel
 KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-6.1.18.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48
-_md5_=26e90ed5503e40be5613961b21789a9d
+_md5_=db1e6b917021544fa3ac3a1849124945
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.20 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.20
index 75a94e54cce4..2e27dc55c351 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.20
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.20
@@ -4,11 +4,11 @@ DESCRIPTION=Kernel Modules for Virtualbox
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
 INHERIT=linux-mod toolchain-funcs
-IUSE=pax_kernel kernel_linux kernel_linux dist-kernel
+IUSE=pax-kernel kernel_linux kernel_linux dist-kernel
 KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-6.1.20.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48
-_md5_=d776339333d3b3580f8c6b1ea36f157f
+_md5_=c930b4d02e135f2c37ba6d30444b9c2b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.22 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.22
index 3332c0f34d56..f4040307daf3 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.22
@@ -4,11 +4,11 @@ DESCRIPTION=Kernel Modules for Virtualbox
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
 INHERIT=linux-mod toolchain-funcs
-IUSE=pax_kernel kernel_linux kernel_linux dist-kernel
+IUSE=pax-kernel kernel_linux kernel_linux dist-kernel
 KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-6.1.22.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48
-_md5_=6cf890b2f486d9a5d9c600f27af67825
+_md5_=70dced3490aa85e1aff06e9590f7e46f
diff --git a/metadata/md5-cache/dev-java/icedtea-3.18.0 b/metadata/md5-cache/dev-java/icedtea-3.18.0
index 04ef16bf638d..9639ea1c534a 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.18.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.18.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= gtk? ( >=dev-libs/atk-1.30.0 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/pango-1.24.5 ) kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) system-lcms? ( >=media-libs/lcms-2.9:2= ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite x11-base/xorg-proto >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 || ( dev-java/openjdk-bin:8 dev-java/openjdk:8 dev-java/icedtea-bin:8 dev-java/icedtea:8 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates dev-lang/perl dev-libs/openssl:0 sys-apps/attr sys-apps/lsb-release x11-libs/libXt virtual/pkgconfig pax_kernel? ( sys-apps/elfix ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= gtk? ( >=dev-libs/atk-1.30.0 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/pango-1.24.5 ) kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) system-lcms? ( >=media-libs/lcms-2.9:2= ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite x11-base/xorg-proto >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 || ( dev-java/openjdk-bin:8 dev-java/openjdk:8 dev-java/icedtea-bin:8 dev-java/icedtea:8 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates dev-lang/perl dev-libs/openssl:0 sys-apps/attr sys-apps/lsb-release x11-libs/libXt virtual/pkgconfig pax-kernel? ( sys-apps/elfix ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 DESCRIPTION=A harness to build OpenJDK using Free Software build tools and dependencies
 EAPI=6
 HOMEPAGE=https://icedtea.classpath.org
 INHERIT=check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix toolchain-funcs xdg-utils
-IUSE=+alsa cacao +cups doc examples +gtk headless-awt jamvm +jbootstrap kerberos pax_kernel +pch pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero elibc_FreeBSD
+IUSE=+alsa cacao +cups doc examples +gtk headless-awt jamvm +jbootstrap kerberos pax-kernel +pch pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero elibc_FreeBSD
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C
 PDEPEND=pulseaudio? ( dev-java/icedtea-sound )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=https://icedtea.classpath.org/download/source/icedtea-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/openjdk.tar.xz -> icedtea-3.18-openjdk-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/corba.tar.xz -> icedtea-3.18-corba-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/jaxp.tar.xz -> icedtea-3.18-jaxp-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/jaxws.tar.xz -> icedtea-3.18-jaxws-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/jdk.tar.xz -> icedtea-3.18-jdk-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/hotspot.tar.xz -> icedtea-3.18-hotspot-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/nashorn.tar.xz -> icedtea-3.18-nashorn-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/langtools.tar.xz -> icedtea-3.18-langtools-3.18.0.tar.xz shenandoah? ( https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/shenandoah.tar.xz -> icedtea-3.18-shenandoah-3.18.0.tar.xz ) arm? ( https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/aarch32.tar.xz -> icedtea-3.18-aarch32-3.18.0.tar.xz ) https://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz https://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
 _eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	b5e6ac3113ad5ad2b604a72029a9969f	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	java-vm-2	1b9686c0df06500159478dfaf5c21338	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=3dfd768a4ea39df1c4ce899da95ff082
+_md5_=93171dc65c4aa08edc3aa86bbc282a8f
diff --git a/metadata/md5-cache/dev-java/icedtea-3.19.0 b/metadata/md5-cache/dev-java/icedtea-3.19.0
index d307fd957652..edbc752ace07 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.19.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.19.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= gtk? ( >=dev-libs/atk-1.30.0 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/pango-1.24.5 ) kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) system-lcms? ( >=media-libs/lcms-2.9:2= ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite x11-base/xorg-proto >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 || ( dev-java/openjdk-bin:8 dev-java/openjdk:8 dev-java/icedtea-bin:8 dev-java/icedtea:8 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates dev-lang/perl dev-libs/openssl:0 sys-apps/attr sys-apps/lsb-release x11-libs/libXt virtual/pkgconfig pax_kernel? ( sys-apps/elfix ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= gtk? ( >=dev-libs/atk-1.30.0 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/pango-1.24.5 ) kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) system-lcms? ( >=media-libs/lcms-2.9:2= ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite x11-base/xorg-proto >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 || ( dev-java/openjdk-bin:8 dev-java/openjdk:8 dev-java/icedtea-bin:8 dev-java/icedtea:8 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates dev-lang/perl dev-libs/openssl:0 sys-apps/attr sys-apps/lsb-release x11-libs/libXt virtual/pkgconfig pax-kernel? ( sys-apps/elfix ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 DESCRIPTION=A harness to build OpenJDK using Free Software build tools and dependencies
 EAPI=6
 HOMEPAGE=https://icedtea.classpath.org
 INHERIT=check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix toolchain-funcs xdg-utils
-IUSE=+alsa cacao +cups doc examples +gtk headless-awt jamvm +jbootstrap kerberos pax_kernel +pch pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero elibc_FreeBSD
+IUSE=+alsa cacao +cups doc examples +gtk headless-awt jamvm +jbootstrap kerberos pax-kernel +pch pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero elibc_FreeBSD
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C
 PDEPEND=pulseaudio? ( dev-java/icedtea-sound )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=https://icedtea.classpath.org/download/source/icedtea-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/openjdk.tar.xz -> icedtea-3.19-openjdk-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/corba.tar.xz -> icedtea-3.19-corba-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/jaxp.tar.xz -> icedtea-3.19-jaxp-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/jaxws.tar.xz -> icedtea-3.19-jaxws-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/jdk.tar.xz -> icedtea-3.19-jdk-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/hotspot.tar.xz -> icedtea-3.19-hotspot-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/nashorn.tar.xz -> icedtea-3.19-nashorn-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/langtools.tar.xz -> icedtea-3.19-langtools-3.19.0.tar.xz shenandoah? ( https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/shenandoah.tar.xz -> icedtea-3.19-shenandoah-3.19.0.tar.xz ) arm? ( https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/aarch32.tar.xz -> icedtea-3.19-aarch32-3.19.0.tar.xz ) https://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz https://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
 _eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	b5e6ac3113ad5ad2b604a72029a9969f	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	java-vm-2	1b9686c0df06500159478dfaf5c21338	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=3dfd768a4ea39df1c4ce899da95ff082
+_md5_=93171dc65c4aa08edc3aa86bbc282a8f
diff --git a/metadata/md5-cache/dev-lang/mlton-20180207 b/metadata/md5-cache/dev-lang/mlton-20180207
index 0b73e3cdd000..78769ce6f691 100644
--- a/metadata/md5-cache/dev-lang/mlton-20180207
+++ b/metadata/md5-cache/dev-lang/mlton-20180207
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst prepare pretend setup test unpack
-DEPEND=dev-libs/gmp:* bootstrap-smlnj? ( dev-lang/smlnj ) !bootstrap-smlnj? ( !amd64? ( dev-lang/smlnj ) ) pax_kernel? ( sys-apps/elfix ) doc? ( virtual/latex-base )
+DEPEND=dev-libs/gmp:* bootstrap-smlnj? ( dev-lang/smlnj ) !bootstrap-smlnj? ( !amd64? ( dev-lang/smlnj ) ) pax-kernel? ( sys-apps/elfix ) doc? ( virtual/latex-base )
 DESCRIPTION=Standard ML optimizing compiler and libraries
 EAPI=7
 HOMEPAGE=http://www.mlton.org
 INHERIT=check-reqs multibuild pax-utils
-IUSE=binary bootstrap-smlnj stage3 doc pax_kernel
+IUSE=binary bootstrap-smlnj stage3 doc pax-kernel
 KEYWORDS=~amd64 ~x86
 LICENSE=HPND MIT
 RDEPEND=dev-libs/gmp:*
 SLOT=0/20180207
 SRC_URI=!binary? ( mirror://sourceforge/mlton/mlton-20180207.src.tgz ) !bootstrap-smlnj? ( amd64? ( mirror://sourceforge/mlton/mlton-20180207-1.amd64-linux.tgz ) )
 _eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	pax-utils	74cd9920d64148719fb62c462935c1b5
-_md5_=95f3c66df46c11efd9ff7c45962157a9
+_md5_=8b77f08003e305274e9aafdaabf2ffe0
diff --git a/metadata/md5-cache/dev-lang/mono-6.12.0.122 b/metadata/md5-cache/dev-lang/mono-6.12.0.122
index 91dd0c90f55a..16011c2b7cbc 100644
--- a/metadata/md5-cache/dev-lang/mono-6.12.0.122
+++ b/metadata/md5-cache/dev-lang/mono-6.12.0.122
@@ -1,15 +1,15 @@
-BDEPEND=sys-devel/bc virtual/yacc pax_kernel? ( sys-apps/elfix ) 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=sys-devel/bc virtual/yacc pax-kernel? ( sys-apps/elfix ) 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=compile configure install postinst prepare pretend setup test
 DEPEND=app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ia64? ( sys-libs/libunwind ) !minimal? ( >=dev-dotnet/libgdiplus-6.0.2 ) nls? ( sys-devel/gettext )
 DESCRIPTION=Mono runtime and class libraries, a C# compiler/interpreter
 EAPI=7
 HOMEPAGE=https://mono-project.com
 INHERIT=autotools check-reqs linux-info mono-env pax-utils multilib-minimal
-IUSE=doc minimal nls pax_kernel xen kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=doc minimal nls pax-kernel xen kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux
 LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ia64? ( sys-libs/libunwind ) !minimal? ( >=dev-dotnet/libgdiplus-6.0.2 ) nls? ( sys-devel/gettext ) app-misc/ca-certificates
 SLOT=0
 SRC_URI=https://download.mono-project.com/sources/mono/mono-6.12.0.122.tar.xz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	check-reqs	97b90bd8fb799993925e6b3a683184e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	mono-env	87888393b1c1b882d0543087e28ec0b0	pax-utils	74cd9920d64148719fb62c462935c1b5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29
-_md5_=26be4d79e7993ba2318a15904a07f0f1
+_md5_=17c6793927baa266e816ef5115ceebb2
diff --git a/metadata/md5-cache/dev-lang/python-2.7.18_p10 b/metadata/md5-cache/dev-lang/python-2.7.18_p10
index 654f45344d64..58b4659d31dc 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.18_p10
+++ b/metadata/md5-cache/dev-lang/python-2.7.18_p10
@@ -13,4 +13,4 @@ RDEPEND=app-arch/bzip2:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcr
 SLOT=2.7
 SRC_URI=https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-2.7.18_p10.tar.xz verify-sig? ( https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz.asc )
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pax-utils	74cd9920d64148719fb62c462935c1b5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=7e35ed85775449fd78121f60cb5d4830
+_md5_=588bd7f131841c9711cb34e19745ab35
diff --git a/metadata/md5-cache/dev-lang/python-2.7.18_p11 b/metadata/md5-cache/dev-lang/python-2.7.18_p11
index e9a041df42dd..5d73f8aab398 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.18_p11
+++ b/metadata/md5-cache/dev-lang/python-2.7.18_p11
@@ -13,4 +13,4 @@ RDEPEND=app-arch/bzip2:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcr
 SLOT=2.7
 SRC_URI=https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-2.7.18_p11.tar.xz verify-sig? ( https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz.asc )
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pax-utils	74cd9920d64148719fb62c462935c1b5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=1068320aaa18c63260791c445f74471a
+_md5_=5925cb1eca08e36bb9d6f625aad2a892
diff --git a/metadata/md5-cache/dev-lang/python-3.10.0_beta2 b/metadata/md5-cache/dev-lang/python-3.10.0_beta2
index 7f9c48542627..1e86ae58fb4d 100644
--- a/metadata/md5-cache/dev-lang/python-3.10.0_beta2
+++ b/metadata/md5-cache/dev-lang/python-3.10.0_beta2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3.10
 SRC_URI=https://www.python.org/ftp/python/3.10.0/Python-3.10.0b2.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.0b2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.0/Python-3.10.0b2.tar.xz.asc )
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	check-reqs	97b90bd8fb799993925e6b3a683184e5	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=030021116d1990003e9b46aedb47d8eb
+_md5_=1e8271a43cd98bdf0b1810850dcc683c
diff --git a/metadata/md5-cache/dev-lang/python-3.10.0_beta3 b/metadata/md5-cache/dev-lang/python-3.10.0_beta3
index dcb9547cd2c3..c62bfde9e902 100644
--- a/metadata/md5-cache/dev-lang/python-3.10.0_beta3
+++ b/metadata/md5-cache/dev-lang/python-3.10.0_beta3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3.10
 SRC_URI=https://www.python.org/ftp/python/3.10.0/Python-3.10.0b3.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.0b3.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.0/Python-3.10.0b3.tar.xz.asc )
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	check-reqs	97b90bd8fb799993925e6b3a683184e5	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=030021116d1990003e9b46aedb47d8eb
+_md5_=1e8271a43cd98bdf0b1810850dcc683c
diff --git a/metadata/md5-cache/dev-lang/python-3.6.13_p5 b/metadata/md5-cache/dev-lang/python-3.6.13_p5
index 45920e2920df..2a3306b62da6 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.13_p5
+++ b/metadata/md5-cache/dev-lang/python-3.6.13_p5
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.13/Python-3.6.13.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.6.13_p5.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.6.13/Python-3.6.13.tar.xz.asc )
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=6587b03b52410143f45ada07009dea1d
+_md5_=eecf4b5bd31c99ef4f7ca5ed697616b9
diff --git a/metadata/md5-cache/dev-lang/python-3.6.14 b/metadata/md5-cache/dev-lang/python-3.6.14
index c7cc2faa32c5..76c5a4c13c6f 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.14
+++ b/metadata/md5-cache/dev-lang/python-3.6.14
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.14/Python-3.6.14.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.6.14.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.6.14/Python-3.6.14.tar.xz.asc )
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=ad050863fb38a11e30f5204afb3dc0cd
+_md5_=b2187e77b9c00abd5df689c3a8318a10
diff --git a/metadata/md5-cache/dev-lang/python-3.7.10_p6 b/metadata/md5-cache/dev-lang/python-3.7.10_p6
index 77c648f1dd52..785c743faaba 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.10_p6
+++ b/metadata/md5-cache/dev-lang/python-3.7.10_p6
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3.7/3.7m
 SRC_URI=https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.10_p6.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tar.xz.asc )
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=b33269295693874f6c4f87565d17f01f
+_md5_=98ffd41ca82985724818c63342fbb638
diff --git a/metadata/md5-cache/dev-lang/python-3.7.11 b/metadata/md5-cache/dev-lang/python-3.7.11
index 19dbc3e4420d..9b34be4a7ebf 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.11
+++ b/metadata/md5-cache/dev-lang/python-3.7.11
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3.7/3.7m
 SRC_URI=https://www.python.org/ftp/python/3.7.11/Python-3.7.11.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.11.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.7.11/Python-3.7.11.tar.xz.asc )
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=e9d07b4a0410d68081081eda4fd6beb5
+_md5_=99a7c87442507952996580ba402cd726
diff --git a/metadata/md5-cache/dev-lang/python-3.8.10_p2 b/metadata/md5-cache/dev-lang/python-3.8.10_p2
index 0974c3d7a84f..16f32e3242d3 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.10_p2
+++ b/metadata/md5-cache/dev-lang/python-3.8.10_p2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.10_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tar.xz.asc )
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=f12c11cdf1aa149633dfabef35e14d1e
+_md5_=f4196b350b447334d80ba24d09cc6141
diff --git a/metadata/md5-cache/dev-lang/python-3.8.11 b/metadata/md5-cache/dev-lang/python-3.8.11
index 6044c302c3f5..08e9dd7ec0ab 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.11
+++ b/metadata/md5-cache/dev-lang/python-3.8.11
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/3.8.11/Python-3.8.11.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.11.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.11/Python-3.8.11.tar.xz.asc )
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=17776ae2833b0b2a5589dc4a3c3a8c40
+_md5_=a30cc3d25c4edf3d2fa3e1d08971bbd7
diff --git a/metadata/md5-cache/dev-lang/python-3.9.5_p2 b/metadata/md5-cache/dev-lang/python-3.9.5_p2
index d166b31669d2..41c1e7c0cca3 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.5_p2
+++ b/metadata/md5-cache/dev-lang/python-3.9.5_p2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3.9
 SRC_URI=https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.5_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tar.xz.asc )
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	check-reqs	97b90bd8fb799993925e6b3a683184e5	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=8589cc416c41a521d9dd754b6e2a5b3c
+_md5_=c3e2b512d565b6c3c9ab3e699bcd4834
diff --git a/metadata/md5-cache/dev-lang/python-3.9.6 b/metadata/md5-cache/dev-lang/python-3.9.6
index 307e20b36982..c2f225498b2f 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.6
+++ b/metadata/md5-cache/dev-lang/python-3.9.6
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3.9
 SRC_URI=https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.6.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tar.xz.asc )
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	check-reqs	97b90bd8fb799993925e6b3a683184e5	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=aa1966dbf573758ab36ccce0f8f1dc2f
+_md5_=cdd3a0f125b5c3c2e5b483aade98d4d9
diff --git a/metadata/md5-cache/dev-lang/smlnj-110.82 b/metadata/md5-cache/dev-lang/smlnj-110.82
index f548912de92f..673ac36e7369 100644
--- a/metadata/md5-cache/dev-lang/smlnj-110.82
+++ b/metadata/md5-cache/dev-lang/smlnj-110.82
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=pax_kernel? ( sys-apps/elfix )
+DEPEND=pax-kernel? ( sys-apps/elfix )
 DESCRIPTION=Standard ML of New Jersey compiler and libraries
 EAPI=6
 HOMEPAGE=http://www.smlnj.org
 INHERIT=epatch multilib toolchain-funcs
-IUSE=pax_kernel
+IUSE=pax-kernel
 KEYWORDS=-* ~amd64 ~ppc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=amd64? ( http://smlnj.cs.uchicago.edu/dist/working/110.82/boot.x86-unix.tgz -> smlnj-110.82-boot.x86-unix.tgz ) ppc? ( http://smlnj.cs.uchicago.edu/dist/working/110.82/boot.ppc-unix.tgz -> smlnj-110.82-boot.ppc-unix.tgz ) sparc? ( http://smlnj.cs.uchicago.edu/dist/working/110.82/boot.sparc-unix.tgz -> smlnj-110.82-boot.sparc-unix.tgz ) x86? ( http://smlnj.cs.uchicago.edu/dist/working/110.82/boot.x86-unix.tgz -> smlnj-110.82-boot.x86-unix.tgz ) http://smlnj.cs.uchicago.edu/dist/working/110.82/doc.tgz -> smlnj-110.82-doc.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/config.tgz -> smlnj-110.82-config.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/cm.tgz -> smlnj-110.82-cm.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/compiler.tgz -> smlnj-110.82-compiler.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/runtime.tgz -> smlnj-110.82-runtime.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/system.tgz -> smlnj-110.82-system.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/MLRISC.tgz -> smlnj-110.82-MLRISC.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/smlnj-lib.tgz -> smlnj-110.82-smlnj-lib.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/old-basis.tgz -> smlnj-110.82-old-basis.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/ckit.tgz -> smlnj-110.82-ckit.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/nlffi.tgz -> smlnj-110.82-nlffi.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/cml.tgz -> smlnj-110.82-cml.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/eXene.tgz -> smlnj-110.82-eXene.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/ml-lpt.tgz -> smlnj-110.82-ml-lpt.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/ml-lex.tgz -> smlnj-110.82-ml-lex.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/ml-yacc.tgz -> smlnj-110.82-ml-yacc.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/ml-burg.tgz -> smlnj-110.82-ml-burg.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/pgraph.tgz -> smlnj-110.82-pgraph.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/trace-debug-profile.tgz -> smlnj-110.82-trace-debug-profile.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/heap2asm.tgz -> smlnj-110.82-heap2asm.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/smlnj-c.tgz -> smlnj-110.82-smlnj-c.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f94ad2dd3b1820c3be25985cd66abc3e
+_md5_=fdf5ad1851c1cb00c02687127619b34f
diff --git a/metadata/md5-cache/dev-libs/libffi-3.3-r2 b/metadata/md5-cache/dev-libs/libffi-3.3-r2
index de01e8a38e65..7d4e0973acc8 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.3-r2
+++ b/metadata/md5-cache/dev-libs/libffi-3.3-r2
@@ -4,11 +4,12 @@ DESCRIPTION=a portable, high level programming interface to various calling conv
 EAPI=7
 HOMEPAGE=https://sourceware.org/libffi/
 INHERIT=multilib-minimal
-IUSE=debug pax_kernel static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=debug pax-kernel pax_kernel static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
+REQUIRED_USE=pax_kernel? ( pax-kernel )
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://github.com/libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29
-_md5_=5068964716729cb77d0976720c68e957
+_md5_=34cde6ec71e9446318fadddf22786bfe
diff --git a/metadata/md5-cache/dev-libs/libffi-compat-3.2.1-r3 b/metadata/md5-cache/dev-libs/libffi-compat-3.2.1-r3
index a62c6abe7e0e..c6a905fa2b08 100644
--- a/metadata/md5-cache/dev-libs/libffi-compat-3.2.1-r3
+++ b/metadata/md5-cache/dev-libs/libffi-compat-3.2.1-r3
@@ -5,7 +5,7 @@ DESCRIPTION=a portable, high level programming interface to various calling conv
 EAPI=7
 HOMEPAGE=https://sourceware.org/libffi/
 INHERIT=libtool multilib-minimal
-IUSE=debug pax_kernel test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=debug pax-kernel test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=!dev-libs/libffi:0/0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=6
 SRC_URI=ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29
-_md5_=51d0fde7f7605447f4ee57b2bd95ff21
+_md5_=0d52cdfb9288fd7fb0d343e2aea0160d
diff --git a/metadata/md5-cache/media-sound/spotify-1.0.72-r1 b/metadata/md5-cache/media-sound/spotify-1.0.72-r1
index 6813c972e109..5f7e7bfbf093 100644
--- a/metadata/md5-cache/media-sound/spotify-1.0.72-r1
+++ b/metadata/md5-cache/media-sound/spotify-1.0.72-r1
@@ -3,7 +3,7 @@ DESCRIPTION=Spotify is a social music platform
 EAPI=6
 HOMEPAGE=https://www.spotify.com/download/linux/
 INHERIT=eutils gnome2-utils pax-utils unpacker xdg-utils
-IUSE=libnotify systray pax_kernel pulseaudio
+IUSE=libnotify systray pax-kernel pulseaudio
 KEYWORDS=x86
 LICENSE=Spotify
 RDEPEND=dev-libs/nss gnome-base/gconf gnome-extra/zenity media-libs/alsa-lib media-libs/harfbuzz media-libs/fontconfig media-libs/mesa[X(+)] net-misc/curl[ssl,curl_ssl_openssl] net-print/cups[ssl] x11-libs/gtk+:2 x11-libs/libXScrnSaver x11-libs/libXtst dev-python/pygobject:3 dev-python/dbus-python libnotify? ( x11-libs/libnotify ) pulseaudio? ( media-sound/pulseaudio ) systray? ( gnome-extra/gnome-integration-spotify )
@@ -11,4 +11,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	pax-utils	74cd9920d64148719fb62c462935c1b5	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=8c2c1cde5e0f4910f27ec4c582df010c
+_md5_=6f577f3e7a17ef1c274635bd0303ce5c
diff --git a/metadata/md5-cache/media-sound/spotify-1.1.26-r1 b/metadata/md5-cache/media-sound/spotify-1.1.26-r1
index 55076ee264b7..fa075c931014 100644
--- a/metadata/md5-cache/media-sound/spotify-1.1.26-r1
+++ b/metadata/md5-cache/media-sound/spotify-1.1.26-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Spotify is a social music platform
 EAPI=7
 HOMEPAGE=https://www.spotify.com/download/linux/
 INHERIT=desktop pax-utils unpacker xdg
-IUSE=libnotify systray pax_kernel pulseaudio
+IUSE=libnotify systray pax-kernel pulseaudio
 KEYWORDS=~amd64
 LICENSE=Spotify
 RDEPEND=dev-libs/nss dev-python/dbus-python dev-python/pygobject:3 libnotify? ( x11-libs/libnotify ) dev-libs/openssl:0= media-libs/alsa-lib media-libs/fontconfig media-libs/harfbuzz media-libs/mesa[X(+)] net-misc/curl[ssl] net-print/cups[ssl] pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-sound/apulse ) systray? ( gnome-extra/gnome-integration-spotify ) x11-libs/gtk+:2 app-accessibility/at-spi2-atk x11-libs/libXScrnSaver x11-libs/libXtst
@@ -13,4 +13,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=274d37d2bad08cd9076c64d4f30edee0
+_md5_=10ea72aef1945a2f33eb1fb3f63ed536
diff --git a/metadata/md5-cache/media-sound/spotify-1.1.26-r2 b/metadata/md5-cache/media-sound/spotify-1.1.26-r2
index e833e5594d59..449b29d22f94 100644
--- a/metadata/md5-cache/media-sound/spotify-1.1.26-r2
+++ b/metadata/md5-cache/media-sound/spotify-1.1.26-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Spotify is a social music platform
 EAPI=7
 HOMEPAGE=https://www.spotify.com/download/linux/
 INHERIT=desktop pax-utils unpacker xdg
-IUSE=libnotify systray pax_kernel pulseaudio
+IUSE=libnotify systray pax-kernel pulseaudio
 KEYWORDS=~amd64
 LICENSE=Spotify
 RDEPEND=dev-libs/nss dev-python/dbus-python dev-python/pygobject:3 libnotify? ( x11-libs/libnotify ) dev-libs/openssl:0= media-libs/alsa-lib media-libs/fontconfig media-libs/harfbuzz media-libs/mesa[X(+)] net-misc/curl[ssl] net-print/cups[ssl] pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-sound/apulse ) systray? ( gnome-extra/gnome-integration-spotify ) x11-libs/gtk+:2 app-accessibility/at-spi2-atk x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libSM x11-libs/libICE
@@ -13,4 +13,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=89267faddf3a799751df9f1cc14da82c
+_md5_=28979e0e477399c28ad2a9d7fe756ca1
diff --git a/metadata/md5-cache/media-sound/spotify-1.1.55 b/metadata/md5-cache/media-sound/spotify-1.1.55
index 3de4b1934779..27e52f98486e 100644
--- a/metadata/md5-cache/media-sound/spotify-1.1.55
+++ b/metadata/md5-cache/media-sound/spotify-1.1.55
@@ -5,7 +5,7 @@ DESCRIPTION=Spotify is a social music platform
 EAPI=7
 HOMEPAGE=https://www.spotify.com/download/linux/
 INHERIT=desktop pax-utils unpacker xdg
-IUSE=libnotify local-playback pax_kernel pulseaudio systray
+IUSE=libnotify local-playback pax-kernel pulseaudio systray
 KEYWORDS=~amd64
 LICENSE=Spotify
 RDEPEND=dev-libs/nss dev-python/dbus-python dev-python/pygobject:3 libnotify? ( x11-libs/libnotify ) dev-libs/openssl:0= media-libs/alsa-lib media-libs/fontconfig media-libs/harfbuzz media-libs/mesa[X(+)] net-misc/curl[ssl] net-print/cups[ssl] pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-sound/apulse ) local-playback? ( media-video/ffmpeg:0/56.58.58 ) systray? ( gnome-extra/gnome-integration-spotify ) x11-libs/gtk+:2 app-accessibility/at-spi2-atk x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libSM x11-libs/libICE
@@ -13,4 +13,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.55.498.gf9a83c60_amd64.deb
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=b6cd437830d79d388427e421380d92d2
+_md5_=8a97e632bde978a8f68561d9b6854f16
diff --git a/metadata/md5-cache/media-sound/spotify-1.1.56 b/metadata/md5-cache/media-sound/spotify-1.1.56
index 0fa27302c985..39db3736f375 100644
--- a/metadata/md5-cache/media-sound/spotify-1.1.56
+++ b/metadata/md5-cache/media-sound/spotify-1.1.56
@@ -5,7 +5,7 @@ DESCRIPTION=Spotify is a social music platform
 EAPI=7
 HOMEPAGE=https://www.spotify.com/download/linux/
 INHERIT=desktop pax-utils unpacker xdg
-IUSE=libnotify local-playback pax_kernel pulseaudio systray
+IUSE=libnotify local-playback pax-kernel pulseaudio systray
 KEYWORDS=~amd64
 LICENSE=Spotify
 RDEPEND=dev-libs/nss dev-python/dbus-python dev-python/pygobject:3 libnotify? ( x11-libs/libnotify ) dev-libs/openssl:0= media-libs/alsa-lib media-libs/fontconfig media-libs/harfbuzz media-libs/mesa[X(+)] net-misc/curl[ssl] net-print/cups[ssl] pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-sound/apulse ) local-playback? ( media-video/ffmpeg:0/56.58.58 ) systray? ( gnome-extra/gnome-integration-spotify ) x11-libs/gtk+:2 app-accessibility/at-spi2-atk x11-libs/libxkbcommon x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libSM x11-libs/libICE
@@ -13,4 +13,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.56.595.g2d2da0de_amd64.deb
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=566687370a9826bd9ad7b8404ed9acd2
+_md5_=7323431be465285079d0d2b1aefa3199
diff --git a/metadata/md5-cache/net-libs/nodejs-14.16.1 b/metadata/md5-cache/net-libs/nodejs-14.16.1
index aca650f23e6d..8b34937020cb 100644
--- a/metadata/md5-cache/net-libs/nodejs-14.16.1
+++ b/metadata/md5-cache/net-libs/nodejs-14.16.1
@@ -1,11 +1,11 @@
-BDEPEND=|| ( dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
+BDEPEND=|| ( dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=7
 HOMEPAGE=https://nodejs.org/
 INHERIT=bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-IUSE=cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test
+IUSE=cpu_flags_x86_sse2 debug doc +icu inspector +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test
 KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/14
 SRC_URI=https://nodejs.org/dist/v14.16.1/node-v14.16.1.tar.xz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pax-utils	74cd9920d64148719fb62c462935c1b5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	python-any-r1	901d9e22c7a848a1196502edf060f330	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b350d56d83676b46634b29d2f149b41
+_md5_=15493fa9d86cd8f9ac1f01e8b6b46aba
diff --git a/metadata/md5-cache/net-libs/nodejs-14.17.0 b/metadata/md5-cache/net-libs/nodejs-14.17.0
index f43788994c9a..1fa1303ef373 100644
--- a/metadata/md5-cache/net-libs/nodejs-14.17.0
+++ b/metadata/md5-cache/net-libs/nodejs-14.17.0
@@ -1,11 +1,11 @@
-BDEPEND=|| ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
+BDEPEND=|| ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=7
 HOMEPAGE=https://nodejs.org/
 INHERIT=bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test
+IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/14
 SRC_URI=https://nodejs.org/dist/v14.17.0/node-v14.17.0.tar.xz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pax-utils	74cd9920d64148719fb62c462935c1b5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	python-any-r1	901d9e22c7a848a1196502edf060f330	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f2bdf0d341d3adc5dc38a1e26d57ccca
+_md5_=1ccb8fb58d1d1a2792b4d49ffd4bdecc
diff --git a/metadata/md5-cache/net-libs/nodejs-14.17.1 b/metadata/md5-cache/net-libs/nodejs-14.17.1
index bf4c753df49c..6013fa1cb10c 100644
--- a/metadata/md5-cache/net-libs/nodejs-14.17.1
+++ b/metadata/md5-cache/net-libs/nodejs-14.17.1
@@ -1,11 +1,11 @@
-BDEPEND=|| ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
+BDEPEND=|| ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=7
 HOMEPAGE=https://nodejs.org/
 INHERIT=bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test
+IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/14
 SRC_URI=https://nodejs.org/dist/v14.17.1/node-v14.17.1.tar.xz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pax-utils	74cd9920d64148719fb62c462935c1b5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	python-any-r1	901d9e22c7a848a1196502edf060f330	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d184f1f2dffdf7a678e65e66f5b1abd8
+_md5_=793497a50fc091c5f3f3a332737b8c4c
diff --git a/metadata/md5-cache/net-libs/nodejs-16.4.0 b/metadata/md5-cache/net-libs/nodejs-16.4.0
index c53516d7ba06..d002641a8595 100644
--- a/metadata/md5-cache/net-libs/nodejs-16.4.0
+++ b/metadata/md5-cache/net-libs/nodejs-16.4.0
@@ -1,11 +1,11 @@
-BDEPEND=|| ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
+BDEPEND=|| ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=7
 HOMEPAGE=https://nodejs.org/
 INHERIT=bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test
+IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/16
 SRC_URI=https://nodejs.org/dist/v16.4.0/node-v16.4.0.tar.xz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pax-utils	74cd9920d64148719fb62c462935c1b5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	python-any-r1	901d9e22c7a848a1196502edf060f330	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d7fce5d7b5638bbfb9814dc83799364b
+_md5_=a4c9f4c85e728e59193cbeb13a385078
diff --git a/metadata/md5-cache/net-libs/nodejs-99999999 b/metadata/md5-cache/net-libs/nodejs-99999999
index 3dba1cda851f..90f7147afaf8 100644
--- a/metadata/md5-cache/net-libs/nodejs-99999999
+++ b/metadata/md5-cache/net-libs/nodejs-99999999
@@ -1,11 +1,11 @@
-BDEPEND=|| ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=7
 HOMEPAGE=https://nodejs.org/
 INHERIT=bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils git-r3
-IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test
+IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 PROPERTIES=live
 RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
@@ -13,4 +13,4 @@ REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl?
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pax-utils	74cd9920d64148719fb62c462935c1b5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	python-any-r1	901d9e22c7a848a1196502edf060f330	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=e32bdbe0f5b07c5c42041ccb90708e68
+_md5_=cde4a984f6fecf88e5f44f34fc9db5a6
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 879861d38a3e..20fe25ff922d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 01 Jul 2021 09:22:13 +0000
+Thu, 01 Jul 2021 09:36:57 +0000
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 217b9b04d4cc..310f5fe9e22a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -622,11 +622,11 @@ app-emulation/virt-what:dmi - Use sys-apps/dmidecode to read firmware data
 app-emulation/virtualbox:dtrace - Install dtrace Extension Pack
 app-emulation/virtualbox:headless - Build without any graphic frontend
 app-emulation/virtualbox:lvm - Build VBoxVolInfo that needs devicemapper from sys-fs/lvm2.
-app-emulation/virtualbox:pax_kernel - Apply patch needed for pax enabled kernels.
+app-emulation/virtualbox:pax-kernel - Apply patch needed for pax enabled kernels.
 app-emulation/virtualbox:sdk - Enable building of SDK
 app-emulation/virtualbox:udev - Controls installation of special USB udev rules.
 app-emulation/virtualbox:vboxwebsrv - Build and install the VirtualBox webservice
-app-emulation/virtualbox-modules:pax_kernel - Apply patch needed for pax enabled kernels
+app-emulation/virtualbox-modules:pax-kernel - Apply patch needed for pax enabled kernels
 app-emulation/vkd3d:spirv-tools - Enable SPIRV shader debugging support using dev-util/spirv-tools
 app-emulation/wine-staging:capi - Enable ISDN support via CAPI
 app-emulation/wine-staging:custom-cflags - Bypass strip-flags; use at your own peril
@@ -1665,7 +1665,7 @@ dev-java/icedtea:headless-awt - Don't install the X backend for AWT, needed by s
 dev-java/icedtea:jamvm - Use the JamVM virtual machine rather than HotSpot.
 dev-java/icedtea:jbootstrap - If possible, recompile the final IcedTea executables with itself.
 dev-java/icedtea:kerberos - Link against Kerberos in order to obtain the cache location.
-dev-java/icedtea:pax_kernel - Apply patch needed for pax enabled kernels.
+dev-java/icedtea:pax-kernel - Apply patch needed for pax enabled kernels.
 dev-java/icedtea:pch - Build using pre-compiled headers.
 dev-java/icedtea:sctp - Build the SCTP NIO channel implementation against lksctp
 dev-java/icedtea:shenandoah - Include the Shenandoah ultra-low pause time garbage collector (-XX:+UseShenandoahGC) (arm64 and x86_64 only)
@@ -1758,14 +1758,14 @@ dev-lang/mercury:trail - Support Mercury trail grades
 dev-lang/mercury-extras:tommath - Enable support for tommath library
 dev-lang/mlton:binary - install a binary version
 dev-lang/mlton:bootstrap-smlnj - Boostrap mlton with dev-lang/smlnj (takes a long time)
-dev-lang/mlton:pax_kernel - Enable if the user plans to run the package under a pax enabled hardened kernel
+dev-lang/mlton:pax-kernel - Enable if the user plans to run the package under a pax enabled hardened kernel
 dev-lang/mlton:stage3 - After bootstrap building mlton with dev-lang/smlnj, rebuild mlton with the second stage build of mlton (recommended).
 dev-lang/moarvm:asan - Enable clang's Address Sanitizer functionality. Expect longer compile time.
 dev-lang/moarvm:clang - Use clang compiler instead of GCC
 dev-lang/moarvm:jit - Enable Just-In-Time-Compiler. Has no effect except on AMD64 and Darwin.
 dev-lang/moarvm:optimize - Enable optimization via CFLAGS
 dev-lang/moarvm:ubsan - Enable clang's Undefined Behavior Sanitizer functionality. Expect longer compile time.
-dev-lang/mono:pax_kernel - Enable if the user plans to run the package under a pax enabled hardened kernel
+dev-lang/mono:pax-kernel - Enable if the user plans to run the package under a pax enabled hardened kernel
 dev-lang/mono:xen - Make mono generate code that is considerably faster on xen VMs but slightly slower on for normal systems.
 dev-lang/nqp:clang - Toggle usage of the clang compiler in conjunction with MoarVM
 dev-lang/nqp:moar - Build the MoarVM backend (experimental/broken)
@@ -1835,7 +1835,7 @@ dev-lang/rust-bin:clippy - Install clippy, Rust code linter
 dev-lang/rust-bin:rls - Install rls, Rust Language Server (used with IDEs supporting RLS protocol)
 dev-lang/rust-bin:rustfmt - Install rustfmt, Rust code formatter
 dev-lang/scala:binary - Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.
-dev-lang/smlnj:pax_kernel - Enable if the user plans to run the package under a pax enabled hardened kernel
+dev-lang/smlnj:pax-kernel - Enable if the user plans to run the package under a pax enabled hardened kernel
 dev-lang/spidermonkey:clang - Use Clang compiler instead of GCC
 dev-lang/spidermonkey:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
 dev-lang/spidermonkey:debug - Enable assertions to allow for easier debugging of programs that link to spidermonkey -- note this will often crash software on regular end-user systems
@@ -2050,8 +2050,9 @@ dev-libs/libevent:malloc-replacement - Support for replacing the memory manageme
 dev-libs/libevent:mbedtls - Support for net-libs/mbedtls encryption
 dev-libs/libevent:ssl - Support for dev-libs/openssl encryption
 dev-libs/libevent:verbose-debug - Support for verbose debug logging
-dev-libs/libffi:pax_kernel - Use PaX emulated trampolines, for we can't use PROT_EXEC
-dev-libs/libffi-compat:pax_kernel - Use PaX emulated trampolines, for we can't use PROT_EXEC
+dev-libs/libffi:pax-kernel - Use PaX emulated trampolines, for we can't use PROT_EXEC
+dev-libs/libffi:pax_kernel - DEPRECATED alias for 'pax-kernel'. Do not use.
+dev-libs/libffi-compat:pax-kernel - Use PaX emulated trampolines, for we can't use PROT_EXEC
 dev-libs/libfido2:nfc - Enable experimental NFC support
 dev-libs/libflatarray:cuda - Enables plugins for NVIDIA GPUs (e.g. CUDAAllocator)
 dev-libs/libgcrypt:asm - Enable assembly for optimization
@@ -4753,7 +4754,7 @@ media-sound/split2flac:flake - Add support for Flake, alternative FLAC encoder
 media-sound/split2flac:mac - Add support for Monkey's Audio files
 media-sound/split2flac:replaygain - Support for Replay Gain metadata, for relative volume adjustment
 media-sound/spotify:local-playback - Allows playing local files with the Spotify client
-media-sound/spotify:pax_kernel - Triggers a paxmarking of the main Spotify binary
+media-sound/spotify:pax-kernel - Triggers a paxmarking of the main Spotify binary
 media-sound/spotify:pulseaudio - Controls the dependency on pulseaudio or apulse
 media-sound/spotify:systray - Pulls in dependencies needed for systray support on some desktop environments
 media-sound/strawberry:vlc - Enable media-video/vlc backend
@@ -6070,7 +6071,7 @@ net-libs/nghttp2:utils - Install nghttp, nghttpd and nghttpx
 net-libs/nodejs:inspector - Enable V8 inspector
 net-libs/nodejs:lto - Build with link-time optimisation
 net-libs/nodejs:npm - Enable NPM package manager
-net-libs/nodejs:pax_kernel - Enable building under a PaX enabled kernel
+net-libs/nodejs:pax-kernel - Enable building under a PaX enabled kernel
 net-libs/nodejs:snapshot - Enable snapshot creation for faster startup
 net-libs/nodejs:system-icu - Use system dev-libs/icu instead of the bundled version
 net-libs/nodejs:system-ssl - Use system OpenSSL instead of the bundled one