From 6b55be9272c15e1858a1a7236482298f677c1a3b Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@endefensadelsl.org>
Date: Fri, 6 Jun 2014 04:00:43 +0000
Subject: Fri Jun  6 03:57:24 UTC 2014

---
 extra/r/PKGBUILD | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'extra/r/PKGBUILD')

diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index ed57820e1..a53e5ac7c 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 210268 2014-04-13 08:32:33Z ronald $
+# $Id: PKGBUILD 214264 2014-06-04 18:45:43Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: K. Piche <kpiche@rogers.com>
 
 pkgname=r
 pkgver=3.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -21,18 +21,23 @@ install=r.install
 source=("http://cran.r-project.org/src/base/R-${pkgver%%.*}/R-${pkgver}.tar.gz"
 	'r.desktop'
 	'r.png'
-	'R.conf')
+	'R.conf'
+	'sweave.patch')
 sha1sums=('a9d13932c739cc12667c6a17fabd9361624a1708'
           'd7fa521345b230a4187d60d07d06ce4b6d573e3f'
           'a69a07ec363440efc18ce0a7f2af103375dea978'
-          '43668da6cfd1b4455a99f23e79e2059294dddac9')
+          '43668da6cfd1b4455a99f23e79e2059294dddac9'
+          '7c89c315673406d6f2e08170dbe12f46f9cec1c5')
 
 prepare() {
    cd R-${pkgver}
-# set texmf dir correctly in makefile
+   # set texmf dir correctly in makefile
    sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in
-# fix for texinfo 5.X
+   # fix for texinfo 5.X
    sed -i 's|test ${makeinfo_version_min} -lt 7|test ${makeinfo_version_min} -lt 0|' configure
+
+   # upstream fix for https://bugs.r-project.org/bugzilla/show_bug.cgi?id=15752
+   patch -Np0 -i ${srcdir}/sweave.patch
 }
 
 build() {
-- 
cgit v1.2.3-54-g00ecf