[gentoo-commits] repo/gentoo:master commit in: dev-libs/libffi-compat/, dev-lang/python/, dev-java/icedtea/, dev-lang/smlnj/, ...

[Marek Szuba]

commit:     618b3e86e2b4078605f99fce1eefb08ac67ea5c9
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  1 09:13:18 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Jul  1 09:13:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=618b3e86

*/*: s/pax_kernel/pax-kernel/g

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 app-emulation/virtualbox-modules/metadata.xml                     | 2 +-
 app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild | 4 ++--
 app-emulation/virtualbox-modules/virtualbox-modules-6.1.20.ebuild | 4 ++--
 app-emulation/virtualbox-modules/virtualbox-modules-6.1.22.ebuild | 4 ++--
 app-emulation/virtualbox/metadata.xml                             | 2 +-
 app-emulation/virtualbox/virtualbox-6.1.18.ebuild                 | 8 ++++----
 app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild              | 8 ++++----
 app-emulation/virtualbox/virtualbox-6.1.22.ebuild                 | 8 ++++----
 dev-java/icedtea/icedtea-3.18.0.ebuild                            | 6 +++---
 dev-java/icedtea/icedtea-3.19.0.ebuild                            | 6 +++---
 dev-java/icedtea/metadata.xml                                     | 2 +-
 dev-lang/mlton/metadata.xml                                       | 2 +-
 dev-lang/mlton/mlton-20180207.ebuild                              | 6 +++---
 dev-lang/mono/metadata.xml                                        | 2 +-
 dev-lang/mono/mono-6.12.0.122.ebuild                              | 6 +++---
 dev-lang/python/python-2.7.18_p10.ebuild                          | 2 +-
 dev-lang/python/python-2.7.18_p11.ebuild                          | 2 +-
 dev-lang/python/python-3.10.0_beta2.ebuild                        | 4 ++--
 dev-lang/python/python-3.10.0_beta3.ebuild                        | 4 ++--
 dev-lang/python/python-3.6.13_p5.ebuild                           | 4 ++--
 dev-lang/python/python-3.6.14.ebuild                              | 4 ++--
 dev-lang/python/python-3.7.10_p6.ebuild                           | 4 ++--
 dev-lang/python/python-3.7.11.ebuild                              | 4 ++--
 dev-lang/python/python-3.8.10_p2.ebuild                           | 4 ++--
 dev-lang/python/python-3.8.11.ebuild                              | 4 ++--
 dev-lang/python/python-3.9.5_p2.ebuild                            | 4 ++--
 dev-lang/python/python-3.9.6.ebuild                               | 4 ++--
 dev-lang/smlnj/metadata.xml                                       | 2 +-
 dev-lang/smlnj/smlnj-110.82.ebuild                                | 6 +++---
 dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild              | 4 ++--
 dev-libs/libffi-compat/metadata.xml                               | 2 +-
 dev-libs/libffi/libffi-3.3-r2.ebuild                              | 4 ++--
 dev-libs/libffi/metadata.xml                                      | 2 +-
 media-sound/spotify/metadata.xml                                  | 2 +-
 media-sound/spotify/spotify-1.0.72-r1.ebuild                      | 6 +++---
 media-sound/spotify/spotify-1.1.26-r1.ebuild                      | 6 +++---
 media-sound/spotify/spotify-1.1.26-r2.ebuild                      | 6 +++---
 media-sound/spotify/spotify-1.1.55.ebuild                         | 6 +++---
 media-sound/spotify/spotify-1.1.56.ebuild                         | 6 +++---
 net-libs/nodejs/metadata.xml                                      | 2 +-
 net-libs/nodejs/nodejs-14.16.1.ebuild                             | 6 +++---
 net-libs/nodejs/nodejs-14.17.0.ebuild                             | 6 +++---
 net-libs/nodejs/nodejs-14.17.1.ebuild                             | 6 +++---
 net-libs/nodejs/nodejs-16.4.0.ebuild                              | 6 +++---
 net-libs/nodejs/nodejs-99999999.ebuild                            | 6 +++---
 45 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/app-emulation/virtualbox-modules/metadata.xml b/app-emulation/virtualbox-modules/metadata.xml
index a4c013c4006..78e437e7a22 100644
--- a/app-emulation/virtualbox-modules/metadata.xml
+++ b/app-emulation/virtualbox-modules/metadata.xml
@@ -6,6 +6,6 @@
     <name>Lars Wendler</name>
   </maintainer>
   <use>
-    <flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
+    <flag name="pax-kernel">Apply patch needed for pax enabled kernels</flag>
   </use>
 </pkgmetadata>

diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
index 17dbf76a1d4..9e446e585c6 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="amd64"
-IUSE="pax_kernel"
+IUSE="pax-kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
 
@@ -40,7 +40,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+	if use pax-kernel && kernel_is -ge 3 0 0 ; then
 		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
 	fi
 

diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.20.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.20.ebuild
index a884e1456d0..ac30ee8cc03 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.20.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.20.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="amd64"
-IUSE="pax_kernel"
+IUSE="pax-kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
 
@@ -35,7 +35,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+	if use pax-kernel && kernel_is -ge 3 0 0 ; then
 		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
 	fi
 

diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.22.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.22.ebuild
index e179b43d537..0a6e70d5825 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.22.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.22.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="~amd64"
-IUSE="pax_kernel"
+IUSE="pax-kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
 
@@ -35,7 +35,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+	if use pax-kernel && kernel_is -ge 3 0 0 ; then
 		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
 	fi
 

diff --git a/app-emulation/virtualbox/metadata.xml b/app-emulation/virtualbox/metadata.xml
index 95eb9062a15..c04761ae2e7 100644
--- a/app-emulation/virtualbox/metadata.xml
+++ b/app-emulation/virtualbox/metadata.xml
@@ -9,7 +9,7 @@
   <flag name="dtrace">Install dtrace Extension Pack</flag>
   <flag name="headless">Build without any graphic frontend</flag>
   <flag name="lvm">Build VBoxVolInfo that needs devicemapper from <pkg>sys-fs/lvm2</pkg>.</flag>
-  <flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag>
+  <flag name="pax-kernel">Apply patch needed for pax enabled kernels.</flag>
   <flag name="sdk">Enable building of SDK</flag>
   <flag name="udev">Controls installation of special USB udev rules.</flag>
   <flag name="vboxwebsrv">Build and install the VirtualBox webservice</flag>

diff --git a/app-emulation/virtualbox/virtualbox-6.1.18.ebuild b/app-emulation/virtualbox/virtualbox-6.1.18.ebuild
index c106cf14fe0..f504873a619 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.18.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.18.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2 dtrace? ( CDDL )"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="amd64"
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
 CDEPEND="
 	${PYTHON_DEPS}
@@ -68,7 +68,7 @@ DEPEND="
 		opengl? ( virtual/opengl )
 	)
 	pam? ( sys-libs/pam )
-	pax_kernel? ( sys-apps/elfix )
+	pax-kernel? ( sys-apps/elfix )
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? ( dev-qt/linguist-tools:5 )
 	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
@@ -206,8 +206,8 @@ src_prepare() {
 		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
 	fi
 
-	# Only add paxmark patch when we're on pax_kernel
-	if use pax_kernel ; then
+	# Only add paxmark patch when we're on pax-kernel
+	if use pax-kernel ; then
 		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
 	fi
 

diff --git a/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild
index 653e36a9997..29d68e769cd 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2 dtrace? ( CDDL )"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="amd64"
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
 CDEPEND="
 	${PYTHON_DEPS}
@@ -68,7 +68,7 @@ DEPEND="
 		opengl? ( virtual/opengl )
 	)
 	pam? ( sys-libs/pam )
-	pax_kernel? ( sys-apps/elfix )
+	pax-kernel? ( sys-apps/elfix )
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? ( dev-qt/linguist-tools:5 )
 	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
@@ -210,8 +210,8 @@ src_prepare() {
 		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
 	fi
 
-	# Only add paxmark patch when we're on pax_kernel
-	if use pax_kernel ; then
+	# Only add paxmark patch when we're on pax-kernel
+	if use pax-kernel ; then
 		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
 	fi
 

diff --git a/app-emulation/virtualbox/virtualbox-6.1.22.ebuild b/app-emulation/virtualbox/virtualbox-6.1.22.ebuild
index f6ba09856a7..0749d1ebaa9 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.22.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.22.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2 dtrace? ( CDDL )"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="~amd64"
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
 CDEPEND="
 	${PYTHON_DEPS}
@@ -68,7 +68,7 @@ DEPEND="
 		opengl? ( virtual/opengl )
 	)
 	pam? ( sys-libs/pam )
-	pax_kernel? ( sys-apps/elfix )
+	pax-kernel? ( sys-apps/elfix )
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? ( dev-qt/linguist-tools:5 )
 	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
@@ -206,8 +206,8 @@ src_prepare() {
 		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
 	fi
 
-	# Only add paxmark patch when we're on pax_kernel
-	if use pax_kernel ; then
+	# Only add paxmark patch when we're on pax-kernel
+	if use pax-kernel ; then
 		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
 	fi
 

diff --git a/dev-java/icedtea/icedtea-3.18.0.ebuild b/dev-java/icedtea/icedtea-3.18.0.ebuild
index 505db1a198f..8adf0db21c7 100644
--- a/dev-java/icedtea/icedtea-3.18.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.18.0.ebuild
@@ -69,7 +69,7 @@ LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 M
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 IUSE="+alsa cacao +cups doc examples +gtk headless-awt
-	jamvm +jbootstrap kerberos pax_kernel +pch
+	jamvm +jbootstrap kerberos pax-kernel +pch
 	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero"
 
 RESTRICT="!test? ( test )"
@@ -152,7 +152,7 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
 	sys-apps/lsb-release
 	x11-libs/libXt
 	virtual/pkgconfig
-	pax_kernel? ( sys-apps/elfix )"
+	pax-kernel? ( sys-apps/elfix )"
 
 PDEPEND="pulseaudio? ( dev-java/icedtea-sound )"
 
@@ -330,7 +330,7 @@ src_configure() {
 		$(use_enable doc docs) \
 		$(use_enable kerberos system-kerberos) \
 		$(use_enable system-lcms) \
-		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+		$(use_with pax-kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
 		$(use_enable sctp system-sctp) \
 		$(use_enable smartcard system-pcsc) \
 		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}

diff --git a/dev-java/icedtea/icedtea-3.19.0.ebuild b/dev-java/icedtea/icedtea-3.19.0.ebuild
index 505db1a198f..8adf0db21c7 100644
--- a/dev-java/icedtea/icedtea-3.19.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.19.0.ebuild
@@ -69,7 +69,7 @@ LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 M
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 IUSE="+alsa cacao +cups doc examples +gtk headless-awt
-	jamvm +jbootstrap kerberos pax_kernel +pch
+	jamvm +jbootstrap kerberos pax-kernel +pch
 	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero"
 
 RESTRICT="!test? ( test )"
@@ -152,7 +152,7 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
 	sys-apps/lsb-release
 	x11-libs/libXt
 	virtual/pkgconfig
-	pax_kernel? ( sys-apps/elfix )"
+	pax-kernel? ( sys-apps/elfix )"
 
 PDEPEND="pulseaudio? ( dev-java/icedtea-sound )"
 
@@ -330,7 +330,7 @@ src_configure() {
 		$(use_enable doc docs) \
 		$(use_enable kerberos system-kerberos) \
 		$(use_enable system-lcms) \
-		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+		$(use_with pax-kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
 		$(use_enable sctp system-sctp) \
 		$(use_enable smartcard system-pcsc) \
 		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}

diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index 18643722fec..e45709af55f 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -27,7 +27,7 @@
 		<flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag>
 		<flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
 		<flag name="kerberos">Link against Kerberos in order to obtain the cache location.</flag>
-		<flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag>
+		<flag name="pax-kernel">Apply patch needed for pax enabled kernels.</flag>
 		<flag name="pch">Build using pre-compiled headers.</flag>
 		<flag name="sctp">Build the SCTP NIO channel implementation against lksctp</flag>
 		<flag name="shenandoah">Include the Shenandoah ultra-low pause time garbage collector (-XX:+UseShenandoahGC) (arm64 and x86_64 only)</flag>

diff --git a/dev-lang/mlton/metadata.xml b/dev-lang/mlton/metadata.xml
index bcf28489a61..52a980d81fc 100644
--- a/dev-lang/mlton/metadata.xml
+++ b/dev-lang/mlton/metadata.xml
@@ -9,7 +9,7 @@
 		<flag name="stage3">After bootstrap building mlton with
 		dev-lang/smlnj, rebuild mlton with the second stage build of
 		mlton (recommended).</flag>
-		<flag name="pax_kernel">Enable if the user plans to run the
+		<flag name="pax-kernel">Enable if the user plans to run the
 		package under a pax enabled hardened kernel</flag>
 	</use>
 	<upstream>

diff --git a/dev-lang/mlton/mlton-20180207.ebuild b/dev-lang/mlton/mlton-20180207.ebuild
index f55bb40d5a1..8ef03ed2eee 100644
--- a/dev-lang/mlton/mlton-20180207.ebuild
+++ b/dev-lang/mlton/mlton-20180207.ebuild
@@ -14,14 +14,14 @@ HOMEPAGE="http://www.mlton.org"
 LICENSE="HPND MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="binary bootstrap-smlnj stage3 doc pax_kernel"
+IUSE="binary bootstrap-smlnj stage3 doc pax-kernel"
 
 DEPEND="dev-libs/gmp:*
 		bootstrap-smlnj? ( dev-lang/smlnj )
 		!bootstrap-smlnj? (
 			!amd64?  ( dev-lang/smlnj )
 		)
-		pax_kernel? ( sys-apps/elfix )
+		pax-kernel? ( sys-apps/elfix )
 		doc? ( virtual/latex-base )"
 RDEPEND="dev-libs/gmp:*"
 
@@ -175,7 +175,7 @@ mlton_src_compile() {
 	if [[ ${MULTIBUILD_VARIANT} == $(mlton_bootstrap_variant) ]]; then
 		emake -j1 \
 			"bootstrap-smlnj" \
-			PAXMARK=$(usex pax_kernel "paxmark.sh" "true") \
+			PAXMARK=$(usex pax-kernel "paxmark.sh" "true") \
 			CFLAGS="${CFLAGS}" \
 			WITH_GMP_INC_DIR="${EPREFIX}"/usr/include \
 			WITH_GMP_LIB_DIR="${EPREFIX}"/$(get_libdir)

diff --git a/dev-lang/mono/metadata.xml b/dev-lang/mono/metadata.xml
index bbf56c22464..debfaeb28da 100644
--- a/dev-lang/mono/metadata.xml
+++ b/dev-lang/mono/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>
-		<flag name="pax_kernel">Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
+		<flag name="pax-kernel">Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
 		<flag name="xen">Make mono generate code that is considerably faster on xen VMs but slightly slower on for normal systems.</flag>
 	</use>
 	<upstream>

diff --git a/dev-lang/mono/mono-6.12.0.122.ebuild b/dev-lang/mono/mono-6.12.0.122.ebuild
index 981a76e8944..b1486e78265 100644
--- a/dev-lang/mono/mono-6.12.0.122.ebuild
+++ b/dev-lang/mono/mono-6.12.0.122.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.mono-project.com/sources/mono/${P}.tar.xz"
 LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="doc minimal nls pax_kernel xen"
+IUSE="doc minimal nls pax-kernel xen"
 
 # Note: mono works incorrect with older versions of libgdiplus
 # Details on dotnet overlay issue: https://github.com/gentoo/dotnet/issues/429
@@ -31,7 +31,7 @@ RDEPEND="
 BDEPEND="
 	sys-devel/bc
 	virtual/yacc
-	pax_kernel? ( sys-apps/elfix )
+	pax-kernel? ( sys-apps/elfix )
 "
 
 PATCHES=(
@@ -66,7 +66,7 @@ src_prepare() {
 	# get killed in the build proces when MPROTECT is enabled, bug #286280
 	# RANDMMAP kills the build process too, bug #347365
 	# We use paxmark.sh to get PT/XT logic, bug #532244
-	if use pax_kernel ; then
+	if use pax-kernel ; then
 		ewarn "We are disabling MPROTECT on the mono binary."
 
 		# issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9

diff --git a/dev-lang/python/python-2.7.18_p10.ebuild b/dev-lang/python/python-2.7.18_p10.ebuild
index 7a8c21f525e..0a02ad224a9 100644
--- a/dev-lang/python/python-2.7.18_p10.ebuild
+++ b/dev-lang/python/python-2.7.18_p10.ebuild
@@ -225,7 +225,7 @@ src_compile() {
 	emake
 
 	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E python
 	else
 		pax-mark m python

diff --git a/dev-lang/python/python-2.7.18_p11.ebuild b/dev-lang/python/python-2.7.18_p11.ebuild
index 17733be6f11..c583ea726d6 100644
--- a/dev-lang/python/python-2.7.18_p11.ebuild
+++ b/dev-lang/python/python-2.7.18_p11.ebuild
@@ -225,7 +225,7 @@ src_compile() {
 	emake
 
 	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E python
 	else
 		pax-mark m python

diff --git a/dev-lang/python/python-3.10.0_beta2.ebuild b/dev-lang/python/python-3.10.0_beta2.ebuild
index e20ed1b7303..818aa5957c7 100644
--- a/dev-lang/python/python-3.10.0_beta2.ebuild
+++ b/dev-lang/python/python-3.10.0_beta2.ebuild
@@ -197,7 +197,7 @@ src_compile() {
 	emake CPPFLAGS= CFLAGS= LDFLAGS=
 
 	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E python
 	else
 		pax-mark m python
@@ -275,7 +275,7 @@ src_install() {
 
 	# python seems to get rebuilt in src_install (bug 569908)
 	# Work around it for now.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E "${ED}/usr/bin/${abiver}"
 	else
 		pax-mark m "${ED}/usr/bin/${abiver}"

diff --git a/dev-lang/python/python-3.10.0_beta3.ebuild b/dev-lang/python/python-3.10.0_beta3.ebuild
index e20ed1b7303..818aa5957c7 100644
--- a/dev-lang/python/python-3.10.0_beta3.ebuild
+++ b/dev-lang/python/python-3.10.0_beta3.ebuild
@@ -197,7 +197,7 @@ src_compile() {
 	emake CPPFLAGS= CFLAGS= LDFLAGS=
 
 	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E python
 	else
 		pax-mark m python
@@ -275,7 +275,7 @@ src_install() {
 
 	# python seems to get rebuilt in src_install (bug 569908)
 	# Work around it for now.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E "${ED}/usr/bin/${abiver}"
 	else
 		pax-mark m "${ED}/usr/bin/${abiver}"

diff --git a/dev-lang/python/python-3.6.13_p5.ebuild b/dev-lang/python/python-3.6.13_p5.ebuild
index e24be42012b..01b06863a38 100644
--- a/dev-lang/python/python-3.6.13_p5.ebuild
+++ b/dev-lang/python/python-3.6.13_p5.ebuild
@@ -182,7 +182,7 @@ src_compile() {
 	emake CPPFLAGS= CFLAGS= LDFLAGS=
 
 	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E python
 	else
 		pax-mark m python
@@ -261,7 +261,7 @@ src_install() {
 
 	# python seems to get rebuilt in src_install (bug 569908)
 	# Work around it for now.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E "${ED}/usr/bin/${abiver}"
 	else
 		pax-mark m "${ED}/usr/bin/${abiver}"

diff --git a/dev-lang/python/python-3.6.14.ebuild b/dev-lang/python/python-3.6.14.ebuild
index bbce0c2bb3a..67dda0865bb 100644
--- a/dev-lang/python/python-3.6.14.ebuild
+++ b/dev-lang/python/python-3.6.14.ebuild
@@ -182,7 +182,7 @@ src_compile() {
 	emake CPPFLAGS= CFLAGS= LDFLAGS=
 
 	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E python
 	else
 		pax-mark m python
@@ -261,7 +261,7 @@ src_install() {
 
 	# python seems to get rebuilt in src_install (bug 569908)
 	# Work around it for now.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E "${ED}/usr/bin/${abiver}"
 	else
 		pax-mark m "${ED}/usr/bin/${abiver}"

diff --git a/dev-lang/python/python-3.7.10_p6.ebuild b/dev-lang/python/python-3.7.10_p6.ebuild
index 0e99aadfd9c..fc1984de3bc 100644
--- a/dev-lang/python/python-3.7.10_p6.ebuild
+++ b/dev-lang/python/python-3.7.10_p6.ebuild
@@ -175,7 +175,7 @@ src_compile() {
 	emake CPPFLAGS= CFLAGS= LDFLAGS=
 
 	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E python
 	else
 		pax-mark m python
@@ -254,7 +254,7 @@ src_install() {
 
 	# python seems to get rebuilt in src_install (bug 569908)
 	# Work around it for now.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E "${ED}/usr/bin/${abiver}"
 	else
 		pax-mark m "${ED}/usr/bin/${abiver}"

diff --git a/dev-lang/python/python-3.7.11.ebuild b/dev-lang/python/python-3.7.11.ebuild
index 1cfc503ae0f..38c80df2cb9 100644
--- a/dev-lang/python/python-3.7.11.ebuild
+++ b/dev-lang/python/python-3.7.11.ebuild
@@ -175,7 +175,7 @@ src_compile() {
 	emake CPPFLAGS= CFLAGS= LDFLAGS=
 
 	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E python
 	else
 		pax-mark m python
@@ -254,7 +254,7 @@ src_install() {
 
 	# python seems to get rebuilt in src_install (bug 569908)
 	# Work around it for now.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E "${ED}/usr/bin/${abiver}"
 	else
 		pax-mark m "${ED}/usr/bin/${abiver}"

diff --git a/dev-lang/python/python-3.8.10_p2.ebuild b/dev-lang/python/python-3.8.10_p2.ebuild
index b1c4a316ec3..3e7b9da36c3 100644
--- a/dev-lang/python/python-3.8.10_p2.ebuild
+++ b/dev-lang/python/python-3.8.10_p2.ebuild
@@ -183,7 +183,7 @@ src_compile() {
 	emake CPPFLAGS= CFLAGS= LDFLAGS=
 
 	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E python
 	else
 		pax-mark m python
@@ -262,7 +262,7 @@ src_install() {
 
 	# python seems to get rebuilt in src_install (bug 569908)
 	# Work around it for now.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E "${ED}/usr/bin/${abiver}"
 	else
 		pax-mark m "${ED}/usr/bin/${abiver}"

diff --git a/dev-lang/python/python-3.8.11.ebuild b/dev-lang/python/python-3.8.11.ebuild
index 0a87aec9180..f3ce31d2a65 100644
--- a/dev-lang/python/python-3.8.11.ebuild
+++ b/dev-lang/python/python-3.8.11.ebuild
@@ -183,7 +183,7 @@ src_compile() {
 	emake CPPFLAGS= CFLAGS= LDFLAGS=
 
 	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E python
 	else
 		pax-mark m python
@@ -262,7 +262,7 @@ src_install() {
 
 	# python seems to get rebuilt in src_install (bug 569908)
 	# Work around it for now.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E "${ED}/usr/bin/${abiver}"
 	else
 		pax-mark m "${ED}/usr/bin/${abiver}"

diff --git a/dev-lang/python/python-3.9.5_p2.ebuild b/dev-lang/python/python-3.9.5_p2.ebuild
index ba35fe24eeb..687ad6e769e 100644
--- a/dev-lang/python/python-3.9.5_p2.ebuild
+++ b/dev-lang/python/python-3.9.5_p2.ebuild
@@ -194,7 +194,7 @@ src_compile() {
 	emake CPPFLAGS= CFLAGS= LDFLAGS=
 
 	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E python
 	else
 		pax-mark m python
@@ -273,7 +273,7 @@ src_install() {
 
 	# python seems to get rebuilt in src_install (bug 569908)
 	# Work around it for now.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E "${ED}/usr/bin/${abiver}"
 	else
 		pax-mark m "${ED}/usr/bin/${abiver}"

diff --git a/dev-lang/python/python-3.9.6.ebuild b/dev-lang/python/python-3.9.6.ebuild
index 444f9d6d14b..6cb6bf8002c 100644
--- a/dev-lang/python/python-3.9.6.ebuild
+++ b/dev-lang/python/python-3.9.6.ebuild
@@ -194,7 +194,7 @@ src_compile() {
 	emake CPPFLAGS= CFLAGS= LDFLAGS=
 
 	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E python
 	else
 		pax-mark m python
@@ -273,7 +273,7 @@ src_install() {
 
 	# python seems to get rebuilt in src_install (bug 569908)
 	# Work around it for now.
-	if has_version dev-libs/libffi[pax_kernel]; then
+	if has_version dev-libs/libffi[pax-kernel]; then
 		pax-mark E "${ED}/usr/bin/${abiver}"
 	else
 		pax-mark m "${ED}/usr/bin/${abiver}"

diff --git a/dev-lang/smlnj/metadata.xml b/dev-lang/smlnj/metadata.xml
index e7ce88d55f5..26bf6629829 100644
--- a/dev-lang/smlnj/metadata.xml
+++ b/dev-lang/smlnj/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <!-- maintainer-needed -->
 	<use>
-		<flag name="pax_kernel">Enable if the user plans to run the
+		<flag name="pax-kernel">Enable if the user plans to run the
 		package under a pax enabled hardened kernel</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-lang/smlnj/smlnj-110.82.ebuild b/dev-lang/smlnj/smlnj-110.82.ebuild
index 3565c9baaa6..68c776772b8 100644
--- a/dev-lang/smlnj/smlnj-110.82.ebuild
+++ b/dev-lang/smlnj/smlnj-110.82.ebuild
@@ -57,8 +57,8 @@ SLOT="0"
 
 #sparc support should be there but is untested
 KEYWORDS="-* ~amd64 ~ppc ~x86"
-IUSE="pax_kernel"
-DEPEND="pax_kernel? ( sys-apps/elfix )"
+IUSE="pax-kernel"
+DEPEND="pax-kernel? ( sys-apps/elfix )"
 RDEPEND=""
 
 S=${WORKDIR}
@@ -87,7 +87,7 @@ src_prepare() {
 			-e "/^CC/s:gcc:$(tc-getCC):" \
 			-e "/^CPP/s:gcc:$(tc-getCC):" \
 			-e "/^CFLAGS/{s:-O[0123s]:: ; s:=:= ${CFLAGS}:}" \
-			-e "/^PAXMARK/s:true:"$(usex pax_kernel "paxmark.sh" "true")":" \
+			-e "/^PAXMARK/s:true:"$(usex pax-kernel "paxmark.sh" "true")":" \
 			-i base/runtime/objs/${file}
 	done
 }

diff --git a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
index 135b4dbf980..179381df972 100644
--- a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
+++ b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://sourceware.org/pub/libffi/libffi-${PV}.tar.gz"
 LICENSE="MIT"
 SLOT="6" # libffi.so.6
 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"
-IUSE="debug pax_kernel test"
+IUSE="debug pax-kernel test"
 
 RESTRICT="!test? ( test )"
 
@@ -45,7 +45,7 @@ multilib_src_configure() {
 	use userland_BSD && export HOST="${CHOST}"
 	econf \
 		--disable-static \
-		$(use_enable pax_kernel pax_emutramp) \
+		$(use_enable pax-kernel pax_emutramp) \
 		$(use_enable debug)
 }
 

diff --git a/dev-libs/libffi-compat/metadata.xml b/dev-libs/libffi-compat/metadata.xml
index 6e9a28c5ac8..1c295db1236 100644
--- a/dev-libs/libffi-compat/metadata.xml
+++ b/dev-libs/libffi-compat/metadata.xml
@@ -34,7 +34,7 @@
 		between the two languages.
 	</longdescription>
 	<use>
-		<flag name="pax_kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag>
+		<flag name="pax-kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:libffi_project:libffi</remote-id>

diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild
index 3433babf3ae..95c00185605 100644
--- a/dev-libs/libffi/libffi-3.3-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta
 LICENSE="MIT"
 SLOT="0/7" # SONAME=libffi.so.7
 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"
-IUSE="debug pax_kernel static-libs test"
+IUSE="debug pax-kernel static-libs test"
 
 RESTRICT="!test? ( test )"
 
@@ -65,7 +65,7 @@ multilib_src_configure() {
 		--includedir="${EPREFIX}"/usr/$(get_libdir)/${PN}/include \
 		--disable-multi-os-directory \
 		$(use_enable static-libs static) \
-		$(use_enable pax_kernel pax_emutramp) \
+		$(use_enable pax-kernel pax_emutramp) \
 		$(use_enable debug)
 }
 

diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml
index 6e9a28c5ac8..1c295db1236 100644
--- a/dev-libs/libffi/metadata.xml
+++ b/dev-libs/libffi/metadata.xml
@@ -34,7 +34,7 @@
 		between the two languages.
 	</longdescription>
 	<use>
-		<flag name="pax_kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag>
+		<flag name="pax-kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:libffi_project:libffi</remote-id>

diff --git a/media-sound/spotify/metadata.xml b/media-sound/spotify/metadata.xml
index 5f4cc456b93..3542c29a74b 100644
--- a/media-sound/spotify/metadata.xml
+++ b/media-sound/spotify/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <use>
     <flag name="local-playback">Allows playing local files with the Spotify client</flag>
-    <flag name="pax_kernel">Triggers a paxmarking of the main Spotify binary</flag>
+    <flag name="pax-kernel">Triggers a paxmarking of the main Spotify binary</flag>
     <flag name="pulseaudio">Controls the dependency on pulseaudio or apulse</flag>
     <flag name="systray">Pulls in dependencies needed for systray support on some desktop environments</flag>
   </use>

diff --git a/media-sound/spotify/spotify-1.0.72-r1.ebuild b/media-sound/spotify/spotify-1.0.72-r1.ebuild
index a3d378506ef..5bc8a509cbd 100644
--- a/media-sound/spotify/spotify-1.0.72-r1.ebuild
+++ b/media-sound/spotify/spotify-1.0.72-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb"
 LICENSE="Spotify"
 SLOT="0"
 KEYWORDS="x86"
-IUSE="libnotify systray pax_kernel pulseaudio"
+IUSE="libnotify systray pax-kernel pulseaudio"
 RESTRICT="mirror strip"
 
 DEPEND=""
@@ -82,12 +82,12 @@ src_install() {
 			"spotify-client.png"
 	done
 	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
+	if use pax-kernel; then
 		#create the headers, reset them to default, then paxmark -m them
 		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "You have set USE=pax-kernel meaning that you intend to run"
 		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
 		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
 		eqawarn "you suspect that ${PN} is being broken by this modification,"

diff --git a/media-sound/spotify/spotify-1.1.26-r1.ebuild b/media-sound/spotify/spotify-1.1.26-r1.ebuild
index 8093edbaa7e..3aa9bba22f4 100644
--- a/media-sound/spotify/spotify-1.1.26-r1.ebuild
+++ b/media-sound/spotify/spotify-1.1.26-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
 LICENSE="Spotify"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libnotify systray pax_kernel pulseaudio"
+IUSE="libnotify systray pax-kernel pulseaudio"
 RESTRICT="mirror strip"
 
 BDEPEND=">=dev-util/patchelf-0.10"
@@ -84,12 +84,12 @@ src_install() {
 			"spotify-client.png"
 	done
 	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
+	if use pax-kernel; then
 		#create the headers, reset them to default, then paxmark -m them
 		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "You have set USE=pax-kernel meaning that you intend to run"
 		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
 		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
 		eqawarn "you suspect that ${PN} is being broken by this modification,"

diff --git a/media-sound/spotify/spotify-1.1.26-r2.ebuild b/media-sound/spotify/spotify-1.1.26-r2.ebuild
index e180d2d3aae..ece161410aa 100644
--- a/media-sound/spotify/spotify-1.1.26-r2.ebuild
+++ b/media-sound/spotify/spotify-1.1.26-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
 LICENSE="Spotify"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libnotify systray pax_kernel pulseaudio"
+IUSE="libnotify systray pax-kernel pulseaudio"
 RESTRICT="mirror strip"
 
 BDEPEND=">=dev-util/patchelf-0.10"
@@ -93,12 +93,12 @@ src_install() {
 			"spotify-client.png"
 	done
 	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
+	if use pax-kernel; then
 		#create the headers, reset them to default, then paxmark -m them
 		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "You have set USE=pax-kernel meaning that you intend to run"
 		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
 		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
 		eqawarn "you suspect that ${PN} is being broken by this modification,"

diff --git a/media-sound/spotify/spotify-1.1.55.ebuild b/media-sound/spotify/spotify-1.1.55.ebuild
index 5abc64369e8..34ff427eb99 100644
--- a/media-sound/spotify/spotify-1.1.55.ebuild
+++ b/media-sound/spotify/spotify-1.1.55.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
 LICENSE="Spotify"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libnotify local-playback pax_kernel pulseaudio systray"
+IUSE="libnotify local-playback pax-kernel pulseaudio systray"
 RESTRICT="mirror strip"
 
 BDEPEND=">=dev-util/patchelf-0.10"
@@ -94,12 +94,12 @@ src_install() {
 			"spotify-client.png"
 	done
 	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
+	if use pax-kernel; then
 		#create the headers, reset them to default, then paxmark -m them
 		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "You have set USE=pax-kernel meaning that you intend to run"
 		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
 		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
 		eqawarn "you suspect that ${PN} is being broken by this modification,"

diff --git a/media-sound/spotify/spotify-1.1.56.ebuild b/media-sound/spotify/spotify-1.1.56.ebuild
index 411d3767eab..2ec7cf64b05 100644
--- a/media-sound/spotify/spotify-1.1.56.ebuild
+++ b/media-sound/spotify/spotify-1.1.56.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
 LICENSE="Spotify"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libnotify local-playback pax_kernel pulseaudio systray"
+IUSE="libnotify local-playback pax-kernel pulseaudio systray"
 RESTRICT="mirror strip"
 
 BDEPEND=">=dev-util/patchelf-0.10"
@@ -95,12 +95,12 @@ src_install() {
 			"spotify-client.png"
 	done
 	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
+	if use pax-kernel; then
 		#create the headers, reset them to default, then paxmark -m them
 		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "You have set USE=pax-kernel meaning that you intend to run"
 		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
 		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
 		eqawarn "you suspect that ${PN} is being broken by this modification,"

diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml
index 15befbfa251..33f1fbc671e 100644
--- a/net-libs/nodejs/metadata.xml
+++ b/net-libs/nodejs/metadata.xml
@@ -14,7 +14,7 @@
 		<flag name="inspector">Enable V8 inspector</flag>
 		<flag name="lto">Build with link-time optimisation</flag>
 		<flag name="npm">Enable NPM package manager</flag>
-		<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
+		<flag name="pax-kernel">Enable building under a PaX enabled kernel</flag>
 		<flag name="snapshot">Enable snapshot creation for faster startup</flag>
 		<flag name="system-icu">Use system <pkg>dev-libs/icu</pkg> instead of the bundled version</flag>
 		<flag name="system-ssl">Use system OpenSSL instead of the bundled one</flag>

diff --git a/net-libs/nodejs/nodejs-14.16.1.ebuild b/net-libs/nodejs/nodejs-14.16.1.ebuild
index a8e2612d7c8..45b882f86ba 100644
--- a/net-libs/nodejs/nodejs-14.16.1.ebuild
+++ b/net-libs/nodejs/nodejs-14.16.1.ebuild
@@ -16,7 +16,7 @@ LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0/$(ver_cut 1)"
 KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos"
 
-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"
 REQUIRED_USE="inspector? ( icu ssl )
 	npm? ( ssl )
 	system-icu? ( icu )
@@ -37,7 +37,7 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )"
+	pax-kernel? ( sys-apps/elfix )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -89,7 +89,7 @@ src_prepare() {
 	fi
 
 	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
 
 	default
 }

diff --git a/net-libs/nodejs/nodejs-14.17.0.ebuild b/net-libs/nodejs/nodejs-14.17.0.ebuild
index 6f3e887f73d..c27716a6b0b 100644
--- a/net-libs/nodejs/nodejs-14.17.0.ebuild
+++ b/net-libs/nodejs/nodejs-14.17.0.ebuild
@@ -23,7 +23,7 @@ else
 	S="${WORKDIR}/node-v${PV}"
 fi
 
-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"
 REQUIRED_USE="inspector? ( icu ssl )
 	npm? ( ssl )
 	system-icu? ( icu )
@@ -43,7 +43,7 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )"
+	pax-kernel? ( sys-apps/elfix )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -102,7 +102,7 @@ src_prepare() {
 	fi
 
 	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
 
 	# All this test does is check if the npm CLI produces warnings of any sort,
 	# failing if it does. Overkill, much? Especially given one possible warning

diff --git a/net-libs/nodejs/nodejs-14.17.1.ebuild b/net-libs/nodejs/nodejs-14.17.1.ebuild
index bccefc5543b..a6c178ef153 100644
--- a/net-libs/nodejs/nodejs-14.17.1.ebuild
+++ b/net-libs/nodejs/nodejs-14.17.1.ebuild
@@ -23,7 +23,7 @@ else
 	S="${WORKDIR}/node-v${PV}"
 fi
 
-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"
 REQUIRED_USE="inspector? ( icu ssl )
 	npm? ( ssl )
 	system-icu? ( icu )
@@ -43,7 +43,7 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )"
+	pax-kernel? ( sys-apps/elfix )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -101,7 +101,7 @@ src_prepare() {
 	fi
 
 	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
 
 	# All this test does is check if the npm CLI produces warnings of any sort,
 	# failing if it does. Overkill, much? Especially given one possible warning

diff --git a/net-libs/nodejs/nodejs-16.4.0.ebuild b/net-libs/nodejs/nodejs-16.4.0.ebuild
index f4221d00ab4..15a3869fc67 100644
--- a/net-libs/nodejs/nodejs-16.4.0.ebuild
+++ b/net-libs/nodejs/nodejs-16.4.0.ebuild
@@ -23,7 +23,7 @@ else
 	S="${WORKDIR}/node-v${PV}"
 fi
 
-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"
 REQUIRED_USE="inspector? ( icu ssl )
 	npm? ( ssl )
 	system-icu? ( icu )
@@ -43,7 +43,7 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )"
+	pax-kernel? ( sys-apps/elfix )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -97,7 +97,7 @@ src_prepare() {
 	fi
 
 	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
 
 	# All this test does is check if the npm CLI produces warnings of any sort,
 	# failing if it does. Overkill, much? Especially given one possible warning

diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 5177302ec77..1141e04146e 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -23,7 +23,7 @@ else
 	S="${WORKDIR}/node-v${PV}"
 fi
 
-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"
 REQUIRED_USE="inspector? ( icu ssl )
 	npm? ( ssl )
 	system-icu? ( icu )
@@ -43,7 +43,7 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )"
+	pax-kernel? ( sys-apps/elfix )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -95,7 +95,7 @@ src_prepare() {
 	fi
 
 	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
 
 	# All this test does is check if the npm CLI produces warnings of any sort,
 	# failing if it does. Overkill, much? Especially given one possible warning