[arch-commits] Commit in root/trunk (PKGBUILD)

[Konstantin Gizdov]

    Date: Sunday, March 3, 2019 @ 19:21:19
  Author: kgizdov
Revision: 437495

replace and conflict all offending variants

Modified:
  root/trunk/PKGBUILD

----------+
 PKGBUILD |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-03 19:13:28 UTC (rev 437494)
+++ PKGBUILD	2019-03-03 19:21:19 UTC (rev 437495)
@@ -7,7 +7,7 @@
 pkgbase=root
 pkgname=('root' 'root-cuda')
 pkgver=6.16.00
-pkgrel=3
+pkgrel=4
 pkgdesc='C++ data analysis framework and interpreter from CERN.'
 arch=('x86_64')
 url='http://root.cern.ch'
@@ -22,6 +22,7 @@
              'ftgl'
              'blas'
              'gcc-fortran'
+             'gcc7'
              'giflib'
              'git'
              'gl2ps'
@@ -133,6 +134,8 @@
     mkdir -p "${srcdir}/build-cuda"
     cd "${srcdir}/build-cuda"
 
+    CC=gcc-7 \
+    CXX=g++-7 \
     CFLAGS="${CFLAGS} -pthread" \
     CXXFLAGS="${CXXFLAGS} -pthread" \
     LDFLAGS="${LDFLAGS} -pthread -Wl,--no-undefined" \
@@ -144,9 +147,9 @@
 }
 
 package_root() {
-    provides=('root-extra')
-    conflicts=('root-extra')
-    replaces=('root-extra')
+    provides=('root-extra' 'python-pyroot')
+    replaces=('root-extra' 'python-pyroot')
+    conflicts=('root-extra' 'python-pyroot' 'python2-pyroot')
     optdepends+=('gcc-fortran: Enable the Fortran components of ROOT')
     cd "${srcdir}/build"
 
@@ -191,7 +194,7 @@
 package_root-cuda() {
     pkgdesc='C++ data analysis framework and interpreter from CERN with GPU (CUDA) features enabled.'
     provides=('root' 'root-extra')
-    conflicts=('root' 'root-extra')
+    conflicts=('root' 'root-extra' 'python-pyroot' 'python2-pyroot')
     depends+=('cuda')
     cd "${srcdir}/build-cuda"