From b8c7370a682e4e29cda623222d17a790c01c3642 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 7 Aug 2024 12:37:21 +0100
Subject: gentoo auto-resync : 07:08:2024 - 12:37:20

---
 sci-libs/pastix/Manifest                         |   5 +-
 sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch | 139 -----------------------
 sci-libs/pastix/pastix-5.2.3.ebuild              | 118 -------------------
 sci-libs/pastix/pastix-6.0.3.ebuild              |   6 +-
 4 files changed, 4 insertions(+), 264 deletions(-)
 delete mode 100644 sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch
 delete mode 100644 sci-libs/pastix/pastix-5.2.3.ebuild

(limited to 'sci-libs/pastix')

diff --git a/sci-libs/pastix/Manifest b/sci-libs/pastix/Manifest
index fcee52f1d4eb..9d181f66c9bc 100644
--- a/sci-libs/pastix/Manifest
+++ b/sci-libs/pastix/Manifest
@@ -1,11 +1,8 @@
-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
 AUX pastix-6.0.3-cmake-spm-project.patch 319 BLAKE2B 11d63d28bb5e843571306321a0c3153eac0cfa5150918db2ae019d8defda1689dd41d584bbd866f4016f3f98102c61a4bb5a18419f88bfc197cd3659afb95311 SHA512 58aebfea042443daf75fb155c39d44e5a2d4ffdc27043b66a6c6089613363b0613ab8ac9e11cde1b749e87ec160aaa0355a0c3a2bb01fbedb43c4d28951e7747
 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 3456 BLAKE2B e9e4935b9eb71023e9a747542fdcd3013c22eea43bc4d6ff0382418da05fe5b352d55be3d517514a1e2abbf46168fb741f9c42ed6d64e5446d6dc77dcd513260 SHA512 4759301acea56b4197dbd098878909521cc9336c0406a4dc0929d5bf4c9c428cbca65016d6c4fa7a340dd46a76cc1b75d4f7881b82ec2ab493f237e67354abd0
-EBUILD pastix-6.0.3.ebuild 2448 BLAKE2B 04f269eb2926adaea198382188b0d8eeef9dab4d6b4a7283ee551cc3c784039ad5a659f52e488ae9ac2bde3f262c16f4301c355c81837cc5f52bae76aff164e7 SHA512 b5b3a23aa9c88638562af1c4373ca478dd7aa28a121b97f1f77504a0e1c17a7461baadf92a0bd2bc3d71931d5ac4d7f590de2dc0f60eaea432a65c903dbe4c88
+EBUILD pastix-6.0.3.ebuild 2448 BLAKE2B 8d8e566725bb16d679c646e4fe82cd61dbfbe26cbd7be81ac36cade527762aba89a9b75daf836e8a32bb143c8d20828d367391815995d7d20ed0f49b8173aee3 SHA512 f447c38370e2ca95d70186fb5787cc2f2982b55d2b000943a4f98ec04d0f3bed9376cbff8bedd7ee7c162e7f10c69d0eb70fab20bf4c94a562b685916e240ad7
 MISC metadata.xml 1318 BLAKE2B fbb4b85fdfda84ea9b836c615710c7edab402a579945cdda7e2df80bfc5f0c68065509de5ddf19ce3cb164c12f1adee899b73167f074294797482eb208f0949a SHA512 ba29b7c771890999442726d6863e86c12e9994bb020d4b5ee81638fa079a05985e4f721436362c4b48aab901f6414e92a713b594178ec93682134356dac08a55
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
deleted file mode 100644
index d86ec5b78416..000000000000
--- a/sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-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
deleted file mode 100644
index 4b0bafedefaf..000000000000
--- a/sci-libs/pastix/pastix-5.2.3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fortran-2 toolchain-funcs
-
-# TODO:
-# testing: emake examples?
-# better doc instalation and building
-# pypastix (separate package?)
-# multilib with eselect?
-# static libs building without pic
-# metis?
-
-# package id: change every version, see the link on inriaforge
-PID=218
-DESCRIPTION="Parallel solver for very large sparse linear systems"
-HOMEPAGE="https://solverstack.gitlabpages.inria.fr/pastix/ https://gitlab.inria.fr/solverstack/pastix"
-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"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc int64 mpi +smp starpu static-libs"
-
-RDEPEND="
-	sci-libs/scotch:0=[int64?,mpi?]
-	sys-apps/hwloc:0=
-	virtual/blas
-	mpi? ( virtual/mpi )
-	starpu? ( dev-libs/starpu:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-MPI-3.0.patch )
-
-src_prepare() {
-	default
-	sed -e 's/^\(HOSTARCH\s*=\).*/\1 ${HOST}/' \
-		-e "s:^\(CCPROG\s*=\).*:\1 $(tc-getCC):" \
-		-e "s:^\(CFPROG\s*=\).*:\1 $(tc-getFC):" \
-		-e "s:^\(CF90PROG\s*=\).*:\1 $(tc-getFC):" \
-		-e "s:^\(ARPROG\s*=\).*:\1 $(tc-getAR):" \
-		-e "s:^\(CCFOPT\s*=\).*:\1 ${FFLAGS}:" \
-		-e "s:^\(CCFDEB\s*=\).*:\1 ${FFLAGS}:" \
-		-e 's:^\(EXTRALIB\s*=\).*:\1 -lm -lrt:' \
-		-e "s:^#\s*\(ROOT\s*=\).*:\1 \$(DESTDIR)${EPREFIX}/usr:" \
-		-e 's:^#\s*\(INCLUDEDIR\s*=\).*:\1 $(ROOT)/include:' \
-		-e 's:^#\s*\(BINDIR\s*=\).*:\1 $(ROOT)/bin:' \
-		-e "s:^#\s*\(LIBDIR\s*=\).*:\1 \$(ROOT)/$(get_libdir):" \
-		-e 's:^#\s*\(SHARED\s*=\).*:\1 1:' \
-		-e 's:^#\s*\(SOEXT\s*=\).*:\1 .so:' \
-		-e '/fPIC/s/^#//g' \
-		-e "s:^#\s*\(SHARED_FLAGS\s*=.*\):\1 ${LDFLAGS}:" \
-		-e "s:pkg-config:$(tc-getPKG_CONFIG):g" \
-		-e "s:^\(BLASLIB\s*=\).*:\1 $($(tc-getPKG_CONFIG) --libs blas):" \
-		-e "s:^\s*\(HWLOC_HOME\s*?=\).*:\1 ${EPREFIX}/usr:" \
-		-e "s:-I\$(HWLOC_INC):$($(tc-getPKG_CONFIG) --cflags hwloc):" \
-		-e "s:-L\$(HWLOC_LIB) -lhwloc:$($(tc-getPKG_CONFIG) --libs hwloc):" \
-		-e "s:^\s*\(SCOTCH_HOME\s*?=\).*:\1 ${EPREFIX}/usr:" \
-		-e "s:^\s*\(SCOTCH_INC\s*?=.*\):\1/scotch:" \
-		-e "s:^\s*\(SCOTCH_LIB\s*?=.*\)lib:\1$(get_libdir):" \
-		config/LINUX-GNU.in > config.in || die
-	sed -e 's/__SO_NAME__,$@/__SO_NAME__,$(notdir $@)/g' -i Makefile || die
-}
-
-src_configure() {
-	if use amd64; then
-		sed -e 's/^\(VERSIONBIT\s*=\).*/\1 _64bit/' \
-			-i config.in || die
-	fi
-
-	if use int64; then
-		sed -e '/VERSIONINT.*_int64/s/#//' \
-			-e '/CCTYPES.*INTSSIZE64/s/#//' \
-			-i config.in || die
-	fi
-
-	if ! use mpi; then
-		sed -e '/VERSIONMPI.*_nompi/s/#//' \
-			-e '/CCTYPES.*NOMPI/s/#//' \
-			-e '/MPCCPROG\s*= $(CCPROG)/s/#//' \
-			-e '/MCFPROG\s*= $(CFPROG)/s/#//' \
-			-e 's/-DDISTRIBUTED//' \
-			-e 's/-lptscotch/-lscotch/g' \
-			-i config.in || die
-	fi
-
-	if ! use smp; then
-		sed -e '/VERSIONSMP.*_nosmp/s/#//' \
-			-e '/CCTYPES.*NOSMP/s/#//' \
-			-i config.in || die
-	fi
-
-	if use starpu; then
-		sed -e '/libstarpu/s/#//g' -i config.in || die
-	fi
-}
-
-src_compile() {
-	emake all drivers
-}
-
-src_test() {
-	# both test and tests targets are defined and do not work
-	emake examples
-	echo
-}
-
-src_install() {
-	default
-	sed -e "s:${D}::g" -i "${ED}"/usr/bin/pastix-conf || die
-	# quick and dirty (static libs should really be built without pic)
-	cd .. || die
-	dodoc README.txt doc/refcard/refcard.pdf
-}
diff --git a/sci-libs/pastix/pastix-6.0.3.ebuild b/sci-libs/pastix/pastix-6.0.3.ebuild
index f8535d36390e..ad6337f2a1d9 100644
--- a/sci-libs/pastix/pastix-6.0.3.ebuild
+++ b/sci-libs/pastix/pastix-6.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake fortran-2 python-single-r1
 
-- 
cgit v1.2.3