Update to version 3.2.5

3 files changed, 41 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f9c7758f8e4..0f30c8a41fd7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Thu May 26 10:07:40 UTC 2016
 pkgbase = microsoft-r-open
 	pkgdesc = Language and environment for statistical computing and graphics, modified version by Microsoft
-	pkgver = 3.2.4
+	pkgver = 3.2.5
 	pkgrel = 1
 	url = https://mran.revolutionanalytics.com/open/
 	arch = x86_64
@@ -10,14 +12,14 @@ pkgbase = microsoft-r-open
 	makedepends = tk
 	options = !makeflags
 	options = !emptydirs
-	source = https://github.com/RevolutionAnalytics/RRO/archive/MRO-3.2.4.tar.gz
+	source = https://github.com/RevolutionAnalytics/RRO/archive/MRO-3.2.5.tar.gz
 	source = Rprofile_site.patch
 	source = mro.desktop
-	md5sums = 002dc0b5e8ec09ed971419256e38ffd7
-	md5sums = 5ac5ecfe3c0ad6445f2ee76791704f8d
+	md5sums = 0572a3384f9bc724118cb9b7c363f885
+	md5sums = 3e35bccbf4b9df66059400c4c42d21ef
 	md5sums = 70e8f9d0b1eebeb1f0b45f4568bc0701
-	sha512sums = ce15113bb7ea9c7bdf42eae3d8fc0ec8a412869d89aca58461092e8e0434cf428ee4de54393e2fcf5c969e324802ec1c11dab7303f28052b4db62d8a35f072f0
-	sha512sums = 4a95d9273c471c36f9a2d1124b6832ca032e4e462cb04ebb169c7a973a91226c93c0ba62c62c968416b8abc9b659b4a6a1e996532e7c06c617688fa61acf9b8f
+	sha512sums = b309dba4820210728cc61520be1e48739b82350e5ae3897578e95a21742ed26ea83c4afd1c727c39417e419ef037a7d52ef554587723201b5ce349ec848d4f89
+	sha512sums = f6d0dc696a1c8fd6f7714c77bf286663ca34d5b1ab0226fb26d9574ed3bf6a38a59743fb2165a9235f91d31cba3f97a7faaca6e5201e60dd9d554fddb0700168
 	sha512sums = 2b0221bd1e0fdd399284333e6f2020bb9ad11395ad39dd2fca688b7ebc68fbbc60de59a757e1898be8bcd9e2926afccc121043f38445e7693f177c3076f92b61
 
 pkgname = microsoft-r-open
@@ -45,14 +47,14 @@ pkgname = microsoft-r-open
 	optdepends = texlive-bin: latex sty files
 	optdepends = revomath: high performance BLAS/Lapack library
 	optdepends = microsoft-r-open-blas-systemblas: use system BLAS&Lapack libraries
-	provides = r=3.2.4
+	provides = r=3.2.5
 	conflicts = r
-	backup = usr/lib/MRO-3.2.4/R-3.2.4/lib64/R/etc/Makeconf
-	backup = usr/lib/MRO-3.2.4/R-3.2.4/lib64/R/etc/Renviron
-	backup = usr/lib/MRO-3.2.4/R-3.2.4/lib64/R/etc/ldpaths
-	backup = usr/lib/MRO-3.2.4/R-3.2.4/lib64/R/etc/repositories
-	backup = usr/lib/MRO-3.2.4/R-3.2.4/lib64/R/etc/javaconf
-	backup = usr/lib/MRO-3.2.4/R-3.2.4/lib64/R/etc/Rprofile.site
+	backup = usr/lib/MRO-3.2.5/R-3.2.5/lib64/R/etc/Makeconf
+	backup = usr/lib/MRO-3.2.5/R-3.2.5/lib64/R/etc/Renviron
+	backup = usr/lib/MRO-3.2.5/R-3.2.5/lib64/R/etc/ldpaths
+	backup = usr/lib/MRO-3.2.5/R-3.2.5/lib64/R/etc/repositories
+	backup = usr/lib/MRO-3.2.5/R-3.2.5/lib64/R/etc/javaconf
+	backup = usr/lib/MRO-3.2.5/R-3.2.5/lib64/R/etc/Rprofile.site
 
 pkgname = microsoft-r-open-blas
 	pkgdesc = Unoptimized math library for Revolution R Open
diff --git a/PKGBUILD b/PKGBUILD
index 96c0e2f9c178..98f21adc95e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgbase=microsoft-r-open
 pkgname=('microsoft-r-open' 'microsoft-r-open-blas')
-pkgver=3.2.4
-_mrandate=2016-04-01
+pkgver=3.2.5
+_mrandate=2016-05-01
 pkgrel=1
 pkgdesc="Language and environment for statistical computing and graphics, modified version by Microsoft"
 arch=('x86_64')
@@ -14,11 +14,11 @@ options=('!makeflags' '!emptydirs')
 source=("https://github.com/RevolutionAnalytics/RRO/archive/MRO-${pkgver}.tar.gz"
 	"Rprofile_site.patch"
 	"mro.desktop")
-md5sums=('002dc0b5e8ec09ed971419256e38ffd7'
-         '5ac5ecfe3c0ad6445f2ee76791704f8d'
+md5sums=('0572a3384f9bc724118cb9b7c363f885'
+         '3e35bccbf4b9df66059400c4c42d21ef'
          '70e8f9d0b1eebeb1f0b45f4568bc0701')
-sha512sums=('ce15113bb7ea9c7bdf42eae3d8fc0ec8a412869d89aca58461092e8e0434cf428ee4de54393e2fcf5c969e324802ec1c11dab7303f28052b4db62d8a35f072f0'
-            '4a95d9273c471c36f9a2d1124b6832ca032e4e462cb04ebb169c7a973a91226c93c0ba62c62c968416b8abc9b659b4a6a1e996532e7c06c617688fa61acf9b8f'
+sha512sums=('b309dba4820210728cc61520be1e48739b82350e5ae3897578e95a21742ed26ea83c4afd1c727c39417e419ef037a7d52ef554587723201b5ce349ec848d4f89'
+            'f6d0dc696a1c8fd6f7714c77bf286663ca34d5b1ab0226fb26d9574ed3bf6a38a59743fb2165a9235f91d31cba3f97a7faaca6e5201e60dd9d554fddb0700168'
             '2b0221bd1e0fdd399284333e6f2020bb9ad11395ad39dd2fca688b7ebc68fbbc60de59a757e1898be8bcd9e2926afccc121043f38445e7693f177c3076f92b61')
 
 prepare() {
diff --git a/Rprofile_site.patch b/Rprofile_site.patch
index 95184de90fcf..f40a5310db33 100644
--- a/Rprofile_site.patch
+++ b/Rprofile_site.patch
@@ -1,9 +1,9 @@
---- Rprofile.site.orig	2016-04-18 22:30:13.000000000 +0200
-+++ Rprofile.site	2016-04-28 23:31:57.199326961 +0200
-@@ -1,35 +1,14 @@
--Revo.version <- structure(list(major = "3", minor = "2.4", "BuildID" = :::BUILDID:::), class = "simple.list")
-+Revo.version <- structure(list(major = "3", minor = "2.4", "BuildID" = 'Arch Linux'), class = "simple.list")
- repos.date <- "2016-04-01"
+--- Rprofile.site	2016-05-10 23:05:06.000000000 +0200
++++ Rprofile.site.new	2016-05-26 11:47:54.542644822 +0200
+@@ -1,25 +1,15 @@
+-Revo.version <- structure(list(major = "3", minor = "2.5", "BuildID" = :::BUILDID:::), class = "simple.list")
++Revo.version <- structure(list(major = "3", minor = "2.5", "BuildID" = 'Arch Linux'), class = "simple.list")
+ repos.date <- "2016-05-01"
  
 -if  (identical(.Platform$OS.type, "windows")) {
 -	options(download.file.method = "wininet")
@@ -13,27 +13,16 @@
 -    if (capabilities("libcurl")) {
 -       options(download.file.method = "libcurl")
 -    } else {
--       options(download.file.method = "curl")
+-		dmethAvail <- Sys.which(c("curl", "wget"))
+-		if (any(dmethAvail != "")) {
+-			options(download.file.method = names(dmethAvail[which(dmethAvail != "")[1]]))
+-		}
 -    }
 +   options(download.file.method = "curl")
  }
  
--if (.Platform$OS.type == "unix" && file.exists("/etc/issue") && (grepl("CentOS release 5", readLines("/etc/issue")[1]))) {
--    warning("Warning: Packages will be downloaded using HTTP. See mran.microsoft.com/faq/#https for information on enabling secure package downloads.\n")
--    options(download.file.method = "wget")
--    options(repos = c(CRAN = paste("http://mran.microsoft.com/snapshot/",repos.date,sep=""))) 
--} else if (.Platform$OS.type == "unix" && file.exists("/etc/issue") && (grepl("Welcome to SUSE Linux Enterprise Server 10", readLines("/etc/issue")[1]))) {
--    warning("Warning: Packages will be downloaded using HTTP. See mran.microsoft.com/faq/#https for information on enabling secure package downloads.\n")
--    options(download.file.method = "wget")
--    options(repos = c(CRAN = paste("http://mran.microsoft.com/snapshot/",repos.date,sep="")))
--} else if (.Platform$OS.type == "unix" && file.exists("/etc/issue") && (grepl("Welcome to SUSE Linux Enterprise Server 10", readLines("/etc/issue")[2]))) {
--    warning("Warning: Packages will be downloaded using HTTP. See mran.microsoft.com/faq/#https for information on enabling secure package downloads.\n")
--    options(download.file.method = "wget")
--    options(repos = c(CRAN = paste("http://mran.microsoft.com/snapshot/",repos.date,sep="")))
--} else {
--    options(repos = c(CRAN = paste("https://mran.microsoft.com/snapshot/",repos.date,sep="")))
--}
-+options(repos = c(CRAN = paste("https://mran.microsoft.com/snapshot/",repos.date,sep="")))
+ options(repos = c(CRAN = paste("https://mran.microsoft.com/snapshot/",repos.date,sep="")))
+ 
  
 -if (.Platform$OS.type == "windows" ) {
 - options(help_type="html")
@@ -41,8 +30,11 @@
  quiet <- any(match(c("-q", "--silent", "--quiet", "--slave"), commandArgs()), na.rm=TRUE)
  	if (!quiet){
                  cat( paste("Microsoft R Open ",Revo.version$major,".",Revo.version$minor,"\n",sep=""))
-@@ -40,8 +19,6 @@
- 
+@@ -27,11 +17,8 @@
+                 cat("The enhanced R distribution from Microsoft\n",sep="")
+                 cat("Visit https://mran.microsoft.com/ for information\n",sep="")
+                 cat("about additional features.\n\n",sep="")
+-
  	}
  	
 -
@@ -50,7 +42,7 @@
  load_if_installed <- function(package) {
    if (!identical(system.file(package="RevoUtilsMath"), "")) {
      do.call('library', list(package))
-@@ -51,20 +28,6 @@
+@@ -41,20 +28,6 @@
    } 
  }
  
@@ -71,12 +63,12 @@
  if(load_if_installed("RevoUtilsMath")){
    local({
      ncores <- RevoUtilsMath::getMKLthreads()
-@@ -76,10 +39,9 @@
+@@ -66,10 +39,9 @@
    })
  } else {
      MROversion <- paste(Revo.version$major, Revo.version$minor, sep=".")
 -	msg <- "No performance acceleration libraries were detected. To take advantage of \nthe available processing power, also install MKL for R Open %s. Visit \nhttp://go.microsoft.com/fwlink/?LinkID=698301 for more details."
-+       msg <- "No performance acceleration libraries were detected. To take advantage of \nthe available processing power, also install MKL for MRO %s. Visit \nhttps://aur.archlinux.org/packages/revomath/ and/or\nhttp://go.microsoft.com/fwlink/?LinkID=698301 for more details."
++	msg <- "No performance acceleration libraries were detected. To take advantage of \nthe available processing power, also install MKL for R Open %s. Visit \nhttp://go.microsoft.com/fwlink/?LinkID=698301 and/or https://aur.archlinux.org/packages/revomath/ for more details."
  	if (!quiet){
          message(sprintf(msg, MROversion))
  	}