gentoo auto-resync : 28:11:2022 - 01:18:20

4 files changed, 28 insertions, 1 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 30cbc26e03e8..46e48165ab52 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest
index 8e0c1a5f8466..cc86bd972820 100644
--- a/sci-physics/bullet/Manifest
+++ b/sci-physics/bullet/Manifest
@@ -1,4 +1,5 @@
 AUX bullet-2.85-soversion.patch 1094 BLAKE2B 8dc035b80d812b3c2382067796f1626a932ce887246b34a8b5e08fddf45d330078a970eb6c2147259285a45974b8aaa26a2494ad4aa4824d89bf58aa7af3ac37 SHA512 f437d553c51c6cc6646a4a3bf0ffe02e2691a3b2109ea560c986f69c602055c409028a5a3711597aca757d3e3b33cab14d60e03fc120f0975f35c6e16be6362d
+AUX bullet-3.21-replace_altivec_vector_keyword.patch 1093 BLAKE2B 64bdfd5fe7f6bede79c6c96c0bba59cc1da01d77e845258fc96b896cb441ae41739a4bdd841319f550b088e83fa2d1bf12ecc6eb344951a562ab3994c412133a SHA512 9460db7e8edf77a5f6ffb1bcf920f69285bd2da67bf1cf41109fdd450cbe6fd8e3ca650b8a5e7ca0b3990a708458130f44093e28a3441872e7edb16ae78ac1d5
 DIST bullet-3.07.tar.gz 148413637 BLAKE2B 776cd7651d11d865095ea000d353860bea09c6ff4ec8dd8e43282a78373e2830f6ce1ce2b87ed25a67be7bded297b3a6320b2872a71dfd3849e7b197c6d2c936 SHA512 31fc7cb4ed8b939abc9eeb0a8f6fff3a454ea4ebcffd797fd35a2320fe3ab222fcd315569809ea148d0efff47267f5eec9f4bf7aaf07730a06aa9babd2abc9a6
 DIST bullet-3.08.tar.gz 129282084 BLAKE2B daa5b6719575af28c6f6359ef51c7a9b8ca9cde2e5b4ea1b00c2991fc4d6b13175d034c7a694eaf36e8ff3ab343457027f57bb511639b3701341ad4551f1a6ca SHA512 4177c2b2f3b007691102973e7a3d4337b8de559d20058db75a2d25eab35b9be62fa14e3362435ef6f7ea2f6b8cf02a78770cc49c17e979adf3a2b41f19ee702a
 DIST bullet-3.17.tar.gz 131995187 BLAKE2B 38996c299eb900f867367966c90c7511d4f5c727671249665a073f86390a4514f7c8193577fd73502b49d467eaeb6e7b195426089065ce3bda3238ee76e237b3 SHA512 a5105bf5f1dd365a64a350755c7d2c97942f74897a18dcdb3651e6732fd55cc1030a096f5808cf50575281f05e3ac09aa50a48d271a47b94cd61f5167a72b7cc
@@ -7,6 +8,6 @@ DIST bullet-3.22b.tar.gz 139800935 BLAKE2B e7fb35d95b11164fd3184c110581bd73c0a48
 EBUILD bullet-3.07-r1.ebuild 1941 BLAKE2B 9c00b272c034d6fdcc17e4aa405c01f5f3b250730f5a1fd01032ef5b8e837383673e9febccdbad37fb8b6e262d3f851e8ab68c6f304c772d0363b6041c545c00 SHA512 6c4dbeed8a710fdb0b0e11bf70268a392fe0027a409c5070bdb3196b5d611fd217f205bb8590ea37ef9b7064744eb5c64b1df933e6957ae9e2340a9a19f800bb
 EBUILD bullet-3.08-r1.ebuild 1943 BLAKE2B 16c07ca3a3bfa16e2d1c99fceb4ea4f0386b7fe528752052fe178f9c3ac28e1867e104b93afcd824110900156758fc314c255c1166ec8543c43f61ef35fbc7b4 SHA512 82ea0f51a8d25ea2feaa208e96f88d86646beee7c50968feb616fdad58769714554cda5fceed3200e9c79e714ead4f73ced463c1d481797733a676e308dd2f5b
 EBUILD bullet-3.17-r1.ebuild 2050 BLAKE2B c1d92afbc4dcbbb8ab547f4e4f2d4ec897666ab7a717c71104658e845e041c5ab85a92f00245268a4a72049bee1667c3dc5ecc63cf72292fee4c24d4c6f36154 SHA512 339ac9eaa2fe976bcf7391a3f662dd8f2d5ed62cb7e8281cf58d66e8895a1105ba25f783e731e7572cd039ff661f5ec44d54b95bfba9e8755dae3f2227b4f29b
-EBUILD bullet-3.21.ebuild 2050 BLAKE2B 91036460e81531717543e48e05e8d08b5cf7857061b181eaff1e5d4237c8ea26b9e246158576b85f259b7a2485c3850880ebfd14063512f269171815b6923d6e SHA512 e1059e59ef9a47555bd99f0cc5d59e290745e746c094015329395e7519c4fae011ffce5b64b711966161c958c16cdff94ff1eccc51cfd3d9b9d07b1a3364de22
+EBUILD bullet-3.21.ebuild 2147 BLAKE2B dfa077d130f33cbb77983d82dd0ccb79eaaab1520facd4668e6f044ee954ca70cdd18861a266232c1dd220400d81d4d7af9be0106f379d9106f6817201c9d042 SHA512 3dca5ae0a009776c28e18ff58b280c9385dc9cbc821a34697db691aea8b01fe8f579408cb006f22c457e5f63aee24fbcd177f01b5e18c4cbe0b80ed87d73cca8
 EBUILD bullet-3.22b.ebuild 2052 BLAKE2B e595345cf8964a6c5868570f38468254ec16fdde8ec744567706cff97b90523f083fd69066ed5a3b58c9b5defcaf68e4aa54b4f800db124d3d2800f610780c29 SHA512 f00875c2cc797a464cc233cecd1972e00c3918c0029469dc80b7b9dc3fa3676e967557c1653d5b3921440c248c22c7590d0e18132984a46cf52eb9dfe6d31a46
 MISC metadata.xml 894 BLAKE2B e58b8207b484f560d885c36d36e55aa68ec2b0c1258f594c8ff276b1fb0191a5af6bd8e52fae1e0eccec6c7fbb82228017233d75c9984e4f8f7b6320243731d7 SHA512 e66b3065069dc6770c965dc0c0c339c800e367ce7496f99c7d305a1059fd63ece09e91b0cbf000cee3a1d0b2b4aef8bb4481db708fdb16b8811d87e6ad5d2c3b
diff --git a/sci-physics/bullet/bullet-3.21.ebuild b/sci-physics/bullet/bullet-3.21.ebuild
index 2dd6ebe42362..fab2d923dee4 100644
--- a/sci-physics/bullet/bullet-3.21.ebuild
+++ b/sci-physics/bullet/bullet-3.21.ebuild
@@ -45,6 +45,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	(use ppc || use ppc64) && PATCHES+=( "${FILESDIR}/${P}-replace_altivec_vector_keyword.patch" )
+
 	cmake_src_prepare
 
 	# allow to generate docs
diff --git a/sci-physics/bullet/files/bullet-3.21-replace_altivec_vector_keyword.patch b/sci-physics/bullet/files/bullet-3.21-replace_altivec_vector_keyword.patch
new file mode 100644
index 000000000000..01ef90646d5b
--- /dev/null
+++ b/sci-physics/bullet/files/bullet-3.21-replace_altivec_vector_keyword.patch
@@ -0,0 +1,24 @@
+--- a/src/clew/clew.h	2022-02-16 18:12:48.879740507 +0100
++++ b/src/clew/clew.h	2022-02-16 18:13:32.403061196 +0100
+@@ -319,14 +319,14 @@
+ 
+ /* Define basic vector types */
+ #if defined(__VEC__)
+ #include <altivec.h> /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
+-	typedef vector unsigned char __cl_uchar16;
+-	typedef vector signed char __cl_char16;
+-	typedef vector unsigned short __cl_ushort8;
+-	typedef vector signed short __cl_short8;
+-	typedef vector unsigned int __cl_uint4;
+-	typedef vector signed int __cl_int4;
+-	typedef vector float __cl_float4;
++       typedef __vector unsigned char     __cl_uchar16;
++       typedef __vector signed char       __cl_char16;
++       typedef __vector unsigned short    __cl_ushort8;
++       typedef __vector signed short      __cl_short8;
++       typedef __vector unsigned int      __cl_uint4;
++       typedef __vector signed int        __cl_int4;
++       typedef __vector float             __cl_float4;
+ #define __CL_UCHAR16__ 1
+ #define __CL_CHAR16__ 1
+ #define __CL_USHORT8__ 1