major fixes and packaging style corrections

6 files changed, 68 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d0d55656d587..0876506312cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = root5
 	pkgdesc = C++ data analysis framework and interpreter from CERN.
 	pkgver = 5.34.36
-	pkgrel = 2
+	pkgrel = 3
 	url = http://root.cern.ch
 	install = root.install
 	arch = i686
@@ -14,18 +14,18 @@ pkgbase = root5
 	depends = glew
 	depends = graphviz
 	depends = gsl
+	depends = libiodbc
+	depends = libafterimage
 	depends = libmysqlclient
 	depends = postgresql-libs
 	depends = python2
+	depends = tex-gyre-fonts
 	depends = unixodbc
-	depends = shared-mime-info
 	depends = xmlrpc-c
-	depends = tex-gyre-fonts
-	depends = libiodbc
-	depends = gtk-update-icon-cache
-	depends = libafterimage
 	optdepends = gcc-fortran: Enable the Fortran components of ROOT
+	optdepends = pythia: Pythia8 event generator support
 	optdepends = tcsh: Legacy CSH support
+	optdepends = xrootd: XRootD data access support
 	conflicts = root
 	options = !emptydirs
 	source = https://root.cern.ch/download/root_v5.34.36.source.tar.gz
@@ -33,11 +33,11 @@ pkgbase = root5
 	source = root.sh
 	source = rootd
 	source = root.xml
-	md5sums = 6a1ad549b3b79b10bbb1f116b49067ee
-	md5sums = 886e0649f28ceb75ea4ba1beb1b6f83f
-	md5sums = 0e883ad44f99da9bc7c23bc102800b62
-	md5sums = efd06bfa230cc2194b38e0c8939e72af
-	md5sums = e2cf69b204192b5889ceb5b4dedc66f7
+	sha256sums = fc868e5f4905544c3f392cc9e895ef5571a08e48682e7fe173bd44c0ba0c7dcd
+	sha256sums = cbe83392eb3d73e212236619a3ad21592c05e23e61c4b6343b0869c4b922337c
+	sha256sums = 9d1f8e7ad923cb5450386edbbce085d258653c0160419cdd6ff154542cc32bd7
+	sha256sums = 3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a
+	sha256sums = 50c08191a5b281a39aa05ace4feb8d5405707b4c54a5dcba061f954649c38cb0
 
 pkgname = root5
 
diff --git a/PKGBUILD b/PKGBUILD
index 6f38dd93e8a1..ac24b1177507 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,36 @@
-# Maintainer:  Konstantin Gizdov <arch@kge.pw>
-# Contributor: Carl Lei <xecycle@gmail.com>
-# Contributor: Scott Lawrence <bytbox@gmail.com>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Sebastian Voecking <voeck@web.de>
+# Maintainer:  Konstantin Gizdov <arch at kge dot pw>
+# Contributor: Carl Lei <xecycle at gmail dot com>
+# Contributor: Scott Lawrence <bytbox at gmail dot com>
+# Contributor: Thomas Dziedzic < gostrc at gmail dot com>
+# Contributor: Sebastian Voecking <voeck at web dot de>
 
 pkgname=root5
 pkgver=5.34.36
-pkgrel=2
+pkgrel=3
 pkgdesc='C++ data analysis framework and interpreter from CERN.'
 arch=('i686' 'x86_64')
 url='http://root.cern.ch'
 license=('LGPL2.1')
 conflicts=('root')
 depends=('cfitsio'
-  'fftw'
-  'ftgl'
-  'giflib'
-  'glew'
-  'graphviz'
-  'gsl'
-  'libmysqlclient'
-  'postgresql-libs'
-  'python2'
-  'unixodbc'
-  'shared-mime-info'
-  'xmlrpc-c'
-  'tex-gyre-fonts'
-  'libiodbc'
-  'gtk-update-icon-cache'
-  'libafterimage')
+         'fftw'
+         'ftgl'
+         'giflib'
+         'glew'
+         'graphviz'
+         'gsl'
+         'libiodbc'
+         'libafterimage'
+         'libmysqlclient'
+         'postgresql-libs'
+         'python2'
+         'tex-gyre-fonts'
+         'unixodbc'
+         'xmlrpc-c')
 optdepends=('gcc-fortran: Enable the Fortran components of ROOT'
+            'pythia: Pythia8 event generator support'
             'tcsh: Legacy CSH support'
-)
+            'xrootd: XRootD data access support')
 install='root.install'
 options=('!emptydirs')
 source=("https://root.cern.ch/download/root_v${pkgver}.source.tar.gz"
@@ -39,22 +38,16 @@ source=("https://root.cern.ch/download/root_v${pkgver}.source.tar.gz"
         'root.sh'
         'rootd'
         'root.xml')
-md5sums=('6a1ad549b3b79b10bbb1f116b49067ee'
-         '886e0649f28ceb75ea4ba1beb1b6f83f'
-         '0e883ad44f99da9bc7c23bc102800b62'
-         'efd06bfa230cc2194b38e0c8939e72af'
-         'e2cf69b204192b5889ceb5b4dedc66f7')
+sha256sums=('fc868e5f4905544c3f392cc9e895ef5571a08e48682e7fe173bd44c0ba0c7dcd'
+            'cbe83392eb3d73e212236619a3ad21592c05e23e61c4b6343b0869c4b922337c'
+            '9d1f8e7ad923cb5450386edbbce085d258653c0160419cdd6ff154542cc32bd7'
+            '3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a'
+            '50c08191a5b281a39aa05ace4feb8d5405707b4c54a5dcba061f954649c38cb0')
 
-build() {
+prepare() {
   cd root
 
-  if [ ${CARCH} == 'i686' ]; then
-    TARGET=linux;
-  else
-    TARGET=linuxx8664gcc;
-  fi
-
-  msg 'python2 switch'
+  msg 'Python2 switch...'
   find . -type f -exec sed -e 's_#!/usr/bin/env python_&2_' \
                            -e 's/python -O/python2 -O/g' \
                            -e 's/python -c/python2 -c/g' -i {} \;
@@ -71,9 +64,21 @@ build() {
   # Horid glibc hack
   sed -e 's/__USE_BSD/__USE_MISC/' -i core/base/src/TTimeStamp.cxx
 
+  msg 'Applying patches...'
   ## https://sft.its.cern.ch/jira/browse/ROOT-8180
   patch -p1 < ${srcdir}/enable_gcc6.patch
 
+}
+
+build() {
+  cd root
+
+  if [ ${CARCH} == 'i686' ]; then
+    TARGET=linux;
+  else
+    TARGET=linuxx8664gcc;
+  fi
+
   local sys_libs=""
   for sys_lib in afterimage ftgl freetype glew pcre zlib lzma; do
     sys_libs+="--disable-builtin-${sys_lib} "
diff --git a/root.install b/root.install
index afabb7aea55d..4724af5cf1c4 100644
--- a/root.install
+++ b/root.install
@@ -1,25 +1,10 @@
-post_install() {
-  update-desktop-database >/dev/null
-
-  update-mime-database /usr/share/mime >/dev/null
-
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_remove() {
-  # leave for pre 5.30.03-3
-  if [[ $(vercmp $1 5.30.03-3) == -1 ]]; then
-    cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot
-    mv /tmp/.pacroot etc/ld.so.conf
-    chmod 644 etc/ld.so.conf
-    sbin/ldconfig -r .
-  fi
+post_install () {
+    echo "Optional packages/features will only be activated"
+    echo "if the optional dependencies are installed before"
+    echo "the package compilation has started. Please reco-"
+    echo "mpile as needed."
 }
 
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+post_upgrade () {
+    post_install
 }
diff --git a/root.sh b/root.sh
index 685e6036bc3a..203b6853d1c4 100644
--- a/root.sh
+++ b/root.sh
@@ -1,5 +1,9 @@
 if [ $PYTHONPATH ]; then
-    export PYTHONPATH=$PYTHONPATH:/usr/lib/root;
+    if [[ ":$PYTHONPATH:" == *":/usr/lib/root:"* ]]; then
+        return 0;
+    else
+        export PYTHONPATH=$PYTHONPATH:/usr/lib/root;
+    fi
 else
     export PYTHONPATH=/usr/lib/root;
 fi
diff --git a/root.xml b/root.xml
index af8dd69c5891..eb2c73eea473 100644
--- a/root.xml
+++ b/root.xml
@@ -3,6 +3,9 @@
   <mime-type type="application/x-root">
     <comment>ROOT file</comment>
     <comment xml:lang="de">ROOT-Datei</comment>
+    <comment xml:lang="en">ROOT-File</comment>
+    <comment xml:lang="fr">ROOT-Fichier</comment>
+    <comment xml:lang="it">ROOT-File</comment>
     <glob pattern="*.root"/>
     <magic priority="80">
       <match value="root" type="string" offset="0:64"/>
diff --git a/rootd b/rootd
index fb2c3388ca24..3767e57f09f8 100644
--- a/rootd
+++ b/rootd
@@ -32,6 +32,6 @@ case "$1" in
     $0 start
     ;;
   *)
-    echo "usage: $0 {start|stop|restart}"  
+    echo "usage: $0 {start|stop|restart}"
 esac
 exit 0