gentoo resync : 08.07.2021

3 files changed, 73 insertions, 1 deletions

diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 17b09f2a8cb8..70f6e377ae22 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -7,5 +7,7 @@ AUX libffi-3.3-ppc-int128.patch 2309 BLAKE2B 5b0c89e8f9f63329d2cb796d23b3a22c48b
 AUX libffi-3.3-ppc-vector-offset.patch 1425 BLAKE2B 334ed26ea082c603cfbf43d37e9cf64ac34a7054857743a9fbf5d05c7226402dfec4fd955cc3dc5652f57712bbaadcd0551ff727cfd8f8305edf38daa9814be2 SHA512 742ef73d95e39eefcbcfb423c4729966a31bf88ff00d20eab6c4db1db04e97f53784bf29111c57c577d1f6264735ee4ed797b4537a74d0ae1753de2990cd3ce9
 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
-MISC metadata.xml 2036 BLAKE2B c2d14d6ad6b019f2d54fa03f5ad058799a334c4b9e868dd84dbe5aaed0fd1c5850a9ebb771f5de58a2c90d278b20e0806ed817b2cb53d330c55a36afde4984b8 SHA512 548ecd3eb1b46dce5c10a74cd8e32118c3424c56732473c9a897516ff82cb5aedb37cb2e52ebb780b643662afb7fc3241b55e40e2b147dbdf178d52561a6b369
+EBUILD libffi-3.4.2.ebuild 2262 BLAKE2B 908f7cb75ad5d719710045934eceb357da7776021a13776f96e853df03fd9c1b16758bb47a76338038333288cc4c588a173ec96e32f3ae364c7123165c232408 SHA512 36e8d6d59179b4a4f0cf9acedea58582a99fcf9cb7d35f52a657e70a283179e2df2294dc3fce22aadbb988f2aa033fd81c29da39db4fb00237007f5e01a92665
+MISC metadata.xml 2136 BLAKE2B 355a8dd1a5ed19eeb00ebd0f3f1229253de575ebbbc6ce57d80b8b6d7b21e1baf53730a7914eb88c6fdeebb64cb1f4bf152b6843076aba85379a95c128b70155 SHA512 8ae782827907c40c8e975d5bf98fa3fc26ab53576edd3a1e9340570dc0bf1c7c715eebb1d4cfc3f82340f5cbab41490fcb58e69d92bd67bdd55d24958a97926e
diff --git a/dev-libs/libffi/libffi-3.4.2.ebuild b/dev-libs/libffi/libffi-3.4.2.ebuild
new file mode 100644
index 000000000000..55fcfb49624c
--- /dev/null
+++ b/dev-libs/libffi/libffi-3.4.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="a portable, high level programming interface to various calling conventions"
+HOMEPAGE="https://sourceware.org/libffi/"
+SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/8" # SONAME=libffi.so.8
+#unkeyworded for initial testing
+#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"
+
+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=""
+BDEPEND="test? ( dev-util/dejagnu )"
+
+DOCS="ChangeLog* README.md"
+
+S=${WORKDIR}/${MY_P}
+
+ECONF_SOURCE=${S}
+
+src_prepare() {
+	default
+	if [[ ${CHOST} == arm64-*-darwin* ]] ; then
+		# ensure we use aarch64 asm, not x86 on arm64
+		sed -i -e 's/aarch64\*-\*-\*/arm64*-*-*|&/' \
+			configure configure.host || die
+	fi
+}
+
+multilib_src_configure() {
+	use userland_BSD && export HOST="${CHOST}"
+	# --includedir= path maintains a few properties:
+	# 1. have stable name across libffi versions: some packages like
+	#    dev-lang/ghc or kde-frameworks/networkmanager-qt embed
+	#    ${includedir} at build-time. Don't require those to be
+	#    rebuilt unless SONAME changes. bug #695788
+	#
+	#    We use /usr/.../${PN} (instead of former /usr/.../${P}).
+	#
+	# 2. have ${ABI}-specific location as ffi.h is target-dependent.
+	#
+	#    We use /usr/$(get_libdir)/... to have ABI identifier.
+	econf \
+		--includedir="${EPREFIX}"/usr/$(get_libdir)/${PN}/include \
+		--disable-multi-os-directory \
+		$(use_enable static-libs static) \
+		$(use_enable exec-static-trampoline exec-static-tramp) \
+		$(use_enable pax-kernel pax_emutramp) \
+		$(use_enable debug)
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+	einstalldocs
+}
diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml
index 85b52eeb3e01..1846097c8bc2 100644
--- a/dev-libs/libffi/metadata.xml
+++ b/dev-libs/libffi/metadata.xml
@@ -34,6 +34,7 @@
 		between the two languages.
 	</longdescription>
 	<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>