commit:     971f30e1fe52029690d95e4be85ba714113048ac
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  1 09:17:40 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Jul  1 09:20:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=971f30e1

dev-libs/libffi: add compatibility guard for USE=pax-kernel

Exactly as previously implemented by slyfox in (ultimately yanked) 3.4_rc1.

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

 dev-libs/libffi/libffi-3.3-r2.ebuild | 5 ++++-
 dev-libs/libffi/metadata.xml         | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild 
b/dev-libs/libffi/libffi-3.3-r2.ebuild
index 95c00185605..40e5b2deafa 100644
--- a/dev-libs/libffi/libffi-3.3-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.3-r2.ebuild
@@ -14,9 +14,12 @@ 
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 pax_kernel static-libs test"
 
 RESTRICT="!test? ( test )"
+# If you are USE=pax_kernel user you really want USE=pax-kernel as well.
+# That's a flag rename: 
https://archives.gentoo.org/gentoo-dev/message/273f5ec9ebc8075f6ee8d8cdda9e759e
+REQUIRED_USE="pax_kernel? ( pax-kernel )"
 
 RDEPEND=""
 DEPEND=""

diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml
index 1c295db1236..85b52eeb3e0 100644
--- a/dev-libs/libffi/metadata.xml
+++ b/dev-libs/libffi/metadata.xml
@@ -35,6 +35,7 @@
        </longdescription>
        <use>
                <flag name="pax-kernel">Use PaX emulated trampolines, for we 
can't use PROT_EXEC</flag>
+               <flag name="pax_kernel">DEPRECATED alias for 'pax-kernel'. Do 
not use.</flag>
        </use>
        <upstream>
                <remote-id type="cpe">cpe:/a:libffi_project:libffi</remote-id>

Reply via email to