geant4 is now optdepends

2 files changed, 15 insertions, 24 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d6696d3101b7..2ee9f416e017 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,19 @@
 pkgname=geant4-radioactivedata
 pkgver=5.4
 pkgrel=3
+_varname='G4RADIOACTIVEDATA'
 _dataname="G4RadioactiveDecay"
-_foldername="RadioactiveDecay${pkgver}"
+_foldername="RadioactiveDecay"
 pkgdesc="Data files for radioactive decay hadronic processes"
 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=('240779da7d13f5bf0db250f472298c3804513e8aca6cae301db97f5ccdcc4a61'
-            '2b7059395bb7f2d8fb9a6d0410509c831fdeb1000dbd4bf6a421806834194084')
+            '1d3efc465b14ca90a5770ad2e35525ae244503a91a7f57d3dbecd0839dc25cf3')
 
 ## Remove this if you want to keep an even smaller package
 ## No need to wait for compression when just installing it.
@@ -23,5 +22,12 @@ PKGEXT='.pkg.tar'
 
 package() {
   install -d ${pkgdir}/usr/share/${pkgname}
-  mv ${srcdir}/${_foldername} ${pkgdir}/usr/share/${pkgname}
+  mv ${srcdir}/${_foldername}${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-radioactivedata.install b/geant4-radioactivedata.install
index ebb76e50fd42..e3af6d9365e5 100644
--- a/geant4-radioactivedata.install
+++ b/geant4-radioactivedata.install
@@ -1,34 +1,19 @@
 #!/bin/sh
 
 _varname='G4RADIOACTIVEDATA'
-_packagename='geant4-radioactivedata'
-_foldername="RadioactiveDecay"
-
-_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
 }