gentoo resync : 02.02.2022

3 files changed, 144 insertions, 3 deletions

diff --git a/sci-libs/pastix/Manifest b/sci-libs/pastix/Manifest
index 7bb75c9fa71c..ec4216338ca3 100644
--- a/sci-libs/pastix/Manifest
+++ b/sci-libs/pastix/Manifest
@@ -1,3 +1,4 @@
+AUX pastix-5.2.3-MPI-3.0.patch 5490 BLAKE2B 8e77cbdbf0857909d6e70570fe27cfeb977e7d3380298ad30e42c8194dc79241e16cb378d2a8da065dd142704530289d6508f87800e171bd6865877d802584cf SHA512 bd142ea25596d28d4962154fd24a4d66b4ab0cc2de9e662ad89e56695ca3e078d79848757efa2f02a3e1920c133d0c9d0b697efd5d9aef3008e07b3c91b16289
 AUX pastix-6.0.3-cmake-examples-optional.patch 5248 BLAKE2B eb6e08274d2bbac53c4fe02497880f61a83eb357dc95ec6ea1049322556010a0e5514d8c6d0f273b00b7b46047394edf2108ee14ef0cde65f99ebe1eb2160786 SHA512 00c214c45cf4a1c06ca4dcf3cffde9915de67f2656b0712ca23f6ff2c4aa29845f37fd7940d011fbbba170d3a47b6d74ec6cb165474c2eb30a292374e0d52953
 AUX pastix-6.0.3-cmake-installdirs.patch 13450 BLAKE2B 9c7535b4074496a97d0673fad73e7729f34c71ad992441fa2dbc1d8801b6cf1d74773872b71fad5dec8f21ac26065abf0e7de12cbec2c9a52098be6368dd7b31 SHA512 89de15236d23fb8e7f9d064789e2a6314a615803a41deeb08f22f4ee5aea92263da939ce967310fd93a5cd89051c0f0a0d3df71b0ea4968cefbec3c5cf5185fe
 AUX pastix-6.0.3-cmake-python-optional.patch 1861 BLAKE2B 5097879c1481ce7514903a182007d0d87a9e59a350f72ebba21b5719e893308617416c3661058744f7a83009cb6c7d8949ba6e57966e0a798aa4b1c96aa1f928 SHA512 ecff70d902a4424b4ee996b563e54b7190ee1d3324ef7079fafdef2f23abbc9a18899f827156ed4145a3d977f5b6c980acafb96f479be693b6658f7d21e5cced
@@ -5,6 +6,6 @@ AUX pastix-6.0.3-cmake-spm-project.patch 319 BLAKE2B 11d63d28bb5e843571306321a0c
 AUX pastix-6.0.3-multiple-coeftabMemory.patch 260 BLAKE2B 968d32d2994afca84fcee7bc4b93aa7cf77dda2d66c2617095ee191572fb9c37d631e83954efdb53aba0997b426f85a6529d40a3c8f85f62de684548cc760447 SHA512 2f73d7f2ebbc92b46f13e0bed42ed76fd6831af5706988e5111971adb3ba46d8bca9fd563f40cb8a10fae1a65e180c2f1866b51ab0c4c95ef801c590513301f2
 DIST pastix-6.0.3.tar.gz 1793579 BLAKE2B 9e0ee71c80b2c93c6762c1a824b2e1262fd1a9f406194fb99eeecbfc172cf82f497d23a541b56c44e5487c3c228cab781f47f683ee04c6cdf426da6126750a69 SHA512 5bf8dfa6ed02ee7e236c63e21c80bd45af807b465b21a8c0520b1328e179095f1416f925be9f8b5ec0e8078ca9bc4398bf0d091fdc8e9ea51b9af12a06d9a544
 DIST pastix_5.2.3.tar.bz2 2246903 BLAKE2B b13cb31bbc2aeb122e932b2a934598ec975a55f327483bf1383280976584858426c56982f6980b52f32f04e05c6e6c8de1cf35e378e61a7be9dddb705b1c033a SHA512 69acffac1be8c756886783c2a6307269ab4d14abfc4a77268b3d14995e53b16084c298446812484233d9d52c317490d6ad67788166adf367075e6c8442147b95
-EBUILD pastix-5.2.3.ebuild 3353 BLAKE2B 275c63ffd0d186f827f568bf73fe606fe520109cb364c279cce2da05965fd1f19b4e331d960458fe454f1abfba4879938f9686674ca0922bcdf8e4bcbaff08c4 SHA512 c7521ecd8eb7a080532867dc1913fcbfb06b9395e262e27ed6cdfee35dd439c32d7305d54f60d5fdab78a1dc218be95d3dcd2b8df69ee7e09ad4eaa77af1ab16
+EBUILD pastix-5.2.3.ebuild 3398 BLAKE2B c26e416bd5f61131e5ebd6f88d022133ab29ee58614aeca17821a6436133cdf18260bd19f92da51060306163efc14b3da690c4ea9d4fc7aa37f85ffb8400515f SHA512 0af54a667650a29aa6921567346d00447bf08755e9c02a94dcd7aef4c5be2ad7138bd126b8a095b1063b3199ca92daf231ecb515560343951b38bc88ee424cb1
 EBUILD pastix-6.0.3.ebuild 2387 BLAKE2B f413e120a0ab1efe348ce72939022d3e0af416d0bb8c8676829e9eb72f27a258bfb3eef246fc07adbe173d22ebbc7acbcafe4c0d6c77a76b6ba3ed2ec4e5baed SHA512 00fdcf36c2318638093f9a2b73144e04df7e24a06fdc30aeb499e79eecc6069d6c601ca26bc95215d94949c31678f5f48648cb6cb0e2b78ef8e7e0c27a5ca647
 MISC metadata.xml 1383 BLAKE2B 0a17508eb75ed0066dbbaad286cb00ddd8491aa5b6047f2f32fde75f5e43277233229d4935d94052000c662e729480aaa02cdcbd4572e4b84075f108b1c61800 SHA512 9cc80da6ccb82311e30288696cce006e858121a8d216ba2860a1c0ae833c8e8076d60cd783283d163528976bfd9af11d114fc95a481b36951b5d7caf3c0fad2c
diff --git a/sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch b/sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch
new file mode 100644
index 000000000000..d86ec5b78416
--- /dev/null
+++ b/sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch
@@ -0,0 +1,139 @@
+https://bugs.gentoo.org/692742
+rename MPI 1.0 to 3.0+ functions:
+- MPI_Address -> MPI_Get_address
+- MPI_Type_struct -> MPI_Type_create_struct
+
+--- a/common/src/nompi.h
++++ b/common/src/nompi.h
+@@ -127,9 +127,9 @@
+ #define MPI_Start(request)
+ #define MPI_Startall(count, array_of_requests)
+ #define MPI_Type_contiguous(count, oldtype, newtype)
+-#define MPI_Type_struct(count, array_of_blocklengths, array_of_displacement, \
++#define MPI_Type_create_struct(count, array_of_blocklengths, array_of_displacement, \
+                         oldtype, newtype)
+-#define MPI_Address(location, newtype)
++#define MPI_Get_address(location, newtype)
+ #define MPI_Type_commit(datatype)
+ #define MPI_Type_free(datatype)
+ #define MPI_Request_free(request)
+--- a/sopalin/src/sopalin_sendrecv.c
++++ b/sopalin/src/sopalin_sendrecv.c
+@@ -1300,10 +1300,10 @@
+   thread_data->gtaboffs[packnbr]   = FANIN_INFOTAB(t);
+   thread_data->gtaboffs[packnbr+1] = FANIN_COEFTAB(t);
+ #else /* NO_MPI_TYPE */
+-  CALL_MPI MPI_Address(FANIN_INFOTAB(t),&(thread_data->gtaboffs[packnbr]));
+-  TEST_MPI("MPI_Address");
+-  CALL_MPI MPI_Address(FANIN_COEFTAB(t),&(thread_data->gtaboffs[packnbr+1]));
+-  TEST_MPI("MPI_Address");
++  CALL_MPI MPI_Get_address(FANIN_INFOTAB(t),&(thread_data->gtaboffs[packnbr]));
++  TEST_MPI("MPI_Get_address");
++  CALL_MPI MPI_Get_address(FANIN_COEFTAB(t),&(thread_data->gtaboffs[packnbr+1]));
++  TEST_MPI("MPI_Get_address");
+ #endif /* NO_MPI_TYPE */
+ 
+   /* Add other contribution for the same task */
+@@ -1410,12 +1410,12 @@
+           thread_data->gtaboffs[packnbr]   = FANIN_INFOTAB(t);
+           thread_data->gtaboffs[packnbr+1] = FANIN_COEFTAB(t);
+ #else /* NO_MPI_TYPE */
+-          CALL_MPI MPI_Address(FANIN_INFOTAB(t),
++          CALL_MPI MPI_Get_address(FANIN_INFOTAB(t),
+                                &(thread_data->gtaboffs[packnbr]));
+-          TEST_MPI("MPI_Address");
+-          CALL_MPI MPI_Address(FANIN_COEFTAB(t),
++          TEST_MPI("MPI_Get_address");
++          CALL_MPI MPI_Get_address(FANIN_COEFTAB(t),
+                                &(thread_data->gtaboffs[packnbr+1]));
+-          TEST_MPI("MPI_Address");
++          TEST_MPI("MPI_Get_address");
+ #endif /* NO_MPI_TYPE */
+ 
+           if (queueSize(sendqueue))
+@@ -1508,10 +1508,10 @@
+   TEST_MPI("MPI_Rsend");
+ #  endif
+ #else /* NO_MPI_TYPE */
+-  CALL_MPI MPI_Type_struct(2*(packnbr/2+1), thread_data->gtabsize,
++  CALL_MPI MPI_Type_create_struct(2*(packnbr/2+1), thread_data->gtabsize,
+                            thread_data->gtaboffs,
+                            thread_data->gtabtype, &newtype);
+-  TEST_MPI("MPI_Type_struct");
++  TEST_MPI("MPI_Type_create_struct");
+   CALL_MPI MPI_Type_commit(&newtype);
+   TEST_MPI("MPI_Type_commit");
+ #  ifdef TEST_ISEND
+@@ -1602,15 +1602,15 @@
+               (long)me, (unsigned int)(intptr_t)BTAG_COEFTAB(t));
+ 
+ #ifndef NO_MPI_TYPE
+-  CALL_MPI MPI_Address(BTAG_BTAGTAB(t),&(taboffs[0]));
+-  TEST_MPI("MPI_Address");
+-  CALL_MPI MPI_Address(BTAG_BCOFTAB(t),&(taboffs[1]));
+-  TEST_MPI("MPI_Address");
+-  CALL_MPI MPI_Address((void *)BTAG_COEFTAB(t),&(taboffs[2]));
+-  TEST_MPI("MPI_Address");
++  CALL_MPI MPI_Get_address(BTAG_BTAGTAB(t),&(taboffs[0]));
++  TEST_MPI("MPI_Get_address");
++  CALL_MPI MPI_Get_address(BTAG_BCOFTAB(t),&(taboffs[1]));
++  TEST_MPI("MPI_Get_address");
++  CALL_MPI MPI_Get_address((void *)BTAG_COEFTAB(t),&(taboffs[2]));
++  TEST_MPI("MPI_Get_address");
+ 
+-  CALL_MPI MPI_Type_struct(3,tabsize,taboffs,tabtype,&newtype);
+-  TEST_MPI("MPI_Type_struct");
++  CALL_MPI MPI_Type_create_struct(3,tabsize,taboffs,tabtype,&newtype);
++  TEST_MPI("MPI_Type_create_struct");
+ 
+   CALL_MPI MPI_Type_commit(&newtype);
+   TEST_MPI("MPI_Type_commit");
+--- a/sopalin/src/updo_sendrecv.c
++++ b/sopalin/src/updo_sendrecv.c
+@@ -347,12 +347,12 @@
+   tabtype[0] = COMM_INT;
+   tabtype[1] = COMM_FLOAT;
+ 
+-  CALL_MPI MPI_Address(infotab,&(taboffs[0]));
+-  TEST_MPI("MPI_Address");
+-  CALL_MPI MPI_Address(FANIN_COEFTAB(SOLV_FTGTIND(j)),&(taboffs[1]));
+-  TEST_MPI("MPI_Address");
+-  CALL_MPI MPI_Type_struct(2,tabsize,taboffs,tabtype,&newtype);
+-  TEST_MPI("MPI_Type_struct");
++  CALL_MPI MPI_Get_address(infotab,&(taboffs[0]));
++  TEST_MPI("MPI_Get_address");
++  CALL_MPI MPI_Get_address(FANIN_COEFTAB(SOLV_FTGTIND(j)),&(taboffs[1]));
++  TEST_MPI("MPI_Get_address");
++  CALL_MPI MPI_Type_create_struct(2,tabsize,taboffs,tabtype,&newtype);
++  TEST_MPI("MPI_Type_create_struct");
+   CALL_MPI MPI_Type_commit(&newtype);
+   TEST_MPI("MPI_Type_commit");
+ #  endif /* NO_MPI_TYPE */
+@@ -974,8 +974,8 @@
+ 
+   tabtype[0] = COMM_INT;
+ 
+-  CALL_MPI MPI_Address(infotab,&(taboffs[0]));
+-  TEST_MPI("MPI_Address");
++  CALL_MPI MPI_Get_address(infotab,&(taboffs[0]));
++  TEST_MPI("MPI_Get_address");
+ 
+   /* If schur, send empty data */
+   if ((sopalin_data->sopar->iparm[IPARM_SCHUR] == API_YES &&
+@@ -988,12 +988,12 @@
+     for (iter=1; iter<UPDOWN_SM2XNBR+1; iter++) {
+       tabsize[iter] = size;
+       tabtype[iter] = COMM_FLOAT;
+-      CALL_MPI MPI_Address(gb+((iter-1)*UPDOWN_SM2XSZE),&(taboffs[iter]));
+-      TEST_MPI("MPI_Address");
++      CALL_MPI MPI_Get_address(gb+((iter-1)*UPDOWN_SM2XSZE),&(taboffs[iter]));
++      TEST_MPI("MPI_Get_address");
+     }
+   }
+-  CALL_MPI MPI_Type_struct(UPDOWN_SM2XNBR+1,tabsize,taboffs,tabtype,&newtype);
+-  TEST_MPI("MPI_Type_struct");
++  CALL_MPI MPI_Type_create_struct(UPDOWN_SM2XNBR+1,tabsize,taboffs,tabtype,&newtype);
++  TEST_MPI("MPI_Type_create_struct");
+   CALL_MPI MPI_Type_commit(&newtype);
+   TEST_MPI("MPI_Type_commit");
+ 
diff --git a/sci-libs/pastix/pastix-5.2.3.ebuild b/sci-libs/pastix/pastix-5.2.3.ebuild
index 2b9322818a96..3d6c4757eed5 100644
--- a/sci-libs/pastix/pastix-5.2.3.ebuild
+++ b/sci-libs/pastix/pastix-5.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,7 @@ PID=218
 DESCRIPTION="Parallel solver for very large sparse linear systems"
 HOMEPAGE="https://pastix.gforge.inria.fr"
 SRC_URI="https://gforge.inria.fr/frs/download.php/latestfile/${PID}/${PN}_${PV}.tar.bz2"
+S="${WORKDIR}/${PN}_${PV}/src"
 
 LICENSE="CeCILL-C"
 SLOT="0"
@@ -33,7 +34,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}_${PV}/src"
+PATCHES=( "${FILESDIR}"/${P}-MPI-3.0.patch )
 
 src_prepare() {
 	default