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

Conflicts:
	community-staging/libgda3/PKGBUILD
	community/intel-tbb/PKGBUILD
	community/mtpaint/PKGBUILD
	extra/cmake/PKGBUILD
	extra/graphicsmagick/PKGBUILD
	extra/kdeadmin/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/lyx/PKGBUILD
	extra/qtscriptgenerator/PKGBUILD
	kde-unstable/kdeadmin/PKGBUILD
	kde-unstable/kdelibs/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	libre/libretools/PKGBUILD
	libre/p7zip-libre/PKGBUILD
	multilib-testing/lib32-glibc/PKGBUILD
	multilib/wine/PKGBUILD
	testing/glibc/PKGBUILD

24 files changed, 335 insertions, 156 deletions

diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 11c6236fb..6d0c0a32e 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,11 +1,10 @@
-# $Id: PKGBUILD 139853 2011-10-05 11:46:05Z andrea $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 145779 2011-12-31 11:08:34Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=cmake
-pkgver=2.8.6
-pkgrel=1.1
+pkgver=2.8.7
+pkgrel=1
 pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -15,7 +14,7 @@ makedepends=('qt')
 optdepends=('qt: cmake-gui')
 install="${pkgname}.install"
 source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
-md5sums=('2147da452fd9212bb9b4542a9eee9d5b')
+md5sums=('e1b237aeaed880f65dec9c20602452f6')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD
index 5a6aa519b..d7f4c1e94 100644
--- a/extra/graphicsmagick/PKGBUILD
+++ b/extra/graphicsmagick/PKGBUILD
@@ -1,26 +1,33 @@
-# $Id: PKGBUILD 130047 2011-07-01 15:56:21Z ronald $
+# $Id: PKGBUILD 145789 2012-01-01 01:38:15Z bisson $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Anton Leontiev <bunder@t-25.ru>
 
 pkgname=graphicsmagick
-pkgver=1.3.12
-pkgrel=2
-pkgdesc="Image processing system"
+pkgver=1.3.13
+pkgrel=1
+pkgdesc='Image processing system'
+url='http://www.graphicsmagick.org/'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.graphicsmagick.org/"
 license=('MIT')
 makedepends=('perl')
-depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms' 'libsm' 
-	'libtiff' 'libwmf' 'libxml2' 'libtool')
+depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz'
+         'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-history/1.3/GraphicsMagick-${pkgver}.tar.gz)
-md5sums=('2cf6e2eea0d7af3019c9a89b81aad624')                                                                                                                                                    
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz")
+sha1sums=('b85b21785bb072fd795f7fc6ac902cffae4e96e6')
 
 build() {
   cd "${srcdir}/GraphicsMagick-$pkgver"
 
-  ./configure --prefix=/usr --with-perl --enable-shared --with-gs-font-dir=/usr/share/fonts/Type1
+  ./configure \
+    --prefix=/usr \
+    --with-perl \
+    --enable-shared \
+    --disable-static \
+    --with-gs-font-dir=/usr/share/fonts/Type1 \
+
   make
 }
 
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index ba82cf2a1..3179a6133 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145269 2011-12-20 21:38:03Z ibiru $
+# $Id: PKGBUILD 145727 2011-12-29 10:11:17Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
 pkgver=3.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK+ is a multi-platform toolkit (v3)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
@@ -14,12 +14,15 @@ options=('!libtool' '!docs')
 backup=(etc/gtk-3.0/settings.ini)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-$pkgver.tar.xz
-        settings.ini)
+        settings.ini
+        empty_grid.patch)
 sha256sums=('e2cf20f2510ebbc7be122a1a33dd1f472a7d06aaf16b4f2a63eb048cd9141d3d'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
+            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
+            'd05ccfeaf4c558668b72aaacdd11356b6419d2359def6c1b9af1b465fa5a3c25')
 
 build() {
     cd "$srcdir/gtk+-$pkgver"
+    patch -Np1 -i "$srcdir/empty_grid.patch"
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
diff --git a/extra/gtk3/empty_grid.patch b/extra/gtk3/empty_grid.patch
new file mode 100644
index 000000000..45aefde47
--- /dev/null
+++ b/extra/gtk3/empty_grid.patch
@@ -0,0 +1,29 @@
+From 97c1df4bb05966a4ce53b07271eff2f53284e235 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Fri, 21 Oct 2011 20:23:03 +0000
+Subject: Fix natural/min widht calculations for empty grids
+
+https://bugzilla.gnome.org/show_bug.cgi?id=660139
+---
+diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
+index a122ad4..78ae2ff 100644
+--- a/gtk/gtkgrid.c
++++ b/gtk/gtkgrid.c
+@@ -927,8 +927,13 @@ gtk_grid_request_sum (GtkGridRequest *request,
+   linedata = &priv->linedata[orientation];
+   lines = &request->lines[orientation];
+ 
+-  min = (nonempty - 1) * linedata->spacing;
+-  nat = (nonempty - 1) * linedata->spacing;
++  min = 0;
++  nat = 0;
++  if (nonempty > 0)
++    {
++      min = (nonempty - 1) * linedata->spacing;
++      nat = (nonempty - 1) * linedata->spacing;
++    }
+ 
+   for (i = 0; i < lines->max - lines->min; i++)
+     {
+--
+cgit v0.9.0.2
diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD
index 55990c6e2..cc0569aae 100644
--- a/extra/kdeadmin/PKGBUILD
+++ b/extra/kdeadmin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144653 2011-12-08 09:19:17Z andrea $
+# $Id: PKGBUILD 145767 2011-12-30 10:33:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -8,7 +8,7 @@ pkgname=('kdeadmin-kcron'
          'kdeadmin-kuser'
          'kdeadmin-system-config-printer-kde')
 pkgver=4.7.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -68,7 +68,8 @@ package_kdeadmin-kuser() {
 
 package_kdeadmin-system-config-printer-kde() {
 	pkgdesc='Configure local and remote Printers'
-	depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt')
+	depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt'
+             'cups' 'python2-gobject2')
 	url="http://kde.org/applications/system/printerapplet/"
 	cd $srcdir/build/system-config-printer-kde
 	make DESTDIR=$pkgdir install
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
index 9f3912dd6..461ec74b9 100644
--- a/extra/kdelibs/PKGBUILD
+++ b/extra/kdelibs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145657 2011-12-26 12:00:06Z andrea $
+# $Id: PKGBUILD 145730 2011-12-29 13:52:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdelibs
 pkgver=4.7.4
-pkgrel=3
+pkgrel=4
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -18,9 +18,11 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 replaces=('kdelibs-experimental')
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch')
+        'kde-applications-menu.patch'
+        'fix-knotify-filepath.patch')
 sha1sums=('78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8'
-          '86ee8c8660f19de8141ac99cd6943964d97a1ed7')
+          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+          '3312f6005aa56a9b992c74008fe5b314f1c8ffba')
 
 build() {
        cd "${srcdir}"/${pkgname}-${pkgver}
@@ -28,6 +30,9 @@ build() {
        # avoid file conflict with gnome-menus
        patch -p1 -i "${srcdir}"/kde-applications-menu.patch
 
+       # https://bugs.kde.org/show_bug.cgi?id=285028
+       patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch
+
        cd "${srcdir}"
        mkdir build
        cd build
diff --git a/extra/kdelibs/fix-knotify-filepath.patch b/extra/kdelibs/fix-knotify-filepath.patch
new file mode 100644
index 000000000..2cd995e97
--- /dev/null
+++ b/extra/kdelibs/fix-knotify-filepath.patch
@@ -0,0 +1,13 @@
+diff --git a/knotify/config/knotifyconfigactionswidget.cpp b/knotify/config/knotifyconfigactionswidget.cpp
+index 88d18b6..0e76658 100644
+--- a/knotify/config/knotifyconfigactionswidget.cpp
++++ b/knotify/config/knotifyconfigactionswidget.cpp
+@@ -128,7 +128,7 @@ void KNotifyConfigActionsWidget::slotPlay(  )
+ 	KUrl soundURL = m_ui.Sound_select->url();
+ 	if ( soundURL.isRelative() )
+ 	{
+-		QString soundString = soundURL.toLocalFile();
++		QString soundString = m_ui.Sound_select->text();
+ 		// we need a way to get the application name in order to ba able to do this :
+ 		/*QString search = QString("%1/sounds/%2").arg(config->appname).arg(soundFile);
+ 		search = KGlobal::mainComponent().dirs()->findResource("data", search);
diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD
index 3c71a1460..1c6c078e9 100644
--- a/extra/lftp/PKGBUILD
+++ b/extra/lftp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141035 2011-10-22 08:18:19Z andyrtr $
+# $Id: PKGBUILD 145777 2011-12-31 09:11:28Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=lftp
-pkgver=4.3.3
+pkgver=4.3.4
 pkgrel=1
 pkgdesc="Sophisticated command line based FTP client"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('autoconf')
 url="http://lftp.yar.ru/"
 backup=('etc/lftp.conf')
 source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('91757a201c1030714ac1996f27437cc7')
+md5sums=('4840d0d20fafff3792b0b8ac305ab01e')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/libvncserver/PKGBUILD b/extra/libvncserver/PKGBUILD
index 1c62d5b3a..5ce12bee4 100644
--- a/extra/libvncserver/PKGBUILD
+++ b/extra/libvncserver/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 140764 2011-10-18 19:48:49Z andrea $
+# $Id: PKGBUILD 145736 2011-12-29 15:45:13Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libvncserver
-pkgver=0.9.8.1
+pkgver=0.9.8.2
 pkgrel=1
 pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('libjpeg' 'gnutls' 'libgcrypt')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz")
-md5sums=('51e972bd26c098b0b8d4687af6afbeb1')
+md5sums=('dfed1dcc25cb338c7fdbcda2c3df7f50')
 
 build() {
   cd "${srcdir}/LibVNCServer-${pkgver}"
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index c81995711..ddba16c90 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 144059 2011-12-02 20:54:39Z ibiru $
+# $Id: PKGBUILD 145773 2011-12-31 06:32:37Z schiv $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=lyx
-pkgver=2.0.1
-pkgrel=3
-pkgdesc="An advanced open-source document processor"
+pkgver=2.0.2
+pkgrel=1
+pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lyx.org"
-depends=('qt' 'texlive-core' 'python2' 'perl' 'imagemagick' 'enchant' 'boost-libs' 'libmythes')
+depends=('qt' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes')
 makedepends=('boost')
+optdepends=('rcs: built-in version control system'
+            'texlive-latexextra: float wrap support')
 license=('GPL')
 source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz
         lyx.desktop lyxrc.dist)
 backup=('etc/lyx/lyxrc.dist')
 install=lyx.install
-sha1sums=('225b4d853f38463e986a9b42a39cac432da56d8a'
-          'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad'
-          '56416642cc3da2a13b87b84e6b87c1a239f3d09a')
-	
+options=('emptydirs')
+md5sums=('f6421fdf118ace93d259220e6a3c4431'
+         '1f65a736f015a5350f8efb41b2f13abd'
+         'b70fdeab95ba4a6c3ff72410dfa61823')
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} +
diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD
index 8bddd8565..336f59ca1 100644
--- a/extra/mono/PKGBUILD
+++ b/extra/mono/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140778 2011-10-19 07:11:57Z daniel $
+# $Id: PKGBUILD 145729 2011-12-29 13:13:45Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Brice Carpentier <brice@dlfp.org>
 
 pkgname=mono
-pkgver=2.10.6
+pkgver=2.10.8
 pkgrel=1
 pkgdesc="Free implementation of the .NET platform including runtime and compiler"
 arch=(i686 x86_64 'mips64el')
@@ -14,9 +14,9 @@ makedepends=('pkgconfig')
 options=('!libtool' '!makeflags')
 provides=('monodoc')
 conflicts=('monodoc')
-source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.gz
         mono.rc.d)
-md5sums=('c442cef4cd6668b0a1391a661f6815a9'
+md5sums=('411a2d9bcfc37a61eb9aedba88b40533'
          '8315e46c6a6e9625502521fc0ad1a322')
 
 build() {
diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD
index 56624f596..4fddb0426 100644
--- a/extra/ntp/PKGBUILD
+++ b/extra/ntp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 145633 2011-12-25 10:45:15Z bisson $
+# $Id: PKGBUILD 145791 2012-01-01 01:38:19Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 
 pkgname=ntp
 pkgver=4.2.6.p5
 _realver=4.2.6p5
-pkgrel=1
+pkgrel=2
 pkgdesc='Network Time Protocol reference implementation'
 url='http://www.ntp.org/'
 license=('custom')
@@ -19,8 +19,8 @@ source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz"
         'ntp.conf'
         'ntpd.conf')
 sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192'
-          '97b41b8bc34f259f4e525ab2e58707c9724e72e2'
-          '63572457586379aa6bf75b6e899e71d651e643f4'
+          '4e324e625c1f080b5c028be5092aa71adbf9bd99'
+          '01394b8a952f5edc85d19df8335eeac3980320f4'
           'f6fa4838a33a3abcdd168a37b3f4a2dddd60472e'
           '6cfcb7bbd34499b30e31dffca2f3e1a036010271')
 
@@ -29,7 +29,8 @@ install=install
 build() {
 	cd "${srcdir}/${pkgname}-${_realver}"
 
-	./configure --prefix=/usr \
+	./configure \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--enable-linux-caps \
 
diff --git a/extra/ntp/install b/extra/ntp/install
index ad9a39d54..926b4126e 100644
--- a/extra/ntp/install
+++ b/extra/ntp/install
@@ -7,4 +7,13 @@ post_upgrade() {
 
 EOF
 	fi
+	if [[ $(vercmp $2 4.2.6.p5-1) -le 0 ]]; then
+		cat <<EOF
+
+==> The PID file /var/run/ntpd.pid has been renamed /run/ntpd.pid
+==> and the new rc.d script only takes the latter into account.
+==> To stop your old ntpd process, please kill it manually.
+
+EOF
+	fi
 }
diff --git a/extra/ntp/ntpd b/extra/ntp/ntpd
index a3e886e1f..480fa1088 100755
--- a/extra/ntp/ntpd
+++ b/extra/ntp/ntpd
@@ -4,49 +4,44 @@
 . /etc/rc.d/functions
 . /etc/conf.d/ntpd.conf
 
-PIDFILE="/var/run/ntpd/ntpd.pid"
-PID=$(cat $PIDFILE 2> /dev/null)
+unset PID
+PIDFILE='/run/ntpd.pid'
+
+if [[ -r ${PIDFILE} ]]; then
+	read -r PID <"${PIDFILE}"
+	if [[ -n ${PID} && ! -d /proc/${PID} ]]; then
+		rm -f "${PIDFILE}"
+		unset PID
+	fi
+fi
 
 case "$1" in
-  start)
-    stat_busy "Starting NTP Daemon"
-    [ ! -d /var/run/ntpd ] && install -d /var/run/ntpd &>/dev/null
-    if [ -z "$PID" ]; then 
-       /usr/bin/ntpd $NTPD_ARGS -p /var/run/ntpd/ntpd.pid &>/dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        add_daemon ntpd
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping NTP Daemon"
-    if [ -n "$PID" ]; then
-      kill $PID &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        rm $PIDFILE &>/dev/null
-        rm_daemon ntpd
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
+	start)
+		stat_busy "Starting NTP Daemon"
+		if [[ -z ${PID} ]] && /usr/bin/ntpd ${NTPD_ARGS} -p "${PIDFILE}" &>/dev/null; then 
+			add_daemon ntpd
+			stat_done
+		else
+			stat_fail
+			exit 1
+		fi
+		;;
+	stop)
+		stat_busy "Stopping NTP Daemon"
+		if [[ -n ${PID} ]] && kill "${PID}" &>/dev/null; then
+			rm ${PIDFILE}
+			rm_daemon ntpd
+			stat_done
+		else
+			stat_fail
+			exit 1
+		fi
+		;;
+	restart)
+		$0 stop
+		sleep 1
+		$0 start
+		;;
+	*)
+		echo "usage: $0 {start|stop|restart}"
 esac
diff --git a/extra/ntp/ntpdate b/extra/ntp/ntpdate
index 4f7c8375b..a8e746785 100755
--- a/extra/ntp/ntpdate
+++ b/extra/ntp/ntpdate
@@ -5,27 +5,25 @@
 . /etc/conf.d/ntpd.conf
 
 case "$1" in
-  start)
-    stat_busy "Starting NTP Client"
-    /usr/bin/ntpd -q $NTP_CLIENT_OPTION &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      add_daemon ntpdate
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping NTP Client"
-    rm_daemon ntpdate
-    stat_done
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
+	start)
+		stat_busy "Starting NTP Client"
+		if /usr/bin/ntpd -q ${NTP_CLIENT_OPTION} &>/dev/null; then
+			add_daemon ntpdate
+			stat_done
+		else
+			stat_fail
+			exit 1
+		fi
+		;;
+	stop)
+		stat_busy "Stopping NTP Client"
+		rm_daemon ntpdate
+		stat_done
+		;;
+	restart)
+		$0 stop
+		$0 start
+		;;
+	*)
+		echo "usage: $0 {start|stop|restart}"
 esac
-
diff --git a/extra/qtscriptgenerator/PKGBUILD b/extra/qtscriptgenerator/PKGBUILD
index 07fb0bff8..72187c991 100644
--- a/extra/qtscriptgenerator/PKGBUILD
+++ b/extra/qtscriptgenerator/PKGBUILD
@@ -1,38 +1,50 @@
-# $Id: PKGBUILD 75658 2010-04-02 04:17:23Z pierre $
+# $Id: PKGBUILD 145770 2011-12-30 11:51:06Z andrea $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=qtscriptgenerator
 pkgver=0.1.0
-pkgrel=4
-pkgdesc="Script generator for qt"
+pkgrel=5
+pkgdesc="A tool that generates Qt bindings for Qt Script"
 arch=("i686" "x86_64" 'mips64el')
-url="http://code.google.com/p/qtscriptgenerator/"
+url="https://code.google.com/p/qtscriptgenerator/"
 license=('GPL')
-depends=('qt' 'phonon')
+depends=('qt' 'phonon' 'qtwebkit')
 makedepends=('pkgconfig' 'mesa')
-source=(http://qtscriptgenerator.googlecode.com/files/qtscriptgenerator-src-0.1.0.tar.gz
-        phonon.patch
-        qtscriptgenerator-gcc44.patch)
-md5sums=('ca4046ad4bda36cd4e21649d4b98886d' 'c0266892ecc645b3407f2203ee11a808'\
-         'a3d48d6a3cfdd9be397bef01d3e4f638')
+source=("https://qtscriptgenerator.googlecode.com/files/${pkgname}-src-${pkgver}.tar.gz"
+        'no-phonon.patch'
+        'gcc44.patch'
+        'qt48.patch'
+        'phonon.patch')
+sha1sums=('eeae733106369e289f257b754822bc372fd6ba75'
+          'c50b26e6504f5c981a916860d9c3929e436e1067'
+          '87cd599403fa9bb441ddc27c77e0b6242e2cc150'
+          '5487e2ed1ce4d35b48b3433dc5cc2a1752a03ff1'
+          'cca1cd546628a10a91475a82fe12ad2e4066a7d0')
 
 build() {
-  cd $srcdir/$pkgname-src-$pkgver/generator
-  patch -p1 -i $srcdir/qtscriptgenerator-gcc44.patch || return 1
+  cd "${srcdir}"/$pkgname-src-$pkgver
+
+  patch -p0 -i "${srcdir}"/gcc44.patch
+  patch -p1 -i "${srcdir}"/phonon.patch
+  patch -p1 -i "${srcdir}"/qt48.patch
+  patch -p1 -i "${srcdir}"/no-phonon.patch
+
   # prepare plugins
-  patch -Np2 -i $srcdir/phonon.patch || return 1
-  qmake || return 1
-  make || return 1
-  ./generator --include-paths=/usr/include || return 1
+  cd generator
+  qmake
+  make
+  ./generator --include-paths=/usr/include
+
   # build plugins
-  cd "$srcdir/$pkgname-src-$pkgver/qtbindings"
-  qmake || return 1
-  make || return 1
+  cd "${srcdir}"/$pkgname-src-$pkgver/qtbindings
+  qmake
+  make
 }
 
 package() {
-  cd "$srcdir/$pkgname-src-$pkgver/qtbindings"
+  cd "${srcdir}"/$pkgname-src-$pkgver/qtbindings
   # move plugins to correct directory
-  mkdir -p $pkgdir/usr/lib/qt/plugins/script
-  mv $srcdir/$pkgname-src-$pkgver/plugins/script/* $pkgdir/usr/lib/qt/plugins/script/
+  install -d "${pkgdir}"/usr/lib/qt/plugins/script
+  mv "${srcdir}"/$pkgname-src-$pkgver/plugins/script/* \
+    "${pkgdir}"/usr/lib/qt/plugins/script/
 }
diff --git a/extra/qtscriptgenerator/gcc44.patch b/extra/qtscriptgenerator/gcc44.patch
new file mode 100644
index 000000000..dbb423e5d
--- /dev/null
+++ b/extra/qtscriptgenerator/gcc44.patch
@@ -0,0 +1,15 @@
+# Patch from upstream bug tracker:
+# http://code.google.com/p/qtscriptgenerator/issues/detail?id=37
+# So far (2009-06-12) this has not been applied at upstream git repo
+
+diff -uNr generator.orig/parser/rpp/pp.h generator/parser/rpp/pp.h
+--- generator.orig/parser/rpp/pp.h	2008-12-05 11:01:44.000000000 +0100
++++ generator/parser/rpp/pp.h	2008-12-13 10:42:22.000000000 +0100
+@@ -30,6 +30,7 @@
+ #include <cctype>
+
+ #include <fcntl.h>
++#include <cstdio>
+
+ #ifdef HAVE_MMAP
+ #  include <sys/mman.h>
diff --git a/extra/qtscriptgenerator/no-phonon.patch b/extra/qtscriptgenerator/no-phonon.patch
new file mode 100644
index 000000000..071b9aa69
--- /dev/null
+++ b/extra/qtscriptgenerator/no-phonon.patch
@@ -0,0 +1,34 @@
+diff -up qtscriptgenerator-src-0.1.0/generator/build_all.txt.no_phonon qtscriptgenerator-src-0.1.0/generator/build_all.txt
+--- qtscriptgenerator-src-0.1.0/generator/build_all.txt.no_phonon	2010-10-26 02:53:53.000000000 -0500
++++ qtscriptgenerator-src-0.1.0/generator/build_all.txt	2010-12-21 12:43:23.717989854 -0600
+@@ -6,7 +6,6 @@
+   <load-typesystem name="typesystem_svg.xml" generate="yes" />
+   <load-typesystem name="typesystem_network.xml" generate="yes" />
+   <load-typesystem name="typesystem_xml.xml" generate="yes" />
+-  <load-typesystem name="typesystem_phonon.xml" generate="yes" />
+   <load-typesystem name="typesystem_webkit.xml" generate="yes" />
+   <load-typesystem name="typesystem_xmlpatterns.xml" generate="yes" />
+   <load-typesystem name="typesystem_uitools.xml" generate="yes" />
+diff -up qtscriptgenerator-src-0.1.0/generator/generate.sh.no_phonon qtscriptgenerator-src-0.1.0/generator/generate.sh
+--- qtscriptgenerator-src-0.1.0/generator/generate.sh.no_phonon	2010-10-26 02:53:53.000000000 -0500
++++ qtscriptgenerator-src-0.1.0/generator/generate.sh	2010-12-21 12:43:23.717989854 -0600
+@@ -12,8 +12,6 @@ xsltproc --stringparam source $PWD/types
+ 
+ xsltproc --stringparam source $PWD/typesystem_sql-qtscript.xml merge.xsl typesystem_sql-common.xml > typesystem_sql.xml
+ 
+-xsltproc --stringparam source $PWD/typesystem_phonon-qtscript.xml merge.xsl typesystem_phonon-common.xml > typesystem_phonon.xml
+-
+ xsltproc --stringparam source $PWD/typesystem_webkit-qtscript.xml merge.xsl typesystem_webkit-common.xml > typesystem_webkit.xml
+ 
+ xsltproc --stringparam source $PWD/typesystem_xmlpatterns-qtscript.xml merge.xsl typesystem_xmlpatterns-common.xml > typesystem_xmlpatterns.xml
+diff -up qtscriptgenerator-src-0.1.0/qtbindings/qtbindings.pro.no_phonon qtscriptgenerator-src-0.1.0/qtbindings/qtbindings.pro
+--- qtscriptgenerator-src-0.1.0/qtbindings/qtbindings.pro.no_phonon	2010-10-26 02:53:53.000000000 -0500
++++ qtscriptgenerator-src-0.1.0/qtbindings/qtbindings.pro	2010-12-21 12:45:01.010979847 -0600
+@@ -6,7 +6,6 @@ SUBDIRS = qtscript_core \
+ 	  qtscript_sql \
+ 	  qtscript_svg \
+ 	  qtscript_xml \
+-	  qtscript_phonon \
+ 	  qtscript_webkit \
+ 	  qtscript_xmlpatterns \
+ 	  qtscript_uitools \
diff --git a/extra/qtscriptgenerator/phonon.patch b/extra/qtscriptgenerator/phonon.patch
index cef0e1fa1..de22f4926 100644
--- a/extra/qtscriptgenerator/phonon.patch
+++ b/extra/qtscriptgenerator/phonon.patch
@@ -1,6 +1,7 @@
---- b/generator/qtscript_masterinclude.h	2009-03-21 20:37:30.719523909 -0400
-+++ a/generator/qtscript_masterinclude.h	2009-03-21 21:00:25.108149339 -0400
-@@ -31,17 +31,41 @@
+diff -up qtscriptgenerator-src-0.1.0/generator/qtscript_masterinclude.h.kde_phonon qtscriptgenerator-src-0.1.0/generator/qtscript_masterinclude.h
+--- qtscriptgenerator-src-0.1.0/generator/qtscript_masterinclude.h.kde_phonon	2010-10-26 02:53:53.000000000 -0500
++++ qtscriptgenerator-src-0.1.0/generator/qtscript_masterinclude.h	2010-12-11 17:00:08.456338081 -0600
+@@ -49,17 +49,46 @@
  
  #include <QtUiTools/QtUiTools>
  
@@ -18,19 +19,22 @@
 +#include <QtXmlPatterns/QtXmlPatterns>                                                              
 +
 +#include <QtWebKit/QtWebKit>                                                                        
-+                                                                                                    
-+#include "phonon/abstractaudiooutput.h"                                                             
-+#include "phonon/abstractmediastream.h"                                                             
-+#include "phonon/abstractvideooutput.h"                                                             
-+#include "phonon/addoninterface.h"                                                                  
-+#include "phonon/audiooutput.h"                                                                     
-+#include "phonon/audiooutputinterface.h"                                                            
-+#include "phonon/backendcapabilities.h"                                                             
++
++#include "phonon/abstractaudiooutput.h"
++#include "phonon/abstractmediastream.h"
++#include "phonon/abstractvideooutput.h"
++#include "phonon/addoninterface.h"
++#include "phonon/audiodataoutput.h"
++#include "phonon/audiodataoutputinterface.h"
++#include "phonon/audiooutput.h"
++#include "phonon/audiooutputinterface.h"
++#include "phonon/backendcapabilities.h"
 +#include "phonon/backendinterface.h"
 +#include "phonon/effect.h"
 +#include "phonon/effectinterface.h"
 +#include "phonon/effectparameter.h"
 +#include "phonon/effectwidget.h"
++#include "phonon/globalconfig.h"
 +#include "phonon/mediacontroller.h"
 +#include "phonon/medianode.h"
 +#include "phonon/mediaobject.h"
@@ -39,9 +43,11 @@
 +#include "phonon/objectdescription.h"
 +#include "phonon/objectdescriptionmodel.h"
 +#include "phonon/path.h"
++#include "phonon/phonon_export.h"
 +#include "phonon/phonondefs.h"
 +#include "phonon/phononnamespace.h"
 +#include "phonon/platformplugin.h"
++#include "phonon/pulsesupport.h"
 +#include "phonon/seekslider.h"
 +#include "phonon/streaminterface.h"
 +#include "phonon/videoplayer.h"
diff --git a/extra/qtscriptgenerator/qt48.patch b/extra/qtscriptgenerator/qt48.patch
new file mode 100644
index 000000000..f397b5ab1
--- /dev/null
+++ b/extra/qtscriptgenerator/qt48.patch
@@ -0,0 +1,22 @@
+diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml
+--- qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent	2011-12-22 11:34:52.615149619 -0600
++++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml	2011-12-22 11:35:31.808659632 -0600
+@@ -2233,7 +2233,6 @@
+     
+                
+   </object-type>
+-  <object-type name="QFileOpenEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FileOpen"/>
+   <object-type name="QFocusEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FocusIn || %1-&gt;type() == QEvent::FocusOut">
+         <modify-function signature="reason()const">
+             <remove/>
+diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml
+--- qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent	2009-02-20 05:42:24.000000000 -0600
++++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml	2011-12-22 11:33:43.058019203 -0600
+@@ -2555,7 +2555,6 @@
+     
+                
+   </object-type>
+-  <object-type name="QFileOpenEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FileOpen"/>
+   <object-type name="QFocusEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FocusIn || %1-&gt;type() == QEvent::FocusOut">
+         <modify-function signature="reason()const">
+             <remove/>
diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD
index 11053221d..a9292949c 100644
--- a/extra/varnish/PKGBUILD
+++ b/extra/varnish/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id
+# $Id: PKGBUILD 145793 2012-01-01 02:41:17Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Douglas Soares de Andrade
@@ -6,7 +6,7 @@
 
 pkgname=varnish
 pkgver=3.0.2
-pkgrel=2
+pkgrel=4
 pkgdesc="High-performance HTTP accelerator"
 arch=(mips64el)
 url="http://www.varnish-cache.org/"
@@ -20,8 +20,8 @@ source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz"
         "$pkgname.conf.d"
         "rc.$pkgname")
 md5sums=('c8eae0aabbe66b6daabdf3a1f58cd47a'
-         'd42eebc7f0ac429d9740125ff1e61daf'
-         '18b7747020ecfe2eac7445971a7014e3')
+         'edd1237d097d72173d9772754335890c'
+         '8366f51568c0bbb3d3891aa0cc724369')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/varnish/rc.varnish b/extra/varnish/rc.varnish
index 2ebd97e33..2841665e5 100644
--- a/extra/varnish/rc.varnish
+++ b/extra/varnish/rc.varnish
@@ -4,6 +4,27 @@
 . /etc/rc.d/functions
 . /etc/conf.d/varnish
 
+reload_vcl() {
+  local activecfg newcfg
+
+  if [[ -z $VARNISH_CFG ]]; then
+    printf '==> ERROR: VARNISH_CFG is undefined in /etc/conf.d/varnish!\n'
+    return 1
+  fi
+
+  activecfg=$(varnishadm 'vcl.list' | awk '/active/ { print $3 }')
+  if [[ -z $activecfg ]]; then
+    printf '==> ERROR: No active VCL found!\n'
+    return 1
+  fi
+
+  printf -v newcfg 'vcl-%(%s)T' -1
+
+  varnishadm "vcl.load $newcfg $VARNISH_CFG" &&
+  varnishadm "vcl.use $newcfg" &&
+  varnishadm "vcl.discard $activecfg" || return 1
+}
+
 pidfile=/run/varnish.pid
 if [[ -r $pidfile ]]; then
   read -r PID < "$pidfile"
@@ -14,7 +35,7 @@ if [[ -r $pidfile ]]; then
   fi
 fi
 
-case "$1" in
+case $1 in
   start)
     stat_busy "Starting Varnish Reverse Proxy"
     if /usr/sbin/varnishd $VARNISHD_OPTS -P "$pidfile"; then
@@ -40,6 +61,10 @@ case "$1" in
     sleep 1
     $0 start
     ;;
+  reload)
+    stat_busy "Recompiling and Reloading VCL"
+    reload_vcl && stat_done || stat_fail
+    ;;
   *)
     echo "usage: $0 {start|stop|restart}"
   ;;
diff --git a/extra/varnish/varnish.conf.d b/extra/varnish/varnish.conf.d
index 2970468b7..904ca119f 100644
--- a/extra/varnish/varnish.conf.d
+++ b/extra/varnish/varnish.conf.d
@@ -7,3 +7,5 @@ VARNISHD_OPTS="-a 0.0.0.0:80 \
                -T localhost:6082 \
                -s malloc,64M
                -u nobody -g nobody"
+
+VARNISH_CFG="/etc/varnish/default.vcl"
diff --git a/extra/varnish/varnish.install b/extra/varnish/varnish.install
index fceaf4be7..1cbb1f16e 100644
--- a/extra/varnish/varnish.install
+++ b/extra/varnish/varnish.install
@@ -2,5 +2,5 @@
 
 # remove localstatedir -- compiled VCL and slab files will still be here.
 post_remove() {
-  rm -rf /var/lib/varnish
+  rm -rf var/lib/varnish
 }