Fri Aug 19 23:14:46 UTC 2011

33 files changed, 239 insertions, 98 deletions

diff --git a/extra/abiword/PKGBUILD b/extra/abiword/PKGBUILD
index 4448b28b5..69974e508 100644
--- a/extra/abiword/PKGBUILD
+++ b/extra/abiword/PKGBUILD
@@ -1,25 +1,29 @@
-# $Id: PKGBUILD 102234 2010-12-06 22:32:25Z ibiru $
+# $Id: PKGBUILD 135772 2011-08-18 15:03:53Z andyrtr $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Maël Lavault <moimael@neuf.fr>
 
 pkgbase=abiword
 pkgname=('abiword' 'abiword-plugins')
 pkgver=2.8.6
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.abisource.com"
 makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup')
 options=('!makeflags' '!libtool')
 source=("http://www.abisource.com/downloads/${pkgbase}/${pkgver}/source/${pkgbase}-${pkgver}.tar.gz"
-        compat_libwpg_0_9.patch)
+        compat_libwpg_0_9.patch
+	abiword-2.8.6-no-undefined.patch)
 sha1sums=('998f69d038000b3fc027d4259548f02d67c8d0df'
-          'e5374f439e3d9b63a4bbd2cd39146c67cf1e85ea')
+          'e5374f439e3d9b63a4bbd2cd39146c67cf1e85ea'
+          '159b1cd0b9354868ab86f851b64a03dae7d254dc')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
   patch -Np1 -i "${srcdir}/compat_libwpg_0_9.patch"
+  # fix a gcc 4.6.x build issue, patch from Fedora
+  patch -Np1 -i "${srcdir}/abiword-2.8.6-no-undefined.patch"
   libtoolize --force
   autoreconf
 
@@ -29,7 +33,8 @@ build() {
 
 package_abiword() {
   pkgdesc="A fully-featured word processor"
-  depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant')
+  depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils')
+  install=$pkgname.install
   optdepends=('abiword-plugins')
   conflicts=("abiword-plugins<${pkgver}-${pkgrel}")
 
@@ -49,7 +54,7 @@ package_abiword() {
 
 package_abiword-plugins() {
   pkgdesc="Additional plugins for Abiword"
-  depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots')
+  depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf')
 
   cd "${srcdir}/${pkgbase}-${pkgver}/plugins"
   for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do
diff --git a/extra/abiword/abiword-2.8.6-no-undefined.patch b/extra/abiword/abiword-2.8.6-no-undefined.patch
new file mode 100644
index 000000000..c07000edb
--- /dev/null
+++ b/extra/abiword/abiword-2.8.6-no-undefined.patch
@@ -0,0 +1,21 @@
+diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am
+--- abiword-2.8.6.orig/src/Makefile.am	2009-09-09 15:11:01.000000000 +0200
++++ abiword-2.8.6/src/Makefile.am	2011-08-02 23:35:51.904761961 +0200
+@@ -107,7 +107,7 @@
+ 
+ AbiWord_LDFLAGS = \
+ 	$(DEPS_LIBS) \
+-	--no-undefined \
++	-Wl,--no-undefined \
+ 	-avoid-version \
+ 	-export-dynamic \
+ 	-headerpad_max_install_names 
+@@ -129,7 +129,7 @@
+ 
+ abiword_LDFLAGS = \
+ 	$(platform_ldflags) \
+-	--no-undefined      \
++	-Wl,--no-undefined      \
+ 	-avoid-version      \
+ 	-export-dynamic
+ 
diff --git a/extra/abiword/abiword.install b/extra/abiword/abiword.install
new file mode 100644
index 000000000..2eaa60550
--- /dev/null
+++ b/extra/abiword/abiword.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD
index b48969b16..2138dbbb9 100644
--- a/extra/claws-mail/PKGBUILD
+++ b/extra/claws-mail/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 127579 2011-06-16 17:10:43Z andyrtr $
+# $Id: PKGBUILD 135774 2011-08-18 15:03:56Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=claws-mail
 pkgver=3.7.9
-pkgrel=4
+pkgrel=5
 pkgdesc="A GTK+ based e-mail client."
 arch=('i686' 'x86_64')
 license=('GPL3')
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 1d3b15889..8b48c8681 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 134554 2011-08-05 18:35:01Z andyrtr $
+# $Id: PKGBUILD 135776 2011-08-18 15:04:02Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.4.8
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index 7f371fe26..78b7d8c3f 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 131265 2011-07-12 13:19:41Z ibiru $
+# $Id: PKGBUILD 135778 2011-08-18 15:04:05Z andyrtr $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=empathy
 pkgver=3.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/Empathy"
diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD
index ca799b5ba..d6f4c744e 100644
--- a/extra/glib-networking/PKGBUILD
+++ b/extra/glib-networking/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 124675 2011-05-23 20:43:54Z ibiru $
+# $Id: PKGBUILD 135780 2011-08-18 15:04:08Z andyrtr $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 pkgname=glib-networking
 pkgver=2.28.7
-pkgrel=1
+pkgrel=4
 pkgdesc="Network-related giomodules for glib"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 license=('GPL2')
-depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schemas')
+depends=('glib2' 'libproxy' 'gnutls' 'libgcrypt' 'ca-certificates' 'gsettings-desktop-schemas')
 makedepends=('intltool')
 options=('!libtool')
 install=glib-networking.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2)
-sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2
+        glib-networking-2.29.9-port-gnutls3-API.patch)
+sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c'
+            '101daf107773f84d08d7ab55a354875e2e021c3b5dd3cdc259fb544f94a8beee')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -Np0 -i "$srcdir/glib-networking-2.29.9-port-gnutls3-API.patch"
   ./configure \
-    --prefix=/usr  --sysconfdir=/etc \
+    --prefix=/usr --sysconfdir=/etc \
     --libexecdir=/usr/lib/glib-networking --disable-static
   make
 }
diff --git a/extra/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch b/extra/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch
new file mode 100644
index 000000000..19a168638
--- /dev/null
+++ b/extra/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch
@@ -0,0 +1,17 @@
+Index: tls/gnutls/gtlsconnection-gnutls.c
+===================================================================
+--- tls/gnutls/gtlsconnection-gnutls.c
++++ tls/gnutls/gtlsconnection-gnutls.c	2011-08-04 00:40:33.194189789 +0200
+@@ -860,9 +860,10 @@
+ 
+   if (peer_certificate)
+     {
+-      int status;
++      int verify_ret;
++      unsigned int status;
+ 
+-      status = gnutls_certificate_verify_peers (gnutls->priv->session);
++      verify_ret = gnutls_certificate_verify_peers2 (gnutls->priv->session, &status); 
+       peer_certificate_errors = g_tls_certificate_gnutls_convert_flags (status);
+       if (peer_certificate_errors)
+ 	{
diff --git a/extra/gmpc/PKGBUILD b/extra/gmpc/PKGBUILD
index 7cee8fc09..6dd1b7e7c 100644
--- a/extra/gmpc/PKGBUILD
+++ b/extra/gmpc/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 80683 2010-05-20 18:05:37Z ibiru $
+# $Id: PKGBUILD 135824 2011-08-18 21:27:02Z eric $
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
 
 pkgname=gmpc
 pkgver=0.20.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A GTK2 client for MPD"
 arch=('i686' 'x86_64')
-url="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client"
-license=("GPL")
-depends=('libglade' 'libmpd>=0.20.0' 'curl' 'libsm' 'libsoup' 'libsexy' 'hicolor-icon-theme')
+url="http://gmpclient.org/home"
+license=('GPL')
+depends=('libglade' 'libmpd>=0.20.0' 'libsoup' 'libsexy' 'sqlite3' \
+         'hicolor-icon-theme' 'xdg-utils')
 makedepends=('gob2' 'intltool' 'vala')
 options=('!libtool')
 install=gmpc.install
@@ -17,11 +18,14 @@ source=(http://download.sarine.nl/Programs/${pkgname}/${pkgver}/${pkgname}-${pkg
 md5sums=('902fd69b0b6bb40abb647604080dd7ef')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --enable-system-libsexy
-  make || return 1
-  sed -i 's|GNOME;Application;AudioVideo;|GTK;Application;AudioVideo;Player;|' \
-    data/${pkgname}.desktop
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|GNOME;AudioVideo;|GTK;AudioVideo;Player;|' \
+    data/gmpc.desktop.in
+  ./configure --prefix=/usr --enable-system-libsexy
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gnome-vfs/PKGBUILD b/extra/gnome-vfs/PKGBUILD
index 6fbc241c5..1282a6dd2 100644
--- a/extra/gnome-vfs/PKGBUILD
+++ b/extra/gnome-vfs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 132804 2011-07-26 10:40:38Z ibiru $
+# $Id: PKGBUILD 135782 2011-08-18 15:04:11Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-vfs
 pkgver=2.24.4
-pkgrel=4
+pkgrel=5
 pkgdesc="The GNOME Virtual File System"
 arch=(i686 x86_64)
 license=('LGPL')
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 6f4fe2870..f501d08f5 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 130900 2011-07-08 17:01:10Z andyrtr $
+# $Id: PKGBUILD 135768 2011-08-18 15:03:47Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=2.12.7
+pkgver=3.0.0
 pkgrel=2
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
@@ -10,23 +10,27 @@ license=('GPL3' 'LGPL')
 url="http://www.gnu.org/software/gnutls/"
 install=gnutls.install
 options=('!libtool' '!zipman')
-depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.bz2)
-md5sums=(4b48aa3119f549d30d550bf4162c721b'')
+depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz
+	align.patch)
+md5sums=('0677a66667f48810ff8df8335a9a9f9b'
+         'bce979498addb45d0fa8d6951f93fab3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  # fix AES-NI for i686
+  patch -Np1 -i ${srcdir}/align.patch
   ./configure --prefix=/usr \
 	--with-zlib \
 	--disable-static \
-	--disable-guile
+	--disable-guile \
+	--without-p11-kit
   make
 }
 
 check() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  #make check # passes all  || /bin/true
-  make check # || /bin/true # see https://lists.gnu.org/archive/html/gnutls-devel/2011-06/msg00007.html
+  make check # passes all  || /bin/true
 }
 
 package() {
diff --git a/extra/gnutls/align.patch b/extra/gnutls/align.patch
new file mode 100644
index 000000000..dce5cf408
--- /dev/null
+++ b/extra/gnutls/align.patch
@@ -0,0 +1,64 @@
+diff --git a/lib/accelerated/intel/aes-x86.c b/lib/accelerated/intel/aes-x86.c
+index 6801e7e..ff5b714 100644
+--- a/lib/accelerated/intel/aes-x86.c
++++ b/lib/accelerated/intel/aes-x86.c
+@@ -40,6 +40,10 @@ struct aes_ctx
+   uint8_t iv[16];
+ };
+ 
++#define AESNI_MIN_ALIGN 16
++#define AESNI_ALIGN(x) \
++        ((void *)(((size_t)(x)+AESNI_MIN_ALIGN-1)&~(AESNI_MIN_ALIGN-1)))
++
+ static int
+ aes_cipher_init (gnutls_cipher_algorithm_t algorithm, void **_ctx)
+ {
+@@ -69,11 +73,11 @@ aes_cipher_setkey (void *_ctx, const void *userkey, size_t keysize)
+   struct aes_ctx *ctx = _ctx;
+   int ret;
+ 
+-  ret = aesni_set_encrypt_key (userkey, keysize * 8, &ctx->expanded_key);
++  ret = aesni_set_encrypt_key (userkey, keysize * 8, AESNI_ALIGN(&ctx->expanded_key));
+   if (ret != 0)
+     return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED);
+ 
+-  ret = aesni_set_decrypt_key (userkey, keysize * 8, &ctx->expanded_key_dec);
++  ret = aesni_set_decrypt_key (userkey, keysize * 8, AESNI_ALIGN(&ctx->expanded_key_dec));
+   if (ret != 0)
+     return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED);
+ 
+@@ -95,7 +99,7 @@ aes_encrypt (void *_ctx, const void *src, size_t src_size,
+ {
+   struct aes_ctx *ctx = _ctx;
+ 
+-  aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key, ctx->iv, 1);
++  aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key), ctx->iv, 1);
+   return 0;
+ }
+ 
+@@ -105,7 +109,7 @@ aes_decrypt (void *_ctx, const void *src, size_t src_size,
+ {
+   struct aes_ctx *ctx = _ctx;
+ 
+-  aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key_dec, ctx->iv, 0);
++  aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key_dec), ctx->iv, 0);
+ 
+   return 0;
+ }
+diff --git a/lib/accelerated/intel/aes-x86.h b/lib/accelerated/intel/aes-x86.h
+index 8f49ff3..20a169e 100644
+--- a/lib/accelerated/intel/aes-x86.h
++++ b/lib/accelerated/intel/aes-x86.h
+@@ -11,10 +11,11 @@ void register_x86_crypto (void);
+ # define ALIGN16
+ #endif
+ 
++#define AES_KEY_ALIGN_SIZE 8
+ #define AES_MAXNR 14
+ typedef struct
+ {
+-  uint32_t ALIGN16 rd_key[4 * (AES_MAXNR + 1)];
++  uint32_t rd_key[4 * (AES_MAXNR + 1)+AES_KEY_ALIGN_SIZE];
+   int rounds;
+ } AES_KEY;
+ 
diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD
index 9487d8769..bccf58f72 100644
--- a/extra/gtk-vnc/PKGBUILD
+++ b/extra/gtk-vnc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 110311 2011-02-18 20:01:10Z heftig $
+# $Id: PKGBUILD 135784 2011-08-18 15:04:13Z andyrtr $
 # Maintainer:
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=gtk-vnc
 pkgver=0.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A VNC viewer widget for GTK"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/gtk-vnc"
diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD
index e4838b8c5..2883bbcc7 100644
--- a/extra/lftp/PKGBUILD
+++ b/extra/lftp/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 129514 2011-06-28 15:35:00Z andyrtr $
+# $Id: PKGBUILD 135786 2011-08-18 15:04:15Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=lftp
 pkgver=4.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Sophisticated command line based FTP client"
 arch=('i686' 'x86_64')
 license=('GPL3')
-depends=('gcc-libs' 'readline>=6.2' "gnutls>=2.12" "expat>=2.0.1-4" 'sh')
+depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh')
 optdepends=('perl: needed for convert-netscape-cookies and verify-file')
 makedepends=('autoconf')
 url="http://lftp.yar.ru/"
diff --git a/extra/libepc/PKGBUILD b/extra/libepc/PKGBUILD
index 22fd2ca7b..ac281e1dc 100644
--- a/extra/libepc/PKGBUILD
+++ b/extra/libepc/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 73829 2010-03-28 19:11:48Z jgc $
+# $Id: PKGBUILD 135788 2011-08-18 15:04:18Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libepc
 pkgver=0.3.11
-pkgrel=1
+pkgrel=2
 pkgdesc="Easy Publish and Consume Library"
 arch=(i686 x86_64)
 license=('LGPL')
 url="http://live.gnome.org/libepc"
-depends=('gtk2>=2.20.0' 'avahi>=0.6.25' 'libsoup>=2.29.91')
+depends=('gtk2' 'avahi' 'libsoup')
 makedepends=('intltool')
 options=('!libtool' '!makeflags')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2)
@@ -17,7 +17,11 @@ sha256sums=('ec38fe4206fab7a8939fb351d7b419cc681ac44afcdd5aab9bdb8fc3386df25c')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+      --localstatedir=/var --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libgnomecups/PKGBUILD b/extra/libgnomecups/PKGBUILD
index 157e18f50..267520f5b 100644
--- a/extra/libgnomecups/PKGBUILD
+++ b/extra/libgnomecups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 122592 2011-05-04 18:48:08Z ibiru $
+# $Id: PKGBUILD 135790 2011-08-18 15:04:20Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Paulius Palevicius <paulius@birzai.com>
 
 pkgname=libgnomecups
 pkgver=0.2.3
-pkgrel=8
+pkgrel=9
 pkgdesc="GNOME cups library"
 arch=(i686 x86_64)
 license=('LGPL' 'GPL')
diff --git a/extra/libgnomeprint/PKGBUILD b/extra/libgnomeprint/PKGBUILD
index db2bfedcd..7c5aaaaae 100644
--- a/extra/libgnomeprint/PKGBUILD
+++ b/extra/libgnomeprint/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 122595 2011-05-04 18:55:04Z ibiru $
+# $Id: PKGBUILD 135792 2011-08-18 15:04:23Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgnomeprint
 pkgver=2.18.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Printing routines for GNOME"
 arch=(i686 x86_64)
 license=('LGPL' 'GPL')
-depends=('pango' 'libart-lgpl' 'libxml2' 'libgnomecups' 'krb5' 'gnutls')
+depends=('pango' 'libart-lgpl' 'libxml2' 'libgnomecups' 'krb5' 'gnutls' 'libgcrypt' 'bzip2')
 makedepends=('intltool' 'pkgconfig')
 replaces=('libgnomeprint-cups')
 conflicts=('libgnomeprint-cups')
diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD
index 92e8e4a68..2c6a4f74d 100644
--- a/extra/libgpod/PKGBUILD
+++ b/extra/libgpod/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 134225 2011-08-02 15:30:18Z jgc $
+# $Id: PKGBUILD 135794 2011-08-18 15:04:25Z andyrtr $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=libgpod
 pkgver=0.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A shared library to access the contents of an iPod"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('gtk2' 'mutagen' 'sg3_utils' 'libimobiledevice')
+depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice')
 makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject-devel' 'gtk-sharp-2')
 optdepends=('gtk-sharp-2: Mono bindings')
 url="http://www.gtkpod.org/libgpod/"
diff --git a/extra/libimobiledevice/PKGBUILD b/extra/libimobiledevice/PKGBUILD
index 279afee1c..1a9d5ea59 100644
--- a/extra/libimobiledevice/PKGBUILD
+++ b/extra/libimobiledevice/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 132259 2011-07-22 09:16:48Z ibiru $
+# $Id: PKGBUILD 135796 2011-08-18 15:04:27Z andyrtr $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Gabriel Martinez < reitaka at gmail dot com >
 
 pkgname=libimobiledevice
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux"
 url="http://libimobiledevice.org/"
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
-depends=('gnutls'  'glib2' 'libplist' 'usbmuxd')
+depends=('glib2' 'gnutls' 'libgcrypt' 'libplist' 'usbmuxd')
 makedepends=('swig' 'python2')
 options=('!libtool')
 source=(http://libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2
@@ -21,7 +21,7 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   # SWIG version check is wrong (still not fixed upstream)
   patch -p1 -i "$srcdir"/swig-version-check.patch
-  ./configure --prefix=/usr
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
   make
 }
 
diff --git a/extra/libvncserver/PKGBUILD b/extra/libvncserver/PKGBUILD
index 72fa515e3..4db546071 100644
--- a/extra/libvncserver/PKGBUILD
+++ b/extra/libvncserver/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 124232 2011-05-17 19:20:06Z andrea $
+# $Id: PKGBUILD 135798 2011-08-18 15:04:30Z andyrtr $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libvncserver
 pkgver=0.9.8
-pkgrel=2
+pkgrel=4
 pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server"
 arch=('i686' 'x86_64')
 url="http://libvncserver.sourceforge.net/"
 license=('GPL')
-depends=('libjpeg' 'zlib' 'gnutls')
+depends=('libjpeg' 'gnutls' 'libgcrypt')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz")
 md5sums=('dda9e75a1d5d7c37bb57d90ead7b32b3')
diff --git a/extra/loudmouth/PKGBUILD b/extra/loudmouth/PKGBUILD
index ad508d66e..d1686df56 100644
--- a/extra/loudmouth/PKGBUILD
+++ b/extra/loudmouth/PKGBUILD
@@ -1,16 +1,16 @@
- $Id: PKGBUILD,v 1.3 2003/11/06 08:27:17 dorphell Exp
+# $Id
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Brice Carpentier <brice.carpentier@orange.fr>
 
 pkgname=loudmouth
 pkgver=1.4.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A lightweight Jabber client library written in C/Glib"
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://groups.google.com/group/loudmouth-dev"
-depends=('glib2>=2.24.1' 'gnutls>=2.8.6' 'libidn>=1.16')
+depends=('glib2' 'gnutls' 'libidn')
 options=('!libtool')
 makedepends=('intltool' 'pkgconfig' 'gtk-doc')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.4/${pkgname}-${pkgver}.tar.bz2
@@ -31,5 +31,9 @@ build() {
   autoreconf
   ./configure --prefix=/usr --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD
index 8975dc93b..13a4df9e5 100644
--- a/extra/msmtp/PKGBUILD
+++ b/extra/msmtp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 127745 2011-06-18 02:59:47Z eric $
+# $Id: PKGBUILD 135802 2011-08-18 15:04:35Z andyrtr $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Ben Mazer <blm@groknil.org>
 
 pkgname=msmtp
 pkgver=1.4.24
-pkgrel=2
+pkgrel=3
 pkgdesc="A mini smtp client"
 arch=('i686' 'x86_64')
 license=('GPL3')
diff --git a/extra/nettle/PKGBUILD b/extra/nettle/PKGBUILD
index 085e98f5d..47e32f558 100644
--- a/extra/nettle/PKGBUILD
+++ b/extra/nettle/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 130897 2011-07-08 16:53:06Z andyrtr $
+# $Id: PKGBUILD 135770 2011-08-18 15:03:50Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: bender02 at gmx dot com
 
 pkgname=nettle
-pkgver=2.1
+pkgver=2.2
 pkgrel=1
 pkgdesc="A low-level cryptographic library"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL2')
 install=$pkgname.install
 depends=('gmp')
 source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$pkgname-$pkgver.tar.gz)
-md5sums=('2bfaf16234a5d8deb96cd23f53a682bb')
+md5sums=('9a9c6102eb9909019f8a13b67578cdfe')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD
index 29a67fc6d..a09d5e918 100644
--- a/extra/qemu-kvm/PKGBUILD
+++ b/extra/qemu-kvm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 135290 2011-08-12 09:22:48Z tpowa $
+# $Id: PKGBUILD 135806 2011-08-18 15:04:40Z andyrtr $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu-kvm
 pkgver=0.15.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=(i686 x86_64)
 license=('GPL2' 'LGPL2.1')
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index ea74ed99a..45f970cdf 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 135285 2011-08-12 09:21:08Z tpowa $
+# $Id: PKGBUILD 135804 2011-08-18 15:04:37Z andyrtr $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu
 pkgver=0.15.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD
index cb1e131ca..360581839 100644
--- a/extra/vino/PKGBUILD
+++ b/extra/vino/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 131782 2011-07-15 06:46:07Z ibiru $
+# $Id: PKGBUILD 135808 2011-08-18 15:04:44Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=vino
 pkgver=3.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="a VNC server for the GNOME desktop"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 27ef0826e..8034ad709 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 133933 2011-07-30 16:56:22Z giovanni $
+# $Id: PKGBUILD 135810 2011-08-18 15:04:49Z andyrtr $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=1.1.11
-pkgrel=3
+pkgrel=4
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD
index 7e2144efc..007f6f5f2 100644
--- a/extra/weechat/PKGBUILD
+++ b/extra/weechat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 125306 2011-05-25 19:29:12Z foutrelis $
+# $Id: PKGBUILD 135812 2011-08-18 15:04:52Z andyrtr $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: lucke <lucke at o2 dot pl>
 
 pkgname=weechat
 pkgver=0.3.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Fast, light and extensible IRC client (curses UI)"
 arch=('i686' 'x86_64')
 url="http://www.weechat.org/"
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index c7925666d..d8572f361 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 132077 2011-07-19 20:50:29Z guillaume $
+# $Id: PKGBUILD 135814 2011-08-18 15:04:55Z andyrtr $
 # Maintainer: Guillaume ALAUX <guillaume at alaux dot net>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=(wireshark-cli wireshark-gtk)
 pkgbase=wireshark
 pkgver=1.6.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL2')
 makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'lua')
diff --git a/extra/xf86-input-wacom/70-wacom.rules b/extra/xf86-input-wacom/70-wacom.rules
index 67e5580cc..f6aa20835 100644
--- a/extra/xf86-input-wacom/70-wacom.rules
+++ b/extra/xf86-input-wacom/70-wacom.rules
@@ -1,8 +1,12 @@
 ACTION!="add|change", GOTO="wacom_end"
 
-# Match all wacom tablets with a serial ID starting with WACf
-ATTRS{id}=="WACf*" ENV{NAME}="Serial Wacom Tablet", ENV{SUBSYSTEM}="input", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
-ATTRS{id}=="FUJ*" ENV{NAME}="Serial Wacom Tablet", ENV{SUBSYSTEM}="input", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
+# Match all serial wacom tablets with a serial ID starting with WACf
+# Notes: We assign NAME though we shouldn't, but currently the server requires it
+#        We assign the lot to subsystem pnp too because server reads NAME from
+#        the parent device. Once all that's fixed, as simple SUBSYSTEM="tty"
+#        will do and the ENV{NAME} can be removed.
+SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
+SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
 
 LABEL="wacom_end"
 
diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD
index 7c96f58c0..e9016a5c6 100644
--- a/extra/xf86-input-wacom/PKGBUILD
+++ b/extra/xf86-input-wacom/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 128917 2011-06-25 14:03:51Z heftig $
+# $Id: PKGBUILD 135826 2011-08-19 02:23:54Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: M Rawash <mrawash@gmail.com>
 
 pkgname=xf86-input-wacom
 pkgver=0.11.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org Wacom tablet driver"
 arch=('i686' 'x86_64')
 url="http://linuxwacom.sourceforge.net/"
@@ -18,7 +18,7 @@ options=(!libtool)
 source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         70-wacom.rules)
 md5sums=('0aec4a338cc583ed497b6af68d6d80ab'
-         '4d3665bb2ef8a8190734640dffa4c6f7')
+         '10db4f8272286690255c1bcc18bfdd92')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xfce4-mailwatch-plugin/PKGBUILD b/extra/xfce4-mailwatch-plugin/PKGBUILD
index 234f034ad..ebc9be73a 100644
--- a/extra/xfce4-mailwatch-plugin/PKGBUILD
+++ b/extra/xfce4-mailwatch-plugin/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 108113 2011-01-29 14:05:40Z andyrtr $
+# $Id: PKGBUILD 135816 2011-08-18 15:04:58Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Suzy Williams <suzanne.williams3@verizon.net>
 
 pkgname=xfce4-mailwatch-plugin
 pkgver=1.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A mailbox watch/check plugin for the Xfce4 panel"
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://spurint.org/projects/xfce4-mailwatch-plugin/"
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4' 'gnutls>=2.4.1' 'hicolor-icon-theme')
+depends=('xfce4-panel' 'libxfcegui4' 'gnutls' 'libgcrypt' 'hicolor-icon-theme')
 makedepends=('intltool' 'xfce4-dev-tools')
 options=('!libtool')
 install=${pkgname}.install
diff --git a/extra/xmlsec/PKGBUILD b/extra/xmlsec/PKGBUILD
index d44420d1f..283a541e8 100644
--- a/extra/xmlsec/PKGBUILD
+++ b/extra/xmlsec/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 131121 2011-07-10 21:19:59Z andyrtr $
+# $Id: PKGBUILD 135818 2011-08-18 15:05:00Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Hussam Al-Tayeb <ht990332@gmail.com>
 
 pkgname=xmlsec
 pkgver=1.2.18
-pkgrel=1
+pkgrel=2
 pkgdesc="XML Security Library is a C library based on LibXML2"
 license=('custom')
 arch=(i686 x86_64)
 url="http://www.aleksey.com/xmlsec/index.html"
-depends=('libxslt>=1.1.26' 'openssl>=1.0.0' 'gnutls>=2.12.7' 'nss>=3.12.10' 'libtool')
+depends=('libxslt>=1.1.26' 'openssl>=1.0.0' 'gnutls' 'nss>=3.12.10' 'libtool')
 makedepends=('pkgconfig')
 options=('!libtool')
 source=(http://www.aleksey.com/xmlsec/download/${pkgname}1-${pkgver}.tar.gz)