update to 29 Oct 2020

2 files changed, 7 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 144d7e314491..15b16c76702e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lammps-beta
 	pkgdesc = Large-scale Atomic/Molecular Massively Parallel Simulator
-	pkgver = 20200824
+	pkgver = 20201029
 	pkgrel = 1
 	url = https://lammps.sandia.gov/
 	arch = x86_64
@@ -10,7 +10,7 @@ pkgbase = lammps-beta
 	depends = openmpi
 	provides = lammps
 	conflicts = lammps
-	source = git+https://github.com/lammps/lammps#tag=patch_24Aug2020?signed
+	source = git+https://github.com/lammps/lammps#tag=patch_29Oct2020?signed
 	sha512sums = SKIP
 
 pkgname = lammps-beta
diff --git a/PKGBUILD b/PKGBUILD
index 51c05217a2ea..69ed300523f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,8 +21,8 @@ _ENABLE_KIM=0
 
 _pkgname=lammps
 pkgname=${_pkgname}-beta
-pkgver=20200824
-_pkgver="24Aug2020"
+pkgver=20201029
+_pkgver="29Oct2020"
 #_pkgver=$(date -d ${pkgver} +%-d%b%Y)
 pkgrel=1
 pkgdesc="Large-scale Atomic/Molecular Massively Parallel Simulator"
@@ -45,15 +45,15 @@ if (( $_ENABLE_INTEL_COMPILER )); then
     depends+=('intel-mkl')
     optdepends=('intel-parallel-studio-xe')
     _feature_args+=('-DCMAKE_C_COMPILER=icc')
-    _feature_args+=('-DCMAKE_C_FLAGS=-xHost -O3 -fp-model fast=2 -no-prec-div -qoverride-limits -qopt-zmm-usage=high')
+    _feature_args+=('-DCMAKE_C_FLAGS=-xHost -O3 -no-prec-div -qoverride-limits -qopt-zmm-usage=high')
     _feature_args+=('-DCMAKE_CXX_COMPILER=icpc')
-    _feature_args+=('-DCMAKE_CXX_FLAGS=-fp-model fast=2 -no-prec-div -qoverride-limits -qopt-zmm-usage=high -qno-offload -fno-alias -ansi-alias -O3 -std=c++11 -DLMP_INTEL_USELRT -DLMP_USE_MKL_RNG -I${MKLROOT}/include -L${MKLROOT}/lib')
+    _feature_args+=('-DCMAKE_CXX_FLAGS=-no-prec-div -qoverride-limits -qopt-zmm-usage=high -qno-offload -fno-alias -ansi-alias -O3 -std=c++11 -DLMP_INTEL_USELRT -DLMP_USE_MKL_RNG')
     _feature_args+=('-DCMAKE_Fortran_COMPILER=ifort')
     _feature_args+=('-DMPI_C_COMPILER=mpiicc')
     _feature_args+=('-DMPI_CXX_COMPILER=mpiicpc')
 fi
 if (( $_BUILD_DOC )); then
-    makedepends+=('python-sphinx')
+    makedepends+=('python-virtualenv' 'doxygen')
 fi
 if (( $_ENABLE_KIM )); then
     depends+=('kim-api>=2.0.2')
@@ -84,29 +84,11 @@ build() {
         #-DPKG_<NAME>=yes
 
   make
-
-  if (( $_BUILD_DOC )) ; then
-    export PYTHONPATH=$PWD/../doc/utils/converters/
-    # Generate HTML from ReStructuredText files
-    mkdir -p html
-    sphinx-build -b html -c "../doc/utils/sphinx-config" -d "doctrees" "../doc/src" html
-  fi
 }
 
 package() {
   cd "${_pkgname}/build"
   make DESTDIR="${pkgdir}" install
-  if (( $_BUILD_DOC )) ; then
-    install -Dm644 -t "${pkgdir}/usr/share/doc/${_pkgname}/html" "html/"*.html
-    install -Dm644 -t "${pkgdir}/usr/share/doc/${_pkgname}/html" "html/"*.js
-    install -Dm644 -t "${pkgdir}/usr/share/doc/${_pkgname}/html/_images" "html/_images/"*
-    install -Dm644 -t "${pkgdir}/usr/share/doc/${_pkgname}/html/_static" "html/_static/"*.png
-    #install -Dm644 -t "${pkgdir}/usr/share/doc/${_pkgname}/html/_static" "html/_static/"*.gif
-    install -Dm644 -t "${pkgdir}/usr/share/doc/${_pkgname}/html/_static" "html/_static/"*.js
-    install -Dm644 -t "${pkgdir}/usr/share/doc/${_pkgname}/html/_static/css" "html/_static/css/"*.css
-    install -Dm644 -t "${pkgdir}/usr/share/doc/${_pkgname}/html/_static/fonts" "html/_static/fonts/"*
-    install -Dm644 -t "${pkgdir}/usr/share/doc/${_pkgname}/html/_static/js" "html/_static/js/"*.js
-  fi
   if (( $_INSTALL_EXAMPLES )) ; then
     mkdir -p "${pkgdir}/usr/share/examples/lammps"
     cp -r "../examples/." "${pkgdir}/usr/share/examples/lammps/"