Wed Apr 27 22:24:53 UTC 2011

author: root <root@rshg047.dnsready.net> 2011-04-27 22:24:53 +0000
committer: root <root@rshg047.dnsready.net> 2011-04-27 22:24:53 +0000
commit: 18d6577d511b9a1ac36eaae50060133a401e42a3 (patch)
tree: f681f9444a7a0a95916de40af82d3b805d5fb8d3 /extra
parent: 69e1fada8bdc9588d0a3d8bc3403fa809d809a84 (diff)
31 files changed, 332 insertions, 206 deletions
diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD
index bd8023903..3e20b8186 100644
--- a/extra/avogadro/PKGBUILD
+++ b/extra/avogadro/PKGBUILD
@@ -1,35 +1,23 @@
-# $Id: PKGBUILD 111981 2011-03-02 21:41:10Z andrea $
+# $Id: PKGBUILD 120742 2011-04-26 09:43:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Nick B <Shirakawasuna at gmail _dot_com>
 
 pkgname=avogadro
-pkgver=1.0.1
-pkgrel=8
+pkgver=1.0.3
+pkgrel=1
 pkgdesc="An advanced molecular editor based on Qt"
 arch=('i686' 'x86_64')
 url="http://avogadro.openmolecules.net/wiki/Main_Page"
 license=('GPL2')
 depends=('eigen' 'openbabel' 'python2-qt' 'boost-libs' 'glew' 'python2-numpy')
 makedepends=('cmake' 'boost')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'sip-4.11.patch'
-        'fix-pycapsule.patch')
-md5sums=('0d5c391197101f0aab7be6b59f81e6fd'
-        'e78c3f96d0dc702947f75de1c094f580'
-        '45b0f3be5913575311e92b74a5520966')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('92c2702c1980f70fb6d87a1a58147911')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/sip-4.11.patch
-  patch -Np1 -i ${srcdir}/fix-pycapsule.patch
-
   cd ${srcdir}
   mkdir build
   cd build
-
-  # use the cmake module in system to enable python 2.7 support
-  rm ../${pkgname}-${pkgver}/cmake/modules/FindPythonLibs.cmake
-
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr
@@ -39,7 +27,4 @@ build() {
 package() {
   cd ${srcdir}/build
   make DESTDIR=${pkgdir} install
-
-  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/cmake/modules/FindAvogadro.cmake \
-    ${pkgdir}/usr/share/cmake-2.8/Modules/FindAvogadro.cmake
 }
diff --git a/extra/cmus/PKGBUILD b/extra/cmus/PKGBUILD
index 3a0709649..05c833387 100644
--- a/extra/cmus/PKGBUILD
+++ b/extra/cmus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 119600 2011-04-12 16:02:29Z eric $
+# $Id: PKGBUILD 120673 2011-04-25 22:55:12Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=cmus
-pkgver=2.3.5
+pkgver=2.4.0
 pkgrel=1
 pkgdesc="A very feature-rich ncurses-based music player"
 arch=('i686' 'x86_64')
@@ -23,8 +23,8 @@ optdepends=('alsa-lib: for ALSA output plugin support'
             'libvorbis: for vorbis input plugin support'
             'flac: for flac input plugin support')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2")
-md5sums=('535a7567ee4cbfa2de8957907a649908')
-sha1sums=('90892d3ba6dc466e453daa091b055c30236813e8')
+md5sums=('0c5a9f4032e632e5f6b6a49f53df1e7e')
+sha1sums=('cbd80d1ff12be5dbf9a3b8b6494381f8b3073761')
 
 build() {
   cd "$srcdir/$pkgname-v$pkgver"
diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD
index 42bf1aaa1..e9189d37e 100644
--- a/extra/enlightenment/PKGBUILD
+++ b/extra/enlightenment/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 99311 2010-11-14 07:31:31Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 120890 2011-04-27 03:29:01Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=enlightenment
-pkgver=1.0.7
+pkgver=1.0.8
 _themever=1.0.1
 pkgrel=1
 pkgdesc="A fast, flexible, and very extensible Window Manager"
@@ -15,12 +15,13 @@ makedepends=('xbitmaps')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/e16-${pkgver}.tar.gz \
         http://downloads.sourceforge.net/enlightenment/e16-themes-${_themever}.tar.gz)
-md5sums=('c0594e9ace69497f5ab6b838dac8ed6f' 'bbd9cfd969610c29c7627c2ba1ce3094')
-sha1sums=('69a38c68f680778c3689a4369bfcbdb907cfc8a6' 'ae34e2df1294198795736bf953bf695aba93b710')
+md5sums=('bf2cf452ea838ebb0c68205215817ecf'
+         'bbd9cfd969610c29c7627c2ba1ce3094')
+sha1sums=('1ff5cfce00c67c866280de9824f0662953b9c552'
+          'ae34e2df1294198795736bf953bf695aba93b710')
 
 build() {
   cd "${srcdir}/e16-${pkgver}"
-  sed -i 's|xsessiondir = $(datadir)/xsessions|xsessiondir = /etc/X11/sessions|' misc/Makefile.in
   ./configure --prefix=/usr --sysconfdir=/etc --enable-sound --enable-mans
   make
 
diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD
index 3accd6fde..3186db961 100644
--- a/extra/ethtool/PKGBUILD
+++ b/extra/ethtool/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 114758 2011-03-15 22:43:11Z ibiru $
+# $Id: PKGBUILD 120232 2011-04-21 15:58:14Z ibiru $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Contributer: Martin Kemp <mdkemp@elys.com>
 pkgname=ethtool
 pkgver=2.6.38
 pkgrel=1
+epoch=1
 pkgdesc="gkernel ethtool"
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/software/network/ethtool/"
@@ -16,5 +17,9 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --mandir=/usr/share/man
   make
-  make DESTDIR="${pkgdir}" install
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/faad2/PKGBUILD b/extra/faad2/PKGBUILD
index eb89c9ea1..04aae2b74 100644
--- a/extra/faad2/PKGBUILD
+++ b/extra/faad2/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 27495 2009-02-22 04:29:09Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Sarah Hay <sarah@archlinux.org>
+# $Id: PKGBUILD 120668 2011-04-25 22:17:14Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=faad2
 pkgver=2.7
-pkgrel=1
+pkgrel=2
 pkgdesc="ISO AAC audio decoder"
 arch=('i686' 'x86_64')
 url="http://www.audiocoding.com/"
@@ -12,15 +11,21 @@ license=('custom:GPL')
 depends=('glibc')
 options=('!libtool' '!makeflags')
 source=(http://downloads.sourceforge.net/sourceforge/faac/${pkgname}-${pkgver}.tar.bz2 LICENSE)
-md5sums=('4c332fa23febc0e4648064685a3d4332' 'ec95f38142e14fb46c849503897a37a0')
-sha1sums=('b0e80481d27ae9faf9e46c8c8dfb617a0adb91b5' '00edd9b30d8d5098b5e91c03c595d96a3bbe56fd')
+md5sums=('4c332fa23febc0e4648064685a3d4332'
+         'ec95f38142e14fb46c849503897a37a0')
+sha1sums=('b0e80481d27ae9faf9e46c8c8dfb617a0adb91b5'
+          '00edd9b30d8d5098b5e91c03c595d96a3bbe56fd')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make CFLAGS="${CFLAGS} -fPIC" || return 1
-  make DESTDIR=${pkgdir} manmdir=/usr/share/man/man1 install || return 1
-  install -m644 common/mp4ff/mp4ff_int_types.h ${pkgdir}/usr/include/mp4ff_int_types.h || return 1
-  install -D -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
-  mv ${pkgdir}/usr/share/man/man1/faad.man ${pkgdir}/usr/share/man/man1/faad.1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make CFLAGS="${CFLAGS} -fPIC"
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" manmdir=/usr/share/man/man1 install
+  mv "${pkgdir}/usr/share/man/man1/faad.man" "${pkgdir}/usr/share/man/man1/faad.1"
+  install -D -m644 common/mp4ff/mp4ff_int_types.h "${pkgdir}/usr/include/mp4ff_int_types.h"
+  install -D -m644 "${srcdir}/LICENSE"  "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD
index c350b58d2..d7489ad85 100644
--- a/extra/feh/PKGBUILD
+++ b/extra/feh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 114383 2011-03-12 22:41:05Z bisson $
+# $Id: PKGBUILD 120449 2011-04-23 22:47:50Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=feh
-pkgver=1.12
+pkgver=1.13
 pkgrel=1
 pkgdesc='Fast, lightweight image viewer which uses imlib2'
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ depends=('giblib' 'curl' 'libxinerama')
 optdepends=('perl: feh-cam, webcam wrapper for feh')
 makedepends=('libxt')
 source=("${url}${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('0f0f6dec50d81f9765bef990018de44e411a7439')
+sha1sums=('8b2c8250137edbda630b920e5eb7ca7ba5818a5e')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 592a9b246..6ba26dd43 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 118880 2011-04-09 09:00:43Z andyrtr $
+# $Id: PKGBUILD 120489 2011-04-24 13:19:44Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=2.12.2
+pkgver=2.12.3
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ install=gnutls.install
 options=('!libtool' '!zipman')
 depends=('gcc-libs>=4.4.3' 'libtasn1>=2.5' 'readline>=6.0' 'zlib' 'libgcrypt>=1.4.5')
 source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ca6903d99b2aca2a6a326bc8df805b61')
+md5sums=('04b72b022b42b10df12cbbae051e2d55')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD
index 674351838..d26892a8a 100644
--- a/extra/gpsd/PKGBUILD
+++ b/extra/gpsd/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 116080 2011-03-22 18:18:49Z andrea $
+# $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.95
-pkgrel=8
+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"
@@ -20,7 +20,7 @@ options=('!libtool')
 install="${pkgname}.install"
 source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'gpsd' 'LICENSE')
-md5sums=('12535a9ed9fecf9ea2c5bdc9840da5ae'
+md5sums=('26a7a04d4298bc3a3a5d89fef4582b64'
          'f929322fc4670543fcb36dafc7bb9e03'
          'd217a23f408e91c94359447735bc1800')
 
diff --git a/extra/ilmbase/PKGBUILD b/extra/ilmbase/PKGBUILD
index b8930a55e..fd95d6f4f 100644
--- a/extra/ilmbase/PKGBUILD
+++ b/extra/ilmbase/PKGBUILD
@@ -2,21 +2,34 @@
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=ilmbase
-pkgver=1.0.1
+pkgver=1.0.2
 pkgrel=1
 depends=('gcc-libs')
-pkgdesc="IlmThread is a thread abstraction library for use with OpenEXR"
+pkgdesc="Base libraries from ILM for OpenEXR"
 arch=(i686 x86_64)
 license=('custom')
 options=('!libtool')
-source=(http://savannah.nongnu.org/download/openexr/$pkgname-$pkgver.tar.gz)
-url="http://www.openexr.org"
-md5sums=('f76f094e69a6079b0beb93d97e2a217e')
+source=(http://savannah.nongnu.org/download/openexr/$pkgname-$pkgver.tar.gz
+        tests-compile-fixes.patch)
+url="http://www.openexr.com"
+md5sums=('26c133ee8ca48e1196fbfb3ffe292ab4'
+         '2687ab9ac01b417ee5cf8c0174b72e43')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd ${srcdir}/$pkgname-$pkgver
+  patch -Np1 -i ${srcdir}/tests-compile-fixes.patch
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
+  make
+}
+
+check() {
+  cd ${srcdir}/$pkgname-$pkgver
+  # one of the tests fails randomly for an unknown reason
+  make check || true
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+  make DESTDIR=${pkgdir} install
   install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
 }
diff --git a/extra/ilmbase/tests-compile-fixes.patch b/extra/ilmbase/tests-compile-fixes.patch
new file mode 100644
index 000000000..27dc24ac6
--- /dev/null
+++ b/extra/ilmbase/tests-compile-fixes.patch
@@ -0,0 +1,12 @@
+diff -ur ilmbase-1.0.2/Imath/ImathMatrix.h ilmbase-1.0.2.new/Imath/ImathMatrix.h
+--- ilmbase-1.0.2/Imath/ImathMatrix.h	2010-07-17 00:48:40.000000000 +0200
++++ ilmbase-1.0.2.new/Imath/ImathMatrix.h	2011-04-25 10:15:21.121608420 +0200
+@@ -49,6 +49,8 @@
+ #include "ImathVec.h"
+ #include "ImathShear.h"
+ 
++#include <cstdlib>
++#include <cstring>
+ #include <iostream>
+ #include <iomanip>
+ 
diff --git a/extra/kdeedu/PKGBUILD b/extra/kdeedu/PKGBUILD
index 4de1a090c..d3c26577a 100644
--- a/extra/kdeedu/PKGBUILD
+++ b/extra/kdeedu/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118069 2011-04-05 10:08:07Z andrea $
+# $Id: PKGBUILD 119955 2011-04-17 11:47:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -26,7 +26,7 @@ pkgname=('kdeedu-blinken'
          'kdeedu-rocs'
          'kdeedu-step')
 pkgver=4.6.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -34,11 +34,16 @@ 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")
-sha1sums=('7c94a10f5c17237dcd5c348a8ac129973934cf05')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
+        'gpsd-2.96.patch')
+sha1sums=('7c94a10f5c17237dcd5c348a8ac129973934cf05'
+          'fd6b6b81945d951bb6ad0bb735df33c11bb2008e')
 
 build() {
-    cd $srcdir
+    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
diff --git a/extra/kdeedu/gpsd-2.96.patch b/extra/kdeedu/gpsd-2.96.patch
new file mode 100644
index 000000000..ec515e99d
--- /dev/null
+++ b/extra/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/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD
index b8adb55c2..208459210 100644
--- a/extra/kdepim-runtime/PKGBUILD
+++ b/extra/kdepim-runtime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 107967 2011-01-28 08:04:50Z andrea $
+# $Id: PKGBUILD 120273 2011-04-22 00:22:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepim-runtime
-pkgver=4.4.10
+pkgver=4.4.11.1
 pkgrel=1
 pkgdesc='KDE PIM Runtime Environment'
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('kdepimlibs' 'kdebase-runtime')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/kdepim-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('a0e74f95daf8c28f7b3bd1ee84b6a86fc509d0ff')
+sha1sums=('e3105eb99ab0de47c617f8491774b2e3ee4cdd4a')
 
 build() {
 	cd $srcdir
diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index 6fc1fd302..4b3e307b0 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118254 2011-04-06 08:33:32Z andrea $
+# $Id: PKGBUILD 120278 2011-04-22 00:23:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -20,23 +20,18 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-ktimetracker'
          'kdepim-libkdepim'
          'kdepim-wizards')
-pkgver=4.4.10
-pkgrel=2
+pkgver=4.4.11.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdepim')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
-	'pilot-link' 'kde-agent' 'docbook-xsl')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'asynchronous-start.patch')
-sha1sums=('b9c45e80dddc3bff201df6ddd76fdf4f1f18d5c3'
-          '3816d618026b85500a21753395712cd91de6e31b')
+             'pilot-link' 'kde-agent')
+source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2')
 
 build() {
-	cd ${srcdir}/${pkgbase}-${pkgver}
-    patch -Np1 -i ${srcdir}/asynchronous-start.patch
-
     cd ${srcdir}
 	mkdir build
 	cd build
diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD
index ce8bce22c..5060e0ab5 100644
--- a/extra/libisoburn/PKGBUILD
+++ b/extra/libisoburn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 119050 2011-04-10 17:34:53Z andyrtr $
+# $Id: PKGBUILD 120340 2011-04-22 11:24:54Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Gour <Gour <gour@mail.inet.hr>
 
 pkgname=libisoburn
-pkgver=1.0.6.pl00
+pkgver=1.0.8.pl00
 pkgrel=1
 pkgdesc="frontend for libraries libburn and libisofs"
 url="http://libburnia.pykix.org/wiki/Libisoburn"
@@ -11,8 +11,9 @@ arch=('i686' 'x86_64')
 license=('GPL2')
 depends=('libburn>=1.0.6' 'libisofs>=1.0.6' 'readline>=6.1')
 options=('!libtool')
+install=${pkgname}.install
 source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz)
-md5sums=('f4eff76915c08dba533180d618df95a1')
+md5sums=('e9d4c2916f591cdf3b7248366ba54506')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver/.pl??/}
diff --git a/extra/libisoburn/libisoburn.install b/extra/libisoburn/libisoburn.install
new file mode 100644
index 000000000..7f8b83e67
--- /dev/null
+++ b/extra/libisoburn/libisoburn.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(xorriso.info.gz xorrisofs.info.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/extra/libmad/PKGBUILD b/extra/libmad/PKGBUILD
index fc978b8e7..842fbe930 100644
--- a/extra/libmad/PKGBUILD
+++ b/extra/libmad/PKGBUILD
@@ -1,40 +1,39 @@
-# $Id: PKGBUILD 28155 2009-02-28 01:26:22Z giovanni $
-# Maintainer: Travis Willard <travis@archlinux.org>
+# $Id: PKGBUILD 120663 2011-04-25 21:54:20Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
 pkgname=libmad
 pkgver=0.15.1b
-pkgrel=4
+pkgrel=5
 pkgdesc="A high-quality MPEG audio decoder"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
+url="http://www.underbit.com/products/mad/"
 license=('GPL')
 depends=('glibc')
 makedepends=('autoconf')
 replaces=('mad')
 conflicts=('mad')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/mad/$pkgname-$pkgver.tar.gz
+source=(http://downloads.sourceforge.net/sourceforge/mad/${pkgname}-${pkgver}.tar.gz
         libmad.patch amd64-64bit.diff frame_length.diff optimize.diff)
-url="http://www.underbit.com/products/mad/"
+md5sums=('1be543bc30c56fb6bea1d7bf6a64e66c'
+         'fbcca0267a423bae45389666f4cb04d5'
+         '8d8bd64a2842dd59153b3a6642059e23'
+         '3329b032118a68e18908197e65b3198d'
+         '3e52afe2103f367810a18bef9e82eb9f')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i $srcdir/libmad.patch || return 1
-  patch -Np1 -i $srcdir/amd64-64bit.diff || return 1
-  patch -Np1 -i $srcdir/frame_length.diff || return 1
-  patch -Np1 -i $srcdir/optimize.diff || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/libmad.patch"
+  patch -p1 -i "${srcdir}/amd64-64bit.diff"
+  patch -p1 -i "${srcdir}/frame_length.diff"
+  patch -p1 -i "${srcdir}/optimize.diff"
   CFLAGS="$CFLAGS -ftree-vectorize -ftree-vectorizer-verbose=1"
   autoconf
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
+  make
 }
 
-md5sums=('1be543bc30c56fb6bea1d7bf6a64e66c'
-         'fbcca0267a423bae45389666f4cb04d5'
-         '8d8bd64a2842dd59153b3a6642059e23'
-         '3329b032118a68e18908197e65b3198d'
-         '3e52afe2103f367810a18bef9e82eb9f')
-sha256sums=('bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690'
-            '813634b07e72ccc23c5c5dc63f88fb789706477fa0a74f535115b8bd898b2ff4'
-            '0b506dc3c3a83837739f84f7b9db7497fd79b3623b5fb7e291ce44f79d7bf726'
-            '0e21f2c6b19337d0b237dacc04f7b90a56be7f359f4c9a2ee0b202d9af0cfa69'
-            'f38216942a1e84fd5341394a56dc5e91117d168a660f3c07ebd59af9b907e6f2')
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libmspack/PKGBUILD b/extra/libmspack/PKGBUILD
index 3f0c60ff1..75c770b91 100644
--- a/extra/libmspack/PKGBUILD
+++ b/extra/libmspack/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 79261 2010-05-02 14:06:52Z andyrtr $
+# $Id: PKGBUILD 120819 2011-04-26 16:19:33Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=libmspack
-pkgver=0.0.20060920alpha
-pkgrel=2
+pkgver=0.2alpha
+pkgrel=1
 pkgdesc="A library for Microsoft compression formats"
 arch=('i686' 'x86_64')
 url="http://www.cabextract.org.uk/libmspack/"
@@ -12,11 +12,15 @@ depends=('glibc')
 makedepends=()
 options=('!libtool')
 source=(http://www.cabextract.org.uk/libmspack/$pkgname-$pkgver.tar.gz)
-md5sums=('72003dfa5da2e843e3d5ae0c18f7c969')
+md5sums=('a51c65ba1dc9b53090d4e65e1f55d860')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --disable-static
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
 }
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index 554fd4ec6..f2f5025d5 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 113970 2011-03-11 00:06:49Z giovanni $
+# $Id: PKGBUILD 120268 2011-04-21 21:31:35Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: 03/08/04 <lefungus@altern.org>
 
 pkgname=mkvtoolnix
-pkgver=4.6.0
+pkgver=4.7.0
 pkgrel=1
 pkgdesc="Set of tools to create, edit and inspect Matroska files"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('wxgtk' 'boost' 'ruby')
 optdepends=('wxgtk: mkvmerge,mkvinfo and mmg GUI')
 install=mkvtoolnix.install
 source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('ca4e5b226175a6df2f9fdad206abf0a8')
+md5sums=('68200debce9570fc14d934a3d6a750b5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD
index 0a272791b..9f071b61b 100644
--- a/extra/mpg123/PKGBUILD
+++ b/extra/mpg123/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 110641 2011-02-20 21:15:21Z eric $
+# $Id: PKGBUILD 120652 2011-04-25 20:44:03Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=mpg123
-pkgver=1.13.2
+pkgver=1.13.3
 pkgrel=1
 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/mpg123"
 license=('GPL2' 'LGPL2.1')
-depends=('glibc' 'libtool' 'alsa-lib')
+depends=('libtool' 'alsa-lib')
 makedepends=('esound' 'sdl' 'jack' 'libpulse')
 optdepends=('esound: for esd audio support'
             'sdl: for sdl audio support'
@@ -16,11 +16,10 @@ optdepends=('esound: for esd audio support'
             'libpulse: for pulse audio support')
 conflicts=('mpg321')
 provides=('mpg321')
-replaces=('mpg321')
 options=('libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('7cb959877d205f89215a32bf446f5737')
-sha1sums=('31a9c27f5fa80f930dbe598846c847f9b35d9dc3')
+md5sums=('b1f990ce76dcf2fdf9d53ac39fc6bc7e')
+sha1sums=('899af289bfcbbb13cbe66d5d0541c25cecf5400d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD
index 582f3928f..a5c7d41c6 100644
--- a/extra/opengtl/PKGBUILD
+++ b/extra/opengtl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 111122 2011-02-24 06:35:03Z eric $
+# $Id: PKGBUILD 120658 2011-04-25 21:17:33Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Andries Radu <admiral0@live.it>
 
 pkgname=opengtl
-pkgver=0.9.15
+pkgver=0.9.15.1
 pkgrel=1
 pkgdesc="A set of library for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications"
 url="http://www.opengtl.org"
@@ -13,8 +13,8 @@ depends=('gcc-libs')
 makedepends=('cmake' 'llvm' 'libpng')
 optdepends=('libpng: for using the png extension')
 source=(http://download.opengtl.org/OpenGTL-${pkgver}.tar.bz2)
-md5sums=('9e59817fddfc7085a8d23a6bbea60bdc')
-sha1sums=('12d53a6ba660d278906539f74d28b464601a08a3')
+md5sums=('052fc8504ced601e356e4d20621699f7')
+sha1sums=('ddd25b1f5eb11ae0b438c67d5a2a73481e919a0a')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/phonon-vlc/PKGBUILD b/extra/phonon-vlc/PKGBUILD
index cd6309f45..717a857df 100644
--- a/extra/phonon-vlc/PKGBUILD
+++ b/extra/phonon-vlc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 107138 2011-01-21 18:51:32Z andrea $
+# $Id: PKGBUILD 120790 2011-04-26 15:17:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon-vlc
-pkgver=0.3.2
+pkgver=0.4.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://phonon.kde.org"
@@ -12,7 +12,7 @@ depends=('vlc')
 makedepends=('cmake' 'automoc4' 'phonon')
 provides=('phonon-backend')
 source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/src/phonon-backend-vlc-${pkgver}.tar.bz2")
-md5sums=('40076298deb89a1f2fd7f43c95e344fb')
+md5sums=('e6ef8c5b54a49610d4dad67754392420')
 
 build() {
   cd ${srcdir}
diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD
index f6c50c036..5c5ffd2db 100644
--- a/extra/postgresql/PKGBUILD
+++ b/extra/postgresql/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 120038 2011-04-18 17:35:03Z dan $
+# $Id: PKGBUILD 120393 2011-04-23 18:29:42Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgbase=postgresql
 pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
 pkgver=9.0.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.postgresql.org"
 license=('custom:PostgreSQL')
@@ -130,7 +130,7 @@ package_postgresql() {
 }
 
 md5sums=('80390514d568a7af5ab61db1cda27e29'
-         '89ada7c282d9ffb82c6adc89bc2778ad'
+         'eacf91f987d230f2dc2d040618ea1817'
          'd63a05943cf0a2726aa2070f3033c569'
          '4d74f4227dc5e12bf95b3490758d86c9'
          '96f82c38f3f540b53f3e5144900acf17'
diff --git a/extra/postgresql/postgresql b/extra/postgresql/postgresql
index 3a8bf44f8..0fbe94036 100755
--- a/extra/postgresql/postgresql
+++ b/extra/postgresql/postgresql
@@ -9,26 +9,26 @@ PGROOT=${PGROOT:-/var/lib/postgres}
 PG_CTL="/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -s -w"
 
 postgres_init() {
-	# initialization
-	if [ ! -d $PGROOT/data ]; then
-		mkdir -p $PGROOT/data && chown -R postgres:postgres $PGROOT
-		su - postgres -c "/usr/bin/initdb $INITOPTS -D $PGROOT/data"
-	fi
-	if [ ! -e /var/log/postgresql.log ]; then
-		touch /var/log/postgresql.log
-		chown postgres /var/log/postgresql.log
-	fi
+    # initialization
+    if [ ! -d $PGROOT/data ]; then
+        mkdir -p $PGROOT/data && chown -R postgres:postgres $PGROOT
+        su - postgres -c "/usr/bin/initdb $INITOPTS -D $PGROOT/data"
+    fi
+    if [ ! -e /var/log/postgresql.log ]; then
+        touch /var/log/postgresql.log
+        chown postgres /var/log/postgresql.log
+    fi
 }
 
 case "$1" in
   start)
-		postgres_init
+    postgres_init
     stat_busy "Starting PostgreSQL"
     su - postgres -c \
      "$PG_CTL start"
     if [ $? -gt 0 ]; then
       stat_fail
-	  exit 1
+      exit 1
     else
       add_daemon postgresql
       stat_done
@@ -51,19 +51,19 @@ case "$1" in
       "$PG_CTL reload"
     if [ $? -gt 0 ]; then
       stat_fail
-	  exit 1
+      exit 1
     else
       stat_done
     fi
     ;;
   restart)
-		postgres_init
+        postgres_init
     stat_busy "Restarting PostgreSQL"
     su - postgres -c \
       "$PG_CTL restart -m fast"
     if [ $? -gt 0 ]; then
       stat_fail
-	  exit 1
+      exit 1
     else
       add_daemon postgresql
       stat_done
diff --git a/extra/postgresql/postgresql.install b/extra/postgresql/postgresql.install
index 4a6f9b848..c3fa4fc3e 100644
--- a/extra/postgresql/postgresql.install
+++ b/extra/postgresql/postgresql.install
@@ -1,11 +1,16 @@
 post_install() {
   getent group postgres >/dev/null || groupadd -g 88 postgres
-  getent passwd postgres >/dev/null || useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /sbin/nologin postgres
+  getent passwd postgres >/dev/null || useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /bin/bash postgres
   passwd -l postgres >/dev/null
 }
 
 post_upgrade() {
   post_install $1
+  # FS#23858, fix postgres user shell issue
+  postgres_shell=$(getent passwd postgres | cut -d: -f7)
+  if [ "$postgres_shell" = "/sbin/nologin" ]; then
+	  chsh -s /bin/bash postgres
+  fi
 }
 
 post_remove() {
diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD
index c7f6570e2..6f07433c0 100644
--- a/extra/qt3/PKGBUILD
+++ b/extra/qt3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 114776 2011-03-15 23:09:15Z andrea $
+# $Id: PKGBUILD 120507 2011-04-24 15:55:09Z andrea $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
@@ -17,7 +17,11 @@ makedepends=('mysql' 'postgresql>=8.2.3' 'unixodbc' 'sqlite3')
 optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
 source=(ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.bz2 qt3-png14.patch qt.profile \
         qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 utf8-bug-qt3.diff \
-	qt-font-default-subst.diff mysql.patch eastern_asian_languagues.diff qt-odbc.patch)
+	    qt-font-default-subst.diff
+        mysql.patch
+        eastern_asian_languagues.diff
+        qt-odbc.patch
+        gcc-4.6.patch)
 options=(!libtool)
 md5sums=('cf3c43a7dfde5bfb76f8001102fe6e85'
          '1dc671df42b9030dbdf68bb61cd3375e'
@@ -28,7 +32,8 @@ md5sums=('cf3c43a7dfde5bfb76f8001102fe6e85'
          '9370d82e85f2c799335ed0dcc1d53189'
          '7d40ed1bd40d33d8b9b27a2076a5d22a'
          '616f1f3029cf8375256ad6a406de3549'
-         '2178ca88dfd75a230918593b30eb0dbe')
+         '2178ca88dfd75a230918593b30eb0dbe'
+         '75177de5b08e1efd437c887c6e606c5b')
 
 # qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/
 # other qt-patches come from fedora and gentoo
@@ -42,24 +47,26 @@ build() {
   cd ${srcdir}/$pkgfqn
   # apply qt patches from kde.org
   for i in ../qt-copy-kde-patches/*; do
-    patch -Np0 -i $i || return 1
+    patch -Np0 -i $i 
   done
   # apply other qt patches and one security fix from debian/gentoo
   for i in ../qt-patches/*; do
-    patch -Np1 -i $i || return 1
+    patch -Np1 -i $i 
   done
   # fix utf8 bug
-  patch -Np0 -i ../utf8-bug-qt3.diff || return 1
+  patch -Np0 -i ../utf8-bug-qt3.diff 
   # fix asia fonts
-  patch -Np0 -i ../qt-font-default-subst.diff || return 1
+  patch -Np0 -i ../qt-font-default-subst.diff 
   # fix segfaults on exit when using mysql DB driver
-  patch -Np0 -i ../mysql.patch || return 1
+  patch -Np0 -i ../mysql.patch 
   # fix CJK font/chars select error (FS#11245)
-  patch -p1 -i ${srcdir}/eastern_asian_languagues.diff || return 1
+  patch -p1 -i ${srcdir}/eastern_asian_languagues.diff 
   # fix build problem against new unixODBC
-  patch -p1 -i ${srcdir}/qt-odbc.patch || return 1
+  patch -p1 -i ${srcdir}/qt-odbc.patch 
+  # fix build with gcc 4.6.0
+  patch -p1 -i ${srcdir}/gcc-4.6.patch
 
-  patch -p0 -i ${srcdir}/qt3-png14.patch || return 1
+  patch -p0 -i ${srcdir}/qt3-png14.patch 
   # start compiling qt
   sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
   rm -rf doc/html examples tutorial
@@ -91,7 +98,7 @@ build() {
   [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/uilib/Makefile
 
   cd ${srcdir}/$pkgfqn
-  make -C qmake || return 1
+  make -C qmake 
   cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/mysql
   ${srcdir}/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
   cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/psql
@@ -100,7 +107,11 @@ build() {
   cd ${srcdir}/$pkgfqn
   # fix the broken makefiles
   #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
-  make || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgfqn
   make INSTALL_ROOT=${pkgdir} install
   rm -rf ${pkgdir}/opt/qt/{phrasebooks,templates,translations}
   sed -i "s|-L${srcdir}/$pkgfqn/lib ||g" ${pkgdir}/opt/qt/lib/*.prl
@@ -110,7 +121,7 @@ build() {
   rm -f ${pkgdir}/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH
 
   # install man pages
-  mkdir -p ${pkgdir}/opt/qt/man
+  install -d -m755 ${pkgdir}/opt/qt/man
   cp -r ${srcdir}/$pkgfqn/doc/man/{man1,man3} ${pkgdir}/opt/qt/man/
 
   install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
diff --git a/extra/qt3/gcc-4.6.patch b/extra/qt3/gcc-4.6.patch
new file mode 100644
index 000000000..bcbffcea6
--- /dev/null
+++ b/extra/qt3/gcc-4.6.patch
@@ -0,0 +1,33 @@
+diff -up qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef qt-x11-free-3.3.8b/src/tools/qmap.h
+--- qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef	2008-01-15 13:09:13.000000000 -0600
++++ qt-x11-free-3.3.8b/src/tools/qmap.h	2011-01-30 21:14:29.275088725 -0600
+@@ -49,6 +49,7 @@
+ #include "qvaluelist.h"
+ #endif // QT_H
+ 
++#include <cstddef>
+ #ifndef QT_NO_STL
+ #include <iterator>
+ #include <map>
+diff -up qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluelist.h
+--- qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef	2008-01-15 13:09:13.000000000 -0600
++++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h	2011-01-30 21:14:01.765846592 -0600
+@@ -47,6 +47,7 @@
+ #include "qdatastream.h"
+ #endif // QT_H
+ 
++#include <cstddef>
+ #ifndef QT_NO_STL
+ #include <iterator>
+ #include <list>
+diff -up qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluevector.h
+--- qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef	2008-01-15 13:09:13.000000000 -0600
++++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h	2011-01-30 21:14:01.765846592 -0600
+@@ -45,6 +45,7 @@
+ #include "qdatastream.h"
+ #endif // QT_H
+ 
++#include <cstddef>
+ #ifndef QT_NO_STL
+ #include <vector>
+ #endif
diff --git a/extra/slang/PKGBUILD b/extra/slang/PKGBUILD
index 8f78015e3..6905293b6 100644
--- a/extra/slang/PKGBUILD
+++ b/extra/slang/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 106236 2011-01-15 15:15:05Z giovanni $
+# $Id: PKGBUILD 120537 2011-04-25 07:37:13Z remy $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=slang
-pkgver=2.2.3
-pkgrel=2
+pkgver=2.2.4
+pkgrel=1
 pkgdesc="S-Lang is a powerful interpreted language"
 arch=('i686' 'x86_64')
 url="http://www.jedsoft.org/slang/"
@@ -12,17 +12,22 @@ license=('GPL')
 depends=('glibc' 'pcre' 'zlib')
 backup=('etc/slsh.rc')
 options=('!makeflags')
-source=(ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-        ${pkgname}-2.2.3-faster-baud-rates.patch)
-md5sums=('17e1864de999ae9535a9f7350a010427'
-         '4e22e58836100adfae34e824f5fbcb1c')
+source=(ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('7fcfd447e378f07dd0c0bae671fe6487')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}"/${pkgname}-2.2.3-faster-baud-rates.patch || return 1
-
   ./configure --prefix=/usr \
-              --sysconfdir=/etc || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install-all || return 1
+              --sysconfdir=/etc
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install-all
 }
diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD
index 4df33bad0..e7a3f1d33 100644
--- a/extra/tumbler/PKGBUILD
+++ b/extra/tumbler/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 114612 2011-03-14 15:06:46Z jgc $
+# $Id: PKGBUILD 120497 2011-04-24 14:50:22Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan Jezek <honzin.jezek@gmail.com>
 
 pkgname=tumbler
 pkgver=0.1.21
-pkgrel=2
+pkgrel=3
 pkgdesc="D-Bus service for applications to request thumbnails"
 url="http://git.xfce.org/xfce/tumbler/"
 license=('GPL2' 'LGPL')
 arch=('i686' 'x86_64')
 groups=('xfce4')
-depends=('poppler-glib' 'dbus-glib' 'ffmpegthumbnailer')
-makedepends=( 'intltool' 'gtk-doc')
+depends=('poppler-glib' 'dbus-glib')
+makedepends=('intltool' 'ffmpegthumbnailer')
+optdepends=('ffmpegthumbnailer:	for video thunbnails')
 options=('!libtool')
 source=(http://archive.xfce.org/src/apps/${pkgname}/0.1/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('2ef0d30750f95efe345de4655049d4f6')
@@ -22,8 +23,7 @@ build() {
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib/xfce4 \
 	--disable-static \
-	--disable-debug \
-	--enable-gtk-doc
+	--disable-debug
   make
 }
 
diff --git a/extra/xf86-input-joystick/PKGBUILD b/extra/xf86-input-joystick/PKGBUILD
index 441603077..b6ffda70b 100644
--- a/extra/xf86-input-joystick/PKGBUILD
+++ b/extra/xf86-input-joystick/PKGBUILD
@@ -1,9 +1,8 @@
-# $Id: PKGBUILD 115532 2011-03-18 10:42:40Z andyrtr $
+# $Id: PKGBUILD 120502 2011-04-24 14:51:16Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-joystick
-_gitdate=20110318
-pkgver=1.5.99_git${_gitdate} # see configure.ac
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="X.Org Joystick input driver"
 arch=(i686 x86_64)
@@ -14,35 +13,21 @@ makedepends=('xorg-server-devel')
 conflicts=('xorg-server<1.10.0')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-	ftp://ftp.archlinux.org/other/$pkgname/${pkgname}-${_gitdate}.tar.bz2
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         50-joystick.conf
         LICENSE)
-sha1sums=('e1eb55c0556984530ab87836b5ade78085c7201b'
+sha1sums=('3b9aed1b8128e1fbd947fdcdd5e16efccad1c780'
           'e1ff3699a0470c6bb78a53f718df9d8521621e11'
           'ee4c79491b36a680ed9d86f5fc41ae447f26353e')
 
-# source PKGBUILD && mksource
-mksource() {
-	mkdir /tmp/${pkgname}-${_gitdate}
-	pushd /tmp/${pkgname}-${_gitdate}
-	git clone -v --depth 1 git://anongit.freedesktop.org/xorg/driver/xf86-input-joystick
-	cd xf86-input-joystick
-	git archive --prefix=xf86-video-joystick-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/${pkgname}-${_gitdate}/${pkgname}-${_gitdate}.tar.bz2
-	popd
-}
-
 build() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-#  ./configure --prefix=/usr
-  cd ${srcdir}/xf86-video-joystick-${_gitdate}
-  ./autogen.sh --prefix=/usr
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
   make
 }
 
 package() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-  cd ${srcdir}/xf86-video-joystick-${_gitdate}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   
   make DESTDIR="${pkgdir}" install
 
diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD
index 452135ebf..8359afd01 100644
--- a/extra/xfdesktop/PKGBUILD
+++ b/extra/xfdesktop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 112928 2011-03-07 18:58:22Z andyrtr $
+# $Id: PKGBUILD 120363 2011-04-22 18:39:32Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfdesktop
-pkgver=4.8.1
-pkgrel=2
+pkgver=4.8.2
+pkgrel=1
 pkgdesc="A desktop manager for Xfce"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -18,7 +18,7 @@ replaces=('xfce4-menueditor')
 options=('!libtool')
 install=xfdesktop.install
 source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a3a255cc7756ddc2a0a6fdee9fb8b2c9')
+md5sums=('ed25d59f478afda552d121e96657d16f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
author	root <root@rshg047.dnsready.net>	2011-04-27 22:24:53 +0000
committer	root <root@rshg047.dnsready.net>	2011-04-27 22:24:53 +0000
commit	18d6577d511b9a1ac36eaae50060133a401e42a3 (patch)
tree	f681f9444a7a0a95916de40af82d3b805d5fb8d3 /extra
parent	69e1fada8bdc9588d0a3d8bc3403fa809d809a84 (diff)