Merge branch 'qe' into 'master'

Update QE: 6.5

See merge request Pmodules/buildblocks!116

MPI/qe/6/variants

@@ -1 +1,2 @@
-qe/6.3  unstable	gcc/8.2.0 openmpi/3.1.1 b:cmake/3.9.6
+qe/6.3  unstable	gcc/8.2.0 openmpi/3.1.1       b:cmake/3.9.6
+qe/6.5  unstable        gcc/9.3.0 lapack/3.9.0 OpenBLAS/0.3.9 openmpi/4.0.4_slurm b:cmake/3.15.5

MPI/qe/build

@@ -1,7 +1,6 @@
 #!/usr/bin/env modbuild
 
 pbuild::set_download_url "https://github.com/QEF/q-e/archive/$P-$V.tar.gz"
-echo "https://github.com/QEF/q-e/archive/$P-$V.tar.gz"
 
 pbuild::add_to_group 'MPI'
 
@@ -9,24 +8,16 @@ pbuild::install_docfiles License README.md CONTRIBUTING.md
 
 pbuild::compile_in_sourcetree
 
-
-pbuild::configure() {
-  mkdir -p ${PREFIX}
-  ./configure -enable-openmp --with-prefix="${PREFIX}/bin" --prefix="${PREFIX}/bin"
+pbuild::pre_configure() {
+        pbuild::add_configure_args "-enable-openmp"
 }
 
 pbuild::compile() {
-  make all
+        make all
+        make install
 }
 
 pbuild::install() {
-   # Due to bug in: https://gitlab.com/QEF/q-e/commit/88e6558646dbbcfcafa5f3fa758217f6062ab91c.diff
-   #   Deploying custom install procedure
-   mkdir -p ${PREFIX}/bin
-   cd ${BUILD_DIR}
-   for x in `find * ! -path "test-suite/*" -name *.x -type f` ; do 
-     cp $x ${PREFIX}/bin/
-   done
-   echo 'Quantum ESPRESSO binaries installed in ${PREFIX}/bin'
-  # make install
+	:
 }
+