From 54dc3ff0672bd8ec5c20dc415d8e45d112a80110 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Mon, 26 May 2025 15:29:45 +0200
Subject: [PATCH] arpack-ng: YAML config and rel.stage changed to stable

---
 Compiler/impi/build             | 18 -------
 Compiler/impi/files/config.yaml | 84 ++++++++++++++++++++++++++++++++-
 MPI/arpack-ng/build             | 22 ---------
 MPI/arpack-ng/files/variants    |  1 -
 MPI/arpack-ng/modulefile        | 11 ++++-
 5 files changed, 92 insertions(+), 44 deletions(-)
 delete mode 100644 MPI/arpack-ng/files/variants

diff --git a/Compiler/impi/build b/Compiler/impi/build
index 84a2e40..6e021f3 100755
--- a/Compiler/impi/build
+++ b/Compiler/impi/build
@@ -1,20 +1,2 @@
 #!/usr/bin/env modbuild
 
-pbuild::add_to_group 'Compiler'
-
-pbuild::prep() {
-	:
-}
-
-pbuild::configure() {
-	:
-}
-
-pbuild::compile() {
-	:
-}
-
-pbuild::install() {
-	:
-}
-
diff --git a/Compiler/impi/files/config.yaml b/Compiler/impi/files/config.yaml
index 5fb6057..df534a9 100644
--- a/Compiler/impi/files/config.yaml
+++ b/Compiler/impi/files/config.yaml
@@ -16,8 +16,90 @@ impi:
     22.2:
       variants:
         - systems: [merlin-.*\.psi.ch]
-          relstage: stable
           group_deps:
             compiler:
               intel: [22.2]
 
+    22.1:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          group_deps:
+            compiler:
+              intel: [22.1]
+
+    21.4:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          group_deps:
+            compiler:
+              intel: [21.4]
+
+    20.4:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          group_deps:
+            compiler:
+              intel: [20.4]
+
+    19.4:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          relstage: deprecated
+          group_deps:
+            compiler:
+              intel: [19.4]
+
+    19.3:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          relstage: deprecated
+          group_deps:
+            compiler:
+              intel: [19.3]
+
+    18.4:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          relstage: deprecated
+          group_deps:
+            compiler:
+              intel: [18.4]
+    18.3:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          relstage: deprecated
+          group_deps:
+            compiler:
+              intel: [18.3]
+
+    18.2:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          relstage: deprecated
+          group_deps:
+            compiler:
+              intel: [18.2]
+ 
+   17.8:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          relstage: deprecated
+          group_deps:
+            compiler:
+              intel: [17.8]
+
+   5.1:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          relstage: deprecated
+          group_deps:
+            compiler:
+              intel: [16.1, 16.2, 16.3, 17.1]
+   5.0:
+      variants:
+        - systems: [merlin-.*\.psi.ch]
+          relstage: deprecated
+          group_deps:
+            compiler:
+              intel: [15.2, 15.3]
+
diff --git a/MPI/arpack-ng/build b/MPI/arpack-ng/build
index 091d3e1..6e021f3 100755
--- a/MPI/arpack-ng/build
+++ b/MPI/arpack-ng/build
@@ -1,24 +1,2 @@
 #!/usr/bin/env modbuild
 
-pbuild::set_download_url \
-	"https://github.com/opencollab/$P/archive/refs/tags/${V_PKG}.tar.gz"
-
-pbuild::set_sha256sum \
-	"3.9.0.tar.gz:24f2a2b259992d3c797d80f626878aa8e2ed5009d549dad57854bbcfb95e1ed0"
-
-declare -rx AR=ar
-
-pbuild::configure() {
-	cmake  \
-           -DCMAKE_BUILD_TYPE:STRING=Release \
-           -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \
-           -DMPI="ON" \
-           -DICB="ON" \
-           -DBUILD_SHARED_LIBS="ON" \
-           -DCMAKE_POSITION_INDEPENDENT_CODE="ON" \
-           "${SRC_DIR}" || exit 1
-}
-
-pbuild::add_to_group 'MPI'
-pbuild::install_docfiles Copyright.txt LICENSE README RELEASE_NOTES
-
diff --git a/MPI/arpack-ng/files/variants b/MPI/arpack-ng/files/variants
deleted file mode 100644
index bc37664..0000000
--- a/MPI/arpack-ng/files/variants
+++ /dev/null
@@ -1 +0,0 @@
-arpack-ng/3.9.0	    unstable		intel/22.2 impi/22.2 b:cmake/3.25.2
diff --git a/MPI/arpack-ng/modulefile b/MPI/arpack-ng/modulefile
index 591a070..e802488 100644
--- a/MPI/arpack-ng/modulefile
+++ b/MPI/arpack-ng/modulefile
@@ -1,10 +1,17 @@
 #%Module1.0
 
-module-whatis		"ARPACK-NG is a collection of Fortran77 subroutines designed to solve large scale eigenvalue problems"
+module-whatis		"collection of Fortran77 subroutines designed to solve large scale eigenvalue problems"
 module-url		"https://github.com/opencollab/arpack-ng/tree/master"
 module-license		"BSD Software License"
 module-maintainer	"Elsa Germann <elsa.germann@psi.ch>"
 
 module-help		"
-This project started as a joint project between Debian, Octave and Scilab in order to provide a common and maintained version of arpack. This is now a community project maintained by a few volunteers. Indeed, no single release has been published by Rice university for the last few years and since many software (Octave, Scilab, R, Matlab...) forked it and implemented their own modifications, arpack-ng aims to tackle this by providing a common repository, maintained versions with a testsuite. arpack-ng is replacing arpack almost everywhere.
+This project started as a joint project between Debian, Octave and Scilab
+in order to provide a common and maintained version of arpack. This is now
+a community project maintained by a few volunteers. Indeed, no single release
+has been published by Rice university for the last few years and since many
+software (Octave, Scilab, R, Matlab...) forked it and implemented their own
+modifications, arpack-ng aims to tackle this by providing a common repository,
+maintained versions with a testsuite. arpack-ng is replacing arpack almost
+everywhere.
 "