gentoo resync : 29.12.2022

3 files changed, 0 insertions, 142 deletions

diff --git a/sci-mathematics/petsc/files/petsc-3.13.0-do_not_run_mpiexec.patch b/sci-mathematics/petsc/files/petsc-3.13.0-do_not_run_mpiexec.patch
deleted file mode 100644
index 4c46658dec71..000000000000
--- a/sci-mathematics/petsc/files/petsc-3.13.0-do_not_run_mpiexec.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/config/BuildSystem/config/packages/MPI.py b/config/BuildSystem/config/packages/MPI.py
-index 7e424e71..ee502bd2 100644
---- a/config/BuildSystem/config/packages/MPI.py
-+++ b/config/BuildSystem/config/packages/MPI.py
-@@ -210,28 +210,11 @@ shared libraries and run with --known-mpi-shared-libraries=1')
-           raise RuntimeError('Could not locate MPIEXEC - please specify --with-mpiexec option')
-       # Support for spaces and () in executable names; also needs to handle optional arguments at the end
-       # TODO: This support for spaces and () should be moved to core BuildSystem
--      self.mpiexec = self.mpiexec.replace(' ', '\\ ').replace('(', '\\(').replace(')', '\\)').replace('\ -',' -')
--      if (hasattr(self, 'ompi_major_version') and int(self.ompi_major_version) >= 3):
--        (out, err, ret) = Configure.executeShellCommand(self.mpiexec+' -help all', checkCommand = noCheck, timeout = 60, log = self.log, threads = 1)
--        if out.find('--oversubscribe') >=0:
--          self.mpiexec = self.mpiexec + ' --oversubscribe'
-+      self.mpiexec = self.mpiexec + ' --oversubscribe'
- 
-     # using mpiexec environmental variables make sure mpiexec matches the MPI libraries and save the variables for testing in PetscInitialize()
-     # the variable HAVE_MPIEXEC_ENVIRONMENTAL_VARIABLE is not currently used. PetscInitialize() can check the existence of the environmental variable to
-     # determine if the program has been started with the correct mpiexec (will only be set for parallel runs so not clear how to check appropriately)
--    (out, err, ret) = Configure.executeShellCommand(self.mpiexec+' -n 1 printenv', checkCommand = noCheck, timeout = 60, threads = 1, log = self.log)
--    if ret:
--      self.logWrite('Unable to run '+self.mpiexec+' with option "-n 1 printenv"\nThis could be ok, some MPI implementations such as SGI produce a non-zero status with non-MPI programs\n'+out+err)
--    else:
--      if out.find('MPIR_CVAR_CH3') > -1:
--        if hasattr(self,'ompi_major_version'): raise RuntimeError("Your libraries are from OpenMPI but it appears your mpiexec is from MPICH");
--        self.addDefine('HAVE_MPIEXEC_ENVIRONMENTAL_VARIABLE', 'MPIR_CVAR_CH3')
--      elif  out.find('MPIR_CVAR_CH3') > -1:
--        if hasattr(self,'ompi_major_version'): raise RuntimeError("Your libraries are from OpenMPI but it appears your mpiexec is from MPICH");
--        self.addDefine('HAVE_MPIEXEC_ENVIRONMENTAL_VARIABLE', 'MPICH')
--      elif out.find('OMPI_COMM_WORLD_SIZE') > -1:
--        if hasattr(self,'mpich_numversion'): raise RuntimeError("Your libraries are from MPICH but it appears your mpiexec is from OpenMPI");
--        self.addDefine('HAVE_MPIEXEC_ENVIRONMENTAL_VARIABLE', 'OMP')
- 
-     self.addMakeMacro('MPIEXEC', self.mpiexec)
-     self.mpiexec = self.mpiexec + ' -n 1'
diff --git a/sci-mathematics/petsc/files/petsc-3.13.0-fix_sandbox_violation.patch b/sci-mathematics/petsc/files/petsc-3.13.0-fix_sandbox_violation.patch
deleted file mode 100644
index c0dfd53a0112..000000000000
--- a/sci-mathematics/petsc/files/petsc-3.13.0-fix_sandbox_violation.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/config/PETSc/options/installDir.py b/config/PETSc/options/installDir.py
-index 860faf0f..87898811 100755
---- a/config/PETSc/options/installDir.py
-+++ b/config/PETSc/options/installDir.py
-@@ -40,13 +40,6 @@ class Configure(config.base.Configure):
-       self.dir = os.path.abspath(os.path.expanduser(self.framework.argDB['prefix']))
-       self.petscDir = self.dir
-       self.petscArch = ''
--      try:
--        os.makedirs(os.path.join(self.dir,'PETScTestDirectory'))
--        os.rmdir(os.path.join(self.dir,'PETScTestDirectory'))
--      except Exception as e:
--        self.logPrint('Error trying to to test write permissions on directory '+str(e))
--        self.installSudoMessage = 'You do not have write permissions to the --prefix directory '+self.dir+'\nYou will be prompted for the sudo password for any external package installs'
--        self.installSudo = 'sudo '
-     else:
-       self.dir = os.path.abspath(os.path.join(self.petscdir.dir, self.arch.arch))
-       self.petscDir = self.petscdir.dir
diff --git a/sci-mathematics/petsc/files/petsc-3.13.0-make_hypre_configure.patch b/sci-mathematics/petsc/files/petsc-3.13.0-make_hypre_configure.patch
deleted file mode 100644
index 1453fd519e81..000000000000
--- a/sci-mathematics/petsc/files/petsc-3.13.0-make_hypre_configure.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/config/BuildSystem/config/packages/hypre.py b/config/BuildSystem/config/packages/hypre.py
-index 4d915c31..1b05a1ee 100644
---- a/config/BuildSystem/config/packages/hypre.py
-+++ b/config/BuildSystem/config/packages/hypre.py
-@@ -5,10 +5,6 @@ class Configure(config.package.GNUPackage):
-   def __init__(self, framework):
-     config.package.GNUPackage.__init__(self, framework)
-     #self.version         = '2.18.2'
--    self.minversion      = '2.14'
--    self.versionname     = 'HYPRE_RELEASE_VERSION'
--    self.versioninclude  = 'HYPRE_config.h'
--    self.requiresversion = 1
-     #self.gitcommit       = 'v'+self.version
-     self.gitcommit       = '93baaa8c9' # v2.18.2+valgrind-fix
-     self.download        = ['git://https://github.com/hypre-space/hypre','https://github.com/hypre-space/hypre/archive/'+self.gitcommit+'.tar.gz']
-diff --git a/include/petsc/private/petschypre.h b/include/petsc/private/petschypre.h
-index 81ca7136..b403e70e 100644
---- a/include/petsc/private/petschypre.h
-+++ b/include/petsc/private/petschypre.h
-@@ -6,12 +6,6 @@
- #include <HYPRE_config.h>
- #include <HYPRE_utilities.h>
- 
--/* from version 2.16 on, HYPRE_BigInt is 64 bit for 64bit installations
--   and 32 bit for 32bit installations -> not the best name for a variable */
--#if PETSC_PKG_HYPRE_VERSION_LT(2,16,0)
--typedef PetscInt HYPRE_BigInt;
--#endif
--
- /*
-   With scalar type == real, HYPRE_Complex == PetscScalar;
-   With scalar type == complex,  HYPRE_Complex is double __complex__ while PetscScalar may be std::complex<double>
-diff --git a/src/mat/impls/hypre/mhypre.c b/src/mat/impls/hypre/mhypre.c
-index 0f7470e6..cce3e2b0 100644
---- a/src/mat/impls/hypre/mhypre.c
-+++ b/src/mat/impls/hypre/mhypre.c
-@@ -15,10 +15,6 @@
- #include <_hypre_parcsr_ls.h>
- #include <_hypre_sstruct_ls.h>
- 
--#if PETSC_PKG_HYPRE_VERSION_LT(2,18,0)
--#define  hypre_ParCSRMatrixClone(A,B) hypre_ParCSRMatrixCompleteClone(A)
--#endif
--
- static PetscErrorCode MatHYPRE_CreateFromMat(Mat,Mat_HYPRE*);
- static PetscErrorCode MatHYPRE_IJMatrixPreallocate(Mat,Mat,HYPRE_IJMatrix);
- static PetscErrorCode MatHYPRE_IJMatrixFastCopy_MPIAIJ(Mat,HYPRE_IJMatrix);
-@@ -63,7 +59,6 @@ static PetscErrorCode MatHYPRE_IJMatrixPreallocate(Mat A_d, Mat A_o, HYPRE_IJMat
-         nnz_o[i] = 0;
-       }
-     }
--#if PETSC_PKG_HYPRE_VERSION_GE(2,16,0)
-     { /* If we don't do this, the columns of the matrix will be all zeros! */
-       hypre_AuxParCSRMatrix *aux_matrix;
-       aux_matrix = (hypre_AuxParCSRMatrix*)hypre_IJMatrixTranslator(ij);
-@@ -73,9 +68,6 @@ static PetscErrorCode MatHYPRE_IJMatrixPreallocate(Mat A_d, Mat A_o, HYPRE_IJMat
-       aux_matrix = (hypre_AuxParCSRMatrix*)hypre_IJMatrixTranslator(ij);
-       hypre_AuxParCSRMatrixNeedAux(aux_matrix) = 1;
-     }
--#else
--    PetscStackCallStandard(HYPRE_IJMatrixSetDiagOffdSizes,(ij,nnz_d,nnz_o));
--#endif
-     ierr = PetscFree(nnz_d);CHKERRQ(ierr);
-     ierr = PetscFree(nnz_o);CHKERRQ(ierr);
-   }
-@@ -233,11 +225,7 @@ static PetscErrorCode MatHYPRE_IJMatrixFastCopy_MPIAIJ(Mat A, HYPRE_IJMatrix ij)
-   /* need to shift the diag column indices (hdiag->j) back to global numbering since hypre is expecting this */
-   hjj = hdiag->j;
-   pjj = pdiag->j;
--#if PETSC_PKG_HYPRE_VERSION_GE(2,16,0)
-   for (i=0; i<pdiag->nz; i++) hjj[i] = pjj[i];
--#else
--  for (i=0; i<pdiag->nz; i++) hjj[i] = cstart + pjj[i];
--#endif
-   ierr = PetscArraycpy(hdiag->data,pdiag->a,pdiag->nz);CHKERRQ(ierr);
-   if (sameint) {
-     ierr = PetscArraycpy(hoffd->i,poffd->i,pA->A->rmap->n + 1);CHKERRQ(ierr);
-@@ -247,12 +235,8 @@ static PetscErrorCode MatHYPRE_IJMatrixFastCopy_MPIAIJ(Mat A, HYPRE_IJMatrix ij)
- 
-   /* need to move the offd column indices (hoffd->j) back to global numbering since hypre is expecting this
-      If we hacked a hypre a bit more we might be able to avoid this step */
--#if PETSC_PKG_HYPRE_VERSION_GE(2,16,0)
-   PetscStackCallStandard(hypre_CSRMatrixBigInitialize,(hoffd));
-   jj  = (PetscInt*) hoffd->big_j;
--#else
--  jj  = (PetscInt*) hoffd->j;
--#endif
-   pjj = poffd->j;
-   for (i=0; i<poffd->nz; i++) jj[i] = garray[pjj[i]];
-