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

Conflicts:
	community-staging/haskell-html/PKGBUILD
	community-staging/haskell-regex-base/PKGBUILD
	community-staging/haskell-stm/PKGBUILD
	community-staging/haskell-terminfo/PKGBUILD
	extra/avahi/PKGBUILD
	extra/elfutils/PKGBUILD
	testing/util-linux/PKGBUILD
	testing/util-linux/util-linux.install

20 files changed, 206 insertions, 102 deletions

diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD
index 0b6b85c53..c050e4fc5 100644
--- a/extra/avahi/PKGBUILD
+++ b/extra/avahi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156451 2012-04-18 12:14:05Z bisson $
+# $Id: PKGBUILD 166539 2012-09-10 04:37:24Z bisson $
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=3
+pkgrel=4
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
@@ -21,17 +21,15 @@ optdepends+=('qt: qt bindings'
 optdepends+=('dbus-python: avahi-discover'
             'nss-mdns: NSS support for mDNS')
 makedepends=('qt' 'pygtk' 'intltool' 'dbus-python'
-             'gobject-introspection' 'gtk3')
+             'gobject-introspection' 'gtk3' 'xmltoman')
 [ "$CARCH" != "mips64el" ] && makedepends+=('qt3' 'mono' 'gtk-sharp-2')
 backup=('etc/avahi/hosts'
         'etc/avahi/avahi-daemon.conf'
         'etc/avahi/services/ssh.service'
         'etc/avahi/services/sftp-ssh.service')
 source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz"
-        'gnome-nettool.png'
         'rc.d.patch')
 sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684'
-          'cf56387c88aed246b9f435efc182ef44de4d52f3'
           '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9')
 
 conflicts=('howl' 'mdnsresponder')
@@ -72,7 +70,6 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
-	install -Dm644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png
 
 	cd "${pkgdir}"
 	sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD
index 091962b0e..8ffcd12f6 100644
--- a/extra/elfutils/PKGBUILD
+++ b/extra/elfutils/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 163718 2012-07-18 03:05:26Z eric $
-# Maintainer: 
+# $Id: PKGBUILD 166543 2012-09-10 09:44:48Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu>
 
 pkgname=elfutils
-pkgver=0.154
+pkgver=0.155
 pkgrel=1
-pkgdesc="Collection of libraries and utilities for working with ELF object files and DWARF debugging information"
-arch=('i686' 'x86_64' 'mips64el')
+pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information"
+arch=('i686' 'x86_64')
 url="https://fedorahosted.org/elfutils/"
 license=('LGPL3' 'GPL' 'GPL3')
 depends=('gcc-libs' 'zlib' 'bzip2' 'xz')
@@ -14,21 +14,17 @@ provides=('libelf')
 replaces=('libelf')
 conflicts=('libelf')
 options=('!makeflags')
-source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig} \
-        elfutils-0.154-binutils-pr-ld-13621.patch
-	http://cdn.debian.net/debian/pool/main/e/elfutils/elfutils_${pkgver}-1.debian.tar.gz)
+source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig}
+        elfutils-0.155-binutils-pr-ld-13621.patch)
+sha1sums=('1b96084cd9fe037c1c0bd2c280aaa701f913462b'
+          'fcd0ebd029b305bf030983daf151a2a1ab5294af'
+          '8a8be7c0686c6311c1ce969ba10494e704ead48c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  for patch in $(cat ../debian/patches/series) ; do
-    patch -Np1 -i "../debian/patches/$patch"
-  done
-
   CFLAGS+=" -g"  # required for test-suite success
-
-  patch -p1 -i "${srcdir}/elfutils-0.154-binutils-pr-ld-13621.patch"
-
+  patch -Np1 -i ../elfutils-0.155-binutils-pr-ld-13621.patch
   ./configure --prefix=/usr --program-prefix="eu-"
   make
 }
diff --git a/extra/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch b/extra/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch
new file mode 100644
index 000000000..7f99ac0be
--- /dev/null
+++ b/extra/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch
@@ -0,0 +1,16 @@
+diff --git a/tests/run-elflint-self.sh b/tests/run-elflint-self.sh
+index 4b01008..7a5f0c8 100755
+--- a/tests/run-elflint-self.sh
++++ b/tests/run-elflint-self.sh
+@@ -18,4 +18,11 @@
+ 
+ . $srcdir/test-subr.sh
+ 
++# Makes sure we exit cleanly even when we don't...
++clean_exit()
++{
++  if test $? != 0; then echo "binutils PR ld/13621 workaround"; exit 0; fi
++}
++trap clean_exit EXIT
++
+ testrun_on_self ../src/elflint --quiet --gnu-ld
diff --git a/extra/gtk-xfce-engine/PKGBUILD b/extra/gtk-xfce-engine/PKGBUILD
index 86002a190..d9d45b80e 100644
--- a/extra/gtk-xfce-engine/PKGBUILD
+++ b/extra/gtk-xfce-engine/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157455 2012-04-28 15:51:09Z foutrelis $
+# $Id: PKGBUILD 166516 2012-09-09 13:16:50Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgbase=gtk-xfce-engine
 pkgname=('gtk2-xfce-engine' 'gtk3-xfce-engine')
-pkgver=3.0.0
+pkgver=3.0.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
@@ -13,7 +13,7 @@ groups=('xfce4')
 makedepends=('gtk2' 'gtk3')
 options=('!libtool')
 source=(http://archive.xfce.org/src/xfce/$pkgbase/3.0/$pkgbase-$pkgver.tar.bz2)
-sha256sums=('90e08fce8cce452656c4090f94afb7aa35a0a92597412f319526b7899d54838d')
+sha256sums=('eb03cf81da1a91e426a2141c092ed7a1634cab29ea2f3546480e901290a7a06d')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index d163a353c..eb9eba647 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=kdeplasma-applets-networkmanagement
 epoch=1
-pkgver=0.9.0.2
+pkgver=0.9.0.4
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ optdepends=('mobile-broadband-provider-info: Database of mobile broadband servic
             'openconnect: Cisco AnyConnect compatible VPN client')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/networkmanagement/${pkgver}/src/networkmanagement-${pkgver}.tar.bz2")
-sha1sums=('58b530d0dc97cc742f24413a54c58f20318cfa14')
+sha256sums=('520d0592171ce1aa1c54916f408e7f2d1e016da0acefc725f7170b67a292e256')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD
index f1403576f..b1246319f 100644
--- a/extra/modemmanager/PKGBUILD
+++ b/extra/modemmanager/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165621 2012-08-27 12:25:05Z heftig $
+# $Id: PKGBUILD 166517 2012-09-09 15:40:36Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=modemmanager
 _realname=ModemManager
-pkgver=0.5.2.0
-pkgrel=4
+pkgver=0.6.0.0
+pkgrel=1
 pkgdesc="Mobile broadband modem management service"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cgit.freedesktop.org/ModemManager/ModemManager/"
@@ -12,9 +12,9 @@ depends=('dbus-glib' 'udev' 'ppp')
 makedepends=('intltool')
 optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
 options=('!libtool')
-source=(http://download.gnome.org/sources/$_realname/0.5/$_realname-$pkgver.tar.xz
+source=(http://download.gnome.org/sources/$_realname/0.6/$_realname-$pkgver.tar.xz
         modem-manager.service)
-sha256sums=('7f8b3e1996a24e031df7534e226a0f0c7c2dd8b30322e6c5f4611dc1a848e6c8'
+sha256sums=('d4468300cf4aa7baf21c8564fa515e578056f34de5a64f452b053331f89e8ae2'
             '118e36f2f956d719cf4036f3fd5f5bf0fde88ca55bdf7ed95051b5b09066fcbe')
 
 build() {
diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD
index 49e01e847..a45f68168 100644
--- a/extra/network-manager-applet/PKGBUILD
+++ b/extra/network-manager-applet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 156942 2012-04-23 09:09:34Z ibiru $
+# $Id: PKGBUILD 166523 2012-09-09 15:41:15Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@archlinux.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -6,20 +6,20 @@
 # Contributor: Will Rea <sillywilly@gmail.com>
 
 pkgname=network-manager-applet
-pkgver=0.9.4.1
+pkgver=0.9.6.2
 pkgrel=1
 pkgdesc="GNOME frontends to NetWorkmanager"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
-depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' 'gnome-icon-theme'
-         'mobile-broadband-provider-info' 'gconf' 'iso-codes')
+depends=("networkmanager>=${pkgver::5}" 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify'
+         'gnome-icon-theme' 'mobile-broadband-provider-info' 'iso-codes')
 makedepends=('intltool' 'gnome-bluetooth')
 optdepends=('gnome-bluetooth: for PAN/DUN support')
 options=('!libtool' '!emptydirs')
 install=network-manager-applet.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz)
-sha256sums=('b6b6de75e28d1fbcdfdbb51c0e40fcd6bc0ec0385bfecd16c457260491cd2ff7')
+sha256sums=('96c79ce199fe7770b66f2ddc5ee0a4b07a0ea1eaf5e2186b78d8dd69e38a3069')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -27,15 +27,12 @@ build() {
       --localstatedir=/var \
       --libexecdir=/usr/lib/networkmanager \
       --disable-static \
-      --disable-maintainer-mode
+      --disable-maintainer-mode \
+      --disable-migration
   make
 }
 
 package() {
   cd ${pkgname}-${pkgver}
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain nm-applet ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/network-manager-applet/network-manager-applet.install b/extra/network-manager-applet/network-manager-applet.install
index 9922d12b2..255ea1f9a 100644
--- a/extra/network-manager-applet/network-manager-applet.install
+++ b/extra/network-manager-applet/network-manager-applet.install
@@ -1,18 +1,18 @@
-pkgname=network-manager-applet
-
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  glib-compile-schemas /usr/share/glib-2.0/schemas
   gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
 }
 
-post_upgrade() {
-  post_install $1
+pre_upgrade() {
+  if (( $(vercmp $2 0.9.6.0) < 0 )); then
+    gconfpkg --uninstall network-manager-applet
+  fi
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+post_upgrade() {
+  post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
+  post_install
+} 
diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD
index 935c34fa7..3ecac5e28 100644
--- a/extra/networkmanager-openconnect/PKGBUILD
+++ b/extra/networkmanager-openconnect/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 156946 2012-04-23 09:09:41Z ibiru $
+# $Id: PKGBUILD 166519 2012-09-09 15:40:55Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-openconnect
-pkgver=0.9.4.0
+pkgver=0.9.6.2
 pkgrel=1
 pkgdesc="NetworkManager VPN integration for openconnect"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'openconnect' 'gconf')
+depends=("networkmanager>=${pkgver::5}" 'openconnect' 'gconf' 'libgnome-keyring')
 makedepends=('intltool')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz)
-sha256sums=('60732587befd062fb8d979540c4410831f5e686b5d092ec24b0237ebd09e1084')
+sha256sums=('3f53d87dbeb00fc841ef5981e6f1a1a192c65d273386246d48245cca84fa41b0')
 
 build() {
   cd NetworkManager-openconnect-${pkgver}
diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD
index a95bae8a3..99e3eb775 100644
--- a/extra/networkmanager-openvpn/PKGBUILD
+++ b/extra/networkmanager-openvpn/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156948 2012-04-23 09:09:44Z ibiru $
+# $Id: PKGBUILD 166520 2012-09-09 15:41:00Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-openvpn
-pkgver=0.9.4.0
+pkgver=0.9.6.0
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for OpenVPN"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 install=networkmanager-openvpn.install
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz)
-sha256sums=('d04870b10c2cd3a0671a4be645f595ad0362bcfd23cb849690b27bbac53683e0')
+sha256sums=('8fb88705793399574b3de2af93f87b63c0eae342d549a1c79bc59f6a1fad87a3')
 
 build() {
   cd NetworkManager-openvpn-${pkgver}
diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD
index 18b53e2fb..61ac1f7f2 100644
--- a/extra/networkmanager-pptp/PKGBUILD
+++ b/extra/networkmanager-pptp/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156950 2012-04-23 09:09:48Z ibiru $
+# $Id: PKGBUILD 166521 2012-09-09 15:41:05Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-pptp
-pkgver=0.9.4.0
+pkgver=0.9.6.0
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for pptp "
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=networkmanager-pptp.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz)
-sha256sums=('6fb772985a7273793296375d0ecba59362fe5575f70a8dd36da622db8a8d235d')
+sha256sums=('a84cbbf24827229e3dd3611bbde191398275c3b7ecd03913047197644f27a2b4')
 
 build() {
   cd NetworkManager-pptp-${pkgver}
diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD
index 2d9ebdb93..6158b31f9 100644
--- a/extra/networkmanager-vpnc/PKGBUILD
+++ b/extra/networkmanager-vpnc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156952 2012-04-23 09:09:52Z ibiru $
+# $Id: PKGBUILD 166522 2012-09-09 15:41:10Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-vpnc
-pkgver=0.9.4.0
+pkgver=0.9.6.0
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for vpnc"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=networkmanager-vpnc.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz)
-sha256sums=('1d52720ce39bd772753a40c879d0a654fc2efcc4ef7b49ec18f55ae2e82efc7d')
+sha256sums=('6c8e35862330e17ee8f4dc44b1ac47470da703e436d339c7b3e2dac7d1b148a2')
 
 build() {
   cd NetworkManager-vpnc-${pkgver}
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index f391c88a2..9c3b8ed62 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 161859 2012-06-15 19:32:00Z heftig $
+# $Id: PKGBUILD 166518 2012-09-09 15:40:49Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
 # Contributor: Tor Krill <tor@krill.nu>
@@ -7,8 +7,8 @@
 
 pkgname=networkmanager
 _pkgname=NetworkManager
-pkgver=0.9.4.0
-pkgrel=6
+pkgver=0.9.6.0
+pkgrel=1
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -26,22 +26,17 @@ options=('!libtool')
 backup=('etc/NetworkManager/NetworkManager.conf')
 install=networkmanager.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch
-         initialize-GError.patch dont-fight-over-ipv6.patch)
-sha256sums=('eb4f124008b3d855a37205d03ef035b7218639cd7332bdae5567095977e93e0f'
+        NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch)
+sha256sums=('3982b623b7b199ac99e2ddd0840fe7d088245a49e3f680237e8baebf0cf86d07'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
             '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
-            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb'
-            '95c06ad34c131b1db0f28d6e78003bd8fd0a3ba903f76027381e3c4c411c6cb6'
-            'cc66f2fdf59f4f9873a5b775421e1968861c5541d7e29b83b4d30351ad1f9e94')
+            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb')
 
 build() {
   cd $_pkgname-$pkgver
 
   patch -Np1 -i ../disable_set_hostname.patch
   patch -Np1 -i ../dnsmasq-path.patch
-  patch -Np1 -i ../initialize-GError.patch
-  patch -Np1 -i ../dont-fight-over-ipv6.patch
 
   ./configure \
     --prefix=/usr \
diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD
index 13b72b32a..934a89d95 100644
--- a/extra/openconnect/PKGBUILD
+++ b/extra/openconnect/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 158780 2012-05-09 17:43:27Z ibiru $
+# $Id: PKGBUILD 166525 2012-09-09 15:41:23Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=openconnect
-pkgver=3.18
+pkgver=4.06
 pkgrel=1
 epoch=1
 pkgdesc="Open client for Cisco AnyConnect VPN"
@@ -13,16 +13,16 @@ depends=('libxml2' 'openssl' 'libproxy' 'vpnc')
 makedepends=('intltool')
 options=('!libtool' '!emptydirs')
 source=(ftp://ftp.infradead.org/pub/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('5a440ad946cfec0f1ee7ee5519081cf1')
+md5sums=('e827c9d08bd4d6983e3cbd0c9c19b978')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr \
       --disable-static
   make
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch b/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch
new file mode 100644
index 000000000..2694334c8
--- /dev/null
+++ b/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch
@@ -0,0 +1,35 @@
+From a5b3dd887dcd60e981626ae2e15c874311fc4fef Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Sun, 2 Sep 2012 04:36:13 +0200
+Subject: [PATCH] Send resume signal when built with systemd and using
+ pm-utils suspend
+
+This case was apparently overlooked when adding systemd support.
+
+Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+---
+ src/linux/up-backend.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c
+index ddd4472..52b430e 100644
+--- a/src/linux/up-backend.c
++++ b/src/linux/up-backend.c
+@@ -603,10 +603,11 @@ gboolean
+ up_backend_emits_resuming (UpBackend *backend)
+ {
+ #ifdef HAVE_SYSTEMD
+-	return TRUE;
+-#else
+-	return FALSE;
++	if (sd_booted ())
++		return TRUE;
++	else
+ #endif
++	return FALSE;
+ }
+ 
+ /**
+-- 
+1.7.12
+
diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD
index 010857cd7..e8ceb8a2b 100644
--- a/extra/upower/PKGBUILD
+++ b/extra/upower/PKGBUILD
@@ -1,17 +1,20 @@
-# $Id: PKGBUILD 164370 2012-07-31 19:43:25Z eric $
+# $Id: PKGBUILD 166524 2012-09-09 15:41:20Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=upower
-pkgver=0.9.17
+pkgver=0.9.18
 pkgrel=2
 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://upower.freedesktop.org"
 license=('GPL')
-depends=('systemd-tools' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
-makedepends=('intltool' 'docbook-xsl' 'gobject-introspection')
+depends=('systemd-tools' 'libsystemd' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
+makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd')
 options=('!libtool')
-source=($url/releases/$pkgname-$pkgver.tar.xz)
+source=($url/releases/$pkgname-$pkgver.tar.xz
+        0001-Send-resume-signal-when-built-with-systemd-and-using.patch)
+md5sums=('bfaaa1e7f8479fca5594406b3c36dff9'
+         '188afea4919dc324b2efbae35d9d216a')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -19,11 +22,13 @@ build() {
   # put udev files in /usr/lib
   sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure
 
+  # https://bugs.freedesktop.org/show_bug.cgi?id=54371
+  patch -Np1 -i ../0001-Send-resume-signal-when-built-with-systemd-and-using.patch
+
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib/upower \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system \
-      --disable-static
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/$pkgname \
+    --disable-static
   make
 }
 
@@ -31,4 +36,3 @@ package() {
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
-md5sums=('9ef7fc8ec438542f014f3a34552822aa')
diff --git a/extra/xf86-input-vmmouse/PKGBUILD b/extra/xf86-input-vmmouse/PKGBUILD
new file mode 100644
index 000000000..f32c89108
--- /dev/null
+++ b/extra/xf86-input-vmmouse/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 159500 2012-05-25 15:04:46Z andyrtr $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xf86-input-vmmouse
+pkgver=12.9.0
+pkgrel=1
+pkgdesc="X.org VMWare Mouse input driver"
+arch=(i686 x86_64)
+license=('custom')
+url="http://xorg.freedesktop.org/"
+depends=('glibc' 'sh')
+makedepends=('xorg-server-devel>=1.11.99.902')
+conflicts=('xorg-server<1.11.99.902')
+groups=('xorg-drivers' 'xorg')
+backup=('etc/X11/xorg.conf.d/50-vmmouse.conf')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('83500beddba2da390389705d482131872fe9be8b')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+    --with-xorg-conf-dir=/etc/X11/xorg.conf.d \
+    --with-udev-rules-dir=/usr/lib/udev/rules.d
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+  rm -rfv ${pkgdir}/usr/{lib,share}/hal
+}
diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD
index b6fdf89b4..e149c5743 100644
--- a/extra/xf86-input-wacom/PKGBUILD
+++ b/extra/xf86-input-wacom/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163478 2012-07-12 19:09:28Z andyrtr $
+# $Id: PKGBUILD 166529 2012-09-09 15:58:07Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: M Rawash <mrawash@gmail.com>
 
 pkgname=xf86-input-wacom
-pkgver=0.16.0
+pkgver=0.17.0
 pkgrel=1
 pkgdesc="X.Org Wacom tablet driver"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,21 +15,20 @@ depends=('libxi' 'libxrandr' 'libxinerama')
 makedepends=('xorg-server-devel>=1.12.0' 'libxext')
 conflicts=('xorg-server<1.12.0')
 options=(!libtool)
-source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2
         70-wacom.rules)
-md5sums=('aeee2bd339c825a9b1215df6a2e5e50b'
+md5sums=('92dffefc3bc30523463f2fa4bc753448'
          '10db4f8272286690255c1bcc18bfdd92')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 
-  install -m755 -d "${pkgdir}/usr/lib/udev/rules.d"
-  install -m644 "${srcdir}/70-wacom.rules"  "${pkgdir}/usr/lib/udev/rules.d/"
+  install -Dm644 ../70-wacom.rules "$pkgdir/usr/lib/udev/rules.d/70-wacom.rules"
 }
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index 493eef879..ed2d7127c 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165875 2012-09-02 10:29:23Z jgc $
+# $Id: PKGBUILD 166511 2012-09-09 07:04:08Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
-pkgver=2.20.6
+pkgver=2.20.7
 pkgrel=1
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -18,7 +18,7 @@ conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'x
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('02e059bfa8e431b7503148a55b7d491816442c50ca706f3ab40052dc454cbb6d')
+sha256sums=('e34503e60f3bc54a7ecbca3a4e7052a5a1015b0f1b4009bf84c101b5e08f9bac')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-vmware/PKGBUILD b/extra/xf86-video-vmware/PKGBUILD
new file mode 100644
index 000000000..a7a678bbf
--- /dev/null
+++ b/extra/xf86-video-vmware/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 154036 2012-03-21 19:49:43Z andyrtr $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xf86-video-vmware
+pkgver=12.0.2
+pkgrel=1
+pkgdesc="X.org vmware video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('libdrm' 'svga-dri')
+makedepends=('xorg-server-devel>=1.11.99.903' 'libx11' 'libxext')
+conflicts=('xorg-server<1.11.99.903')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool' '!emptydirs')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('efa47f365d88da245804a9934719ff860ed04f95')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --enable-vmwarectrl-client
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}