gentoo resync : 25.11.2020

3 files changed, 37 insertions, 16 deletions

diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 6bbebda7e646..71d48bf77c45 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -1,4 +1,5 @@
 AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 BLAKE2B 651067a56e0bd0980a696ad12c8fa76d68d914fa370fb93c3f5f5759dd4837895a077510606fa451beafb75e7da19f42a9f88e3d56d6c283f684da695ad69960 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65
+AUX libffi-3.3-compiler-vendor-quote.patch 896 BLAKE2B 6c2895f821f11f3e41bf078c8ae5d4b97c50ec0db007380f6d33159adc7e2101a6db21b6513db2cd596834c5d71dd36be63c5d108ed79de6b91b4d281b019d71 SHA512 e7ab9255af8528e6b9b7ce3fd4a016d6b67b24e27aa00131d2240aadc4dc599ea33492944641608146e123a6cd363df411f614436cb999eadc2e840e7de93f77
 AUX libffi-3.3-power7-memcpy-2.patch 1086 BLAKE2B 954504aca37f2dd16913c3fb3d61e8fb5e8db017d897405905366f4701bf2357871dd41e86e59050733f04321e0155b03683577f132504aec5c476cc78323be6 SHA512 5a0d8590c2e53e20e4384dad704060a2c781b91487a0e14d2f1521f69b722ccc60e25b84c38f9ded65b01bef49250e07c6935be577d100aea18496abfbe374f5
 AUX libffi-3.3-power7-memcpy.patch 1681 BLAKE2B 6e3df741b07718f13c347ae54fe82bbf0f433790d14dff4114ffa77f2c3700460801af3fc5a649589ab2d1d0122db0729cd1aaa5321ea3f7822b1cd4d7f64b05 SHA512 13eb09d8080cadedb959c8d62d37f80bf3c32fbe488fdb59955ff6c8649f1086baaedb015e47ee52de65836f57bc172dbce2d2b3bc1aee6aca07eb9da451cf70
 AUX libffi-3.3-power7.patch 1172 BLAKE2B 42408c0774553fde9c086ea3c2b0d0152d15a9dce63860e8884c683ce92553c3db38d6fdddcdee644f7819f56a28a12e639ee05a0956cf0fa3fed521157754f7 SHA512 17062f152ce2aa8d46e4e01c3c0b8e52c67d30c3405b9b2f40656dfe731c774fd67ff3ad397f426d9e56ca4fe4ec4908f5c8f6082d52975cf19171ca4e39c534
@@ -6,5 +7,5 @@ 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
-EBUILD libffi-3.3-r2.ebuild 2700 BLAKE2B 2f5669b7f15368ad63f7cd397c75281bd91897b993c1e5702d6e69043073eb28d3c7900a80d8e8453d4849e0eb92b05209b580d2f9268c69725d0526d4e18e41 SHA512 afaa4d12655e7d42f36fd7780e4928d32b7143a8c449cfe64f56d291a8745cbeab664b2b394ed0c24004340b7da81e9b2f89ea0e0992ea247e3b529a5aa64116
+EBUILD libffi-3.3-r2.ebuild 2132 BLAKE2B f43309407a223ae675f111dce582d96b1a9400bdaa9ed92fcd9c2a7218e9e669e06fd81deb171d2c3848ae22fc4315d864ddd2bea4863c1b10bdcc614ddd7b83 SHA512 3c377d5ad57c7d4063a6d84eb055fe5be502ec1d3acf1b3ec330f60c879ce1f20342f454e917b93cf5f1451fd6713ee189012fb9b225e60b81177063c21804ec
 MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
diff --git a/dev-libs/libffi/files/libffi-3.3-compiler-vendor-quote.patch b/dev-libs/libffi/files/libffi-3.3-compiler-vendor-quote.patch
new file mode 100644
index 000000000000..db5b69ce2db9
--- /dev/null
+++ b/dev-libs/libffi/files/libffi-3.3-compiler-vendor-quote.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/753299
+--- a/testsuite/lib/libffi.exp
++++ b/testsuite/lib/libffi.exp
+@@ -287,9 +287,6 @@ proc libffi-init { args } {
+     verbose "libffi $blddirffi"
+ 
+     # Which compiler are we building with?
+-    set tmp [grep "$blddirffi/config.log" "^ax_cv_c_compiler_vendor.*$"]
+-    regexp -- {^[^=]*=(.*)$} $tmp nil compiler_vendor
+-
+     if { [string match $compiler_vendor "gnu"] } {
+         set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a]
+         if {$gccdir != ""} {
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,6 +59,7 @@ fi
+ cat > local.exp <<EOF
+ set CC_FOR_TARGET "$CC"
+ set CXX_FOR_TARGET "$CXX"
++set compiler_vendor "$ax_cv_c_compiler_vendor"
+ EOF
+ 
+ AM_MAINTAINER_MODE
+--- a/configure
++++ b/configure
+@@ -17402,6 +17402,7 @@ fi
+ cat > local.exp <<EOF
+ set CC_FOR_TARGET "$CC"
+ set CXX_FOR_TARGET "$CXX"
++set compiler_vendor "$ax_cv_c_compiler_vendor"
+ EOF
+ 
+ 
diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild
index 19e01b0832dd..55138eb082d5 100644
--- a/dev-libs/libffi/libffi-3.3-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.3-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit multilib multilib-minimal toolchain-funcs
+inherit multilib multilib-minimal
 
 MY_PV=${PV/_rc/-rc}
 MY_P=${PN}-${MY_PV}
@@ -32,26 +32,13 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.3-power7-memcpy-2.patch
 	"${FILESDIR}"/${PN}-3.3-ppc-int128.patch
 	"${FILESDIR}"/${PN}-3.3-ppc-vector-offset.patch
+	"${FILESDIR}"/${PN}-3.3-compiler-vendor-quote.patch
 )
 
 S=${WORKDIR}/${MY_P}
 
 ECONF_SOURCE=${S}
 
-pkg_setup() {
-	# Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example
-	if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then
-		local base="${T}"/conftest
-		echo 'int main() { }' > "${base}".c
-		$(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null
-		if [ $? -eq 0 ]; then
-			eerror "The linker reported linking against -lffi to be working while it shouldn't have."
-			eerror "This is wrong and you should find and delete the old copy of libffi before continuing."
-			die "The system is in inconsistent state with unknown libffi installed."
-		fi
-	fi
-}
-
 multilib_src_configure() {
 	use userland_BSD && export HOST="${CHOST}"
 	# --includedir= path maintains a few properties: