geant4 is now optdepends

3 files changed, 17 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 36929e4c47a9..f3bd0cd7f8ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Mon Aug 24 08:44:54 UTC 2020
+# Fri Aug 28 08:55:09 UTC 2020
 pkgbase = geant4-neutronhpdata
 	pkgdesc = Neutron data files with thermal cross sections
 	pkgver = 4.6
@@ -8,11 +8,11 @@ pkgbase = geant4-neutronhpdata
 	install = geant4-neutronhpdata.install
 	arch = any
 	license = GPL
-	depends = geant4>=10.06
+	optdepends = geant4>=10.06
 	source = https://cern.ch/geant4-data/datasets/G4NDL.4.6.tar.gz
 	source = geant4-neutronhpdata.install
 	sha256sums = 9d287cf2ae0fb887a2adce801ee74fb9be21b0d166dab49bcbee9408a5145408
-	sha256sums = 708b99a1e63fedf9cb2f735512cefcf5a3b7fb58a82feeb0fdfe8d8906df61e0
+	sha256sums = e68d9bc99c0440ee36adb6caa92469bca5fb3b5b2c0086ce7fbd0dceb0992fa4
 
 pkgname = geant4-neutronhpdata
 
diff --git a/PKGBUILD b/PKGBUILD
index d81233e96aae..e96a8ab453b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,20 @@
 # Maintainer: L.G. Sarmiento (Pico) <Luis.Sarmientop-ala-nuclear.lu.se>
 pkgname=geant4-neutronhpdata
+_varname='G4NEUTRONHPDATA'
 _dataname="G4NDL"
+_foldername='G4NDL'
 pkgver=4.6
 pkgrel=3
 pkgdesc="Neutron data files with thermal cross sections"
 url="http://geant4.cern.ch/"
 arch=('any')
 license=('GPL')
-depends=('geant4>=10.06')
-#it cannot be optdepend since we require the geant4.sh file to exist
-#to setup the environment variable
+optdepends=('geant4>=10.06')
 install="${pkgname}.install"
 source=("https://cern.ch/geant4-data/datasets/${_dataname}.${pkgver}.tar.gz"
   "${pkgname}.install")
 sha256sums=('9d287cf2ae0fb887a2adce801ee74fb9be21b0d166dab49bcbee9408a5145408'
-            '708b99a1e63fedf9cb2f735512cefcf5a3b7fb58a82feeb0fdfe8d8906df61e0')
+            'd3cd3c831d47dad0deeb463e62a3f087258dab7ba38759c1cbae70e6cecf8e6d')
 
 ## Remove this if you want to keep an even smaller package
 ## No need to wait for compression when just installing it.
@@ -23,4 +23,11 @@ PKGEXT='.pkg.tar'
 package() {
   install -d ${pkgdir}/usr/share/${pkgname}
   mv ${srcdir}/${_dataname}${pkgver} ${pkgdir}/usr/share/${pkgname}
+
+  echo "export ${_varname}=/usr/share/${pkgname}/${_foldername}${pkgver}" > ${srcdir}/${pkgname}.sh
+  echo "setenv ${_varname} /usr/share/${pkgname}/${_foldername}${pkgver}" > ${srcdir}/${pkgname}.csh
+
+  install -d ${pkgdir}/etc/profile.d
+  install -m755 ${srcdir}/${pkgname}.sh  ${pkgdir}/etc/profile.d/${pkgname}.sh
+  install -m755 ${srcdir}/${pkgname}.csh ${pkgdir}/etc/profile.d/${pkgname}.csh
 }
diff --git a/geant4-neutronhpdata.install b/geant4-neutronhpdata.install
index 11963dd7645f..112f352fbedb 100644
--- a/geant4-neutronhpdata.install
+++ b/geant4-neutronhpdata.install
@@ -1,34 +1,19 @@
 #!/bin/sh
 
 _varname='G4NEUTRONHPDATA'
-_packagename='geant4-neutronhpdata'
-_foldername='G4NDL'
-
-_add() {
-    _dataversion=${1}
-    echo "export ${_varname}=/usr/share/${_packagename}/${_foldername}${_dataversion}" >> /etc/profile.d/geant4.sh
-    echo "setenv ${_varname} /usr/share/${_packagename}/${_foldername}${_dataversion}" >> /etc/profile.d/geant4.csh
-}
 
 _remove() {
-    sed -i "/${_varname}/d" /etc/profile.d/geant4.sh
-    sed -i "/${_varname}/d" /etc/profile.d/geant4.csh
+    ## from the time where this variables where stored in this one script
+    sed -n -i "/${_varname}/d" /etc/profile.d/geant4.sh  2>/dev/null
+    sed -n -i "/${_varname}/d" /etc/profile.d/geant4.csh 2>/dev/null
 }
 
 pre_install() {
     _remove
 }
-post_install() {
-    _version=${1::-2}
-    _add ${_version}
-}
 pre_upgrade() {
     _remove
 }
-post_upgrade() {
-    _version=${1::-2}
-    _add ${_version}
-}
 pre_remove() {
     _remove
 }