diff --git a/app-emulation/virtualbox-modules/metadata.xml b/app-emulation/virtualbox-modules/metadata.xml index a4c013c400673..78e437e7a2210 100644 --- a/app-emulation/virtualbox-modules/metadata.xml +++ b/app-emulation/virtualbox-modules/metadata.xml @@ -6,6 +6,6 @@ Lars Wendler - Apply patch needed for pax enabled kernels + Apply patch needed for pax enabled kernels 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 17dbf76a1d408..9e446e585c666 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 a884e1456d03c..ac30ee8cc0379 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 e179b43d5370b..0a6e70d582593 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 95eb9062a15f4..c04761ae2e7ee 100644 --- a/app-emulation/virtualbox/metadata.xml +++ b/app-emulation/virtualbox/metadata.xml @@ -9,7 +9,7 @@ Install dtrace Extension Pack Build without any graphic frontend Build VBoxVolInfo that needs devicemapper from sys-fs/lvm2. - Apply patch needed for pax enabled kernels. + Apply patch needed for pax enabled kernels. Enable building of SDK Controls installation of special USB udev rules. Build and install the VirtualBox webservice diff --git a/app-emulation/virtualbox/virtualbox-6.1.18.ebuild b/app-emulation/virtualbox/virtualbox-6.1.18.ebuild index c106cf14fe049..f504873a619ed 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 653e36a99976e..29d68e769cd28 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 f6ba09856a756..0749d1ebaa9fc 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 505db1a198f0c..8adf0db21c723 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 505db1a198f0c..8adf0db21c723 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 18643722fecb8..e45709af55fdc 100644 --- a/dev-java/icedtea/metadata.xml +++ b/dev-java/icedtea/metadata.xml @@ -27,7 +27,7 @@ Use the JamVM virtual machine rather than HotSpot. If possible, recompile the final IcedTea executables with itself. Link against Kerberos in order to obtain the cache location. - Apply patch needed for pax enabled kernels. + Apply patch needed for pax enabled kernels. Build using pre-compiled headers. Build the SCTP NIO channel implementation against lksctp Include the Shenandoah ultra-low pause time garbage collector (-XX:+UseShenandoahGC) (arm64 and x86_64 only) diff --git a/dev-lang/mlton/metadata.xml b/dev-lang/mlton/metadata.xml index bcf28489a6147..52a980d81fca5 100644 --- a/dev-lang/mlton/metadata.xml +++ b/dev-lang/mlton/metadata.xml @@ -9,7 +9,7 @@ After bootstrap building mlton with dev-lang/smlnj, rebuild mlton with the second stage build of mlton (recommended). - Enable if the user plans to run the + Enable if the user plans to run the package under a pax enabled hardened kernel diff --git a/dev-lang/mlton/mlton-20180207.ebuild b/dev-lang/mlton/mlton-20180207.ebuild index f55bb40d5a143..8ef03ed2eee94 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 bbf56c2246473..debfaeb28dae5 100644 --- a/dev-lang/mono/metadata.xml +++ b/dev-lang/mono/metadata.xml @@ -3,7 +3,7 @@ - Enable if the user plans to run the package under a pax enabled hardened kernel + Enable if the user plans to run the package under a pax enabled hardened kernel Make mono generate code that is considerably faster on xen VMs but slightly slower on for normal systems. diff --git a/dev-lang/mono/mono-6.12.0.122.ebuild b/dev-lang/mono/mono-6.12.0.122.ebuild index 981a76e894422..b1486e7826574 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 7a8c21f525e79..0a02ad224a976 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 17733be6f118e..c583ea726d66f 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 e20ed1b73034c..818aa5957c758 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 e20ed1b73034c..818aa5957c758 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 e24be42012b14..01b06863a38e8 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 bbce0c2bb3a4c..67dda0865bbaf 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 0e99aadfd9c44..fc1984de3bc16 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 1cfc503ae0f07..38c80df2cb933 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 b1c4a316ec348..3e7b9da36c3b9 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 0a87aec91800e..f3ce31d2a6579 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 ba35fe24eebb7..687ad6e769ed9 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 444f9d6d14b59..6cb6bf8002c2b 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 e7ce88d55f5ee..26bf66298295e 100644 --- a/dev-lang/smlnj/metadata.xml +++ b/dev-lang/smlnj/metadata.xml @@ -3,7 +3,7 @@ - Enable if the user plans to run the + Enable if the user plans to run the package under a pax enabled hardened kernel diff --git a/dev-lang/smlnj/smlnj-110.82.ebuild b/dev-lang/smlnj/smlnj-110.82.ebuild index 3565c9baaa6d5..68c776772b8d9 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 135b4dbf980d5..179381df97238 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 6e9a28c5ac886..1c295db123620 100644 --- a/dev-libs/libffi-compat/metadata.xml +++ b/dev-libs/libffi-compat/metadata.xml @@ -34,7 +34,7 @@ between the two languages. - Use PaX emulated trampolines, for we can't use PROT_EXEC + Use PaX emulated trampolines, for we can't use PROT_EXEC cpe:/a:libffi_project:libffi diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild index 3433babf3aec7..95c001856050c 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 6e9a28c5ac886..1c295db123620 100644 --- a/dev-libs/libffi/metadata.xml +++ b/dev-libs/libffi/metadata.xml @@ -34,7 +34,7 @@ between the two languages. - Use PaX emulated trampolines, for we can't use PROT_EXEC + Use PaX emulated trampolines, for we can't use PROT_EXEC cpe:/a:libffi_project:libffi diff --git a/media-sound/spotify/metadata.xml b/media-sound/spotify/metadata.xml index 5f4cc456b9346..3542c29a74b6c 100644 --- a/media-sound/spotify/metadata.xml +++ b/media-sound/spotify/metadata.xml @@ -3,7 +3,7 @@ Allows playing local files with the Spotify client - Triggers a paxmarking of the main Spotify binary + Triggers a paxmarking of the main Spotify binary Controls the dependency on pulseaudio or apulse Pulls in dependencies needed for systray support on some desktop environments diff --git a/media-sound/spotify/spotify-1.0.72-r1.ebuild b/media-sound/spotify/spotify-1.0.72-r1.ebuild index a3d378506efc0..5bc8a509cbd9d 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 8093edbaa7e8c..3aa9bba22f4f0 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 e180d2d3aaefb..ece161410aa8d 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 5abc64369e878..34ff427eb99a2 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 411d3767eab33..2ec7cf64b054a 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 15befbfa251bf..33f1fbc671e1a 100644 --- a/net-libs/nodejs/metadata.xml +++ b/net-libs/nodejs/metadata.xml @@ -14,7 +14,7 @@ Enable V8 inspector Build with link-time optimisation Enable NPM package manager - Enable building under a PaX enabled kernel + Enable building under a PaX enabled kernel Enable snapshot creation for faster startup Use system dev-libs/icu instead of the bundled version Use system OpenSSL instead of the bundled one diff --git a/net-libs/nodejs/nodejs-14.16.1.ebuild b/net-libs/nodejs/nodejs-14.16.1.ebuild index a8e2612d7c836..45b882f86ba93 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 6f3e887f73d1a..c27716a6b0b5e 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 bccefc5543bc1..a6c178ef153ab 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 f4221d00ab454..15a3869fc6715 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 5177302ec77b5..1141e04146e19 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