5 files changed, 94 insertions, 16 deletions
diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD
index 424bf2c46..4b20f73a1 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,16 +21,14 @@ optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
             'dbus-python: avahi-discover'
             'nss-mdns: NSS support for mDNS')
 makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
-             'gtk-sharp-2' 'gobject-introspection' 'gtk3')
+             'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman')
 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')
@@ -67,7 +65,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 8cbee1e68..37075ff99 100644
--- a/extra/elfutils/PKGBUILD
+++ b/extra/elfutils/PKGBUILD
@@ -1,11 +1,11 @@
-# $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"
+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')
@@ -14,16 +14,16 @@ 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)
-sha1sums=('3a92a6f636cc3d14d4b3b00ba5c1e88a2a8d510b'
-          '956461d44b03823e0b448e78b1f4aa25ef269e1e'
-          '09681b728edb86c77eed47286554bef048f3507f')
+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}"
   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/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-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}/"
+}