gentoo resync : 24.12.2018

3 files changed, 82 insertions, 1 deletions

diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 81e94890b475..ac16cc66396d 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -6,10 +6,11 @@ AUX libffi-3.2.1-include-path-autogen.patch 2901 BLAKE2B 836e61b6f64b9d649e96979
 AUX libffi-3.2.1-include-path.patch 1156 BLAKE2B b5842f5dc6462edac0a5f58265246599d0283bb148f954fb79d8037e37ae332a664f57a201589b89022d63932d8a4e56c4b0c6a7a9a2240ae6602e847fff3a55 SHA512 f387590510ee5e3aedc03744fcf1faae35c105a81d4c2f646e495d489bc6467cd88d4a0a63b40a29fe620ad71db1a05c1fe483af63974222f366135f73f36cb3
 AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 BLAKE2B 651067a56e0bd0980a696ad12c8fa76d68d914fa370fb93c3f5f5759dd4837895a077510606fa451beafb75e7da19f42a9f88e3d56d6c283f684da695ad69960 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65
 AUX libffi-3.3_rc0-hppa-no-TEXTREL.patch 2821 BLAKE2B fcc7eb0ed4a3f9b31718bf7761de8194a5fff6dc0c32be843e15e3da089ccd3819b656843844475199eb5ecc53312f4ad5c1b26d896df464d077ce15ee32eb13 SHA512 202b0685ecbf058a0414e1f2e673e4c793f5381b5714e5e8f025307068eb48f5c7eb85081859194b4500cbc5b6981f07fb4b6efc866071ea0e64f9231852444c
+AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb632b0763af9e14200ef7206db763b01e289a68ce544709c8abc5a86adca5f1c0c895c6bf24f667429b118bf660ffa95bb39 SHA512 4684b87f1d36a0098ebde7996e4417718b3535eb66ec7c619be74fa30e4446849c246b491cad3aea1ac44bdf9e9fbf6e952000cb85299faf5b1d8598136b184b
 DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
 DIST libffi-3.3-rc0.tar.gz 1084854 BLAKE2B 2c38d60f17ef52bcf270178c13c218f6ee320c9785091621d4689bcf6cee31d07eaaca12790965e1ae3ad71ad2c408342743968bf1d23f81a07fbdf6cfd55b90 SHA512 e6e695d32cd6eb7d65983f32986fccdfc786a593d2ea18af30ce741f58cfa1eb264b1a8d09df5084cb916001aea15187b005c2149a0620a44397a4453b6137d4
 EBUILD libffi-3.2.1-r1.ebuild 2269 BLAKE2B e2075034b9e9bec42427dcacbfc03aa114d9c2e5fd3cbda307bd24ae63573a8ab27459ed0b73177bd969232be7640b737a35bae7f5be69876b92de4351dfcbff SHA512 1f27cd306112d3de8762f0cfab1f6196819a6793585c477027b3e0a48fdf0259f764d87b8cb221c5b32aabd5ae47d8535f040d0960256064d14a4d78a67bcfb9
 EBUILD libffi-3.2.1-r2.ebuild 2328 BLAKE2B 26926447321e54807371c9e2154b062def22f04e298ee1ccbc5f92fed4bedab44d19622f034460c0727838fa1c6146c42cbd7fe83bc385df03c827535c42b949 SHA512 04a18c564ca898ffc3434ab7d62f2c2380300937726dae6c50f5e0d479009b059d020d48589b52970aa34723f6530bbeddd0f8f5f6fe3a865d90a48dd494e189
 EBUILD libffi-3.2.1.ebuild 1968 BLAKE2B 611f038994a687222d26a6709163e1848d15114dccd3e87c9b0a28cdc5851c6cb769eba5517d18f196cf0d27a1703ed01b40ae73e04d4e15b9cc26c07ecc9acb SHA512 f9f3b0a71a8a57adb563eb6c1ed64602976f18ff8e653f777d8dd14928bfc27417ee1aa81eab2529be1dd6b7fb70af274fe2d7cc1c0c09d29e48f37661ddeec7
-EBUILD libffi-3.3_rc0.ebuild 2022 BLAKE2B bfa0038c2730f125a3754a8c5e52895d2163ff7748235082112e8dc5316b7e7ed43b3bc8eb0726513dda7058aa0f5fb1a9b4be0c18f205eba2c48f8144ae4061 SHA512 134ee21346f8b308cdeb05c3f72ad541f846eadfa786c188dfb050916c2703ea8c282b9b59ba008ffb18a125df9f195b127a252b9839c964cb8411f4846f4252
+EBUILD libffi-3.3_rc0.ebuild 2070 BLAKE2B 7d53ad6fa9507d557f3daeca835517b2eca33d422f4f7f2500edeec9522e581c7b4b6c8224c478ed23f80de83274dbfa0889a4805368d533a50aef67117296bc SHA512 39c967836885558ac90b7779e69b180c08ea007f06bd628881f44f7a5d574ef19886734a1b17e71f0bb161a55c633eb59336e15aca82fc8bef463fe9e53cd1e6
 MISC metadata.xml 1866 BLAKE2B 4623e414d8d8c2d569b2ae8a6fd6117c38b11e5b3845bba17b32ce442b88afd0ea1aff66cd73181c59b7e66be65df078d68d13f793ab654c3e213ab4c20fce50 SHA512 e1de94bb58c77aa48ee1b7d81777d26b736db3f3ef652099bb3f3a9bd75689258a61168371a30976e0717519bc9300b3812a8405ad1f16683c45a24817960b90
diff --git a/dev-libs/libffi/files/libffi-3.3_rc0-ppc-macos-go.patch b/dev-libs/libffi/files/libffi-3.3_rc0-ppc-macos-go.patch
new file mode 100644
index 000000000000..88f9b4557657
--- /dev/null
+++ b/dev-libs/libffi/files/libffi-3.3_rc0-ppc-macos-go.patch
@@ -0,0 +1,79 @@
+ffi_darwin: use FFI_GO_CLOSURES guard to avoid unsolvable dependencies
+
+The go calls depend on compilation and link-time signatures and symbols
+which are missing because they aren't build due to FFO_GO_CLOSURES not
+being set.
+
+Signed-off-by: Fabian Groffen <grobian@gentoo.org>
+
+--- a/src/powerpc/ffi_darwin.c	2018-04-02 14:21:51.000000000 +0200
++++ b/src/powerpc/ffi_darwin.c	2018-12-10 13:57:26.000000000 +0100
+@@ -909,8 +909,10 @@
+ extern void ffi_call_AIX(extended_cif *, long, unsigned, unsigned *,
+ 			 void (*fn)(void), void (*fn2)(void));
+ 
++#if FFI_GO_CLOSURES
+ extern void ffi_call_go_AIX(extended_cif *, long, unsigned, unsigned *,
+ 			    void (*fn)(void), void (*fn2)(void), void *closure);
++#endif
+ 
+ extern void ffi_call_DARWIN(extended_cif *, long, unsigned, unsigned *,
+ 			    void (*fn)(void), void (*fn2)(void), ffi_type*);
+@@ -950,6 +952,7 @@
+     }
+ }
+ 
++#if FFI_GO_CLOSURES
+ void
+ ffi_call_go (ffi_cif *cif, void (*fn) (void), void *rvalue, void **avalue,
+ 	     void *closure)
+@@ -981,6 +984,7 @@
+       break;
+     }
+ }
++#endif
+ 
+ static void flush_icache(char *);
+ static void flush_range(char *, int);
+@@ -1110,6 +1114,7 @@
+   return FFI_OK;
+ }
+ 
++#if FFI_GO_CLOSURES
+ ffi_status
+ ffi_prep_go_closure (ffi_go_closure* closure,
+ 		     ffi_cif* cif,
+@@ -1133,6 +1138,7 @@
+     }
+   return FFI_OK;
+ }
++#endif
+ 
+ static void
+ flush_icache(char *addr)
+@@ -1168,9 +1174,11 @@
+ ffi_closure_helper_DARWIN (ffi_closure *, void *,
+ 			   unsigned long *, ffi_dblfl *);
+ 
++#if FFI_GO_CLOSURES
+ ffi_type *
+ ffi_go_closure_helper_DARWIN (ffi_go_closure*, void *,
+ 			      unsigned long *, ffi_dblfl *);
++#endif
+ 
+ /* Basically the trampoline invokes ffi_closure_ASM, and on
+    entry, r11 holds the address of the closure.
+@@ -1430,6 +1438,7 @@
+ 				    closure->user_data, rvalue, pgr, pfr);
+ }
+ 
++#if FFI_GO_CLOSURES
+ ffi_type *
+ ffi_go_closure_helper_DARWIN (ffi_go_closure *closure, void *rvalue,
+ 			      unsigned long *pgr, ffi_dblfl *pfr)
+@@ -1437,4 +1446,5 @@
+   return ffi_closure_helper_common (closure->cif, closure->fun,
+ 				    closure, rvalue, pgr, pfr);
+ }
++#endif
+ 
diff --git a/dev-libs/libffi/libffi-3.3_rc0.ebuild b/dev-libs/libffi/libffi-3.3_rc0.ebuild
index 0a31487e51f1..5f56796bb879 100644
--- a/dev-libs/libffi/libffi-3.3_rc0.ebuild
+++ b/dev-libs/libffi/libffi-3.3_rc0.ebuild
@@ -25,6 +25,7 @@ DOCS="ChangeLog* README.md"
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044
 	"${FILESDIR}"/${PN}-3.3_rc0-hppa-no-TEXTREL.patch
+	"${FILESDIR}"/${PN}-3.3_rc0-ppc-macos-go.patch
 )
 
 S=${WORKDIR}/${MY_P}