data library names and pkg revisited

3 files changed, 41 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fd6be566ac00..aa50f30d04ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sat Jan 30 21:52:32 UTC 2021
+# Sat Jan 30 22:34:17 UTC 2021
 
 
 pkgbase = geant4
@@ -11,7 +11,7 @@ pkgbase = geant4
 	arch = x86_64
 	license = custom: http://geant4.cern.ch/license/
 	depends = cmake>=3.8
-	depends = xerces-c
+	depends = xerces-c>=3
 	depends = qt5-base
 	depends = glu
 	depends = openmotif
@@ -20,18 +20,17 @@ pkgbase = geant4
 	optdepends = java-environment: for histogram visualizations and analysis
 	optdepends = tcsh: for C Shell support
 	optdepends = python: for G4Python support
-	optdepends = geant4-neutronhpdata: Neutron data files with thermal cross sections
+	optdepends = geant4-abladata: Data files for nuclear shell effects in INCL/ABLA hadronic mode
+	optdepends = geant4-ensdfstatedata: Nuclei properties from the Evaluated Nuclear Structure Data Files
+	optdepends = geant4-incldata: Data files for proton and neutron density profiles
 	optdepends = geant4-ledata: Data files for low energy electromagnetic processes
 	optdepends = geant4-levelgammadata: Data files for photon evaporation
-	optdepends = geant4-radioactivedata: Data files for radioactive decay hadronic processes
+	optdepends = geant4-neutronhpdata: Neutron data files with thermal cross sections
 	optdepends = geant4-particlexsdata: Data files for evaluated p, d, t, He3, He4 and gamma cross sections, replaces geant4-neutronxsdata
 	optdepends = geant4-piidata: Data files for shell ionisation cross sections
+	optdepends = geant4-radioactivedata: Data files for radioactive decay hadronic processes
 	optdepends = geant4-realsurfacedata: Data files for measured optical surface reflectance
 	optdepends = geant4-saiddata: Data files from evaluated cross-sections in SAID data-base
-	optdepends = geant4-abladata: Data files for nuclear shell effects in INCL/ABLA hadronic mode
-	optdepends = geant4-incldata: Data files for proton and neutron density profiles
-	optdepends = geant4-ensdfstatedata: Nuclei properties from the Evaluated Nuclear Structure Data Files
-	optdepends = geant4-particlehpdata: Data files for protons, deuterons, tritons, He3 and alphas for use with ParticleHP
 	conflicts = geant4_devel
 	options = !emptydirs
 	source = http://cern.ch/geant4-data/releases/geant4.10.07.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 5a272ae9e280..128be79d9c68 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _pkgver=10.07
 pkgrel=1
 pkgdesc="A simulation toolkit for particle physics interactions."
 depends=('cmake>=3.8'
-         'xerces-c'
+         'xerces-c>=3'
          'qt5-base'
          'glu'
          'openmotif'
@@ -17,18 +17,17 @@ optdepends=('java-environment: for histogram visualizations and
 analysis'
   'tcsh: for C Shell support'
   'python: for G4Python support'
-  'geant4-neutronhpdata: Neutron data files with thermal cross sections'
+  'geant4-abladata: Data files for nuclear shell effects in INCL/ABLA hadronic mode'
+  'geant4-ensdfstatedata: Nuclei properties from the Evaluated Nuclear Structure Data Files'
+  'geant4-incldata: Data files for proton and neutron density profiles'
   'geant4-ledata: Data files for low energy electromagnetic processes'
   'geant4-levelgammadata: Data files for photon evaporation'
-  'geant4-radioactivedata: Data files for radioactive decay hadronic processes'
+  'geant4-neutronhpdata: Neutron data files with thermal cross sections'
   'geant4-particlexsdata: Data files for evaluated p, d, t, He3, He4 and gamma cross sections, replaces geant4-neutronxsdata'
   'geant4-piidata: Data files for shell ionisation cross sections'
+  'geant4-radioactivedata: Data files for radioactive decay hadronic processes'
   'geant4-realsurfacedata: Data files for measured optical surface reflectance'
   'geant4-saiddata: Data files from evaluated cross-sections in SAID data-base'
-  'geant4-abladata: Data files for nuclear shell effects in INCL/ABLA hadronic mode'
-  'geant4-incldata: Data files for proton and neutron density profiles'
-  'geant4-ensdfstatedata: Nuclei properties from the Evaluated Nuclear Structure Data Files'
-  'geant4-particlehpdata: Data files for protons, deuterons, tritons, He3 and alphas for use with ParticleHP'
 )
 url="http://geant4.cern.ch/"
 arch=('x86_64')
@@ -82,19 +81,21 @@ package() {
 
   msg "Removing 'wrongly' set environment variables"
 
-  variables=(  "G4NEUTRONHPDATA" \
-               "G4LEDATA" \
-               "G4LEVELGAMMADATA" \
-               "G4RADIOACTIVEDATA" \
-               "G4PARTICLEXSDATA" \
-               "G4PIIDATA" \
-               "G4REALSURFACEDATA" \
-               "G4SAIDXSDATA" \
-               "G4ABLADATA" \
-               "G4INCLDATA" \
-               "G4ENSDFSTATEDATA" \
-               "G4PARTICLEHPDATA" \  # not included by default anyway
-            )
+  # Last revisited: 10.7
+  # also in .install file.
+  variables=(
+      "G4ABLADATA" \
+          "G4ENSDFSTATEDATA" \
+          "G4INCLDATA" \
+          "G4LEDATA" \
+          "G4LEVELGAMMADATA" \
+          "G4NEUTRONHPDATA" \
+          "G4PARTICLEXSDATA" \
+          "G4PIIDATA" \
+          "G4RADIOACTIVEDATA" \
+          "G4REALSURFACEDATA" \
+          "G4SAIDXSDATA" \
+          )
 
   for _varname in ${variables[*]}
   do
diff --git a/geant4.install b/geant4.install
index 295e50da5538..4c5d318154c8 100644
--- a/geant4.install
+++ b/geant4.install
@@ -1,20 +1,19 @@
 #!/bin/sh
 
 _init() {
-    variables=(  "G4NEUTRONHPDATA" \
-                 "G4LEDATA" \
-                 "G4LEVELGAMMADATA" \
-                 "G4RADIOACTIVEDATA" \
-                 "G4PARTICLEXSDATA" \
-                 "G4PIIDATA" \
-                 "G4REALSURFACEDATA" \
-                 "G4SAIDXSDATA" \
-                 "G4ABLADATA" \
-                 "G4INCLDATA" \
-                 "G4ENSDFSTATEDATA" \
-                 "G4PARTICLEHPDATA" \  # not included by default anyway
-                 "G4NEUTRONXS" \       # to be removed
-              )
+    variables=(
+        "G4ABLADATA" \
+            "G4ENSDFSTATEDATA" \
+            "G4INCLDATA" \
+            "G4LEDATA" \
+            "G4LEVELGAMMADATA" \
+            "G4NEUTRONHPDATA" \
+            "G4PARTICLEXSDATA" \
+            "G4PIIDATA" \
+            "G4RADIOACTIVEDATA" \
+            "G4REALSURFACEDATA" \
+            "G4SAIDXSDATA" \
+            )
 
 shell=("sh" "csh")