From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1298092-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id F198613933E
	for <garchives@archives.gentoo.org>; Thu,  1 Jul 2021 09:21:59 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 35857E0837;
	Thu,  1 Jul 2021 09:21:59 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 1A802E0837
	for <gentoo-commits@lists.gentoo.org>; Thu,  1 Jul 2021 09:21:59 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id A2622335C52
	for <gentoo-commits@lists.gentoo.org>; Thu,  1 Jul 2021 09:21:57 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 158767A2
	for <gentoo-commits@lists.gentoo.org>; Thu,  1 Jul 2021 09:21:56 +0000 (UTC)
From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" <marecki@gentoo.org>
Message-ID: <1625131255.971f30e1fe52029690d95e4be85ba714113048ac.marecki@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libffi/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/libffi/libffi-3.3-r2.ebuild dev-libs/libffi/metadata.xml
X-VCS-Directories: dev-libs/libffi/
X-VCS-Committer: marecki
X-VCS-Committer-Name: Marek Szuba
X-VCS-Revision: 971f30e1fe52029690d95e4be85ba714113048ac
X-VCS-Branch: master
Date: Thu,  1 Jul 2021 09:21:56 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f13e95a8-9d95-4ace-a9d3-5fac5fb00852
X-Archives-Hash: 5db746d1eedc3d843e5cb8d3bf47e182

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>