update to v3.6.0 and conditional depends

Signed-off-by: Alexander Phinikarides <alexisph@gmail.com>

3 files changed, 56 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e181c1b498f5..88c6d6dd2979 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = r-mkl
 	pkgdesc = Language and environment for statistical computing and graphics, linked to the Intel(R) MKL.
-	pkgver = 3.5.3
+	pkgver = 3.6.0
 	pkgrel = 1
 	url = http://www.r-project.org/
 	install = r-mkl.install
@@ -9,10 +9,9 @@ pkgbase = r-mkl
 	makedepends = java-environment
 	makedepends = tk
 	depends = intel-mkl
-	depends = intel-compiler-base
-	depends = intel-fortran-compiler
+	depends = intel-common-libs
 	depends = bzip2
-	depends = desktop-file-utils
+	depends = curl
 	depends = gcc-libs
 	depends = gcc-fortran
 	depends = icu
@@ -33,26 +32,25 @@ pkgbase = r-mkl
 	depends = zlib
 	optdepends = texlive-bin: LaTeX sty files
 	optdepends = tk: tcl-tk interface
-	provides = r=3.5.3
+	provides = r=3.6.0
 	conflicts = r
 	conflicts = microsoft-r-open
-	options = !makeflags
 	options = !emptydirs
 	backup = etc/R/Makeconf
 	backup = etc/R/Renviron
 	backup = etc/R/ldpaths
 	backup = etc/R/repositories
 	backup = etc/R/javaconf
-	source = http://cran.r-project.org/src/base/R-3/R-3.5.3.tar.gz
+	source = http://cran.r-project.org/src/base/R-3/R-3.6.0.tar.gz
 	source = r.desktop
 	source = r.png
 	source = R.conf
-	md5sums = 525e902dd331c387f271692a1537aff8
-	md5sums = 44ca875140b148543148b7749c7d6f5e
+	md5sums = 65601eac6d353f7efb5b48c29097c2fb
+	md5sums = 2dd24e473eb837016b63a45b638af167
 	md5sums = 8e0c51650b8a63f110fa7b09e699e9c4
 	md5sums = 1dfa62c812aed9642f6e4ac34999b9fe
-	sha512sums = 077cbd4bc9f19a3a2485afbd4d8e08e0754ddcb9a10164cbc8478f239d5ed0ffaf6796929f154cce1c8aea549c32d460049fc036dc326174d1dbb0a1ddb5f5ef
-	sha512sums = 1a90aed5411d72dd3e7708db0cb92c518e656e1a510ece02ad934131e05b8e683b4a36da8d37198263dc19fb2f3f19656c19c01f9b67974f0d7755974076d0b7
+	sha512sums = b2e17b909b6387abb964492e2e9370f913295ca7ac99bab0e965c43ed3c4635e27468c326fb2bca3c529b03c731b0170d9e777a194ad4d6c5a983c050223d8c8
+	sha512sums = 658793de80f905f790ef3f8205ce4d78c69eb27eafaf6579056743df7af921824ce2e07561a5c14706a9d6520bbbde0c0ee70c10eccf2d11f7626b00c567562d
 	sha512sums = 1491b01d3d14b86d26c383e00e2305858a52ddd498158c9f7f6b33026ee01f246408b1676cffea73f7783c8c4cf546285705c43c0286adbd75ad77706918b5fe
 	sha512sums = aae388c5b6c02d9fb857914032b0cd7d68a9f21e30c39ba11f5a29aaf1d742545482054b57ce18872eabb6605bbb359b2fc1e9be5ce6881443fdbdf6b67fab3b
 
diff --git a/PKGBUILD b/PKGBUILD
index 8a315e643955..e576409d5a45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Based on the PKGBUILD for R
 
 pkgname=r-mkl
-pkgver=3.5.3
+pkgver=3.6.0
 pkgrel=1
 pkgdesc="Language and environment for statistical computing and graphics, linked to the Intel(R) MKL."
 arch=('x86_64')
@@ -13,30 +13,29 @@ url='http://www.r-project.org/'
 provides=("r=${pkgver}")
 conflicts=('r' 'microsoft-r-open')
 depends=('intel-mkl'
-        'intel-compiler-base'
-        'intel-fortran-compiler'
-        'bzip2'
-        'desktop-file-utils'
-        'gcc-libs'
-        'gcc-fortran'
-        'icu'
-        'libjpeg'
-        'libpng'
-        'libtiff'
-        'libxmu'
-        'libxt'
-        'ncurses'
-        'openmp'
-        'pango'
-        'pcre'
-        'perl'
-        'readline'
-        'unzip'
-        'xz'
-        'zip'
-        'zlib')
+         'intel-common-libs'
+         'bzip2'
+         'curl'
+         'gcc-libs'
+         'gcc-fortran'
+         'icu'
+         'libjpeg'
+         'libpng'
+         'libtiff'
+         'libxmu'
+         'libxt'
+         'ncurses'
+         'openmp'
+         'pango'
+         'pcre'
+         'perl'
+         'readline'
+         'unzip'
+         'xz'
+         'zip'
+         'zlib')
 makedepends=('java-environment'
-            'tk')
+             'tk')
 optdepends=('texlive-bin: LaTeX sty files'
             'tk: tcl-tk interface')
 backup=('etc/R/Makeconf'
@@ -44,7 +43,7 @@ backup=('etc/R/Makeconf'
         'etc/R/ldpaths'
         'etc/R/repositories'
         'etc/R/javaconf')
-options=('!makeflags' '!emptydirs')
+options=('!emptydirs')
 install=r-mkl.install
 
 source=("http://cran.r-project.org/src/base/R-${pkgver%%.*}/R-${pkgver}.tar.gz"
@@ -52,12 +51,12 @@ source=("http://cran.r-project.org/src/base/R-${pkgver%%.*}/R-${pkgver}.tar.gz"
         'r.png'
         'R.conf')
 
-md5sums=('525e902dd331c387f271692a1537aff8'
-         '44ca875140b148543148b7749c7d6f5e'
+md5sums=('65601eac6d353f7efb5b48c29097c2fb'
+         '2dd24e473eb837016b63a45b638af167'
          '8e0c51650b8a63f110fa7b09e699e9c4'
          '1dfa62c812aed9642f6e4ac34999b9fe')
-sha512sums=('077cbd4bc9f19a3a2485afbd4d8e08e0754ddcb9a10164cbc8478f239d5ed0ffaf6796929f154cce1c8aea549c32d460049fc036dc326174d1dbb0a1ddb5f5ef'
-            '1a90aed5411d72dd3e7708db0cb92c518e656e1a510ece02ad934131e05b8e683b4a36da8d37198263dc19fb2f3f19656c19c01f9b67974f0d7755974076d0b7'
+sha512sums=('b2e17b909b6387abb964492e2e9370f913295ca7ac99bab0e965c43ed3c4635e27468c326fb2bca3c529b03c731b0170d9e777a194ad4d6c5a983c050223d8c8'
+            '658793de80f905f790ef3f8205ce4d78c69eb27eafaf6579056743df7af921824ce2e07561a5c14706a9d6520bbbde0c0ee70c10eccf2d11f7626b00c567562d'
             '1491b01d3d14b86d26c383e00e2305858a52ddd498158c9f7f6b33026ee01f246408b1676cffea73f7783c8c4cf546285705c43c0286adbd75ad77706918b5fe'
             'aae388c5b6c02d9fb857914032b0cd7d68a9f21e30c39ba11f5a29aaf1d742545482054b57ce18872eabb6605bbb359b2fc1e9be5ce6881443fdbdf6b67fab3b')
 
@@ -65,6 +64,14 @@ sha512sums=('077cbd4bc9f19a3a2485afbd4d8e08e0754ddcb9a10164cbc8478f239d5ed0ffaf6
 # Comment the following line to build the package with GCC
 # _CC="icc"
 
+# update dependencies w.r.t the compiler used
+if [[ $_CC = "icc" ]]; then
+  depends+=('intel-compiler-base'
+            'intel-fortran-compiler'
+            'intel-openmp')
+fi
+
+
 prepare() {
   cd R-${pkgver}
   # set texmf dir correctly in makefile
@@ -73,6 +80,7 @@ prepare() {
   # sed -i '/LIBS=`eval $query VAR=LIBS`/a\LDFLAGS=`eval $query VAR=LDFLAGS`' src/scripts/config
 }
 
+
 build() {
   cd R-${pkgver}
 
@@ -113,16 +121,16 @@ build() {
     export FFLAGS="${_intel_cc_opt}"
     export FCFLAGS="${_intel_cc_opt}"
   else
-    _gcc_opt=" -O3 -m64 -march=native -I${MKLROOT}/include"
+    _gcc_opt=" -m64 -I${MKLROOT}/include"
     # export LDFLAGS=" -fopenmp"
 
     # Dynamic Linking
     _mkllibs=" -L${MKLROOT}/lib/${_intel_arch} \
       -Wl,--no-as-needed \
       -l${_gfortran_lib} \
-      -lmkl_intel_thread \
+      -lmkl_gnu_thread \
       -lmkl_core \
-      -liomp5 \
+      -lgomp \
       -lpthread \
       -lm \
       -ldl"
@@ -133,10 +141,10 @@ build() {
     export LD="ld"
     export F77="gfortran"
     export FC="gfortran"
-    export CFLAGS="${_gcc_opt}"
-    export CXXFLAGS="${_gcc_opt}"
-    export FFLAGS="${_gcc_opt}"
-    export FCFLAGS="${_gcc_opt}"
+    export CFLAGS="${_gcc_opt} $CFLAGS"
+    export CXXFLAGS="${_gcc_opt} $CXXFLAGS"
+    export FFLAGS="${_gcc_opt} $FFLAGS"
+    export FCFLAGS="${_gcc_opt} $FCFLAGS"
   fi
 
   ./configure  --prefix=/usr \
@@ -163,11 +171,13 @@ build() {
   make shared
 }
 
+
 check() {
   cd R-${pkgver}
   make check-recommended
 }
 
+
 package() {
   cd R-${pkgver}
   make DESTDIR="${pkgdir}" install
diff --git a/r.desktop b/r.desktop
index 7732c9bed1f8..6ceca7a12fed 100644
--- a/r.desktop
+++ b/r.desktop
@@ -8,4 +8,4 @@ DocPath=/usr/lib/R/doc/html/index.html
 StartupNotify=true
 Terminal=true
 Type=Application
-Categories=Science;
+Categories=Math;Science;Education