Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/erlang/PKGBUILD
	community/haskell-x11-xft/PKGBUILD
	community/libgdamm/PKGBUILD
	community/luasql/PKGBUILD
	community/myodbc/PKGBUILD
	community/python2-basemap/PKGBUILD
	community/ruby-cairo/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/stardict/PKGBUILD
	core/diffutils/PKGBUILD
	core/libsasl/PKGBUILD
	core/systemd/PKGBUILD
	extra/anjuta/PKGBUILD
	extra/ardour/PKGBUILD
	extra/boost/PKGBUILD
	extra/calligra/PKGBUILD
	extra/gnokii/PKGBUILD
	extra/icu/PKGBUILD
	extra/libgda/PKGBUILD
	extra/libmtp/PKGBUILD
	extra/lighttpd/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mysql/PKGBUILD
	extra/php/PKGBUILD
	extra/qt3/PKGBUILD
	extra/qt4/PKGBUILD
	extra/qt5/PKGBUILD
	extra/tracker/PKGBUILD
	extra/vlc/PKGBUILD
	extra/webkitgtk/PKGBUILD
	libre/lilo/PKGBUILD
	libre/psi/PKGBUILD

2 files changed, 20 insertions, 50 deletions

diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index 4f8843606..68c6465d0 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 177618 2013-02-08 07:48:31Z ronald $
+# $Id: PKGBUILD 180808 2013-03-26 11:49:39Z foutrelis $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: K. Piche <kpiche@rogers.com>
 
 pkgname=r
-pkgver=2.15.2
-pkgrel=3
+pkgver=2.15.3
+pkgrel=1
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -13,21 +13,19 @@ url=('http://www.r-project.org/')
 depends=('blas' 'lapack' 'bzip2'  'libpng' 'libjpeg' 'libtiff'
          'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs'
          'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils')
-makedepends=('openjdk6' 'gcc-fortran' 'tk>=8.6.0')
+makedepends=('jdk7-openjdk' 'gcc-fortran' 'tk')
 optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files')
 backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories')
 options=('!makeflags' '!emptydirs')
+install=r.install
 source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
 	'r.desktop'
 	'r.png'
-	'R.conf'
-	'x11.patch')
-install=r.install
-sha1sums=('c80da687d66ee88d1e34fc1ae5c1bd525f9513dd'
+	'R.conf')
+sha1sums=('a05b68f31b00d8038d9f0a8562cfc0c8e32d9621'
           '13aa29219bcaa102e575de8c1c8e0833d233e836'
           'a69a07ec363440efc18ce0a7f2af103375dea978'
-          '43668da6cfd1b4455a99f23e79e2059294dddac9'
-          'a11b91d53645bd545fddc382c991096502e8ac67')
+          '43668da6cfd1b4455a99f23e79e2059294dddac9')
 
 build() {
    cd "${srcdir}/R-${pkgver}"
@@ -36,8 +34,8 @@ build() {
   # set texmf dir correctly in makefile
   sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in
 
-  # upstream patch fixing empty plots FS#32597
-  patch -Np0 -i ${srcdir}/x11.patch
+# fix for texinfo 5.X
+  sed -i 's|test ${makeinfo_version_min} -lt 7|test ${makeinfo_version_min} -lt 0|' configure
 
    ./configure  --prefix=/usr \
 		--libdir=/usr/lib \
@@ -53,11 +51,19 @@ build() {
                 F77=gfortran \
 		LIBnn=lib
    make
+
+# make libRmath.so
+   cd src/nmath/standalone
+   make shared
 }
 
 package() {
    cd "${srcdir}/R-${pkgver}"
-   make -j1 DESTDIR="${pkgdir}" install
+   make DESTDIR="${pkgdir}" install
+
+# install libRmath.so
+   cd src/nmath/standalone
+   make DESTDIR="${pkgdir}" install
 
    #  Fixup R wrapper scripts.
    sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R"
@@ -80,5 +86,5 @@ package() {
   done
 
   # Install ld.so.conf.d file to ensure other applications access the shared lib
-  install -Dm644 ${srcdir}/R.conf ${pkgdir}/etc/ld.so.conf.d/R.conf
+  install -Dm644 "${srcdir}/R.conf" "${pkgdir}/etc/ld.so.conf.d/R.conf"
 }
diff --git a/extra/r/x11.patch b/extra/r/x11.patch
deleted file mode 100644
index 3a02b28ea..000000000
--- a/extra/r/x11.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/modules/X11/devX11.c	(révision 61681)
-+++ src/modules/X11/devX11.c	(révision 61682)
-@@ -244,6 +244,7 @@ 
- {
-     if(inclose || !xd || !xd->buffered || xd->holdlevel > 0) return;
-     cairo_paint(xd->xcc);
-+    cairo_surface_flush(xd->xcs);
-     if (xd->type == WINDOW) XDefineCursor(display, xd->window, arrow_cursor);
-     XSync(display, 0);
-     xd->last = currentTime();
-@@ -753,8 +754,10 @@ 
- #ifdef HAVE_WORKING_CAIRO
- 	    pX11Desc xd = (pX11Desc) dd->deviceSpecific;
- 	    /* We can use the buffered copy where we have it */ 
--	    if(xd->buffered == 1) cairo_paint(xd->xcc);
--	    else if (xd->buffered > 1)
-+	    if(xd->buffered == 1) {
-+		cairo_paint(xd->xcc);
-+		cairo_surface_flush(xd->xcs);
-+	    } else if (xd->buffered > 1)
- 		/* rely on timer to repaint eventually */
- 		xd->last_activity = currentTime();
- 	    else
-@@ -2691,7 +2694,11 @@ 
- 		Cairo_update(xd);
- 	    return;
- 	}
--	if(xd->buffered) cairo_paint(xd->xcc);
-+	if(xd->buffered) {
-+	    cairo_paint(xd->xcc);
-+	    cairo_surface_flush(xd->xcs);
-+	}
-+	
- #endif
- 	if(xd->type==WINDOW) XDefineCursor(display, xd->window, arrow_cursor);
- 	XSync(display, 0);