Merge branch '48-name-clash-with-cuda-toolchains' into 'releases/23b'

Resolve "Name clash with cuda toolchains"

Closes #48

See merge request !51

toolchains/foss2021a-cuda-mpi/spack.yaml

@@ -33,7 +33,7 @@ spack:
     - etsf-io@1.0.4
     - bigdft-futile@1.9.2+mpi
     - bigdft-psolver@1.9.2+mpi~cuda  # octopus does not use cuda variant
-    - dftbplus@21.2~arpack~dftd3~elsi~gpu~mpi~sockets~transport+api+sharedlibs~openmp  # non gpu and non openmp variant based on the easybuild configuration (octopus does not use gpu variant)
+    - dftbplus@21.2~arpack~dftd3~elsi~gpu+mpi~sockets~transport+api+sharedlibs~openmp  # non gpu and non openmp variant based on the easybuild configuration (octopus does not use gpu variant)
     - perl-yaml@1.27
     # - openblas@0.3.15
     # - libpspio@0.2.4  # missing in spack

toolchains/foss2021a-serial/spack.yaml

@@ -25,7 +25,7 @@ spack:
     - etsf-io@1.0.4
     - bigdft-futile@1.9.2~mpi
     - bigdft-psolver@1.9.2~mpi~scalapack
-    - dftbplus@21.2~arpack+dftd3~elsi~gpu~mpi~sockets~transport+api+sharedlibs~openmp
+    - dftbplus@21.2~arpack~dftd3~elsi~gpu~mpi~sockets~transport+api+sharedlibs~openmp
     - perl-yaml@1.27
 
     # - openblas@0.3.15

toolchains/foss2022a-cuda-mpi/spack.yaml

@@ -33,7 +33,7 @@ spack:
     - etsf-io@1.0.4
     - bigdft-futile@1.9.2+mpi
     - bigdft-psolver@1.9.2+mpi~cuda  # octopus does not use cuda variant
-    - dftbplus@21.2~arpack~dftd3~elsi~gpu~mpi~sockets~transport+api+sharedlibs~openmp # non gpu and non openmp variant based on the easybuild configuration (octopus does not use gpu variant)
+    - dftbplus@21.2~arpack~dftd3~elsi~gpu+mpi~sockets~transport+api+sharedlibs~openmp # non gpu and non openmp variant based on the easybuild configuration (octopus does not use gpu variant)
     - perl-yaml@1.27
     # - openblas@0.3.15
     # - libpspio@0.2.4  # missing in spack

toolchains/foss2022a-serial/spack.yaml

@@ -26,7 +26,7 @@ spack:
     - etsf-io@1.0.4
     - bigdft-futile@1.9.2~mpi
     - bigdft-psolver@1.9.2~mpi~scalapack
-    - dftbplus@21.2~arpack+dftd3~elsi~gpu~mpi~sockets~transport+api+sharedlibs~openmp
+    - dftbplus@21.2~arpack~dftd3~elsi~gpu~mpi~sockets~transport+api+sharedlibs~openmp
     - perl-yaml@1.27
     # - flexiblas@3.0.4
     # - libpspio@0.2.4  # missing in spack