geant4 is now optdepends

2 files changed, 14 insertions, 22 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 8203bb9f6eea..60af531a053e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,22 @@
 # Maintainer: L.G. Sarmiento (Pico) <Luis.Sarmientop-ala-nuclear.lu.se>
 pkgname=geant4-particlexsdata
+_varname='G4PARTICLEXSDATA'
 _dataname="G4PARTICLEXS"
+_foldername='G4PARTICLEXS'
 pkgver=2.1
 pkgrel=3
 pkgdesc="Data files for evaluated particle cross-sections on natural composition of elements"
 url="http://geant4.cern.ch/"
 arch=('any')
 license=('GPL')
-depends=('geant4>=10.5')
-#it cannot be optdepend since we require the geant4.sh file to exist
-#to setup the environment variable
+optdepends=('geant4>=10.5')
 conflicts=('geant4-neutronxsdata')
 provides=('geant4-neutronxsdata')
 install="${pkgname}.install"
 source=("https://cern.ch/geant4-data/datasets/${_dataname}.${pkgver}.tar.gz"
   "${pkgname}.install")
 sha256sums=('094d103372bbf8780d63a11632397e72d1191dc5027f9adabaf6a43025520b41'
-            '5aa2e976b79285159b2c9091634fcfff878c04df0d338f50d05157df67edb332')
+            'bc476e1b0ebb6e5ea2f57398887ed3b2ec22e4b678be2f54edf439d6f3dc18a2')
 
 ## Remove this if you want to keep an even smaller package
 ## No need to wait for compression when just installing it.
@@ -25,4 +25,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-particlexsdata.install b/geant4-particlexsdata.install
index 4ecf7cea1e67..ba53afe742ff 100644
--- a/geant4-particlexsdata.install
+++ b/geant4-particlexsdata.install
@@ -1,34 +1,19 @@
 #!/bin/sh
 
 _varname='G4PARTICLEXSDATA'
-_packagename='geant4-particlexsdata'
-_foldername='G4PARTICLEXS'
-
-_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
 }