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

Conflicts:
	community-testing/vhba-module/PKGBUILD
	community/cdemu-daemon/PKGBUILD
	community/luakit/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gthumb/PKGBUILD
	gnome-unstable/libgnomekbd/PKGBUILD
	multilib/lib32-e2fsprogs/PKGBUILD
	multilib/lib32-freetype2/PKGBUILD
	multilib/lib32-gnutls/PKGBUILD
	multilib/lib32-krb5/PKGBUILD
	multilib/lib32-libsm/PKGBUILD
	multilib/lib32-libxcursor/PKGBUILD
	multilib/lib32-libxmu/PKGBUILD
	multilib/lib32-libxrender/PKGBUILD
	multilib/lib32-libxt/PKGBUILD
	multilib/lib32-libxv/PKGBUILD
	multilib/lib32-libxvmc/PKGBUILD
	multilib/lib32-mpg123/PKGBUILD

3 files changed, 19 insertions, 17 deletions

diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD
index 0d6cbc375..de77f191b 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 153444 2012-03-14 12:02:02Z foutrelis $
+# $Id: PKGBUILD 154327 2012-03-26 11:27:11Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
 
 pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.10.2
+pkgver=2.10.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pidgin.im/"
@@ -18,7 +18,7 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
 options=('!libtool')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
         port-to-farstream-v2.patch)
-sha256sums=('e5cdd29056d36677cb81225c3b36b1bcde64605e201492f6e2fdf27ff24d32b8'
+sha256sums=('0f67d96231fea3945c2735e6a3b4bd92590ef489fa1511fa69aa6a543cb4168b'
             '03ba48e0da1331a976efc28a66810be4f51599a2b8065ac449965e0aefca4482')
 
 build() {
diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD
index 3bd747b37..67144bfed 100644
--- a/extra/raptor/PKGBUILD
+++ b/extra/raptor/PKGBUILD
@@ -1,30 +1,36 @@
-# $Id: PKGBUILD 143845 2011-11-30 01:41:45Z eric $
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# $Id: PKGBUILD 154325 2012-03-26 11:01:20Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: eric <eric@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=raptor
-pkgver=2.0.6
+pkgver=2.0.7
 pkgrel=1
 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://librdf.org/raptor"
-depends=('curl>=7.22.0' 'libxslt>=1.1.26')
+depends=('curl' 'libxslt' 'icu')
 license=('LGPL')
 options=('!libtool')
 source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz")
-md5sums=('1f07af81cbe3cf1bf0d1d250b18d9f93')
 
 build() {
   cd "${srcdir}"/raptor2-${pkgver}
 
   ./configure --prefix=/usr \
     --disable-static \
-    --with-yajl=no
+    --with-yajl=no \
+    --with-icu-config=/usr/bin/icu-config
   make
 }
 
+#check() {
+#	make -C "raptor2-$pkgver" check // currently does not work
+#}
+
 package() {
   cd "${srcdir}"/raptor2-${pkgver}
   make prefix="${pkgdir}"/usr install
 }
+md5sums=('699073463467dc8eded2ca89de2ab2ea')
diff --git a/extra/vpnc/PKGBUILD b/extra/vpnc/PKGBUILD
index ad1e703de..4529ddacc 100644
--- a/extra/vpnc/PKGBUILD
+++ b/extra/vpnc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145645 2011-12-26 07:05:40Z dreisner $
+# $Id: PKGBUILD 154323 2012-03-26 10:17:14Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=vpnc
 _vpncver=0.5.3
-pkgver=$_vpncver.svn481
+pkgver=$_vpncver.svn516
 pkgrel=1
 pkgdesc="VPN client for cisco3000 VPN Concentrators"
 url="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
@@ -15,7 +15,7 @@ arch=('i686' 'x86_64' 'mips64el')
 source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz"
         'vpnc.conf')
 backup=('etc/vpnc/default.conf')
-md5sums=('42edf29f8b9f05cd2e708d5130deb770'
+md5sums=('2118c5ccc464250c0892be57dbfabdf7'
          'a3f4e0cc682f437e310a1c86ae198e45')
 
 mktarball() {
@@ -26,9 +26,6 @@ mktarball() {
   svn co http://svn.unix-ag.uni-kl.de/vpnc/trunk
   _svnrev=$(cd trunk >/dev/null; svn info | awk '/^Revision:/ { print $2 }')
 
-  git clone git://git.infradead.org/users/dwmw2/vpnc-scripts.git
-  cp vpnc-scripts/vpnc-script trunk/
-
   find trunk/ -type d -name .svn -exec rm -rf {} +
   mv trunk "$pkgname-$_vpncver.svn$_svnrev"
   tar cJf "../$pkgname-$_vpncver.svn$_svnrev.tar.xz" "$pkgname-$_vpncver.svn$_svnrev/"
@@ -54,6 +51,5 @@ package() {
 
   make DESTDIR="$pkgdir" PREFIX=/usr install
 
-  rm -f "$pkgdir"/etc/vpnc/vpnc.conf
-  install -D -m644 "$srcdir"/vpnc.conf "$pkgdir"/etc/vpnc/default.conf
+  install -Dm644 "$srcdir"/vpnc.conf "$pkgdir"/etc/vpnc/default.conf
 }