Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	core/systemd/PKGBUILD
	core/sysvinit/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/lynx/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/sip/PKGBUILD
	libre/kdelibs-libre/PKGBUILD
	testing/libdrm/PKGBUILD
	testing/xf86-video-ati/PKGBUILD

15 files changed, 137 insertions, 88 deletions

diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD
index 877efd21e..8342a31e2 100644
--- a/extra/accountsservice/PKGBUILD
+++ b/extra/accountsservice/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 159201 2012-05-17 21:37:52Z heftig $
+# $Id: PKGBUILD 162754 2012-06-29 15:28:24Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=accountsservice
-pkgver=0.6.21
+pkgver=0.6.22
 pkgrel=1
 pkgdesc="D-Bus interface for user account query and manipulation"
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,7 @@ depends=('glib2' 'polkit' 'libsystemd')
 makedepends=('intltool' 'gobject-introspection' 'vala')
 options=('!libtool')
 source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.xz)
-md5sums=('b501d48963b70983170983258c19cc2c')
+md5sums=('6159898955b4c7079a8ae64cd7aa5bf1')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD
index df7d8cc08..0078ccb4e 100644
--- a/extra/dcraw/PKGBUILD
+++ b/extra/dcraw/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146432 2012-01-11 00:54:52Z eric $
+# $Id: PKGBUILD 162767 2012-06-29 22:10:56Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=dcraw
-pkgver=9.12
+pkgver=9.15
 pkgrel=1
 pkgdesc="A command line based converter for digicams raw output"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('lcms' 'jasper')
 source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz
         license.txt)
-sha1sums=('b0110f83692b14940a8e43759d7ccefa77103cc6'
+sha1sums=('0b06047603640fe19b5d3b2461319d6ba22eee6a'
           '502c8f0ac7434d48f5dcb2eefe7599627cb69454')
 
 build() {
diff --git a/extra/hyphen/PKGBUILD b/extra/hyphen/PKGBUILD
index 65fda4b8c..036a60751 100644
--- a/extra/hyphen/PKGBUILD
+++ b/extra/hyphen/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 140476 2011-10-15 10:01:23Z andyrtr $
+# $Id: PKGBUILD 162738 2012-06-29 10:59:41Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase=hyphen
 pkgname=('hyphen' 'hyphen-en')
-pkgver=2.8.3
-pkgrel=1.1
+pkgver=2.8.4
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hunspell.sf.net"
 license=('GPL' 'LGPL' 'MPL')
@@ -12,7 +12,7 @@ groups=()
 makedepends=('glibc' 'perl')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/hunspell/${pkgname}-${pkgver}.tar.gz)
-md5sums=('86261f06c097d3e425a2f6d0b0635380')
+md5sums=('a2f6010987e1c601274ab5d63b72c944')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index 7a93cd72b..bc2cf88ed 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 162136 2012-06-22 03:39:00Z eric $
+# $Id: PKGBUILD 162725 2012-06-29 04:45:55Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.7.9
+pkgver=6.7.7.10
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.imagemagick.org/"
@@ -12,7 +12,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
              'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr')
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
         perlmagick.rpath.patch)
-sha1sums=('d45a936b59afa3bc484c0ea1b512f8fc026c14e4'
+sha1sums=('289e539f7fd40ca9b06f94a3348641abf0e56a1f'
           '23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {
@@ -33,7 +33,7 @@ build() {
 
 check() {
   cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-#  make check
+  make check
 }
 
 package_imagemagick() {
diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
index 070f71d6b..1c1aaba1a 100644
--- a/extra/kdebindings-python/PKGBUILD
+++ b/extra/kdebindings-python/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 161107 2012-06-08 06:34:53Z andrea $
+# $Id: PKGBUILD 162743 2012-06-29 11:34:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-python
 pkgname=('kdebindings-python'
          'kdebindings-python2')
 pkgver=4.8.4
-pkgrel=1
+pkgrel=2
 url='http://kde.org/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 'qscintilla')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt'
+             'pyqt' 'qscintilla' 'python-sip' 'python2-sip')
 source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
 sha1sums=('e629d7a1d7d1aa1d1dd24769dc5412a60b6ac256')
 
@@ -23,6 +24,7 @@ build() {
   cmake ../pykde4-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python \
     -DPYTHON_LIBRARY=/usr/lib/libpython3.2mu.so.1.0
   make
   cd ..
diff --git a/extra/libmythes/PKGBUILD b/extra/libmythes/PKGBUILD
index c5e5899da..d57a1363c 100644
--- a/extra/libmythes/PKGBUILD
+++ b/extra/libmythes/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 145626 2011-12-24 14:41:49Z andyrtr $
+# $Id: PKGBUILD 162736 2012-06-29 10:55:24Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=libmythes
-pkgver=1.2.2
+pkgver=1.2.3
 pkgrel=1
 epoch=1
 pkgdesc="a simple thesaurus"
@@ -14,7 +14,7 @@ makedepends=('hunspell')
 options=('!libtool')
 provides=('mythes')
 source=(http://downloads.sourceforge.net/hunspell/${pkgname/lib/}-${pkgver}.tar.gz)
-md5sums=('e1e255dc43dbcbb34cb19e8a0eba90ae')
+md5sums=('46e92b68e31e858512b680b3b61dc4c1')
 
 build() {
   cd ${srcdir}/${pkgname/lib/}-$pkgver
diff --git a/extra/lynx/PKGBUILD b/extra/lynx/PKGBUILD
index 122248b0b..b342e6b46 100644
--- a/extra/lynx/PKGBUILD
+++ b/extra/lynx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149487 2012-02-08 10:10:55Z pierre $
+# $Id: PKGBUILD 162749 2012-06-29 12:15:20Z pierre $
 # Maintainer:
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -6,10 +6,10 @@
 pkgname=lynx
 pkgver=2.8.7
 _pkgver=2-8-7
-pkgrel=5
+pkgrel=6
 pkgdesc="A text browser for the World Wide Web"
 url="http://lynx.isc.org/"
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('ncurses' 'openssl')
 backup=('etc/lynx.cfg')
diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD
index 51d8cb634..c4d5cd01b 100644
--- a/extra/nx/PKGBUILD
+++ b/extra/nx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162703 2012-06-28 17:12:56Z andyrtr $
+# $Id: PKGBUILD 162757 2012-06-29 15:32:58Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=nx
@@ -12,7 +12,7 @@ options=('!makeflags')
 makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages
              'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
              )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
         nx-x11.ld.so.conf.d)
 md5sums=('f20f5a12e15849bae8a1f2d7b44830ab'
          'f2ec60c7e2d81bef2f7292d2b33681a6')
diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD
index 49a7c000c..c2d6b4ff0 100644
--- a/extra/pyqt/PKGBUILD
+++ b/extra/pyqt/PKGBUILD
@@ -1,27 +1,21 @@
-# $Id: PKGBUILD 161771 2012-06-13 17:06:46Z andrea $
+# $Id: PKGBUILD 162740 2012-06-29 11:34:16Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
 
 pkgbase=pyqt
-pkgname=('pyqt' 'python2-pyqt')
-pkgver=4.9.1
-pkgrel=2
+pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
+pkgver=4.9.4
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
 makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon'
              'python-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
-source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz"
-        'fix-qthelp-build.patch')
-md5sums=('7f495dc49f71e3bfb64bf942e0d8bb3c'
-         '6acfe0a5a00779f946c29d5fac647ce1')
+             source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz")
+md5sums=('a0b6a820633366365af5124ddbd059c7')
 
 build() {
-  # Build QtHelp (FS#27665)
-  cd "${srcdir}"/PyQt-x11-gpl-${pkgver}
-  patch -p1 -i "${srcdir}"/fix-qthelp-build.patch
-
   cd "${srcdir}"
   cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
 
@@ -48,37 +42,52 @@ build() {
   make
 }
 
+package_pyqt-common(){
+  pkgdesc="Common PyQt files shared between pyqt and python2-pyqt"
+  
+  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
+  make -C pyrcc DESTDIR="${pkgdir}" install
+  make -C pylupdate DESTDIR="${pkgdir}" install
+  make -C designer INSTALL_ROOT="${pkgdir}" install
+  
+  install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
+}
+
 package_pyqt(){
   pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python-sip' 'python-dbus')
+  depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common')
   optdepends=('phonon: enable audio and video in PyQt applications'
               'qscintilla: QScintilla API'
               'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  replaces=('python-qt')
-  provides=('python-qt')
 
   cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
   make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+  # Provided by pyqt-common
+  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
+  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
+  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
 }
 
 package_python2-pyqt(){
   pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
-  depends=('pyqt' 'python2-sip' 'python2-dbus')
+  depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common')
   optdepends=('phonon: enable audio and video in PyQt applications'
               'python-opengl: enable OpenGL 3D graphics in PyQt applications'
               'qscintilla: QScintilla API'
               'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  replaces=('python2-qt')
   provides=('python2-qt')
-  options=('!emptydirs')
 
   cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
   make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
-  # Provided by pyqt
-  rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4}
-  rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so
-  rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api
+  # Fix conflicts with pyqt
+  mv "${pkgdir}"/usr/bin/{,python2-}pyuic4
+  
+  # Provided by pyqt-common
+  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
+  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
+  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
 }
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index 9d424235f..8f1e4f199 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -1,41 +1,42 @@
-# $Id: PKGBUILD 150137 2012-02-13 11:40:55Z eric $
+# $Id: PKGBUILD 162741 2012-06-29 11:34:22Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgbase=qscintilla
-pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla')
-pkgver=2.6.1
+pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
+         'python-qscintilla-common')
+pkgver=2.6.2
 pkgrel=1
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-makedepends=('python2-pyqt' 'chrpath')
+makedepends=('python2-pyqt' 'pyqt' 'chrpath')
 source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz"
         'configure.py-objdir-support.diff')
-md5sums=('39a1d0567a20b416177eb1a8afe225a7'
+md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9'
          '8cf9c06252e2f11ab00e62848e322fd3')
 
 build() {
     cd "${srcdir}/QScintilla-gpl-${pkgver}" 
     patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
 
-    cd Qt4
+    cd Qt4Qt5
     qmake qscintilla.pro
     make
     
     cd ../designer-Qt4
-    qmake designer.pro INCLUDEPATH+=../Qt4 QMAKE_LIBDIR+=../Qt4
+    qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
     make
 
     cd ../
     cp -rf Python Python2
     cd Python
-    python configure.py -n ../Qt4/ -o ../Qt4 -c -p 4
+    python configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
     make
 
     cd ../Python2
-    python2 configure.py -n ../Qt4/ -o ../Qt4 -c -p 4
+    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
     make    
 }
 
@@ -43,16 +44,27 @@ package_qscintilla() {
     pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
     depends=('qt')
 
-    cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4"
+    cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5"
     make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
     cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4"
     make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 }
 
+package_python-qscintilla-common() {
+    pkgdest="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla"
+    depends=('qscintilla')
+
+    cd "${srcdir}/QScintilla-gpl-${pkgver}"/Python
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+      
+    # Provided by python-qscintilla
+    rm "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so"
+}
+
 package_python-qscintilla() {
-    pkgdesc="Python 3 bindings for QScintilla2"
-    depends=('pyqt' 'qscintilla')
+    pkgdesc="Python 3.x bindings for QScintilla2"
+    depends=('python-qscintilla-common' 'pyqt')
 
     cd "${srcdir}/QScintilla-gpl-${pkgver}/Python"
     install -Dm755 Qsci.so \
@@ -60,9 +72,10 @@ package_python-qscintilla() {
 }
 
 package_python2-qscintilla() {
-    pkgdesc="Python 2 bindings for QScintilla2"
-    depends=('python-qscintilla' 'python2-pyqt')
+    pkgdesc="Python 2.x bindings for QScintilla2"
+    depends=('python-qscintilla-common' 'python2-pyqt')
 
     cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2"
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+    install -Dm755 Qsci.so \
+      "${pkgdir}/usr/lib/python2.7/site-packages/PyQt4/Qsci.so"
 }
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index 5e0733772..fa3893cdf 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 154825 2012-03-30 19:44:16Z ronald $
+# $Id: PKGBUILD 162765 2012-06-29 20:58:34Z ronald $
 # 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.0
+pkgver=2.15.1
 pkgrel=1
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,21 +12,28 @@ license=('GPL')
 url=('http://www.r-project.org/')
 depends=('blas' 'lapack' 'bzip2'  'libpng' 'libjpeg' 'libtiff'
          'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs'
-         'tk' 'libxt' 'libxmu' 'pango' 'xz')
-makedepends=('openjdk6' 'gcc-fortran')
+         'libxt' 'libxmu' 'pango' 'xz' 'texlive-bin' 'desktop-file-utils')
+makedepends=('openjdk6' 'gcc-fortran' 'tk')
+optdepends=('tk: tcl/tk interface')
 backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories')
-options=('!makeflags')
+options=('!makeflags' '!emptydirs')
 source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
 	'r.desktop'
-	'r.png')
+	'r.png'
+	'R.conf')
 install=r.install
-sha1sums=('a633f87fdbd22e8c371971c535ca815e63c297f6'
+sha1sums=('f0e6912be6dfc0d1fdc4be66048304d8befe8424'
           '13aa29219bcaa102e575de8c1c8e0833d233e836'
-          'a69a07ec363440efc18ce0a7f2af103375dea978')
+          'a69a07ec363440efc18ce0a7f2af103375dea978'
+          '43668da6cfd1b4455a99f23e79e2059294dddac9')
 
 build() {
    cd "${srcdir}/R-${pkgver}"
    sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c
+
+  # set texmf dir correctly in makefile
+  sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in
+
    ./configure  --prefix=/usr \
 		--libdir=/usr/lib \
 		--sysconfdir=/etc/R \
@@ -66,4 +73,7 @@ package() {
     mv -f ${i} "${pkgdir}/etc/R"
     ln -s /etc/R/${i} ${i}
   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
 }
diff --git a/extra/r/R.conf b/extra/r/R.conf
new file mode 100644
index 000000000..e360859db
--- /dev/null
+++ b/extra/r/R.conf
@@ -0,0 +1,2 @@
+/usr/lib/R/lib
+
diff --git a/extra/r/r.install b/extra/r/r.install
index d3289ab64..89fea599b 100644
--- a/extra/r/r.install
+++ b/extra/r/r.install
@@ -1,5 +1,7 @@
 post_install() {
   update-desktop-database -q
+  echo ">>> updating the filename database for texlive..."
+  mktexlsr --quiet usr/share/texmf
 }
 
 post_upgrade() {
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index 0dd0920a3..14123a53b 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 150174 2012-02-14 07:57:34Z andrea $
+# $Id: PKGBUILD 162739 2012-06-29 11:34:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
 
 pkgbase=sip
-pkgname=('sip' 'python2-sip')
-pkgver=4.13.2
-pkgrel=1
+pkgname=('sip' 'python-sip' 'python2-sip')
+pkgver=4.13.3
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.com/software/sip/"
 license=('custom:"sip"')
 makedepends=('python' 'python2')
 source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('5a12ea8e8a09b879ed2b3817e30fbc84')
+md5sums=('76192829cc42ec558db46e4f9e1d8ba9')
 
 build() {
   cd "${srcdir}"
@@ -30,25 +30,36 @@ build() {
 
 package_sip() {
   pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries"
-  depends=('python')
-  replaces=('python-sip')
-  provides=('python-sip')
+  depends=('glibc')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install -C sipgen
 
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
+package_python-sip() {
+  pkgdesc="Python 3.x SIP bindings for C and C++ libraries"
+  depends=('sip' 'python')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install -C siplib
+  
+  install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python3.2/site-packages/sipconfig.py
+  install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python3.2/site-packages/sipdistutils.py
+  
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
 package_python2-sip() {
-  pkgdesc="A tool that makes it easy to create Python2 bindings for C and C++ libraries"
+  pkgdesc="Python 2.x SIP bindings for C and C++ libraries"
   depends=('sip' 'python2')
 
   cd "${srcdir}/python2-${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
+  make DESTDIR="${pkgdir}" install -C siplib
+  
+  install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipconfig.py
+  install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipdistutils.py
+  
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-  # Provided by sip
-  rm "${pkgdir}/usr/bin/sip"
 }
diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD
index dd9f8cce3..4cba29cb9 100644
--- a/extra/whois/PKGBUILD
+++ b/extra/whois/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 158030 2012-05-01 10:41:36Z giovanni $
+# $Id: PKGBUILD 162734 2012-06-29 09:39:59Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=whois
-pkgver=5.0.16
+pkgver=5.0.17
 pkgrel=1
 pkgdesc="The whois client by Marco d'Itri"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('libidn')
 makedepends=('perl')
 source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.xz")
-md5sums=('6d689965473c23db6be890c7e5260c67')
+md5sums=('754ff9a089913bf198400eb937e24055')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"