gentoo resync : 01.08.2021

4 files changed, 5 insertions, 12 deletions

diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 33f87299deb2..cc6bec1ee0a5 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -8,6 +8,6 @@ AUX libffi-3.3-ppc-vector-offset.patch 1425 BLAKE2B 334ed26ea082c603cfbf43d37e9c
 AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb632b0763af9e14200ef7206db763b01e289a68ce544709c8abc5a86adca5f1c0c895c6bf24f667429b118bf660ffa95bb39 SHA512 4684b87f1d36a0098ebde7996e4417718b3535eb66ec7c619be74fa30e4446849c246b491cad3aea1ac44bdf9e9fbf6e952000cb85299faf5b1d8598136b184b
 DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f
 DIST libffi-3.4.2.tar.gz 1351355 BLAKE2B a8137bc895b819f949fd7705e405be627219c6d1fdef280253330f7407d4a548bb057d7bb0e9225d1767d42f9bf5f0ab3c455db1c3470d7cc876bb7b7d55d308 SHA512 31bad35251bf5c0adb998c88ff065085ca6105cf22071b9bd4b5d5d69db4fadf16cadeec9baca944c4bb97b619b035bb8279de8794b922531fddeb0779eb7fb1
-EBUILD libffi-3.3-r2.ebuild 2531 BLAKE2B 3641ea628b4739fc65860b02df30e911c03967fbdc9c29c0d3fae1af5e8ff80d2f47cbf4b316b7276695e3acfaaa7a61008e7970d17e714290437adac88dca0c SHA512 4bd62e770641663af4ffeb65a419015e83eb03ca7b5932102204de39cbf26ba15d3f7a64ca9de5270e9adf2ec2d97b172b215671f069739bd8c51249e631e2c2
-EBUILD libffi-3.4.2.ebuild 2228 BLAKE2B 31b9f428e2b026e56f0ccb8325a627fe04bf61635d1f6f4e1b7a5fbaa4d837783c5a086173c5d3359de1883db2bd34a695eec82e6a3fee61f931520f721b0339 SHA512 7040febd29aab4b8985a603de05a3908bb8abbec84e5126d7f1502f78c326dc422d04b32f65f0087a7ef63cf36de808a2b80b552995c7733d481e3137389bb26
-MISC metadata.xml 2136 BLAKE2B 355a8dd1a5ed19eeb00ebd0f3f1229253de575ebbbc6ce57d80b8b6d7b21e1baf53730a7914eb88c6fdeebb64cb1f4bf152b6843076aba85379a95c128b70155 SHA512 8ae782827907c40c8e975d5bf98fa3fc26ab53576edd3a1e9340570dc0bf1c7c715eebb1d4cfc3f82340f5cbab41490fcb58e69d92bd67bdd55d24958a97926e
+EBUILD libffi-3.3-r2.ebuild 2301 BLAKE2B 51983b388ddc5930ab59b82d1d4e7a5ce5c15cdffc09c3237d81453aa7f9fc59cfea9e23cf6e5b365719c3ce58d17eabb892331e918e7370fd9fe0d1bda8ebfd SHA512 8cd544d41c6d124c82c3c3188d6bef3b9230ab97150580f99944ab82067189ad71b32b7abca866fb048bc74d759a4c903da05141ac3af3f14165d5ea27382b90
+EBUILD libffi-3.4.2.ebuild 1998 BLAKE2B f80ecc2cd7f4440147fa9fc59a92d0f32d1a0b288bf5b24d89e7d14ca0c30afc5d66c65b0229f57c3f724a5e6e65614d6d135f989ebd5e3f0073a3077c0d70cd SHA512 86b409fdf330274210f5884e79d0aac309c59439ecd4ec80d3ed0512c9d0522418fd90d817b5658a953bbf8bd2228f8aed57af7741863193cb873a29433523e0
+MISC metadata.xml 2056 BLAKE2B bf10ba9f71fc556022c9c7fbbaa058602bcc51280b2d5faede5b65f0bd76931098458a84d95bb22e3c57a76b8c40ef6dd14841ca8c80804884b7dfee3e0d21e2 SHA512 e1ea336d07f6a934d35874797c8a2a951b0b120cf3d3e96396cd08348cfddd718e759d6614c4e85f09d6693d04024e0ca37d912be62758fd61ce0d401a0b6b12
diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild
index 40e5b2deafa4..95c001856050 100644
--- a/dev-libs/libffi/libffi-3.3-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.3-r2.ebuild
@@ -14,12 +14,9 @@ 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 pax_kernel static-libs test"
+IUSE="debug 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/libffi-3.4.2.ebuild b/dev-libs/libffi/libffi-3.4.2.ebuild
index ea7ec8362d07..71baf938aacb 100644
--- a/dev-libs/libffi/libffi-3.4.2.ebuild
+++ b/dev-libs/libffi/libffi-3.4.2.ebuild
@@ -14,12 +14,9 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta
 LICENSE="MIT"
 SLOT="0/8" # SONAME=libffi.so.8
 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 exec-static-trampoline pax-kernel pax_kernel static-libs test"
+IUSE="debug exec-static-trampoline 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 1846097c8bc2..a61504558736 100644
--- a/dev-libs/libffi/metadata.xml
+++ b/dev-libs/libffi/metadata.xml
@@ -36,7 +36,6 @@
 	<use>
 		<flag name="exec-static-trampoline">Don't rely on dynamic code generation for trampolines.</flag>
 		<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>