gentoo resync : 12.05.2022

3 files changed, 12 insertions, 5 deletions

diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index c6fff73b3613..7cfc0c24b398 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -7,7 +7,8 @@ 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-loongarch64-20220428.patch.xz 64932 BLAKE2B d144dc28a7fce008bc5cd43d9e04125ea8e972324d77951d42039d46e818014079c871f87a0cdbec758b55320c02dff718cf2449f9c630cc899e8e1610784a60 SHA512 33715b21fe027692cc584d6524c03510af7876cc35f318221e1b2b91644cf165c02979c8b426228a8cc6c471e6a59d0435e761b6b7aef589c41a4f28caa36e62
 DIST libffi-3.4.2.tar.gz 1351355 BLAKE2B a8137bc895b819f949fd7705e405be627219c6d1fdef280253330f7407d4a548bb057d7bb0e9225d1767d42f9bf5f0ab3c455db1c3470d7cc876bb7b7d55d308 SHA512 31bad35251bf5c0adb998c88ff065085ca6105cf22071b9bd4b5d5d69db4fadf16cadeec9baca944c4bb97b619b035bb8279de8794b922531fddeb0779eb7fb1
 EBUILD libffi-3.3-r2.ebuild 2257 BLAKE2B 5a212c60da8441e8fa7ae839bde431f4f74025cfb975836f3369138931ece80d140c109d79d5fba45bd5d684ae96abd273004e211c4782cfcd56d83714b76e93 SHA512 8d4be46533328714d161a6d52ef0316c2286f50d6cce723fa8c1ae9b2bb29336fbb666992c9662da4eaf0dd9d983be79f3177b3d398edceb1223a358340320be
-EBUILD libffi-3.4.2-r1.ebuild 2306 BLAKE2B 951dc793eb8320352b4bd9122d3ae07e76ab7e33701b21cfa33526fac6e880bc4cc50aca4c0bd0d76a96cf6afdd91178e445a63b1dc023c4cc243c40384a6b40 SHA512 0d449586b47141ebb0f30bf87d455cfaa53a73b66155d9b799b87ca4a003e60dda8f4bd63c996a6acaf27aeb699a3c3024cd23ac14747ed0c8f21762bef38a8c
-MISC metadata.xml 2057 BLAKE2B 478cfc0ba71ab10a5a98bcde7f976911587a4ab2a031feffd12ea6225ea4426efa4b7aed9a7b89a710e3ae2dffb252067a3649dc17cd132a45b8295d8da067f6 SHA512 0b8a1172ddfcf11595ee4b86f0b41c079de1bb50592816239c76333ee5b22f500155c323f7a006259503d3bcdd389791ff85072e363fb4f96666ae8cb1d5d6df
+EBUILD libffi-3.4.2-r1.ebuild 2536 BLAKE2B 2de1e9338aa5bc3ede5406a4572ce4f691f6bb893dbfc12825afcbcae422da9cd5063e3a2f4c5d0c8a01849767056ac05e7b05e6fece7bbb64b72927a9504b62 SHA512 41ceb3dbaf0d54831016042bf5e0eafd1e28086e79a0b7442b153e3987c2f163a77f38a6e602c1188849eead1b2dd69ca228d50d7e2a1150788bb75f0c16d83b
+MISC metadata.xml 2134 BLAKE2B 55a67beb917d8f4b342712b0de198d11b6a579ed7b3fa29a523869162d9103c0a9c4034db69835f1583963ffabf33573632266ae4c4206c957f5fe8897dae3da SHA512 e8d0867e4aa99a0227c5e62f2ee28e4235ea100789328168b061fd318af5b705cff097bbd9e98540457dc8f3da09e12b0c94f5fda6fd2240e592bd20595eaa45
diff --git a/dev-libs/libffi/libffi-3.4.2-r1.ebuild b/dev-libs/libffi/libffi-3.4.2-r1.ebuild
index 492d9b34c625..9c4a5672ce13 100644
--- a/dev-libs/libffi/libffi-3.4.2-r1.ebuild
+++ b/dev-libs/libffi/libffi-3.4.2-r1.ebuild
@@ -10,7 +10,8 @@ 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"
+SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz
+	experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/${MY_P}-loongarch64-20220428.patch.xz )"
 S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT"
@@ -19,8 +20,8 @@ LICENSE="MIT"
 # with FEATURES="-preserved-libs" or another package manager if SONAME
 # changes.
 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 static-libs test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 experimental-loong pax-kernel static-libs test"
 
 RESTRICT="!test? ( test )"
 BDEPEND="test? ( dev-util/dejagnu )"
@@ -30,6 +31,10 @@ DOCS="ChangeLog* README.md"
 ECONF_SOURCE=${S}
 
 src_prepare() {
+	if use experimental-loong; then
+		PATCHES+=( "${WORKDIR}/${MY_P}-loongarch64-20220428.patch" )
+	fi
+
 	default
 	if [[ ${CHOST} == arm64-*-darwin* ]] ; then
 		# ensure we use aarch64 asm, not x86 on arm64
diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml
index 53754327cd3f..9a236f87a6a5 100644
--- a/dev-libs/libffi/metadata.xml
+++ b/dev-libs/libffi/metadata.xml
@@ -35,6 +35,7 @@
 	</longdescription>
 	<use>
 		<flag name="exec-static-trampoline">Don't rely on dynamic code generation for trampolines.</flag>
+		<flag name="experimental-loong">Add experimental LoongArch patchset</flag>
 		<flag name="pax-kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag>
 	</use>
 	<upstream>