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

Conflicts:
	community/cppcheck/PKGBUILD

35 files changed, 878 insertions, 215 deletions

diff --git a/community-testing/qlandkartegt/PKGBUILD b/community-testing/qlandkartegt/PKGBUILD
new file mode 100644
index 000000000..e478e9200
--- /dev/null
+++ b/community-testing/qlandkartegt/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 45140 2011-04-17 12:03:02Z andrea $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Matthias Maennich <arch@maennich.net>
+# Contributor: <boenki@gmx.de>
+
+pkgname=qlandkartegt
+pkgver=1.1.1
+pkgrel=2
+pkgdesc="Use your GPS with Linux"
+arch=('i686' 'x86_64')
+url="http://www.qlandkarte.org/"
+license=('GPL')
+depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'mesa' 'postgresql-libs' 'qt' 'shared-mime-info')
+makedepends=('cmake' 'garmindev')
+optdepends=('garmindev: to connect garmin devices')
+install=$pkgname.install
+changelog=$pkgname.changelog
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+        $pkgname-mimetypes.xml
+        gpsd-2.96.patch)
+sha256sums=('0288c94edcb0af4e39bc045c8607ed9404b4692c44e5409eff64329a21b33af9'
+            'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0'
+            'b641c94c6db4087c9ae1a79e31e2ea126830abf7ff1b05c27953edc6afebf8c7')
+
+build() {
+  cd ${srcdir}/$pkgname-$pkgver
+
+  patch -Np0 -i ${srcdir}/gpsd-2.96.patch
+
+  install -d ${srcdir}/$pkgname-$pkgver/build
+  cd ${srcdir}/$pkgname-$pkgver/build
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+  make
+}
+
+package(){
+  cd ${srcdir}/$pkgname-$pkgver/build
+
+  make DESTDIR=${pkgdir} install
+
+  install -D -m644 ${srcdir}/$pkgname-mimetypes.xml \
+    ${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml
+}
diff --git a/community-testing/qlandkartegt/gpsd-2.96.patch b/community-testing/qlandkartegt/gpsd-2.96.patch
new file mode 100644
index 000000000..634e9ad7e
--- /dev/null
+++ b/community-testing/qlandkartegt/gpsd-2.96.patch
@@ -0,0 +1,49 @@
+$NetBSD: patch-ab,v 1.1 2011/03/31 20:21:34 drochner Exp $
+
+for gpsd-2.96
+
+--- src/CDeviceGPSD.h.orig	2011-03-15 20:13:04.000000000 +0000
++++ src/CDeviceGPSD.h
+@@ -56,7 +56,7 @@ class CGPSDThread : public QThread
+     protected:
+         virtual void run();
+ 
+-        gps_data_t* gpsdata;
++        gps_data_t* gpsdata, gpsdata_store;
+ 
+         bool decodeData();
+ 
+$NetBSD: patch-ac,v 1.1 2011/03/31 20:21:34 drochner Exp $
+
+for gpsd-2.96
+
+--- src/CDeviceGPSD.cpp.orig	2011-03-15 20:13:04.000000000 +0000
++++ src/CDeviceGPSD.cpp
+@@ -138,6 +138,7 @@ CGPSDThread::CGPSDThread( int _pipe_fd )
+ log_mutex( new QMutex() ),
+ pipe_fd( _pipe_fd )
+ {
++    gpsdata = &gpsdata_store;
+ }
+ 
+ 
+@@ -149,8 +150,8 @@ CGPSDThread::~CGPSDThread()
+ 
+ void CGPSDThread::run()
+ {
+-    gpsdata = gps_open( "localhost", DEFAULT_GPSD_PORT );
+-    if( !gpsdata )
++    int res = gps_open( "localhost", DEFAULT_GPSD_PORT, gpsdata );
++    if( res )
+     {
+         // TODO: message box (from other thread)
+         qDebug() << "gps_open failed.";
+@@ -187,7 +188,7 @@ void CGPSDThread::run()
+             }                    // if
+             else if( FD_ISSET( gpsdata->gps_fd, &fds ) )
+             {
+-                gps_poll( gpsdata );
++                gps_read( gpsdata );
+                 if( !decodeData() ) break;
+             }                    // else if
+         }                        // else if
diff --git a/community-testing/qlandkartegt/qlandkartegt-mimetypes.xml b/community-testing/qlandkartegt/qlandkartegt-mimetypes.xml
new file mode 100644
index 000000000..46d3d402c
--- /dev/null
+++ b/community-testing/qlandkartegt/qlandkartegt-mimetypes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+  <mime-type type="application/vnd.qlandkartegt.qlb">
+    <comment>QLandkarteGT File</comment>
+    <glob pattern="*.qlb"/>
+  </mime-type>
+</mime-info>
diff --git a/community-testing/qlandkartegt/qlandkartegt.changelog b/community-testing/qlandkartegt/qlandkartegt.changelog
new file mode 100644
index 000000000..c832cc8d2
--- /dev/null
+++ b/community-testing/qlandkartegt/qlandkartegt.changelog
@@ -0,0 +1,9 @@
+2011-03-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.1.1-1
+
+2011-02-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.1.0-1
+
+2011-02-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.0.1-2
+	* moved to [community] with 59 AUR votes
diff --git a/community-testing/qlandkartegt/qlandkartegt.install b/community-testing/qlandkartegt/qlandkartegt.install
new file mode 100644
index 000000000..aacc9e6a8
--- /dev/null
+++ b/community-testing/qlandkartegt/qlandkartegt.install
@@ -0,0 +1,7 @@
+post_install() {
+update-mime-database usr/share/mime > /dev/null
+}
+
+post_remove() {
+update-mime-database usr/share/mime > /dev/null
+}
diff --git a/community/bonnie++/PKGBUILD b/community/bonnie++/PKGBUILD
new file mode 100644
index 000000000..55800b024
--- /dev/null
+++ b/community/bonnie++/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: jelle van der Waa <jelle@vdwaa.nl>
+# Contributor: eric <eric@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+
+pkgname=bonnie++
+pkgver=1.03e
+pkgrel=4
+pkgdesc="Based on the Bonnie hard drive benchmark by Tim Bray"
+arch=('i686' 'x86_64')
+url="http://www.coker.com.au/bonnie++/"
+license=('GPL')
+depends=('perl')
+source=(http://www.coker.com.au/bonnie++/$pkgname-$pkgver.tgz)
+sha256sums=('cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb')
+
+build() {
+        cd ${pkgname}-${pkgver}
+        ./configure --prefix=/usr
+        sed -i "s:CFLAGS=-O2  -DNDEBUG \$(WFLAGS) \$(MORECFLAGS):CFLAGS=${CFLAGS}:" Makefile
+        make
+}
+
+package() {
+        cd ${pkgname}-${pkgver}
+        make prefix="${pkgdir}/usr" install
+}
+
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index 667293c11..d9ae9a7ca 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 45092 2011-04-16 08:48:47Z giovanni $
+# $Id: PKGBUILD 45148 2011-04-17 18:17:05Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
-pkgver=0.7.55
+pkgver=0.7.56
 pkgrel=1
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug')
 install=calibre.install
 source=(http://calibre-ebook.googlecode.com/files/${pkgname}-${pkgver}.tar.gz
         desktop_integration.patch)
-md5sums=('1da19a3ec6ae2de05e48de6133ba82fc'
+md5sums=('83ed678bf0d0178093fd4cce5a94754e'
          'bcc538a3b004429bf8f5a0ac1d89a37f')
 
 build() {
diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD
index 3852a3652..1e8718b8b 100644
--- a/community/cppcheck/PKGBUILD
+++ b/community/cppcheck/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 39750 2011-02-15 22:58:04Z stephane $
+# $Id: PKGBUILD 45163 2011-04-18 02:26:25Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 pkgname=cppcheck
-pkgver=1.47
+pkgver=1.48
 pkgrel=1
 pkgdesc="A tool for static C/C++ code analysis"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://cppcheck.wiki.sourceforge.net"
+url="http://cppcheck.wiki.sourceforge.net/"
 license=('GPL')
-depends=('gcc-libs' 'pcre')
+depends=('pcre')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('ab30d8968064d50d2e1022c749b0d7d10c8b65ae')
+sha1sums=('10cf38034148b7cb258840febe620ba397114fd1')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/ocaml-findlib/PKGBUILD b/community/ocaml-findlib/PKGBUILD
index 7f8b3c632..366f9fc14 100644
--- a/community/ocaml-findlib/PKGBUILD
+++ b/community/ocaml-findlib/PKGBUILD
@@ -3,19 +3,19 @@
 # Contributor: Benjamin Andresen <benny(at)klapmuetz(dot)org>
 #              scj <scj archlinux us>
 pkgname=ocaml-findlib
-pkgver=1.2.6
-pkgrel=4
+pkgver=1.2.7
+pkgrel=1
 license=('MIT')
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Objective Caml (OCaml) package manager"
 url="http://projects.camlcity.org/projects/findlib.html"
 depends=('ocaml')
-source=("http://download.camlcity.org/download/findlib-${pkgver}.tar.gz")
-md5sums=('4924c8c3ef1208eb0fa9096c8b8bb72f')
+source=("http://download.camlcity.org/download/findlib-$pkgver.tar.gz")
+md5sums=('000bff723e8d3d727a7edd5b5901b540')
 options=('!strip' 'zipman') # otherwise the bytecode gets broken
 
 build() {
-  cd ${srcdir}/findlib-${pkgver}
+  cd $srcdir/findlib-$pkgver
   ./configure\
       -config /etc/findlib.conf \
       -sitelib /usr/lib/ocaml \
@@ -24,13 +24,13 @@ build() {
 }
 
 package () {
-  cd ${srcdir}/findlib-${pkgver}
-  make prefix=${pkgdir} install 
+  cd $srcdir/findlib-$pkgver
+  make prefix=$pkgdir install 
 
   # Add the old site-lib to the path to maintain compatability with old style
   # packages.
   sed -i 's/path=\"\/usr\/lib\/ocaml\"/path="\/usr\/lib\/ocaml:\/usr\/lib\/ocaml\/site-lib"/' ${pkgdir}/etc/findlib.conf
 
-  install -m755 src/findlib/ocamlfind_opt "${pkgdir}/usr/bin/"
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -m755 src/findlib/ocamlfind_opt "$pkgdir/usr/bin/"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD
index 74da4ee82..e34e02601 100644
--- a/community/pokerth/PKGBUILD
+++ b/community/pokerth/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 41001 2011-03-03 04:26:22Z tdziedzic $
+# $Id: PKGBUILD 45135 2011-04-17 08:17:41Z tdziedzic $
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Vasco Costa <vasco.costa@meiodigital.com>
 
 pkgname=pokerth
 _realname=PokerTH
 pkgver=0.8.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Poker game written in C++/QT4"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pokerth.net/"
diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD
index b1fd5e45e..26e100ad0 100644
--- a/community/texmaker/PKGBUILD
+++ b/community/texmaker/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 
 pkgname=texmaker
-pkgver=3.0
+pkgver=3.0.1
 pkgrel=1
 pkgdesc='Free cross-platform latex editor'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ url="http://www.xm1math.net/texmaker/index.html"
 license=('GPL')
 depends=('poppler-qt' 'ghostscript')
 source=("http://www.xm1math.net/texmaker/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('d2802c093906b62c455ccc7944106da3')
+md5sums=('0e96cbd3e8171363c2858fbe96eb1baa')
 
 build() {
 	cd ${pkgname}-${pkgver}
diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD
index 33896f967..83c43377e 100644
--- a/community/widelands/PKGBUILD
+++ b/community/widelands/PKGBUILD
@@ -1,12 +1,11 @@
-# $Id: PKGBUILD 44278 2011-04-05 06:00:24Z svenstaro $
+# $Id: PKGBUILD 45158 2011-04-18 00:22:21Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <rabyte*gmail>
 
 pkgname=widelands
-pkgver=16rc1
-_realver=build16-rc1
-_brokenver=build16-rc2 # How could they fuck this up!?
+pkgver=16
+_realver=build16
 pkgrel=1
 pkgdesc="A realtime strategy game with emphasis on economy and transport"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,13 +17,13 @@ source=(http://launchpad.net/$pkgname/build16/$_realver/+download/$pkgname-$_rea
         $pkgname.desktop
         $pkgname.png
         $pkgname.sh)
-md5sums=('dde77c66156ad522877616df165d5c6a'
+md5sums=('3d8c28e145b73c64d8ed1625319d25a2'
          '15820bf099fd6f16251fe70a75c534bb'
          '3dfda7e9ca76ca00dd98d745d0ceb328'
          '7cae50aba5ed0cd2cfeea79124637b46')
 
 build() {
-    cd $srcdir/$pkgname-$_brokenver-src
+    cd $srcdir/$pkgname-$_realver-src
 
     mkdir -p build/compile && cd build/compile
 
@@ -37,7 +36,7 @@ build() {
 }
 
 package() {
-    cd $srcdir/$pkgname-$_brokenver-src/build/compile
+    cd $srcdir/$pkgname-$_realver-src/build/compile
 
     make DESTDIR="$pkgdir" install
 
diff --git a/core/bin86/PKGBUILD b/core/bin86/PKGBUILD
deleted file mode 100644
index ac634403b..000000000
--- a/core/bin86/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 87909 2010-08-18 18:45:21Z andyrtr $
-# Maintainer: judd <jvinet@zeroflux.org>
-pkgname=bin86
-pkgver=0.16.17
-pkgrel=5
-pkgdesc="A complete 8086 assembler and loader"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-url="http://www.debath.co.uk/"
-depends=('glibc')
-source=(http://homepage.ntlworld.com/robert.debath/dev86/$pkgname-$pkgver.tar.gz
-	bin86-0.16.17-x86_64-1.patch)
-md5sums=('c9e8d72dd2e7457b52d0e3164fc199a1' '92bdce7b0655cd2e9f83c83fc56d128e')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  if [ "$CARCH" = "x86_64" ]; then
-     patch -Np1 -i ../bin86-0.16.17-x86_64-1.patch || return 1
-  fi
-  make PREFIX=/usr
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1
-  make PREFIX=$pkgdir/usr MANDIR=$pkgdir/usr/share/man/man1 install
-}
diff --git a/core/bin86/bin86-0.16.17-x86_64-1.patch b/core/bin86/bin86-0.16.17-x86_64-1.patch
deleted file mode 100644
index 152413ee7..000000000
--- a/core/bin86/bin86-0.16.17-x86_64-1.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Submitted By: Ken Moffat <ken@kenmoffat.uklinux.net>
-Date: 2005-06-28
-Initial Package Version: 0.16.14
-Upstream Status: Submitted Upstream
-Origin: from ROCK Linux
-Description: Allows bin86 to compile on x86_64, which permits lilo to
- be used in a 64-bit system.  I'm dubious about ROCK's attempts to
- automatically add dual-licensing to all their patches, but bin86 is
- already GPL'd.  I've heard from the maintainer that this will be
- included in the next upload.
-
-
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/x86/bin86/x86_64.patch
-# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-diff -urN bin86-0.16.14-orig/ld/x86_aout.h bin86-0.16.14/ld/x86_aout.h
---- bin86-0.16.14-orig/ld/x86_aout.h	2004-11-07 20:07:31.506442000 +0100
-+++ bin86-0.16.14/ld/x86_aout.h	2004-11-07 20:07:41.106982496 +0100
-@@ -12,6 +12,9 @@
- #if defined(i386) || defined(__BCC__) || defined(MSDOS)
- typedef long Long;
- #define __OUT_OK 1
-+#elif defined(__x86_64__)
-+typedef int Long;
-+#define __OUT_OK 1
- #else
- typedef char Long[4];
- #endif
diff --git a/core/lilo/PKGBUILD b/core/lilo/PKGBUILD
deleted file mode 100644
index ed6b0bc3e..000000000
--- a/core/lilo/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 118988 2011-04-09 21:38:07Z tpowa $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=lilo
-pkgver=23.2
-pkgrel=1
-pkgdesc="A bootloader for Linux"
-arch=('i686' 'x86_64' 'mips64el')
-url="https://alioth.debian.org/projects/lilo/"
-license=('BSD')
-# While lilo should stay in the base category,
-# it usually makes no sense if it is installed
-# with pacman -S base, therefore, don't add
-# the base group here.
-#groups=('base')
-backup=('etc/lilo.conf')
-depends=('device-mapper' 'coreutils')
-makedepends=('bin86' 'sharutils')
-optdepends=('perl: to use keytab-lilo')
-install=lilo.install
-options=('!makeflags')
-source=("http://lilo.alioth.debian.org/ftp/sources/${pkgname}-${pkgver}.tar.gz"
-        'lilo.conf')
-md5sums=('51b9b9db665d3b8724919e3d46054d12'
-         'a3a4c90bead3f9b8672bd384ff9f8db1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  export LC_ALL=C
-  make all
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -D -m644 "${srcdir}/lilo.conf" "${pkgdir}/etc/lilo.conf"
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/core/lilo/lilo.conf b/core/lilo/lilo.conf
deleted file mode 100644
index 0e31e77a5..000000000
--- a/core/lilo/lilo.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# /etc/lilo.conf
-#
-
-boot=/dev/hda
-# This line often fixes L40 errors on bootup
-# disk=/dev/hda bios=0x80
-
-default=arch
-timeout=50
-lba32
-prompt
-
-image=/boot/vmlinuz26
-	label=arch
-	root=/dev/hda3
-	initrd=/boot/kernel26.img
-	read-only
-
-image=/boot/vmlinuz26
-	label=arch-fallback
-	root=/dev/hda3
-	initrd=/boot/kernel26-fallback.img
-	read-only
-
-#other=/dev/hda1
-#	label=dos
-
diff --git a/core/lilo/lilo.install b/core/lilo/lilo.install
deleted file mode 100644
index 7375fddf8..000000000
--- a/core/lilo/lilo.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_upgrade() {
-  echo
-  echo "If you use the LILO bootloader, you should run 'lilo' after upgrading."
-  echo
-}
diff --git a/extra/fvwm/PKGBUILD b/extra/fvwm/PKGBUILD
index 9619a07a2..07b588a9c 100644
--- a/extra/fvwm/PKGBUILD
+++ b/extra/fvwm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 119852 2011-04-16 03:57:41Z eric $
+# $Id: PKGBUILD 119981 2011-04-18 00:06:29Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=fvwm
-pkgver=2.6.0
+pkgver=2.6.1
 pkgrel=1
 pkgdesc="A multiple large virtual desktop window manager originally derived from twm"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,9 +11,9 @@ license=('GPL' 'custom')
 depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'readline' 'librsvg')
 conflicts=('fvwm-devel')
 source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/${pkgname}-${pkgver}.tar.bz2 fvwm2.desktop)
-md5sums=('e4b4b065b2185be9071a9a55ac49b39a'
+md5sums=('fbbbed1bb41fa0878b17ee209947602d'
          'e52a6ef25a936dcf3ad0e58f2e9ed0ea')
-sha1sums=('7c6ed1075c3faa1cd13c2ebc31f720d971564f5e'
+sha1sums=('cf7165d40180b45409e604736066cf9fcc792e36'
           'e0924164329e7eb14e0d6137d8ff18cf6230191c')
 
 build() {
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index 3ac949f11..2f12a6395 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Jakub Schmidtke <sjakub-at-gmail.com>
 
 pkgname=kdeplasma-applets-networkmanagement
-pkgver=git20110405
-_commit=947e4de8b211b7c29ead108a2c3618a4af9dafe1
+pkgver=git20110418
+_commit=070512212cf01f05a43e4a6fff340994a9bfc290
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,11 +14,11 @@ depends=('kdebase-workspace' 'networkmanager')
 makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info')
 optdepends=('mobile-broadband-provider-info: allow to add new mobile connection')
 install=${pkgname}.install
-source=("${pkgname}-${_commit}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}")
-md5sums=('17315e3dc3604ee59cf7b5777806f1b7')
+source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}")
+md5sums=('fec76f032b94e06bb2fb7b53d00c944c')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../networkmanagement \
diff --git a/extra/latex2rtf/PKGBUILD b/extra/latex2rtf/PKGBUILD
index 9838d2653..e80c4c714 100644
--- a/extra/latex2rtf/PKGBUILD
+++ b/extra/latex2rtf/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 66768 2010-02-01 11:56:05Z giovanni $
-# Maintainer: Jason Chu <jason@archlinux.org>
+# $Id: PKGBUILD 119963 2011-04-17 22:11:07Z remy $
+# Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=latex2rtf
-pkgver=2.0.0
+pkgver=2.1.0
 pkgrel=1
 pkgdesc="LaTeX to RTF converter"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,12 +11,15 @@ url="http://latex2rtf.sourceforge.net/"
 license=('GPL')
 depends=('glibc' 'imagemagick' 'ghostscript')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('39611b6dbb5ce78b48c7695f3fcafb88')
+sha1sums=('31e6280312b56c2c38cf6a3fddff21a9910c7d6f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  make PREFIX=/usr
+}
 
-  make PREFIX=/usr || return 1
-  make PREFIX=${pkgdir}/usr MAN_INSTALL=${pkgdir}/usr/share/man/man1 install || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make PREFIX=${pkgdir}/usr MAN_INSTALL=${pkgdir}/usr/share/man/man1 install
   sed -i -e 's|error "no input file specified"| echo "error: no input file specified"|' ${pkgdir}/usr/bin/latex2png
 }
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index 266222340..fa2b2aaa8 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 117371 2011-03-31 21:19:18Z andrea $
+# $Id: PKGBUILD 119950 2011-04-17 11:43:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgbase=qscintilla
 pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla')
-pkgver=2.5
+pkgver=2.5.1
 pkgrel=1
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
 makedepends=('python-qt')
 source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz"
         'configure.py-objdir-support.diff')
-md5sums=('c4677b837c16bcb9d806ff04d5a727b8'
+md5sums=('dd7edef5ff674d307057a3c12dbd8fce'
          '8cf9c06252e2f11ab00e62848e322fd3')
 
 
diff --git a/testing/blender/PKGBUILD b/testing/blender/PKGBUILD
new file mode 100644
index 000000000..152dc77bf
--- /dev/null
+++ b/testing/blender/PKGBUILD
@@ -0,0 +1,81 @@
+# $Id: PKGBUILD 119990 2011-04-18 02:49:47Z eric $
+# Contributor: John Sowiak <john@archlinux.org>
+# Maintainer: tobias <tobias@archlinux.org>
+
+# Apparently, the blender guys refuse to release source tarballs for
+# intermediate releases that deal mainly with binaries but incorporate tiny
+# minor changes from cvs. Since I'm sick and tired of the urges of users that
+# look for release numbers only we make a messy PKGBUILD that can checkout cvs
+# tags if necessary.
+#_cvs=true
+_cvs=false
+
+pkgname=blender
+pkgver=2.57
+pkgrel=1
+pkgdesc="A fully integrated 3D graphics creation suite"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.blender.org"
+depends=('libjpeg' 'libpng' 'openjpeg' 'libtiff' 'openexr' 'sdl' 'python' 'desktop-file-utils' \
+         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gettext' 'libxi' 'libxmu' 'mesa' \
+         'freetype2' 'openal' 'libsndfile' 'libsamplerate' 'ffmpeg')
+makedepends=('cmake' 'cvs')
+install=blender.install
+if [ ! $_cvs -o $_cvs = false ]; then
+  makedepends=('cmake')
+  source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
+  md5sums=('e6cb5523323a71c070051e6fe6efe497')
+fi
+
+build() {
+  if [ $_cvs = true ]; then
+    cd "$srcdir/"
+    #cvs -d:pserver:anonymous@cvs.blender.org:/cvsroot/bf-blender login
+    cvs -z3 -d:pserver:anonymous@cvs.blender.org:/cvsroot/bf-blender checkout $pkgname
+    _cvsrel=$pkgname-$(echo $pkgver | sed 's/\./-/')-release
+    cvs -d:pserver:anonymous@cvs.blender.org:/cvsroot/bf-blender update -r $_cvsrel
+    find $pkgname/{bin,release/scripts} -name 'CVS' -exec rm -rf {} \; 2> /dev/null
+    cd $pkgname
+  else
+    cd "$srcdir/$pkgname-$pkgver"
+  fi
+
+  mkdir build
+  cd build
+
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+    -DCMAKE_BUILD_TYPE:STRING=Release \
+    -DWITH_INSTALL_PORTABLE:BOOL=OFF \
+    -DWITH_PYTHON_INSTALL:BOOL=OFF \
+    -DWITH_OPENCOLLADA:BOOL=OFF \
+    -DWITH_GAMEENGINE:BOOL=ON \
+    -DWITH_PLAYER:BOOL=ON \
+    -DPYTHON_VERSION:STRING=3.2 \
+    -DPYTHON_LIBPATH:STRING=/usr/lib \
+    -DPYTHON_LIBRARY:STRING=python3.2mu \
+    -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu
+
+  make $MAKEFLAGS
+}
+
+package() {
+  if [ $_cvs = true ]; then
+    cd "$srcdir/$pkgname"
+  else
+    cd "$srcdir/$pkgname-$pkgver"
+  fi
+
+  cd build
+  make DESTDIR="${pkgdir}" install
+  python -m compileall "${pkgdir}/usr/share/blender"
+
+  for i in 128 16 192 22 32 48 64 96 ; do
+    install -D -m644 ../release/freedesktop/icons/${i}x${i}/blender.png \
+      "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/blender.png"
+  done
+
+  install -D -m644 ../release/freedesktop/icons/scalable/blender.svg \
+    "${pkgdir}/usr/share/icons/hicolor/scalable/apps/blender.svg"
+}
diff --git a/testing/blender/blender.install b/testing/blender/blender.install
new file mode 100644
index 000000000..2fcf98022
--- /dev/null
+++ b/testing/blender/blender.install
@@ -0,0 +1,27 @@
+post_install() {
+  cat << EOF
+
+NOTE
+----
+
+We also ship the plugins, but most of these features can be accessed only
+from the users home directory. Therefore, you want to copy everything from
+/usr/share/blender/2.57 to ~/.blender (some are hidden files!). 
+
+EOF
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_remove() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD
new file mode 100644
index 000000000..54287473b
--- /dev/null
+++ b/testing/curl/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id: PKGBUILD 119987 2011-04-18 02:10:36Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=curl
+pkgver=7.21.5
+pkgrel=1
+pkgdesc="An URL retrival utility and library"
+arch=('i686' 'x86_64')
+url="http://curl.haxx.se"
+license=('MIT')
+depends=('zlib' 'openssl' 'bash' 'ca-certificates')
+options=('!libtool')
+source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2
+        curlbuild.h)
+md5sums=('dadd6353c9407161ddd62c0943718d59'
+         '751bd433ede935c8fae727377625a8ae')
+
+[[ $CARCH == "x86_64" ]] && _curlbuild=curlbuild-64.h
+[[ $CARCH == "i686" ]] && _curlbuild=curlbuild-32.h
+build() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+
+    ./configure \
+        --with-random=/dev/urandom \
+        --prefix=/usr \
+        --mandir=/usr/share/man \
+        --disable-dependency-tracking \
+        --enable-ipv6 \
+        --disable-ldaps \
+        --disable-ldap \
+        --enable-manual \
+        --enable-versioned-symbols \
+        --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
+        --without-libidn \
+        --enable-threaded-resolver
+    make
+}
+
+package() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+
+    make DESTDIR=${pkgdir} install
+    install -Dm644 COPYING \
+        ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+    install -Dm644 docs/libcurl/libcurl.m4 \
+        ${pkgdir}/usr/share/aclocal/libcurl.m4
+    mv "${pkgdir}/usr/include/curl/curlbuild.h" "${pkgdir}/usr/include/curl/${_curlbuild}"
+    install -m 644 ${srcdir}/curlbuild.h "${pkgdir}/usr/include/curl/curlbuild.h"
+}
diff --git a/testing/curl/curlbuild.h b/testing/curl/curlbuild.h
new file mode 100644
index 000000000..b48862696
--- /dev/null
+++ b/testing/curl/curlbuild.h
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "curlbuild-32.h"
+#elif __WORDSIZE == 64
+#include "curlbuild-64.h"
+#else
+#error "Unknown word size"
+#endif
diff --git a/testing/gdm/PKGBUILD b/testing/gdm/PKGBUILD
index e6509aa65..bbb3b7622 100644
--- a/testing/gdm/PKGBUILD
+++ b/testing/gdm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 118402 2011-04-06 16:14:51Z ibiru $
+# $Id: PKGBUILD 119944 2011-04-17 09:10:01Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=gdm
 pkgver=3.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -60,4 +60,5 @@ package() {
 
   rmdir "${pkgdir}/var/gdm"
   chmod 1770 "${pkgdir}/var/log/gdm"
+  rm -rf "${pkgdir}/var/run"
 }
diff --git a/testing/gdm/gdm.install b/testing/gdm/gdm.install
index c2b5e375e..6cd981d77 100644
--- a/testing/gdm/gdm.install
+++ b/testing/gdm/gdm.install
@@ -2,31 +2,14 @@ pkgname=gdm
 
 post_install() {
   getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm
-  if getent passwd gdm > /dev/null 2>&1; then
-    usr/sbin/usermod -d /var/lib/gdm -c 'Gnome Display Manager' -s /sbin/nologin gdm > /dev/null 2>&1
-  else
-    usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
-  fi
+  getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
   passwd -l gdm > /dev/null
-  chown gdm:gdm /var/lib/gdm > /dev/null
-  chown -R gdm:gdm /var/lib/gdm/.gconf.mandatory
+  chown -R gdm:gdm /var/lib/gdm > /dev/null
 
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   gconfpkg --install ${pkgname}
 }
 
-pre_upgrade() {
-  if [ -f opt/gnome/etc/gdm/custom.conf ]; then
-     mkdir -p etc/gdm
-     sed -e 's|/opt/gnome/libexec|usr/lib/gdm|g' \
-         -e 's|/opt/gnome/etc|/etc|g' \
-         -e 's|/opt/gnome/|/usr/|g' \
-     opt/gnome/etc/gdm/custom.conf > etc/gdm/custom.conf
-     mv opt/gnome/etc/gdm/custom.conf opt/gnome/etc/gdm/custom.conf.pacsave
-  fi
-  pre_remove
-}
-
 pre_remove() {
   if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
     gconfpkg --uninstall ${pkgname}
diff --git a/testing/gpsd/LICENSE b/testing/gpsd/LICENSE
new file mode 100644
index 000000000..076538678
--- /dev/null
+++ b/testing/gpsd/LICENSE
@@ -0,0 +1,38 @@
+			COPYRIGHTS
+
+Compilation copyright is held by the GPSD project.  All rights reserved.
+
+GPSD project copyrights are assigned to the project lead, currently
+Eric S. Raymond. Other portions of the GPSD code are Copyright (c)
+1997, 1998, 1999, 2000, 2001, 2002 by Remco Treffkorn, and others
+Copyright (c) 2005 by Eric S. Raymond.  For other copyrights, see
+individual files.
+
+			BSD LICENSE
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:<P>
+
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.<P>
+
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.<P>
+
+Neither name of the GPSD project nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/testing/gpsd/PKGBUILD b/testing/gpsd/PKGBUILD
new file mode 100644
index 000000000..d26892a8a
--- /dev/null
+++ b/testing/gpsd/PKGBUILD
@@ -0,0 +1,77 @@
+# $Id: PKGBUILD 116032 2011-03-22 16:23:53Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
+# Contributor: Giacomo Rizzo <alt@free-os.it>
+
+pkgname=gpsd
+pkgver=2.96
+pkgrel=1
+pkgdesc="GPS daemon and library to support USB/serial GPS devices"
+arch=('i686' 'x86_64')
+url="http://gpsd.berlios.de"
+license=('BSD')
+depends=('lesstif' 'libxaw' 'python2' 'pth' 'libusb' 'desktop-file-utils')
+optdepends=('php: generate a PHP status page for your GPS'
+            'php-gd: image support for the PHP status page')
+makedepends=('docbook-xsl')
+backup=('etc/conf.d/gpsd' 'lib/udev/rules.d/99-gpsd-usb.rules')
+options=('!libtool')
+install="${pkgname}.install"
+source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'gpsd' 'LICENSE')
+md5sums=('26a7a04d4298bc3a3a5d89fef4582b64'
+         'f929322fc4670543fcb36dafc7bb9e03'
+         'd217a23f408e91c94359447735bc1800')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # install python to the same DESTDIR given make
+  sed -i 's|--prefix=${prefix} # --root=$(DESTDIR)|--prefix=${prefix} --root=$(DESTDIR)|' Makefile.am Makefile.in
+
+  # fix python 2.7 path
+  sed -i 's|/usr/bin/python|/usr/bin/python2|' gpsd.hotplug{,.wrapper}
+  sed -i 's|/usr/bin/python2.6|/usr/bin/python2|' valgrind-audit
+  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gpscat \
+    gpsfake gpsprof xgps xgpsspeed gps/gps.py
+  
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+    --disable-libQgpsmm \
+    --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Fix man pages path (FS#21715)
+  sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1
+
+  make DESTDIR="${pkgdir}" install
+
+  # Our own udev-install since the Makefile uses absolute paths
+  # Original file names are [mostly] unmodified: useful to match process name in case of error
+  # Following the switch from hotplug to udev helper scripts now live in /lib/udev/ instead of /etc/hotplug/
+  sed -i 's|GPSD_OPTIONS=""|GPSD_OPTIONS="-P /var/run/gpsd.pid"|' packaging/deb/etc_default_gpsd
+  sed -i 's|"/var/run/gpsd.sock"|"/var/run/gpsd/gpsd.sock"|' packaging/deb/etc_default_gpsd
+  install -D -m644 "packaging/deb/etc_default_gpsd" "${pkgdir}/etc/conf.d/gpsd"
+
+  sed -i 's|Id: gpsd.rules|Id: 99-gpsd-usb.rules|' gpsd.rules
+  install -D -m644 "gpsd.rules" "${pkgdir}/lib/udev/rules.d/99-gpsd-usb.rules"
+
+  sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug.wrapper
+  install -D -m755 gpsd.hotplug.wrapper "${pkgdir}/lib/udev/gpsd.hotplug.wrapper"
+
+  # Patch a path bug. Check to see if fixed in ensuing releases
+  sed -i 's|gpsdcmd = "gpsd %s|gpsdcmd = "/usr/sbin/gpsd %s|' gpsd.hotplug
+  install -D -m755 gpsd.hotplug "${pkgdir}/lib/udev/gpsd.hotplug"
+
+  install -D -m644 packaging/X11/xgps.desktop ${pkgdir}/usr/share/applications/xgps.desktop
+  install -D -m644 packaging/X11/xgpsspeed.desktop ${pkgdir}/usr/share/applications/xgpsspeed.desktop
+  install -D -m644 packaging/X11/gpsd-logo.png ${pkgdir}/usr/share/gpsd/gpsd-logo.png
+
+  install -D -m755 "${srcdir}/gpsd" "${pkgdir}/etc/rc.d/gpsd"
+
+  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/testing/gpsd/gpsd b/testing/gpsd/gpsd
new file mode 100755
index 000000000..b0f22c735
--- /dev/null
+++ b/testing/gpsd/gpsd
@@ -0,0 +1,43 @@
+#! /bin/sh
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+[ -f /etc/conf.d/gpsd ] && . /etc/conf.d/gpsd
+
+NAME=gpsd
+DAEMON=/usr/sbin/$NAME
+PID=$(pidof -o %PPID /usr/sbin/gpsd)
+
+case "$1" in
+   start)
+	stat_busy "Starting gpsd"
+	[ ! -d /var/run/gpsd ] && install -d /var/run/gpsd
+	[ -z "$PID" ] && "$DAEMON" ${GPSD_OPTIONS} -F ${GPSD_SOCKET} ${DEVICES}
+	if [ $? -gt 0 ]; then
+		stat_fail
+	else
+		add_daemon gpsd
+		stat_done
+	fi
+   ;;
+   stop)
+	stat_busy "Stopping gpsd"
+	[ ! -z "$PID" ]  && kill $PID &> /dev/null
+	if [ $? -gt 0 ]; then
+		stat_fail
+	else
+	rm -f /var/run/$PID.pid &>/dev/null
+	rm_daemon gpsd
+	stat_done
+	fi
+   ;;
+
+   restart)
+	$0 stop
+	sleep 2
+	$0 start
+   ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/testing/gpsd/gpsd.install b/testing/gpsd/gpsd.install
new file mode 100644
index 000000000..ee661fcb1
--- /dev/null
+++ b/testing/gpsd/gpsd.install
@@ -0,0 +1,16 @@
+post_install() {
+    echo ">>> Note: the supplied gpsd udev rules are device-specific, so"
+    echo ">>> if your device isn't detected correctly, please use lsusb or"
+    echo ">>> another suitable tool to determine the proper device IDs and"
+    echo ">>> use the commented rules to fill in the blanks for your device."
+
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    update-desktop-database -q
+}
+
+post_remove() {
+    update-desktop-database -q
+}
diff --git a/testing/kdeedu/PKGBUILD b/testing/kdeedu/PKGBUILD
new file mode 100644
index 000000000..d3c26577a
--- /dev/null
+++ b/testing/kdeedu/PKGBUILD
@@ -0,0 +1,281 @@
+# $Id: PKGBUILD 119955 2011-04-17 11:47:18Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgbase=kdeedu
+pkgname=('kdeedu-blinken'
+         'kdeedu-cantor'
+         'kdeedu-data'
+         'kdeedu-kalgebra'
+         'kdeedu-kalzium'
+         'kdeedu-kanagram'
+         'kdeedu-kbruch'
+         'kdeedu-kgeography'
+         'kdeedu-khangman'
+         'kdeedu-kig'
+         'kdeedu-kiten'
+         'kdeedu-klettres'
+         'kdeedu-kmplot'
+         'kdeedu-kstars'
+         'kdeedu-ktouch'
+         'kdeedu-kturtle'
+         'kdeedu-kwordquiz'
+         'kdeedu-libkdeedu'
+         'kdeedu-marble'
+         'kdeedu-parley'
+         'kdeedu-rocs'
+         'kdeedu-step')
+pkgver=4.6.2
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'cfitsio' 'gpsd'
+	'kdebase-runtime' 'libqalculate' 'gsl' 'boost' 'libindi' 'r' 'libspectre'
+	'python2' 'docbook-xsl' 'avogadro')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
+        'gpsd-2.96.patch')
+sha1sums=('7c94a10f5c17237dcd5c348a8ac129973934cf05'
+          'fd6b6b81945d951bb6ad0bb735df33c11bb2008e')
+
+build() {
+    cd ${srcdir}/${pkgbase}-${pkgver}
+    patch -Np1 -i ${srcdir}/gpsd-2.96.patch
+
+    cd ${srcdir}
+	mkdir build
+	cd build
+	# rpath is needed for cantor to find R
+	cmake ../${pkgbase}-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=OFF \
+		-DCMAKE_INSTALL_PREFIX=/usr
+	make
+}
+
+package_kdeedu-blinken() {
+	pkgdesc='A memory enhancement game'
+	depends=('kdebase-runtime' 'kdeedu-libkdeedu')
+	install='kdeedu.install'
+	cd $srcdir/build/blinken
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/blinken
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeedu-cantor() {
+	pkgdesc='KDE Frontend to Mathematical Software'
+	depends=('kdeedu-libkdeedu' 'libspectre')
+	optdepends=('kdeedu-kalgebra: backend'
+		'maxima: backend'
+		'r: backend')
+	install='kdeedu.install'
+	cd $srcdir/build/cantor
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/cantor
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeedu-data() {
+	pkgdesc='Data for KDE Educational Software'
+	groups=()
+	cd $srcdir/build/data
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeedu-kalgebra() {
+	pkgdesc='Math Expression Solver and Plotter'
+	depends=('kdebase-runtime')
+	install='kdeedu.install'
+	cd $srcdir/build/kalgebra
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kalgebra
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeedu-kalzium() {
+	pkgdesc='KDE Periodic Table of Elements'
+	depends=('kdebase-runtime'  'kdeedu-libkdeedu' 'avogadro')
+	install='kdeedu.install'
+	cd $srcdir/build/kalzium
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kalzium
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeedu-kanagram() {
+	pkgdesc='KDE Letter Order Game'
+	depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data')
+	install='kdeedu.install'
+	cd $srcdir/build/kanagram
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kanagram
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeedu-kbruch() {
+	pkgdesc='Practice exercises with fractions'
+	depends=('kdelibs' 'kdebase-runtime')
+	install='kdeedu.install'
+	cd $srcdir/build/kbruch
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kbruch
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeedu-kgeography() {
+	pkgdesc='A Geography Learning Program'
+	depends=('kdebase-runtime')
+	install='kdeedu.install'
+	cd $srcdir/build/kgeography
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kgeography
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeedu-khangman() {
+	pkgdesc='KDE Hangman Game'
+	depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data')
+	install='kdeedu.install'
+	cd $srcdir/build/khangman
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/khangman
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeedu-kig() {
+	pkgdesc='Explore Geometric Constructions'
+	depends=('kdebase-runtime' 'boost-libs' 'python2')
+	install='kdeedu.install'
+	cd $srcdir/build/kig
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kig
+	make DESTDIR=$pkgdir install
+
+	# Use the python2 executable
+	sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' ${pkgdir}/usr/bin/pykig.py
+}
+
+package_kdeedu-kiten() {
+	pkgdesc='Japanese Reference and Study Tool'
+	depends=('kdebase-runtime')
+	install='kdeedu.install'
+	cd $srcdir/build/kiten
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kiten
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeedu-klettres() {
+	pkgdesc='a KDE program to learn the alphabet'
+	depends=('kdebase-runtime')
+	install='kdeedu.install'
+	cd $srcdir/build/klettres
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/klettres
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeedu-kmplot() {
+	pkgdesc='Function Plotter'
+	depends=('kdebase-runtime')
+	install='kdeedu.install'
+	cd $srcdir/build/kmplot
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kmplot
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeedu-kstars() {
+	pkgdesc='Desktop Planetarium'
+	depends=('kdebase-runtime' 'libindi')
+	install='kdeedu.install'
+	cd $srcdir/build/kstars
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kstars
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeedu-ktouch() {
+	pkgdesc='Touch Typing Tutor'
+	depends=('kdebase-runtime')
+	install='kdeedu.install'
+	cd $srcdir/build/ktouch
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/ktouch
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeedu-kturtle() {
+	pkgdesc='Educational Programming Environment'
+	depends=('kdebase-runtime')
+	install='kdeedu.install'
+	cd $srcdir/build/kturtle
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kturtle
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeedu-kwordquiz() {
+	pkgdesc='A flashcard and vocabulary learning program'
+	depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data')
+	install='kdeedu.install'
+	cd $srcdir/build/kwordquiz
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kwordquiz
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeedu-libkdeedu() {
+	pkgdesc='Support library for KDE Educational Software'
+	groups=()
+	depends=('kdelibs')
+	install='kdeedu.install'
+	cd $srcdir/build/libkdeedu
+	make DESTDIR=$pkgdir install
+	install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKDEEdu.cmake \
+		$pkgdir/usr/share/apps/cmake/modules/FindKDEEdu.cmake
+}
+
+package_kdeedu-marble() {
+	pkgdesc='Desktop Globe'
+	depends=('kdebase-runtime' 'gpsd')
+	install='kdeedu.install'
+	cd $srcdir/build/marble
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/marble
+	make DESTDIR=$pkgdir install
+	install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindMarbleWidget.cmake \
+		$pkgdir/usr/share/apps/cmake/modules/FindMarbleWidget.cmake
+}
+
+package_kdeedu-parley() {
+	pkgdesc='Vocabulary Trainer'
+	depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data' 'kdebindings-python')
+	install='kdeedu.install'
+	cd $srcdir/build/parley
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/parley
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeedu-rocs() {
+	pkgdesc='Graph Theory Tool for Professors and Students.'
+	depends=('kdebase-runtime' 'kdeedu-libkdeedu')
+	install='kdeedu.install'
+	cd $srcdir/build/rocs
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/rocs
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeedu-step() {
+	pkgdesc='Simulate physics experiments'
+	depends=('kdebase-runtime' 'gsl' 'libqalculate')
+	install='kdeedu.install'
+	cd $srcdir/build/step
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/step
+	make DESTDIR=$pkgdir install
+}
diff --git a/testing/kdeedu/gpsd-2.96.patch b/testing/kdeedu/gpsd-2.96.patch
new file mode 100644
index 000000000..ec515e99d
--- /dev/null
+++ b/testing/kdeedu/gpsd-2.96.patch
@@ -0,0 +1,43 @@
+Index: kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
+===================================================================
+--- kdeedu-4.5.5.orig/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
++++ kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
+@@ -18,6 +18,9 @@ using namespace Marble;
+ 
+ GpsdConnection::GpsdConnection( QObject* parent )
+     : QObject( parent ),
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++      m_gpsd("localhost", DEFAULT_GPSD_PORT),
++#endif
+       m_timer( 0 )
+ {
+     connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
+@@ -26,7 +29,11 @@ GpsdConnection::GpsdConnection( QObject*
+ void GpsdConnection::initialize()
+ {
+     m_timer.stop();
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++    gps_data_t* data;
++#else
+     gps_data_t* data = m_gpsd.open();
++#endif
+     if ( data ) {
+         m_status = PositionProviderStatusAcquiring;
+         emit statusChanged( m_status );
+@@ -73,8 +80,16 @@ void GpsdConnection::initialize()
+ void GpsdConnection::update()
+ {
+ #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET )
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++    if ( m_gpsd.waiting(0) ) {
++#else
+     if ( m_gpsd.waiting() ) {
++#endif
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++        gps_data_t* data = m_gpsd.read();
++#else
+         gps_data_t* data = m_gpsd.poll();
++#endif
+         if ( data && data->set & PACKET_SET ) {
+             emit gpsdInfo( *data );
+         }
diff --git a/testing/kdeedu/kdeedu.install b/testing/kdeedu/kdeedu.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/testing/kdeedu/kdeedu.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/testing/kdeplasma-applets-networkmanagement/PKGBUILD b/testing/kdeplasma-applets-networkmanagement/PKGBUILD
index 0c7ed1b65..e59512436 100644
--- a/testing/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/testing/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -3,9 +3,9 @@
 # Contributor: Jakub Schmidtke <sjakub-at-gmail.com>
 
 pkgname=kdeplasma-applets-networkmanagement
-pkgver=git20110417
-_commit=51897916c5e45f12f3e5132fdad421fbda794ad7
-pkgrel=1
+pkgver=git20110418
+_commit=545967db075ed65b0452def93e1c1588190cdc9a
+pkgrel=2
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde.org/"
@@ -15,7 +15,7 @@ makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info')
 optdepends=('mobile-broadband-provider-info: allow to add new mobile connection')
 install=${pkgname}.install
 source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}")
-md5sums=('e7fd481cdc40e5c7b77c6fc01571bb8d')
+md5sums=('d7f50b4b6917d39c79332b868ad2d0cf')
 
 build() {
   cd "${srcdir}"