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

Conflicts:
	community-testing/vdrift/PKGBUILD
	community-testing/widelands/PKGBUILD
	core/cracklib/PKGBUILD
	core/systemd/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/mesa/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	testing/libreoffice/PKGBUILD
	testing/mpfr/PKGBUILD
	testing/systemd/PKGBUILD
	testing/sysvinit/PKGBUILD
	testing/yp-tools/PKGBUILD

11 files changed, 69 insertions, 40 deletions

diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index 51081072d..ea67c706d 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165455 2012-08-20 08:43:02Z andrea $
+# $Id: PKGBUILD 165807 2012-08-30 18:32:15Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
@@ -21,8 +21,8 @@ pkgname=('calligra-filters'
          'calligra-handbook'
          'calligra-braindump'
          'calligra-flow')
-pkgver=2.5.0
-pkgrel=2
+pkgver=2.5.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
@@ -32,7 +32,7 @@ makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
              'openjpeg' 'kdegraphics-okular' 'pstoedit')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('bea9b5e9d95691caaba385ef5522a60d')
+md5sums=('7bc75d770bfd7ffd5f70386c25970888')
 
 build() {
   mkdir build
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index ff60556ce..e339943bf 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 164788 2012-08-05 11:49:39Z andyrtr $
+# $Id: PKGBUILD 165815 2012-08-30 20:33:31Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.0.22
+pkgver=3.1.0
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,8 @@ depends=('gcc-libs>=4.7.1-5' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit
 makedepends=('strace')
 [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind')
 source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('7b3db90934c2d410c573e37efce3d579'
-         '33aab6d202af8d6f8f51cfb9249b6d50')
+md5sums=('db88d8fc44e44be4a0a14b24aa204bbf'
+         'c3fa5f3bda5ebe7f37cc997717bb8476')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/ifplugd/PKGBUILD b/extra/ifplugd/PKGBUILD
index 5e351a09d..baa62dbb6 100644
--- a/extra/ifplugd/PKGBUILD
+++ b/extra/ifplugd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 165779 2012-08-29 20:42:40Z thomas $
+# $Id: PKGBUILD 165791 2012-08-30 09:38:27Z thomas $
 # Contributor: Manolis Tzanidakis
 # Contributor: kevin <kevin@archlinux.org>
 # Maintainer: 
 
 pkgname=ifplugd
 pkgver=0.28
-pkgrel=12
+pkgrel=13
 pkgdesc="A daemon which brings up/down network interfaces upon cable insertion/removal."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://0pointer.de/lennart/projects/ifplugd"
@@ -23,7 +23,7 @@ source=($url/${pkgname}-${pkgver}.tar.gz
 md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3'
          '54eb22844b5aeed161c0b80aa9008570'
          'f26dbd7597d9d637f0b2b104b11ab820'
-         '158bda9014eb35979af9b094feca5fe1'
+         '1ea9aa64415a5a9e27b84634cd08a7f2'
          'f2e8a37af52b79ee0e3c5bcc2470ce10'
          '3dc2ce45d0e12d155ecc7a5bc9e3ee04')
 
diff --git a/extra/ifplugd/ifplugd b/extra/ifplugd/ifplugd
index f6c8db938..354238fe2 100644
--- a/extra/ifplugd/ifplugd
+++ b/extra/ifplugd/ifplugd
@@ -24,7 +24,7 @@ case $1 in
 
     for nic in "${net_ifs[@]}"; do
       # only start if a PID doesn't already exist
-      if [[ ! -f /var/run/ifplugd.$nic.pid ]];
+      if [[ ! -f /var/run/ifplugd.$nic.pid ]]; then
         /usr/bin/ifplugd-daemon $nic
 
         # use presence of PID file to check for start success
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index c1ba3fe96..f86b0d8bd 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165104 2012-08-11 06:10:43Z eric $
+# $Id: PKGBUILD 165819 2012-08-30 20:53:00Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.9.0
+pkgver=6.7.9.2
 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=('531a150014119573a04eed28df6192137f4799bc'
+sha1sums=('a22342f53903f2fe6debc099136263412f2b6571'
           '23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {
@@ -25,7 +25,7 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
     --disable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
     --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
-    --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr \
+    --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \
     --without-gvc --without-djvu --without-autotrace --without-webp \
     --without-jbig --without-fpx --without-dps --without-fftw
   make
@@ -33,7 +33,7 @@ build() {
 
 check() {
   cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-  make check
+#  make check
 }
 
 package_imagemagick() {
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index 70130c1a1..1b2ec8cfd 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 165281 2012-08-14 20:41:57Z andyrtr $
+# $Id: PKGBUILD 165816 2012-08-30 20:33:39Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.38
+pkgver=2.4.39
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64 'mips64el')
@@ -16,8 +16,8 @@ url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
         no-pthread-stubs.patch
         COPYING)
-sha256sums=('3e5a2f318edaf1eef41e7e6c85aa9596d6f9f8b083ec4d7d6710ffbb8921e7e9'
-            'f7a587357ea29cab9c06a4889f09e30d63eae76e9b9654666c53020d15ea52d7'
+sha256sums=('386b17388980504bca16ede81ceed4c77b12c3488f46ecb7f4d48e48512a733d'
+            '66fb39be073c634abc7c2af238535a63b2a03990888eb8cc5ea79fa3ef083930'
             '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
 
 build() {
diff --git a/extra/libdrm/no-pthread-stubs.patch b/extra/libdrm/no-pthread-stubs.patch
index 6745f4bc4..a8de91d9d 100644
--- a/extra/libdrm/no-pthread-stubs.patch
+++ b/extra/libdrm/no-pthread-stubs.patch
@@ -62,7 +62,7 @@ diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am
  
  libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
  libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+ libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined
 -libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
 +libdrm_radeon_la_LIBADD = ../libdrm.la
  
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 4940ba1c7..d1f56eda6 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163968 2012-07-23 03:03:08Z allan $
+# $Id: PKGBUILD 165814 2012-08-30 20:33:25Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
@@ -16,10 +16,10 @@ if [ "${_git}" = "true" ]; then
   else
     pkgver=8.0.4
 fi
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' 
-             'gcc-libs>=4.7.1-5' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'udev>=183')
+             'gcc-libs>=4.7.1-5' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'systemd-tools')
 [[ "$CARCH" != "mips64el" ]] && makedepends+=('llvm')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
@@ -67,7 +67,6 @@ if [ "${_git}" = "true" ]; then
     --enable-osmesa \
     --enable-gles1 \
     --enable-gles2 \
-    --enable-egl \
     --enable-texture-float \
     --enable-xa \
     --enable-shared-dricore \
@@ -81,6 +80,7 @@ if [ "${_git}" = "true" ]; then
     ./configure --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
     --enable-gallium-egl \
+    --with-egl-platforms=x11,drm \
     --enable-shared-glapi \
     --enable-gbm \
     --enable-glx-tls \
@@ -89,7 +89,6 @@ if [ "${_git}" = "true" ]; then
     --enable-osmesa \
     --enable-gles1 \
     --enable-gles2 \
-    --enable-egl \
     --enable-texture-float \
     --enable-xa \
     --enable-shared-dricore \
@@ -142,12 +141,15 @@ package_libglapi() {
 }
 
 package_libgbm() {
-  depends=('glibc')
+  depends=('systemd-tools')
   pkgdesc="Mesa gbm library"
 
   cd ${srcdir}/?esa-*   
-  install -m755 -d "${pkgdir}/usr/lib"
+  install -m755 -d ${pkgdir}/usr/{include,lib/gbm}
   bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/"
+  bin/minstall src/gbm/main/gbm.h "${pkgdir}/usr/include/"
+  bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/"
+  bin/minstall lib/gbm/gbm_gallium_drm.so* "${pkgdir}/usr/lib/gbm/"
   install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
   bin/minstall src/gbm/main/gbm.pc "${pkgdir}/usr/lib/pkgconfig/"
 
@@ -177,7 +179,7 @@ package_libgles() {
 }
 
 package_libegl() {
-  depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel')
+  depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'libgbm' 'khrplatform-devel')
   pkgdesc="Mesa EGL libraries and headers"
 
   cd ${srcdir}/?esa-*   
@@ -228,12 +230,14 @@ package_mesa() {
   rm -f "${pkgdir}/usr/lib/libEGL"*
   rm -rf "${pkgdir}/usr/lib/egl"
   rm -f "${pkgdir}/usr/lib/libOSMesa"*
+  rm -rf "${pkgdir}/usr/lib/gbm"
   rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc,gbm.pc}
   rm -rf "${pkgdir}/usr/lib/xorg"
   rm -f "${pkgdir}/usr/include/GL/glew.h"
   rm -f "${pkgdir}/usr/include/GL/glxew.h"
   rm -f "${pkgdir}/usr/include/GL/wglew.h"
   rm -f "${pkgdir}/usr/include/GL/glut.h"
+  rm -f "${pkgdir}/usr/include/gbm.h"
   rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR}
 
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
@@ -241,7 +245,7 @@ package_mesa() {
 }
 
 package_ati-dri() {
-  depends=("libgl=${pkgver}")
+  depends=("libgl=${pkgver}" 'libffi')
   pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon"
   conflicts=('xf86-video-ati<6.9.0-6')
 
@@ -251,6 +255,11 @@ package_ati-dri() {
   # gallium3D driver for r300,r600
   make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
   make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
+  # gallium egl drivers
+  cd ${srcdir}/?esa-*
+  install -m755 -d "${pkgdir}/usr/lib/gbm"
+  bin/minstall lib/gbm/pipe_r{300,600}.so* "${pkgdir}/usr/lib/gbm/"
+
 }
 
 package_intel-dri() {
@@ -272,8 +281,12 @@ package_nouveau-dri() {
 }
 
 package_svga-dri() {
-  depends=("mesa=${pkgver}")
+  depends=("mesa=${pkgver}" 'libffi')
   pkgdesc="Gallium3D VMware guest GL driver"
 
   make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install
+  # gallium egl driver
+  cd ${srcdir}/?esa-*
+  install -m755 -d "${pkgdir}/usr/lib/gbm"
+  bin/minstall lib/gbm/pipe_vmwgfx.so* "${pkgdir}/usr/lib/gbm/"
 }
diff --git a/extra/watchdog/PKGBUILD b/extra/watchdog/PKGBUILD
index 2eaa31f62..c48bbde13 100644
--- a/extra/watchdog/PKGBUILD
+++ b/extra/watchdog/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 158941 2012-05-13 14:21:11Z thomas $
+# $Id: PKGBUILD 165803 2012-08-30 17:35:28Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=watchdog
 pkgver=5.12
-pkgrel=1
+pkgrel=2
 pkgdesc="Watchdog daemon"
 arch=(i686 x86_64 'mips64el')
 url="http://sourceforge.net/projects/watchdog"
@@ -15,11 +15,13 @@ backup=(etc/watchdog.conf
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
         watchdog.sh
         watchdog.cf
-        watchdog-5.12-fix-oom-in-wd_keepalive.patch)
+        watchdog-5.12-fix-oom-in-wd_keepalive.patch
+        watchdog.systemd)
 md5sums=('cea28bea70e54f3625062bc808aef9af'
-         '854451f554718b55186599faaa8d85f6'
+         'f57d33967eb9404dd52e3c4e73795a20'
          '01c1e2e13f515131180b4ebe9b8b7cc3'
-         'c90c2686975b5254f82b3de683f1f442')
+         'c90c2686975b5254f82b3de683f1f442'
+         'a835ae5cbdbb21c19a468dedb5d734e4')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
@@ -29,7 +31,10 @@ build() {
 	--prefix=/usr \
 	--mandir=/usr/share/man \
 	--sysconfdir=/etc \
-	--localstatedir=/var
+	--localstatedir=/var \
+	--with-pidfile=/run/watchdog.pid \
+	--with-ka_pidfile=/run/wd_keepalive.pid
+  
   make
 }
 
@@ -40,6 +45,7 @@ package() {
 	install -D -m755 "${srcdir}"/watchdog.sh "${pkgdir}"/etc/rc.d/${fil}
 	install -D -m644 "${srcdir}"/watchdog.cf "${pkgdir}"/etc/conf.d/${fil}
   done
+  install -D -m644 "${srcdir}"/watchdog.systemd "${pkgdir}"/usr/lib/systemd/system/watchdog.service
 
   sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/rc.d/wd_keepalive
   sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/conf.d/wd_keepalive
diff --git a/extra/watchdog/watchdog.sh b/extra/watchdog/watchdog.sh
index 00d5078a9..54f78454f 100644
--- a/extra/watchdog/watchdog.sh
+++ b/extra/watchdog/watchdog.sh
@@ -3,7 +3,7 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID="$( cat /var/run/watchdog.pid 2>/dev/null )"
+PID="$( cat /run/watchdog.pid 2>/dev/null )"
 [ -r /etc/conf.d/watchdog ] && source /etc/conf.d/watchdog
 
 case "$1" in
@@ -31,7 +31,7 @@ case "$1" in
       stat_done
     fi
 
-    rm -f /var/run/watchdog.pid
+    rm -f /run/watchdog.pid
     ;;
   restart)
     $0 stop
diff --git a/extra/watchdog/watchdog.systemd b/extra/watchdog/watchdog.systemd
new file mode 100644
index 000000000..57c73fb45
--- /dev/null
+++ b/extra/watchdog/watchdog.systemd
@@ -0,0 +1,10 @@
+[Unit]
+Description=Watchdog Daemon
+
+[Service]
+Type=forking
+PIDFile=/run/watchdog.pid
+ExecStart=/usr/sbin/watchdog
+
+[Install]
+WantedBy=multi-user.target