Merge branch 'master' of vparabola:~/abslibre-pre-mips64el

author: Joshua Ismael Haase Hernandez <hahj87@gmail.com> 2011-05-26 11:13:51 -0500
committer: Joshua Ismael Haase Hernandez <hahj87@gmail.com> 2011-05-26 11:13:51 -0500
commit: b18caf89fb235f174419d578a7da0237e456ef3d (patch)
tree: 9a9f7e391135f5ce2b05b3956ced1a00bd664bbb /extra
parent: a084559f421a288dd77f81e458161f95ae8d1be9 (diff)
parent: 6e35be4b44d90f92ddceb8b067cbbf03fc652a35 (diff)
68 files changed, 618 insertions, 352 deletions
diff --git a/extra/acpid/PKGBUILD b/extra/acpid/PKGBUILD
index a836d69f8..f6cefe7b7 100644
--- a/extra/acpid/PKGBUILD
+++ b/extra/acpid/PKGBUILD
@@ -1,42 +1,43 @@
-# $Id: PKGBUILD 65410 2010-01-28 20:47:17Z ibiru $
-# Maintainer: Thayer Williams <thayer@archlinux.org>
+# $Id: PKGBUILD 124267 2011-05-18 16:31:02Z andrea $
+# Maintainer:
+# Contributor: xduugu
 # Contributor: Manolis Tzanidakis
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
+# Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
 
 pkgname=acpid
-pkgver=1.0.10
-pkgrel=3
-pkgdesc="A daemon for delivering ACPI power management events"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://acpid.sourceforge.net"
+pkgver=2.0.10
+pkgrel=1
+pkgdesc="A daemon for delivering ACPI power management events with netlink support"
+arch=('i686' 'x86_64')
+url="http://tedfelix.com/linux/acpid-netlink.html"
 license=('GPL')
-depends=(glibc)
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
-    acpid
-    acpid.conf.d
-    anything
-    handler.sh)
+depends=('bash')
+source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz"
+        'acpid'
+        'anything'
+        'handler.sh'
+        'acpid.conf.d')
+replaces=('acpid2')
 backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid')
 
 build() {
-    cd $srcdir/$pkgname-$pkgver
-    /usr/bin/make || return 1
-    /bin/install -d -m0755 $pkgdir/usr/bin || return 1
-    /usr/bin/make INSTPREFIX=$pkgdir \
-        MAN8DIR=$pkgdir/usr/share/man/man8 install || return 1
+  cd "${srcdir}"/$pkgname-$pkgver
+  make
+}
 
-    # install our supplementary scripts
-    /bin/install -D -m0755 $srcdir/acpid $pkgdir/etc/rc.d/acpid || return 1
-    /bin/install -D -m0644 $srcdir/acpid.conf.d $pkgdir/etc/conf.d/acpid || return 1
-    /bin/install -D -m0644 $srcdir/anything $pkgdir/etc/acpi/events/anything || return 1
-    /bin/install -D -m0755 $srcdir/handler.sh $pkgdir/etc/acpi/handler.sh || return 1
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
 
-    # set world readable bit on the acpid binary
-    /bin/chmod 755 $pkgdir/usr/sbin/acpid || return 1
-}
+  install -Dm755 "$srcdir/acpid" "$pkgdir/etc/rc.d/acpid"
+  install -Dm644 "$srcdir/anything" "$pkgdir/etc/acpi/events/anything"
+  install -Dm755 "$srcdir/handler.sh" "$pkgdir/etc/acpi/handler.sh"
+  install -Dm644 "$srcdir/acpid.conf.d" "$pkgdir/etc/conf.d/acpid"
 
-md5sums=('61156ef32015c56dc0f2e3317f4ae09e'
-         'd9ca7f71f520238a0448fab105a23fe9'
-         '91fdb3709c878eed757d192a420251a1'
+  chmod 755 "${pkgdir}"/usr/sbin/acpid
+}
+md5sums=('d5dd88bcfaa4a0bf51905e95115da6df'
+         '955490c4db5233ec44461db694b873a4'
          '2d37b98d6e74bab815604b8b48c6cfd4'
-         '0e8dd13793b1baa79a745f4034888367')
+         '7b2e4c299af5eb87e1a81c07b6916c97'
+         '929c6d2e91295c22ed9ec6212d7eabef')
diff --git a/extra/acpid/acpid b/extra/acpid/acpid
index 9a4ab8ac7..9177c8207 100644
--- a/extra/acpid/acpid
+++ b/extra/acpid/acpid
@@ -19,7 +19,7 @@ case "$1" in
     ;;
   stop)
     stat_busy "Stopping acpid"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail
     else
diff --git a/extra/acpid/acpid.conf.d b/extra/acpid/acpid.conf.d
index 25c9cc1ef..b60103a2d 100644
--- a/extra/acpid/acpid.conf.d
+++ b/extra/acpid/acpid.conf.d
@@ -3,4 +3,3 @@
 #
 
 ACPID_ARGS=""
-
diff --git a/extra/acpid/handler.sh b/extra/acpid/handler.sh
index ad31d1aa9..518a62dea 100644
--- a/extra/acpid/handler.sh
+++ b/extra/acpid/handler.sh
@@ -26,7 +26,7 @@ case "$1" in
         ;;
     ac_adapter)
         case "$2" in
-            AC)
+            AC|ACAD|ADP0)
                 case "$4" in
                     00000000)
                         echo -n $minspeed >$setspeed
diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD
index e0034efe3..bc394106c 100644
--- a/extra/at-spi2-atk/PKGBUILD
+++ b/extra/at-spi2-atk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 120714 2011-04-26 05:27:06Z jgc $
+# $Id: PKGBUILD 124722 2011-05-24 07:05:08Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=at-spi2-atk
-pkgver=2.0.1
+pkgver=2.0.2
 pkgrel=1
 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ install=at-spi2-atk.install
 options=('!libtool')
 groups=('gnome')
 source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('d78a88067a53db479d3c7c1ce31f095b1d4962e44e653800a12599ade397dafc')
+sha256sums=('4b958d3701afd0c8f83ecf297750032f06a07491007d85173997ce7371688725')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD
index f826d6763..c3dd97d41 100644
--- a/extra/at-spi2-core/PKGBUILD
+++ b/extra/at-spi2-core/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 120767 2011-04-26 14:35:02Z ibiru $
+# $Id: PKGBUILD 124714 2011-05-24 07:02:56Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=at-spi2-core
-pkgver=2.0.1
+pkgver=2.0.2
 pkgrel=1
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 groups=('gnome')
 source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f0880d816a554c0560e9f6aea786614e8ab439e17189d383a83ed7eebd9e328b')
+sha256sums=('15e13433d1923c96139c109568295313de636a83dbb3700c8467fcb9c5e4e6ce')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index 0991e44fb..833881841 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 119918 2011-04-16 22:59:51Z bisson $
+# $Id: PKGBUILD 124404 2011-05-20 15:01:13Z bisson $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=audacious
-pkgver=2.5.0
+pkgver=2.5.1
 pkgrel=1
 pkgdesc='Lightweight, GTK2-based advanced audio player focused on audio quality'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL3')
 depends=('gtk2' 'libmcs' 'dbus-glib' 'libguess' 'audacious-plugins' 'desktop-file-utils' 'hicolor-icon-theme')
 optdepends=('unzip: zipped skins support')
 source=("http://distfiles.atheme.org/$pkgname-$pkgver.tgz")
-sha1sums=('df76909c83a69b42197dab0702e0846295eceb1f')
+sha1sums=('886e1cde03069b3dee15a6df04e3e8f5934018f1')
 
 provides=('audacious-player')
 replaces=('audacious-player')
diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD
index 3f97b8415..587b7abff 100644
--- a/extra/banshee/PKGBUILD
+++ b/extra/banshee/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 122335 2011-05-03 22:31:33Z ibiru $
+# $Id: PKGBUILD 124622 2011-05-23 14:30:18Z ibiru $
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=banshee
 pkgver=2.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Music management and playback for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://banshee.fm/"
 license=('MIT')
-depends=('libxxf86vm' 'mono-addins' 'notify-sharp-svn' 'boo' 'libwebkit' 'gdata-sharp' 'gtk-sharp-beans' 'gudev-sharp' 'ipod-sharp' 'gkeyfile-sharp' 'taglib-sharp' 'libmtp' 'libgpod' 'mono-zeroconf' 'gstreamer0.10-base-plugins' 'desktop-file-utils' 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gconf-sharp')
+depends=('libxxf86vm' 'mono-addins' 'notify-sharp-svn' 'boo' 'libwebkit' 'gdata-sharp' 'gtk-sharp-beans' 'gudev-sharp' 'gkeyfile-sharp' 'taglib-sharp' 'libmtp' 'libgpod' 'mono-zeroconf' 'gstreamer0.10-base-plugins' 'desktop-file-utils' 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gconf-sharp')
 makedepends=('intltool' 'gnome-doc-utils')
 optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
             'gstreamer0.10-ugly-plugins: Extra media codecs'
diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD
index c944706ab..173ddd0f4 100644
--- a/extra/bind/PKGBUILD
+++ b/extra/bind/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 123947 2011-05-14 15:17:07Z bisson $
+# $Id: PKGBUILD 124551 2011-05-22 22:52:52Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq@hotmail.com>
@@ -8,7 +8,7 @@ pkgname=bind
 # Use a period and not a hyphen before the patch level for proper versioning.
 pkgver=9.8.0.P1
 _pkgver=9.8.0-P1
-pkgrel=2
+pkgrel=3
 
 pkgdesc='Berkeley Internet Name Daemon (BIND) is the reference implementation of the Domain Name System (DNS) protocols'
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,12 +17,11 @@ license=('custom:ISC')
 provides=('dns-server')
 backup=('etc/logrotate.d/named'
         'etc/conf.d/named'
-        'etc/named.conf'
-        'etc/rndc.key')
+        'etc/named.conf')
 depends=('openssl' 'krb5' 'libxml2')
 options=('!makeflags' '!libtool')
 source=("http://ftp.isc.org/isc/bind9/${_pkgver}/${pkgname}-${_pkgver}.tar.gz"
-        'ftp://ftp.rs.internic.net/domain/db.cache'
+        'root.hint::ftp://ftp.rs.internic.net/domain/db.cache'
         'so_bsdcompat.patch'
         'notools.patch'
         'named'
@@ -35,7 +34,7 @@ sha1sums=('aa8f308f218e437ac4bad616e0ae83a9b9c40c29'
           'ee52947062c1582858187716b776afa3613608fb'
           '2f737f4e81186447ac2ef370fa8dcea0b3abec31'
           '5277cf4d6fbc5728c55b51c77c9347d28393fb7c'
-          '02b0e20a542663d27af4faa4d2e397ae2764276e'
+          '46232e9db243c6c05e170a1781d7a7f413be5d03'
           '5ca7a5f2a132548a090a045a2df3acea6b35d9eb'
           '7848edbfb9a848843f57c11c02b0289eefd42d00'
           '9ffb5c3f72390a517aeae557e32349d5d278cb63'
@@ -70,19 +69,18 @@ package() {
 
 	make DESTDIR="${pkgdir}" install
 
-	install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
+	rmdir "${pkgdir}/var/run"
 	install -d "${pkgdir}"/usr/share/doc/bind
-	install ./doc/arm/*.html "${pkgdir}"/usr/share/doc/bind/
+	install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind/
+	install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
 	install -D -m755 ../named "${pkgdir}"/etc/rc.d/named
 	install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named
 	install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named
-	install -D -m640 -o  0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf
+	install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf
 
-	install -d -m750 -o  0 -g 40 "${pkgdir}"/var/named
-	install -d -m755 -o 40 -g 40 "${pkgdir}"/var/run/named
-	install    -m640 -o  0 -g 40 ../db.cache "${pkgdir}"/var/named/root.hint
-	install    -m640 -o  0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named/
-	install    -m640 -o  0 -g 40 ../localhost.zone "${pkgdir}"/var/named/
+	install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named
+	install    -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named/
+	install    -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named/
+	install    -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named/
 }
diff --git a/extra/bind/named b/extra/bind/named
index 3be558f27..7907f9983 100755
--- a/extra/bind/named
+++ b/extra/bind/named
@@ -1,12 +1,16 @@
 #!/bin/bash
 
-NAMED_ARGS=
-[ -f /etc/conf.d/named ] && . /etc/conf.d/named
-
 . /etc/rc.conf
 . /etc/rc.d/functions
+. /etc/conf.d/named
+
+[[ -d /var/run/named ]] || mkdir -p /var/run/named
+chown named:named /var/run/named
+
+PIDFILE=/var/run/named/named.pid
+PID=$(cat $PIDFILE 2>/dev/null)
+readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; }
 
-PID=`pidof -o %PPID /usr/sbin/named`
 case "$1" in
   start)
     stat_busy "Starting BIND"
diff --git a/extra/curl/PKGBUILD b/extra/curl/PKGBUILD
index d731a2ea4..736416bb2 100644
--- a/extra/curl/PKGBUILD
+++ b/extra/curl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 120474 2011-04-24 01:23:51Z angvp $
+# $Id: PKGBUILD 123955 2011-05-14 18:55:23Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
@@ -6,12 +6,12 @@
 
 pkgname=curl
 pkgver=7.21.6
-pkgrel=1
+pkgrel=2
 pkgdesc="An URL retrival utility and library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://curl.haxx.se"
 license=('MIT')
-depends=('zlib' 'openssl' 'bash' 'ca-certificates')
+depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2')
 options=('!libtool')
 source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2
         curlbuild.h)
diff --git a/extra/ecasound/PKGBUILD b/extra/ecasound/PKGBUILD
index 9a3e77412..05eb23efb 100644
--- a/extra/ecasound/PKGBUILD
+++ b/extra/ecasound/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 123924 2011-05-14 11:30:01Z schiv $
+# $Id: PKGBUILD 124853 2011-05-24 19:44:26Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ecasound
-pkgver=2.8.0
+pkgver=2.8.1
 pkgrel=1
 pkgdesc="A software package designed for multitrack audio processing"
 arch=('i686' 'x86_64' 'mips64el')
@@ -25,7 +25,7 @@ optdepends=('python2: ecamonitor, ECI API'
 options=('!libtool')
 changelog=$pkgname.changelog
 source=(http://ecasound.seul.org/download/$pkgname-$pkgver.tar.gz)
-md5sums=('8072340f6cd72fdea05d7efa625b78c5')
+md5sums=('d9ded0074a8eeb59dd507c248220d010')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD
index d59b6c7f7..bef0d5518 100644
--- a/extra/eog-plugins/PKGBUILD
+++ b/extra/eog-plugins/PKGBUILD
@@ -1,14 +1,16 @@
-# $Id: PKGBUILD 120414 2011-04-23 21:13:06Z ibiru $
+# $Id: PKGBUILD 124756 2011-05-24 07:54:16Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 pkgname=eog-plugins
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Plugins for Eye of Gnome"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/"
 license=('GPL2')
 depends=('eog' 'libpeas' 'libchamplain' 'libexif')
 makedepends=('intltool')
+install=eog-plugins.install
+options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2)
 sha256sums=('87cced9baf3c8ba84dcad95d774686694f5cb140a187a7bad3891bc50bc4c7bd')
 
diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD
index 3485bdb20..77bd376a2 100644
--- a/extra/feh/PKGBUILD
+++ b/extra/feh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 123419 2011-05-11 10:13:28Z bisson $
+# $Id: PKGBUILD 124340 2011-05-19 23:17:46Z 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.14
+pkgver=1.14.1
 pkgrel=1
 pkgdesc='Fast, lightweight image viewer which uses imlib2'
 arch=('i686' 'x86_64' 'mips64el')
@@ -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=('da8886b62aa46c8e85cbced73ef14d704ab66907')
+sha1sums=('4d35b14c41cd8a753e6d8d334bab216c69361688')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD
index 80316e094..796d84761 100644
--- a/extra/fetchmail/PKGBUILD
+++ b/extra/fetchmail/PKGBUILD
@@ -1,26 +1,30 @@
-# $Id: PKGBUILD 102917 2010-12-13 01:30:42Z eric $
+# $Id: PKGBUILD 124586 2011-05-23 05:55:07Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=fetchmail
 pkgver=6.3.19
-pkgrel=1
+pkgrel=2
 pkgdesc="A remote-mail retrieval utility"
+arch=('i686' 'x86_64')
 url="http://fetchmail.berlios.de/"
-arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
 depends=('glibc' 'openssl' 'python2')
-optdepends=('tk: fetchmailconf')
+optdepends=('tk: for using fetchmailconf')
+backup=('etc/conf.d/fetchmail')
 options=('!makeflags')
-license=('GPL')
 install=fetchmail.install
 source=(http://download2.berlios.de/fetchmail/${pkgname}-${pkgver}.tar.bz2
         fetchmail.rc fetchmail.conf)
-md5sums=('64519711c8533f5a34d20c9ff620d880' '6742e99d65a827bc2b9d6bc8efe269e6'\
+md5sums=('64519711c8533f5a34d20c9ff620d880'
+         '89fdde15bf81b3a5c065949322b5d138'
          '8fcd6a22dfbc247755fdd050c5c5c4d3')
-sha1sums=('fcc9b9299fe147d8f522cff93f8f619e5e1372b7' '13c7e3c538211c79c5b403f2bfa6712a2ad0ac30'\
-         '30401729386d6f774c6c36ab8530842166de54a8')
+sha1sums=('fcc9b9299fe147d8f522cff93f8f619e5e1372b7'
+          '910ec21ad0a619db67e4665189dc46d2a0634ea5'
+          '30401729386d6f774c6c36ab8530842166de54a8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' fetchmailconf.py
   ./configure --prefix=/usr --with-ssl=/usr
   make
 }
@@ -28,10 +32,6 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-
   install -Dm755 "${srcdir}/fetchmail.rc" "${pkgdir}/etc/rc.d/fetchmail"
   install -Dm644 "${srcdir}/fetchmail.conf" "${pkgdir}/etc/conf.d/fetchmail"
-
-  # "home" directory for pid file.
-  install -d -o 90 -g nobody -m700 "${pkgdir}/var/run/fetchmail"
 }
diff --git a/extra/fetchmail/fetchmail.rc b/extra/fetchmail/fetchmail.rc
index 7c25f72b2..6d453a223 100644
--- a/extra/fetchmail/fetchmail.rc
+++ b/extra/fetchmail/fetchmail.rc
@@ -8,13 +8,12 @@ PID=`pidof -o %PPID /usr/bin/fetchmail`
 case "$1" in
   start)
     stat_busy "Starting fetchmail"
+    [ ! -d /var/run/fetchmail ] && install -d -o fetchmail -g nobody -m700 /var/run/fetchmail
     [ -z "$PID" ] &&
 		su -c "/usr/bin/fetchmail -d $INTERVAL -f $CONFIG" -s /bin/sh fetchmail
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      #Fetchmail does this for us:
-      #echo $PID > /var/run/fetchmail.pid
       add_daemon fetchmail
       stat_done
     fi
diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD
index f99068d86..55401aa90 100644
--- a/extra/fontforge/PKGBUILD
+++ b/extra/fontforge/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 110943 2011-02-23 09:57:15Z bisson $
+# $Id: PKGBUILD 124359 2011-05-20 08:42:23Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=fontforge
 pkgver=20110222
-pkgrel=1
+pkgrel=2
 pkgdesc='Outline and bitmap font editor'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://fontforge.sourceforge.net'
@@ -23,11 +23,11 @@ build() {
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--enable-type3 \
-		--enable-double \
 		--enable-devicetables \
 		--with-regular-link \
 		--with-python=python2 \
-		--enable-pyextension
+		--enable-pyextension \
+
 	make
 }
 
diff --git a/extra/gcalctool/PKGBUILD b/extra/gcalctool/PKGBUILD
index c397966ce..d242b0783 100644
--- a/extra/gcalctool/PKGBUILD
+++ b/extra/gcalctool/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 120856 2011-04-26 21:28:12Z ibiru $
+# $Id: PKGBUILD 124701 2011-05-24 06:54:45Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gcalctool
-pkgver=6.0.1
+pkgver=6.0.2
 pkgrel=1
 pkgdesc="GNOME Scientific calculator"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ options=(!emptydirs)
 url="http://www.gnome.org"
 install=gcalctool.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('be11a7c36a1ec20bd0b190e572aefedea13fb2cb8479b06673e182c7461cadfe')
+sha256sums=('63190fde1be5202ab43774785b5521d8f11592c6a9e125673028c5ac235c9316')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/git/ChangeLog b/extra/git/ChangeLog
index 8ed0884fe..76298e68f 100644
--- a/extra/git/ChangeLog
+++ b/extra/git/ChangeLog
@@ -1,4 +1,21 @@
-Simple version bumps are ommitted from the following ChangeLog.
+Simple version bumps are omitted from the following ChangeLog.
+
+2011-05-05 Dan McGee <dan@archlinux.org>
+	Version 1.7.5.1-1
+	* Byte compile emacs files (FS#20874)
+	* Respect CFLAGS/LDFLAGS (FS#23963)
+
+2011-04-27 Dan McGee <dan@archlinux.org>
+	Version 1.7.5-1
+	* Add missing optdepends for git send-email (FS#20923)
+
+2011-01-05 Dan McGee <dan@archlinux.org>
+	Version 1.7.3.5-1
+	* More flexible git-daemon RC scripts (FS#20575)
+
+2010-10-01 Allan McRae <allan@archlinux.org>
+	Version 1.7.3.1-2
+	* Python 2/3 rebuild
 
 2010-06-29 Dan McGee <dan@archlinux.org>
 	Version 1.7.1.1-1
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index d6d9396da..e67522047 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 122647 2011-05-05 13:19:03Z dan $
+# $Id: PKGBUILD 124414 2011-05-20 16:19:11Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.5.1
+pkgver=1.7.5.2
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64 'mips64el')
@@ -75,11 +75,11 @@ package() {
   install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
 }
 
-md5sums=('a49291116e3b0564e069ae989e4db6fb'
-         'cb0ec1095fbdf5b4935d5c43194b976a'
+md5sums=('f79ab8fe79b35346b499f131cbf381a4'
+         '43fc5538f137231f5c96e7da5eb6c934'
          '8e2648910fd5dd4f1c41d3c7fa9e9156'
          '2e42bf97779a1c6411d89043334c9e78')
-sha256sums=('a1d4a1c59300e68fbc493a2cbe9257048d4d6f4363924bf34f38c413a825f80c'
-            '9d8ab1487df85ca596f3f6718d6a7831868abd9b98035a65c71d7f45af4aac8e'
+sha256sums=('65dbb9789a1ff8aa7e4f7e156b9ce36ef101810608ed55a297156348d70f9349'
+            '8521210a77809d189a3fe72e2bd13df50ecf8ec58e7098ec1655dfdb4086b6ca'
             '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598'
             'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68')
diff --git a/extra/gnome-desktop-sharp/PKGBUILD b/extra/gnome-desktop-sharp/PKGBUILD
index c8e883a28..34681fe3f 100644
--- a/extra/gnome-desktop-sharp/PKGBUILD
+++ b/extra/gnome-desktop-sharp/PKGBUILD
@@ -1,16 +1,14 @@
-# $Id: PKGBUILD 121043 2011-04-28 09:15:35Z heftig $
+# $Id: PKGBUILD 124614 2011-05-23 14:21:08Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-pkgname=gnome-desktop-sharp
+pkgbase=gnome-desktop-sharp
+pkgname=('gnome-desktop-sharp' 'libgnome-desktop-sharp' 'gnome-print-sharp' 'gtkhtml-sharp' 'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp')
 pkgver=2.26.0
-pkgrel=6
-pkgdesc="GNOME desktop bindings for C#"
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=7
+arch=('i686' 'x86_64')
 license=(LGPL)
 url="http://gtk-sharp.sourceforge.net"
-depends=('gnome-sharp' 'gnome-desktop2' 'vte' 'librsvg' 'libwnck' 'gtkhtml' 'gtksourceview2')
-makedepends=('monodoc' 'libgnomeprintui')
-optdepends=('libgnomeprintui')
+makedepends=('gnome-sharp' 'gnome-desktop2' 'vte' 'librsvg' 'libgnomeprintui' 'libwnck' 'gtkhtml' 'gtksourceview2' 'monodoc')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
 	gnome-desktop-sharp-lib-target.patch)
@@ -18,18 +16,72 @@ md5sums=('4bc990900bb318b2ba0b0e7998bb47d1'
          '980cd3adf5e745f4caee0a172a51dcc3')
 
 build() {
- # get rid of that .wapi errors; thanks to brice
-  export MONO_SHARED_DIR="$srcdir/wapi"
-  mkdir -p "$MONO_SHARED_DIR"
+    export MONO_SHARED_DIR="$srcdir/wapi"
+    mkdir -p "$MONO_SHARED_DIR"
 
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i $srcdir/gnome-desktop-sharp-lib-target.patch
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
+    cd "$srcdir/$pkgname-$pkgver"
+    patch -Np1 -i $srcdir/gnome-desktop-sharp-lib-target.patch
+    ./configure --prefix=/usr --sysconfdir=/etc
+    make
 }
 
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make GACUTIL="/usr/bin/gacutil /root ${pkgdir}/usr/lib" \
-      DESTDIR="$pkgdir" install
+package_gnome-desktop-sharp() {
+    pkgdesc="GNOME desktop bindings for C#"
+    depends=('libgnome-desktop-sharp' 'gnome-print-sharp' 'gtkhtml-sharp' 'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp')
+}
+
+package_libgnome-desktop-sharp() {
+    pkgdesc="Mono bindings for libgnome-desktop"
+    depends=('gtk-sharp-2' 'gnome-desktop2')
+
+    cd "$srcdir/$pkgbase-$pkgver"
+    make -C gnomedesktop install DESTDIR="$pkgdir"
+}
+
+package_gnome-print-sharp() {
+    pkgdesc="Mono bindings for libgnomeprint and libgnomeprintui"
+    depends=('art-sharp' 'libgnomeprintui')
+
+    cd "$srcdir/$pkgbase-$pkgver"
+    make -C gnomeprint install DESTDIR="$pkgdir"
+}
+
+package_gtkhtml-sharp() {
+    pkgdesc="Mono bindings for gtkhtml"
+    depends=('gtk-sharp-2' 'gtkhtml')
+
+    cd "$srcdir/$pkgbase-$pkgver"
+    make -C gtkhtml install DESTDIR="$pkgdir"
+}
+
+package_gtksourceview2-sharp() {
+    pkgdesc="Mono bindings for gtksourceview2"
+    depends=('gtk-sharp-2' 'gtksourceview2')
+
+    cd "$srcdir/$pkgbase-$pkgver"
+    make -C gtksourceview install DESTDIR="$pkgdir"
+}
+
+package_rsvg2-sharp() {
+    pkgdesc="Mono bindings for librsvg"
+    depends=('gtk-sharp-2' 'librsvg')
+
+    cd "$srcdir/$pkgbase-$pkgver"
+    make -C rsvg install DESTDIR="$pkgdir"
+}
+
+package_vte-sharp() {
+    pkgdesc="Mono bindings for libvte"
+    depends=('gtk-sharp-2' 'vte')
+
+    cd "$srcdir/$pkgbase-$pkgver"
+    make -C vte install DESTDIR="$pkgdir"
+}
+
+package_wnck-sharp() {
+    pkgdesc="Mono bindings for libwnck"
+    depends=('gtk-sharp-2' 'libwnck')
+
+    cd "$srcdir/$pkgbase-$pkgver"
+    make -C wnck install DESTDIR="$pkgdir"
 }
diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD
index 6488fc2dd..7bf4f4cc3 100644
--- a/extra/gnome-keyring/PKGBUILD
+++ b/extra/gnome-keyring/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 120584 2011-04-25 17:40:10Z ibiru $
+#$Id: PKGBUILD 124399 2011-05-20 14:09:17Z heftig $
 # Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gnome-keyring
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs' '!makeflags')
 url="http://www.gnome.org"
 install=gnome-keyring.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('1b296fc58fb189c9632fdd8a8a8a2dbb0af97db1529af87d73e21a96c4b78c03')
+sha256sums=('ed834e5a6d87fe8a90c7c79153af3d8979740d5f8eacad6a8991ef147c924af7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD
index c8f8f333a..ab785b02e 100644
--- a/extra/gnumeric/PKGBUILD
+++ b/extra/gnumeric/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 116890 2011-03-26 01:00:08Z heftig $
+# $Id: PKGBUILD 124498 2011-05-22 15:36:35Z ibiru $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Kritoke <typeolinux@yahoo.com>
 
 pkgname=gnumeric
-pkgver=1.10.14
+pkgver=1.10.15
 pkgrel=1
 pkgdesc="A GNOME Spreadsheet Program"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org/projects/gnumeric/"
 license=('GPL')
-depends=('goffice' 'gconf' 'desktop-file-utils')
+depends=('goffice' 'gconf' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('intltool' 'python2' 'gnome-doc-utils' 'pygobject' 'psiconv')
 optdepends=('pygobject: for python plugin support'
             'psiconv: for Psion 5 file support'
@@ -17,7 +17,7 @@ optdepends=('pygobject: for python plugin support'
 install=gnumeric.install
 options=('libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('b655fa76dd2e6654b8543fbcd92982e9fdcb4c0ae113aa577ce114109deb1587')
+sha256sums=('4343a8e72bd19380d83ab5d4937388b2327e0dbb6187296e66dc7ca2d2b9025a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD
index a91420fd4..cc3b434f1 100644
--- a/extra/goffice/PKGBUILD
+++ b/extra/goffice/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 116834 2011-03-25 22:19:46Z heftig $
+# $Id: PKGBUILD 124493 2011-05-22 15:24:56Z ibiru $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=goffice
-pkgver=0.8.14
+pkgver=0.8.15
 pkgrel=1
 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org"
 license=('GPL')
 options=('!libtool')
-depends=('gconf' 'libgsf')
+depends=('gtk2' 'gconf' 'libgsf')
 makedepends=('pkgconfig' 'intltool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6f86a5361ef49c60a4a87c0d5913b001f67782c2cc3eaa13c6557087bee976de')
+sha256sums=('6a6ddf9821ff1547ef1977c276fa5a7c6842a1b4cb90c923d600283260aecf58')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index bfd548e0c..71cca0883 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 112741 2011-03-06 12:56:57Z giovanni $
+# $Id: PKGBUILD 124848 2011-05-24 19:25:12Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
 pkgname=gparted
-pkgver=0.8.0
-pkgrel=2
+pkgver=0.8.1
+pkgrel=1
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gparted.sourceforge.net"
@@ -21,18 +21,18 @@ optdepends=('e2fsprogs: for ext2/ext3 partitions'
             'gpart: for recovering corrupt partition tables')
 install=gparted.install
 source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('29adfe33df34c03b7f800ce5374e957a')
+md5sums=('ba3a434a259ae2ddcfc7f7488ee648ef')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr
-  make || return 1
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make DESTDIR="${pkgdir}" install || return 1
-  sed -i -e "s:Exec= /usr/sbin:Exec=gksu /usr/sbin:g" ${pkgdir}/usr/share/applications/gparted.desktop || return 1
+  make DESTDIR="${pkgdir}" install
+  sed -i -e "s:Exec= /usr/sbin:Exec=gksu /usr/sbin:g" ${pkgdir}/usr/share/applications/gparted.desktop
 }
diff --git a/extra/htop/ChangeLog b/extra/htop/ChangeLog
index 686b0e181..ea5776244 100644
--- a/extra/htop/ChangeLog
+++ b/extra/htop/ChangeLog
@@ -1,3 +1,6 @@
+2011-05-17  Angel Velasquez <angvp@archlinux.org>
+	* Added patch to fix --sort-key (closes FS#23224)
+
 2009-09-21  Eric Belanger  <eric@archlinux.org>
 
 	* htop 0.8.3-1
diff --git a/extra/htop/PKGBUILD b/extra/htop/PKGBUILD
index 75cb3940d..447b035a7 100644
--- a/extra/htop/PKGBUILD
+++ b/extra/htop/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 105144 2011-01-06 20:57:13Z angvp $
+# $Id: PKGBUILD 124246 2011-05-18 04:38:36Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Eric Belanger <eric@archlinux.org>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=htop
 pkgver=0.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Interactive process viewer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://htop.sourceforge.net/"
@@ -12,13 +13,17 @@ license=('GPL')
 depends=('ncurses')
 makedepends=('python2')
 options=('!emptydirs')
-source=(http://downloads.sourceforge.net/htop/${pkgname}-${pkgver}.tar.gz)
-md5sums=('7c5507f35f363f3f40183a2ba3c561f8')
+changelog=ChangeLog
+source=(http://downloads.sourceforge.net/htop/${pkgname}-${pkgver}.tar.gz
+        htop.c.patch)
+md5sums=('7c5507f35f363f3f40183a2ba3c561f8'
+         '750e8ad8476c5d9738da2a2bc7a7c2b6')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
 	sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c configure 
 	sed -i 's|python|python2|' scripts/MakeHeader.py
+    patch -Np0 -i $srcdir/htop.c.patch
 	./configure --prefix=/usr --enable-unicode --enable-openvz \
 	    --enable-vserver 
 	make 
diff --git a/extra/htop/htop.c.patch b/extra/htop/htop.c.patch
new file mode 100644
index 000000000..41a2dd377
--- /dev/null
+++ b/extra/htop/htop.c.patch
@@ -0,0 +1,15 @@
+From: Roman Kosenko <madkite@gmail.com>
+Date: Thu, 10 Mar 2011 16:23:53 +0200
+Subject: [PATCH] Fix stupid bug with --sort-key
+
+--- htop.c.old	2010-11-24 20:45:38.000000000 +0200
++++ htop.c	2011-03-10 16:32:18.473716667 +0200
+@@ -282,7 +282,7 @@
+             printVersionFlag();
+             break;
+          case 's':
+-            if (strcmp(optarg, "help")) {
++            if (!strcmp(optarg, "help")) {
+                for (int j = 1; j < LAST_PROCESSFIELD; j++)
+                   printf ("%s\n", Process_fieldNames[j]);
+                exit(0);
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index f8a341783..210e6cead 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 122250 2011-05-03 10:29:38Z andrea $
+# $Id: PKGBUILD 124831 2011-05-24 17:22:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 pkgver=4.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -16,8 +16,7 @@ groups=('kde')
 depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'qimageblitz' 'libqalculate'
          'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'libdmtx'
          'xorg-xsetroot' 'libxcomposite' 'libxinerama')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'networkmanager' 'bluez'
-             'python2' 'kdebindings-python')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python')
 replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
 conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
 install="${pkgname}.install"
@@ -28,7 +27,8 @@ backup=('usr/share/config/kdm/kdmrc'
 options=('emptydirs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-        'fixpath.patch' 'terminate-server.patch' 'nm-09.patch')
+        'fixpath.patch' 'terminate-server.patch'
+        'fix-app-launch-in-plasmoid.patch')
 sha1sums=('50103b7752defbab08965b665fa95361bb5b3ff6'
           '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
@@ -37,14 +37,16 @@ sha1sums=('50103b7752defbab08965b665fa95361bb5b3ff6'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          '91ed84f5bb99909cab1b5ca0779bbf5cf6c72d33')
+          'ca55cd0a25fd8cfb95fa3b1cdd373d496fd7312d')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
 	patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
 	patch -p0 -i ${srcdir}/fixpath.patch
 	patch -p0 -i ${srcdir}/terminate-server.patch
-    patch -p1 -i ${srcdir}/nm-09.patch
+
+    # Already fixed upstream
+    patch -p1 -i ${srcdir}/fix-app-launch-in-plasmoid.patch
 
 	cd ${srcdir}
 	mkdir build
@@ -54,7 +56,8 @@ build() {
 		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DWITH_Xmms=OFF \
-		-DWITH_Googlegadgets=OFF
+		-DWITH_Googlegadgets=OFF \
+        -DWITH_NetworkManager=OFF
 	make
 }
 
diff --git a/extra/kdebase-workspace/fix-app-launch-in-plasmoid.patch b/extra/kdebase-workspace/fix-app-launch-in-plasmoid.patch
new file mode 100644
index 000000000..fec667663
--- /dev/null
+++ b/extra/kdebase-workspace/fix-app-launch-in-plasmoid.patch
@@ -0,0 +1,22 @@
+commit 3f1dd3b94ab2b56abb43a51b7b78a9cd162325d0
+Author: Aaron Seigo <aseigo@kde.org>
+Date:   Fri May 6 22:51:50 2011 +0200
+
+    get rid of duplicate connect
+    
+    patch contributed by Luc Menut
+    BUG:262614
+    REVIEW:101284
+
+diff --git a/plasma/generic/containmentactions/applauncher/launch.cpp b/plasma/generic/containmentactions/applauncher/launch.cpp
+index cbc7175..bef53e5 100644
+--- a/plasma/generic/containmentactions/applauncher/launch.cpp
++++ b/plasma/generic/containmentactions/applauncher/launch.cpp
+@@ -36,7 +36,6 @@ AppLauncher::AppLauncher(QObject *parent, const QVariantList &args)
+ {
+     m_menu = new KMenu();
+     connect(m_menu, SIGNAL(triggered(QAction*)), this, SLOT(switchTo(QAction*)));
+-    connect(m_menu, SIGNAL(triggered(QAction*)), this, SLOT(switchTo(QAction*)));
+ 
+     m_action->setMenu(m_menu);
+ }
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
index 572d2bdb3..428e753e8 100644
--- a/extra/kdelibs/PKGBUILD
+++ b/extra/kdelibs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 122843 2011-05-06 11:48:02Z andrea $
+# $Id: PKGBUILD 124805 2011-05-24 14:15:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdelibs
 pkgver=4.6.3
-pkgrel=2
+pkgrel=3
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -19,11 +19,13 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl'
 replaces=('arts' 'kdelibs-experimental')
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch' 'abs-syntax-highlight.patch')
+        'kde-applications-menu.patch' 'archlinux-menu.patch'
+        'abs-syntax-highlight.patch' 'fix-double-POST-action.patch')
 sha1sums=('c7fb089c9d52a6b1d9188b9e788753373a3288e4'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          'd994f262356af5b9e4e9619646e471bd98c91efb')
+          'd994f262356af5b9e4e9619646e471bd98c91efb'
+          'c8ef05943e71a28c4604217d31fc6ca83e48476c')
 
 build() {
        cd ${srcdir}/${pkgname}-${pkgver}
@@ -35,6 +37,9 @@ build() {
        # add syntax highlightning for PKGBUILD and .install files
        patch -p1 -i $srcdir/abs-syntax-highlight.patch
 
+       # Already fixed upstream
+       patch -p1 -i $srcdir/fix-double-POST-action.patch
+
        cd ${srcdir}
        mkdir build
        cd build
diff --git a/extra/kdelibs/fix-double-POST-action.patch b/extra/kdelibs/fix-double-POST-action.patch
new file mode 100644
index 000000000..2672d65db
--- /dev/null
+++ b/extra/kdelibs/fix-double-POST-action.patch
@@ -0,0 +1,27 @@
+commit 92db24adfa941003db1d885df01157056617f30b
+Author: Maks Orlovich <maksim@kde.org>
+Date:   Sun May 8 14:39:03 2011 -0400
+
+    Fix the job-on-hold reuse logic, which caused the double-POST problem)
+    
+    adawit, could you please at least READ what you're backporting if you are
+    going to be this aggressive? Or better yet, please don't backport anything
+    that's not fixing a critical bug or is trivial, as per:
+    http://techbase.kde.org/Policies/Minor_Point_Release_Policy
+    
+    CCMAIL: adawit@kde.org
+    BUG: 272466
+
+diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp
+index 55da053..9f5607e 100644
+--- a/kio/kio/scheduler.cpp
++++ b/kio/kio/scheduler.cpp
+@@ -1151,7 +1151,7 @@ Slave *SchedulerPrivate::heldSlaveForJob(SimpleJob *job)
+         bool canJobReuse = (cmd == CMD_GET || cmd == CMD_MULTI_GET);
+ 
+         if (KIO::TransferJob *tJob = qobject_cast<KIO::TransferJob *>(job)) {
+-            canJobReuse = cmd == (canJobReuse || cmd == CMD_SPECIAL);
++            canJobReuse = (canJobReuse || cmd == CMD_SPECIAL);
+             if (canJobReuse) {
+                 KIO::MetaData outgoing = tJob->outgoingMetaData();
+                 const QString resume = outgoing.value("resume");
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index b3d455918..36f799fbb 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgname=kdeplasma-applets-networkmanagement
 epoch=1
-pkgver=git20110323
-_commit=986cae8974998213496a8678ad03523dba83e69d
+pkgver=git20110524
+_commit=f112886575a9c1fc8986f098db9ef84a6fb2e98e
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,15 +15,10 @@ 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}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}"
-        'nm-09.patch')
-md5sums=('3dc3b2631e0d4e4f578ef20f7802bf04'
-         'b7ad3dac9a5022c99dfd2ad0dc8549cb')
+source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}")
+md5sums=('19d139aa4e80b5829b8a898b315a0a0a')
 
 build() {
-  cd "${srcdir}/networkmanagement"
-  patch -p1 -i "${srcdir}/nm-09.patch"
-
   cd "${srcdir}"
   mkdir build
   cd build
@@ -38,5 +33,3 @@ package() {
   cd ${srcdir}/build
   make DESTDIR=${pkgdir} install
 }
-md5sums=('8373cd729b12a821b28b483e3e9d253f'
-         'c46839bc0503f2dbec76282b8ab163bd')
diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD
index 158699992..57df71c05 100644
--- a/extra/libgnome-keyring/PKGBUILD
+++ b/extra/libgnome-keyring/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 120579 2011-04-25 17:26:49Z ibiru $
+#$Id: PKGBUILD 124609 2011-05-23 13:28:25Z ibiru $
 #Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=libgnome-keyring
-pkgver=3.0.1
-pkgrel=1
+pkgver=3.0.2
+pkgrel=2
 pkgdesc="GNOME keyring client library"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
@@ -11,11 +11,14 @@ depends=('dbus-core' 'libgcrypt' 'glib2')
 makedepends=('intltool' 'pkgconfig')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('9d748842dab86914488bef039ca2c25f8ff5510daae3815643e6e00a2f69cacb')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+        fix_crash.patch)
+sha256sums=('7914ac5edae5e602ba8f7c505ecd18faa84e8482a3f4e6ee0a20aee3a24d6f5d'
+            '4b8c3d9cbc72d171b274e9ad38b01ff9f7ce92beaf1d1e89c54db70d6c4e8a6a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix_crash.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gnome-keyring
diff --git a/extra/libgnome-keyring/fix_crash.patch b/extra/libgnome-keyring/fix_crash.patch
new file mode 100644
index 000000000..1e28cdb73
--- /dev/null
+++ b/extra/libgnome-keyring/fix_crash.patch
@@ -0,0 +1,35 @@
+From 9bcac748b54e00836715b0f70be26b7cbdc8c888 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Mon, 23 May 2011 08:58:49 +0000
+Subject: Fix crash from recent memleak fix (b49e32b)
+
+make_attribute_list_va() statically copies the caller's method arguments into
+the GnomeKeyringAttributeList, so we must only free the array itself, not the
+GnomeKeyringAttribute strings.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=650840
+---
+diff --git a/library/gnome-keyring.c b/library/gnome-keyring.c
+index dc271dd..4febf47 100644
+--- a/library/gnome-keyring.c
++++ b/library/gnome-keyring.c
+@@ -2443,7 +2443,7 @@ gnome_keyring_find_itemsv (GnomeKeyringItemType                  type,
+ 	va_end (args);
+ 
+ 	ret = gnome_keyring_find_items (type, attributes, callback, data, destroy_data);
+-	gnome_keyring_attribute_list_free (attributes);
++	g_array_free (attributes, TRUE);
+ 	return ret;
+ }
+ 
+@@ -2520,7 +2520,7 @@ gnome_keyring_find_itemsv_sync  (GnomeKeyringItemType        type,
+ 	va_end (args);
+ 
+ 	ret = gnome_keyring_find_items_sync (type, attributes, found);
+-	gnome_keyring_attribute_list_free (attributes);
++	g_array_free (attributes, TRUE);
+ 	return ret;
+ }
+ 
+--
+cgit v0.9
diff --git a/extra/libgsf/PKGBUILD b/extra/libgsf/PKGBUILD
index 061dd2e68..d5343da70 100644
--- a/extra/libgsf/PKGBUILD
+++ b/extra/libgsf/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 116824 2011-03-25 21:58:52Z heftig $
+# $Id: PKGBUILD 124392 2011-05-20 13:18:16Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgbase=libgsf
 pkgname=('libgsf' 'libgsf-gnome')
-pkgver=1.14.20
+pkgver=1.14.21
 pkgrel=1
 arch=(i686 x86_64 'mips64el')
 url="http://www.gnome.org/"
@@ -13,7 +13,7 @@ makedepends=('libxml2' 'glib2' 'bzip2' 'intltool' 'pkgconfig'
              'python2' 'libbonobo' 'gconf' 'pygtk')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/1.14/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('df82cd86e472a6f8e566976eb7eb8f587aac2639c1448b14b4dbf4db7da1ada6')
+sha256sums=('eef0a9d6eca4e6af6c16b208947e3c958c428b94d22792bdd0b80c08a4b301db')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD
index ce6e6e706..742e73b6b 100644
--- a/extra/libjpeg-turbo/PKGBUILD
+++ b/extra/libjpeg-turbo/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 111658 2011-02-28 03:23:17Z allan $
+# $Id: PKGBUILD 124693 2011-05-24 03:40:20Z eric $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com>
 
 pkgname=libjpeg-turbo
-pkgver=1.1.0
+pkgver=1.1.1
 pkgrel=1
 pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libjpeg-turbo.virtualgl.org/"
 license=('GPL' 'custom')
+depends=('glibc')
 makedepends=('nasm')
 provides=('libjpeg=8.0.2')
 conflicts=('libjpeg')
 replaces=('libjpeg')
 options=('!libtool')
 source=(http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('83e6914a281d649ad289445dc20f9de4')
+md5sums=('03b9c1406c7bfdc204313c2917ce6962')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -28,6 +29,5 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir/" install
-  install -Dm644 LICENSE.txt $pkgdir/usr/share/licenses/libjpeg-turbo/LICENSE
+  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/libjpeg-turbo/LICENSE"
 }
-
diff --git a/extra/libmygpo-qt/PKGBUILD b/extra/libmygpo-qt/PKGBUILD
index 9a8fbea4d..d75e8840c 100644
--- a/extra/libmygpo-qt/PKGBUILD
+++ b/extra/libmygpo-qt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 122697 2011-05-06 06:29:29Z andrea $
+# $Id: PKGBUILD 124554 2011-05-22 22:58:16Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libmygpo-qt
-pkgver=1.0.2
+pkgver=1.0.3
 pkgrel=1
 pkgdesc="A C++/Qt client library for gpodder.net"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL2.1')
 depends=('qjson')
 makedepends=('cmake')
 source=("http://stefan.derkits.at/files/${pkgname}/${pkgname}.${pkgver}.tar.gz")
-md5sums=('6f88444c82e9840638ec16e366457dd7')
+md5sums=('0ed91cc9483f4634e8709a0ea95baeba')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libssh2/PKGBUILD b/extra/libssh2/PKGBUILD
new file mode 100644
index 000000000..ddf30e72c
--- /dev/null
+++ b/extra/libssh2/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 124297 2011-05-19 05:00:38Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: ice-man <icemanf@gmail.com>
+
+pkgname=libssh2
+pkgver=1.2.7
+pkgrel=2
+pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts"
+url="http://www.libssh2.org/"
+arch=('i686' 'x86_64')
+license=('BSD')
+depends=('openssl')
+makedepends=('zlib')
+options=('!libtool')
+source=("http://www.libssh2.org/download/${pkgname}-${pkgver}.tar.gz")
+md5sums=('a5d78344886f1282e4008c09bf568076')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/extra/libxfce4ui/PKGBUILD b/extra/libxfce4ui/PKGBUILD
index 2f4479bee..2e7e8d593 100644
--- a/extra/libxfce4ui/PKGBUILD
+++ b/extra/libxfce4ui/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 106352 2011-01-16 16:37:35Z andyrtr $
+# $Id: PKGBUILD 124354 2011-05-20 06:47:50Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>
 
 pkgname=libxfce4ui
 pkgver=4.8.0
-pkgrel=1
+pkgrel=3
 pkgdesc="share commonly used Xfce widgets among the Xfce applications"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.xfce.org/"
-groups=('xfce4')
-depends=('libxfce4util>=4.8.0' 'gtk2' "xfconf>=4.8.0" 'startup-notification') 
+depends=('libxfce4util>=4.8.0' 'gtk2' "xfconf>=4.8.0" 'libsm' 'startup-notification') 
 makedepends=('intltool' 'gtk-doc' 'glade')
 optdepends=('glade: for using the included glade module')
 #replaces=('libxfcegui4') - later when all is ported
diff --git a/extra/libxfce4util/PKGBUILD b/extra/libxfce4util/PKGBUILD
index 6b2f5a989..7855ad22c 100644
--- a/extra/libxfce4util/PKGBUILD
+++ b/extra/libxfce4util/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 106357 2011-01-16 16:41:01Z andyrtr $
+# $Id: PKGBUILD 124279 2011-05-18 16:40:43Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=libxfce4util
 pkgver=4.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Basic utility non-GUI functions for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.xfce.org/"
-groups=('xfce4')
 depends=("glib2")
 makedepends=('pkgconfig' 'intltool' 'gtk-doc')
 options=('!libtool')
diff --git a/extra/libxfcegui4/PKGBUILD b/extra/libxfcegui4/PKGBUILD
index a99ca04d9..5c7e594d0 100644
--- a/extra/libxfcegui4/PKGBUILD
+++ b/extra/libxfcegui4/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 119470 2011-04-11 17:35:10Z andyrtr $
+# $Id: PKGBUILD 124284 2011-05-18 17:58:51Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
 
 pkgname=libxfcegui4
 pkgver=4.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Various gtk widgets for Xfce"
 arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://www.xfce.org/"
-groups=('xfce4')
 depends=('startup-notification' "xfconf>=4.8.0" "libglade" 'libsm' 'hicolor-icon-theme')
 makedepends=('intltool')
 options=('!libtool')
diff --git a/extra/lsdvd/PKGBUILD b/extra/lsdvd/PKGBUILD
index 7fd464fb3..fbda54607 100644
--- a/extra/lsdvd/PKGBUILD
+++ b/extra/lsdvd/PKGBUILD
@@ -1,23 +1,28 @@
-# $Id: PKGBUILD 39761 2009-05-21 11:31:55Z jgc $
+# $Id: PKGBUILD 124465 2011-05-22 11:21:47Z andrea $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=lsdvd
 pkgver=0.16
-pkgrel=4
-pkgdesc="lsdvd is a C application for reading the contents of a DVD and printing the contents to your terminal"
-arch=(i686 x86_64 'mips64el')
-url="http://untrepid.com/acidrip/lsdvd.html"
-depends=('libdvdread>=4.1.3')
+pkgrel=5
+pkgdesc="A C application for reading the contents of a DVD and printing the contents to your terminal"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/lsdvd/"
+depends=('libdvdread')
 license=('GPL2')
 #Special thanks to Mathieu Clabaut <mathieu.clabaut@gmail.com> for patches
-source=(http://downloads.sourceforge.net/lsdvd/${pkgname}-${pkgver}.tar.gz
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
         stdint_usage.patch)
-md5sums=('340e1abe5c5e5abf7ff8031e78f49ee7' '6cbcbfde873f894bd3c784f65141b2fc')
+md5sums=('340e1abe5c5e5abf7ff8031e78f49ee7'
+         '6cbcbfde873f894bd3c784f65141b2fc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/stdint_usage.patch" || return 1
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  patch -Np1 -i "${srcdir}/stdint_usage.patch"
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index 19b9c8249..386ec0f3b 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 120268 2011-04-21 21:31:35Z giovanni $
+# $Id: PKGBUILD 124863 2011-05-24 19:57:14Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: 03/08/04 <lefungus@altern.org>
 
 pkgname=mkvtoolnix
-pkgver=4.7.0
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Set of tools to create, edit and inspect Matroska files"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
-depends=('libmatroska' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2' 'xdg-utils')
-makedepends=('wxgtk' 'boost' 'ruby')
-optdepends=('wxgtk: mkvmerge,mkvinfo and mmg GUI')
+depends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' 'boost-libs' 'lzo2' 'xdg-utils')
+makedepends=('boost' 'ruby')
 install=mkvtoolnix.install
 source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('68200debce9570fc14d934a3d6a750b5')
+md5sums=('47a730706f3da2bcf4ba62bba3a8f260')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD
index cbe919280..2df733cc2 100644
--- a/extra/moc/PKGBUILD
+++ b/extra/moc/PKGBUILD
@@ -1,11 +1,9 @@
-# $Id: PKGBUILD 107458 2011-01-25 20:51:09Z remy $
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: dorphell <dorphell@gmx.net>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# $Id: PKGBUILD 124292 2011-05-19 04:47:01Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=moc
 pkgver=2.4.4
-pkgrel=3
+pkgrel=4
 pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://moc.daper.net/"
@@ -18,27 +16,32 @@ optdepends=('speex: for using the speex plugin'
 	    'libmpcdec: for using the musepack plugin' 
             'wavpack: for using the wavpack plugin' 
 	    'libmodplug: for using the modplug plugin')
-options=('!libtool' 'force')
-source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('647c770a5542a4ae5437386807a89796')
-sha1sums=('e56ee13aa17c177f0afc42efe3804ebbbf46d4db')
+options=('!libtool')
+source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2 \
+        gcc-undefined-symbols.diff curl-streams.diff)
+md5sums=('647c770a5542a4ae5437386807a89796'
+         'efacb8559e9145e15b0c25f8fa2a9d79'
+         'bb9be1e80762851c57075c99a612af2f')
+sha1sums=('e56ee13aa17c177f0afc42efe3804ebbbf46d4db'
+          'a811a4ac7e049914aab528d3f06a6be6634c2720'
+          'a58ca952d7f3b0ede19b95c53da96c090d0a94c4')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-
-	sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' decoder_plugins/ffmpeg/ffmpeg.c
-	sed -i 's|avcodec_decode_audio|avcodec_decode_audio2|' decoder_plugins/ffmpeg/ffmpeg.c
-	# Disabling aac to use the external ffmpeg to play them (FS#13164)
-	./configure --prefix=/usr --without-rcc --without-aac \
-	    --with-oss  --with-alsa  --with-jack --with-mp3 \
-	    --with-musepack --with-vorbis --with-flac --with-wavpack \
-	    --with-sndfile --with-modplug --with-ffmpeg --with-speex \
-	    --with-samplerate --with-curl
-	make
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i ../gcc-undefined-symbols.diff
+  patch -p1 -i ../curl-streams.diff
+  sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' decoder_plugins/ffmpeg/ffmpeg.c
+  sed -i 's|avcodec_decode_audio|avcodec_decode_audio2|' decoder_plugins/ffmpeg/ffmpeg.c
+# Disabling aac to use the external ffmpeg to play them (FS#13164)
+  ./configure --prefix=/usr --without-rcc --without-aac \
+    --with-oss  --with-alsa  --with-jack --with-mp3 \
+    --with-musepack --with-vorbis --with-flac --with-wavpack \
+    --with-sndfile --with-modplug --with-ffmpeg --with-speex \
+    --with-samplerate --with-curl
+  make
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-
-	make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/moc/curl-streams.diff b/extra/moc/curl-streams.diff
new file mode 100644
index 000000000..2dbc38d54
--- /dev/null
+++ b/extra/moc/curl-streams.diff
@@ -0,0 +1,28 @@
+diff -u moc-2.4.4/io_curl.c moc-2.4.4/io_curl.c
+--- a/io_curl.c	2007-07-08 08:54:45.000000000 +0200
++++ b/io_curl.c	2011-05-18 09:09:40.000000000 +0200
+@@ -338,6 +338,8 @@
+ 			fd_set read_fds, write_fds, exc_fds;
+ 			int max_fd;
+ 			int ret;
++         long milliseconds;
++         struct timeval timeout;
+ 
+ 			logit ("Doing select()...");
+ 
+@@ -356,8 +358,14 @@
+ 			if (s->curl.wake_up_pipe[0] > max_fd)
+ 				max_fd = s->curl.wake_up_pipe[0];
+ 
++         curl_multi_timeout(s->curl.multi_handle, &milliseconds);
++         if(milliseconds <= 0)
++           milliseconds = 1000; /* just a cautionary default */
++         timeout.tv_sec = milliseconds / 1000;
++         timeout.tv_usec = (milliseconds % 1000) * 1000;
++
+ 			ret = select (max_fd + 1, &read_fds, &write_fds,
+-					&exc_fds, NULL);
++					&exc_fds, &timeout);
+ 
+ 			if (ret < 0 && errno == EINTR) {
+ 				logit ("Interrupted");
diff --git a/extra/moc/gcc-undefined-symbols.diff b/extra/moc/gcc-undefined-symbols.diff
new file mode 100644
index 000000000..09e9b8bda
--- /dev/null
+++ b/extra/moc/gcc-undefined-symbols.diff
@@ -0,0 +1,12 @@
+--- decoder.c~	2011-05-08 09:28:28.077137883 +0200
++++ decoder.c	2011-05-10 21:40:48.887941968 +0200
+@@ -259,6 +259,9 @@
+ 	for (i = 0; i < plugins_num; i++)
+ 		if (plugins[i].decoder->destroy)
+ 			plugins[i].decoder->destroy ();
++	for (i = 0; i < plugins_num; i++)
++		if (plugins[i].handle)
++                    lt_dlclose(plugins[i].handle);
+ 
+ 	if (lt_dlexit())
+ 		logit ("lt_exit() failed: %s", lt_dlerror());
diff --git a/extra/neverball/PKGBUILD b/extra/neverball/PKGBUILD
index 90812bd04..839a9a9d1 100644
--- a/extra/neverball/PKGBUILD
+++ b/extra/neverball/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 63937 2010-01-19 04:44:36Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Ben <contrasutra@myrealbox.com>
+# $Id: PKGBUILD 124594 2011-05-23 08:40:29Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=neverball
 pkgver=1.5.4
-pkgrel=2
+pkgrel=3
 pkgdesc="3D game similar to Super Monkey Ball or Marble Madness"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://neverball.org/"
 license=('GPL')
-depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg>=7' 'libvorbis' 'physfs')
+depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs')
 makedepends=('mesa')
 source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz)
 md5sums=('c523b0f72c2035831310e821162f7bd7')
@@ -17,36 +16,31 @@ sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h || return 1
+  sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h
 
   if [ "${CARCH}" = "i686" ] ;then
-    make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS="" || return 1
+    make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS=""
   else
-    make ENABLE_NLS=1 DATADIR=/usr/share/neverball || return 1
+    make ENABLE_NLS=1 DATADIR=/usr/share/neverball
   fi
+}
 
-  install -D -m755 neverball "${pkgdir}/usr/bin/neverball" || return 1
-  install -D -m755 neverputt "${pkgdir}/usr/bin/neverputt" || return 1
-  install -D -m755 mapc "${pkgdir}/usr/bin/mapc" || return 1
-
-  install -d "${pkgdir}/usr/share/neverball"
-  cp -r data/* "${pkgdir}/usr/share/neverball/" || return 1
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -d "${pkgdir}/usr/bin"
+  install -d "${pkgdir}"/usr/share/{neverball,locale,applications,pixmaps,doc/neverball}
+  install -d "${pkgdir}"/usr/share/man/man{1,6}
+
+  install -m755 neverball neverputt mapc "${pkgdir}/usr/bin"
+  cp -r locale/* "${pkgdir}/usr/share/locale/"
+  cp -r data/* "${pkgdir}/usr/share/neverball/"
+  install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/"
+  install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/"
+  install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/"
+  install -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1"
+  install -m644 dist/{neverball.6,neverputt.6} "${pkgdir}/usr/share/man/man6"
+
+  ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png"
+  ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png"
   find "${pkgdir}/usr/share/neverball" -type f -exec chmod 0644 {} \;
-
-  install -d "${pkgdir}/usr/share/locale"
-  cp -r locale/* "${pkgdir}/usr/share/locale/" || return 1
-
-  install -d "${pkgdir}/usr/share/applications"
-  install -d "${pkgdir}/usr/share/pixmaps"
-  install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/" || return 1
-  install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/" || return 1
-  ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png" || return 1
-  ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png" || return 1
-
-  install -d "${pkgdir}/usr/share/doc/neverball"
-  install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/" || return 1
-
-  install -D -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1/mapc.1" || return 1
-  install -D -m644 dist/neverball.6 "${pkgdir}/usr/share/man/man6/neverball.6" || return 1
-  install -D -m644 dist/neverputt.6 "${pkgdir}/usr/share/man/man6/neverputt.6" || return 1
 }
diff --git a/extra/parted/PKGBUILD b/extra/parted/PKGBUILD
index e22ade6ce..f64ee4525 100644
--- a/extra/parted/PKGBUILD
+++ b/extra/parted/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 82289 2010-06-10 01:52:54Z andrea $
+# $Id: PKGBUILD 124503 2011-05-22 16:56:26Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=parted
-pkgver=2.3
+pkgver=2.4
 pkgrel=1
 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ url="http://www.gnu.org/software/parted/parted.html"
 depends=('device-mapper' 'e2fsprogs')
 options=('!libtool')
 install=${pkgname}.install
-source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('30ceb6df7e8681891e865e2fe5a7903d')
+source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('b6cc55fd6e04b37b1745bc2e10d1a888')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -21,11 +21,11 @@ build() {
   ./configure --prefix=/usr \
               --disable-debug \
               --disable-rpath \
-              --disable-Werror || return 1
-  make || return 1
+              --disable-Werror
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/partitionmanager/PKGBUILD b/extra/partitionmanager/PKGBUILD
index a37d30f06..061d656eb 100644
--- a/extra/partitionmanager/PKGBUILD
+++ b/extra/partitionmanager/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 89515 2010-09-01 13:48:17Z tpowa $
+# $Id: PKGBUILD 124524 2011-05-22 18:37:51Z giovanni $
 # Maintainer:  Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Nick B <Shirakawasuna at gmail _dot_com>
 
 pkgname=partitionmanager
 pkgver=1.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A KDE 4 utility that allows you to manage disks, partitions, and file systems."
 arch=('i686' 'x86_64' 'mips64el')
 url="https://sourceforge.net/projects/partitionman/"
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index 2f2b85473..417ab5c15 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 123813 2011-05-13 12:45:42Z bisson $
+# $Id: PKGBUILD 124325 2011-05-19 16:07:15Z bisson $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgname=postfix
 pkgver=2.8.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Secure, fast, easy to administer drop in replacement for Sendmail (MTA)'
 url='http://www.postfix.org/'
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${p
         'rc.d')
 sha1sums=('2604066f158f5327449960afd6334b996dc01799'
           '5fc3de6c7df1e5851a0a379e825148868808318b'
-          '050e6afc5886049682c945ce147b3c47fe113939')
+          '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
 
 provides=('smtp-server' 'smtp-forwarder')
 replaces=('postfix-mysql' 'postfix-pgsql')
diff --git a/extra/postfix/rc.d b/extra/postfix/rc.d
index 94ccc2af0..fa314bb84 100755
--- a/extra/postfix/rc.d
+++ b/extra/postfix/rc.d
@@ -4,24 +4,23 @@
 . /etc/rc.d/functions
 
 name=postfix
-PID=$(pidof -o %PPID /usr/lib/postfix/master)
 
 case "$1" in
 start)
 	stat_busy "Starting $name daemon"
-	[[ -z "$PID" ]] && /usr/sbin/postfix start &>/dev/null \
+	/usr/sbin/postfix start &>/dev/null \
 	&& { add_daemon $name; stat_done; } \
 	|| { stat_fail; exit 1; }
 	;;
 stop)
 	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && /usr/sbin/postfix stop &>/dev/null \
+	/usr/sbin/postfix stop &>/dev/null \
 	&& { rm_daemon $name; stat_done; } \
 	|| { stat_fail; exit 1; }
 	;;
 reload)
 	stat_busy "Reloading $name daemon"
-	[[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \
+	/usr/sbin/postfix reload &>/dev/null \
 	&& { stat_done; } \
 	|| { stat_fail; exit 1; }
 	;;
diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD
index e7ed56b07..c41f9caee 100644
--- a/extra/rosegarden/PKGBUILD
+++ b/extra/rosegarden/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 109447 2011-02-09 17:52:06Z schiv $
-# Maintainer: Ray Rashif <schivmeister@gmail.com>
+# $Id: PKGBUILD 124858 2011-05-24 19:56:15Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Robert Emil Berge <robert@rebi.no>
 
 pkgname=rosegarden
-pkgver=11.02
+pkgver=11.06
 pkgrel=1
 pkgdesc="MIDI/audio sequencer and notation editor"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,7 +24,7 @@ optdepends=('lilypond: notation display'
                                      'dssi-vst: win32 VST support')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('fca86bfd7351a16cc2b55a85d2c8a128')
+md5sums=('77ab43d06de53ace338843ff82e26288')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/rsync/ChangeLog b/extra/rsync/ChangeLog
index a1d6b4f9d..d07e4ad5a 100644
--- a/extra/rsync/ChangeLog
+++ b/extra/rsync/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-17  Angel Velasquez <angvp@archlinux.org>
+    * rsync 3.0.8-2
+	* Added call_rsync func to rsyncd to support pass arguments to the daemon
+
 2010-01-01  Eric Belanger  <eric@archlinux.org>
 
 	* rsync 3.0.7-1
diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD
index 27f09a91d..a43d1440f 100644
--- a/extra/rsync/PKGBUILD
+++ b/extra/rsync/PKGBUILD
@@ -1,26 +1,27 @@
-# $Id: PKGBUILD 118437 2011-04-06 20:17:24Z angvp $
+# $Id: PKGBUILD 124256 2011-05-18 05:08:59Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 pkgname=rsync
 pkgver=3.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A file transfer program to keep remote files in sync"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://samba.anu.edu.au/rsync/"
 license=('GPL3')
 depends=('acl')
 backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync')
+changelog=ChangeLog
 source=(http://rsync.samba.org/ftp/rsync/${pkgname}-${pkgver}.tar.gz \
         rsyncd.conf rsyncd rsync.xinetd)
 md5sums=('0ee8346ce16bdfe4c88a236e94c752b4'
          '4395c0591638349b1a7aeaaa4da1f03a'
-         '3d8f90ac8467ff6af28754584a61fd11'
+         '7a9ce3b5de97f3aae29b906f93e1d157'
          'ea3e9277dc908bc51f9eddc0f6b935c1')
 sha1sums=('10e80173c7e9ed8b8a4dc9e8fdab08402da5f08d'
           '48be09294134dfed888818872fe552a59c29147a'
-          '357af5648eb4ecf84cc6b1de1cd79d21eca3a518'
+          'eda623c31d9def454cf8e3e88dcf63de4ca5c08b'
           'fdb99785bc87ee13d77aa90dc1804f3f75dd7fc1')
 
 build() {
diff --git a/extra/rsync/rsyncd b/extra/rsync/rsyncd
index 573130fb3..d7a772e8e 100644
--- a/extra/rsync/rsyncd
+++ b/extra/rsync/rsyncd
@@ -3,10 +3,16 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
+[ -f /etc/conf.d/rsyncd ] && . /etc/conf.d/rsyncd
+
+function call_rsyncd() {
+	/usr/bin/rsync --daemon $RSYNCD_ARGS
+}
+
 case "$1" in
   start)
     stat_busy "Starting rsyncd"
-    [ ! -f /var/run/daemons/rsyncd ] && /usr/bin/rsync --daemon
+    [ ! -f /var/run/daemons/rsyncd ] && call_rsyncd
     if [ $? -gt 0 ]; then
       stat_fail
     else
diff --git a/extra/rxvt-unicode/ChangeLog b/extra/rxvt-unicode/ChangeLog
new file mode 100644
index 000000000..6b3a80c20
--- /dev/null
+++ b/extra/rxvt-unicode/ChangeLog
@@ -0,0 +1,2 @@
+2011-05-17  Angel Velasquez <angvp@archlinux.org>
+	* Removed not accepted upstream patch (closes FS#23324)
diff --git a/extra/rxvt-unicode/PKGBUILD b/extra/rxvt-unicode/PKGBUILD
index 07bf9746e..86da1fd45 100644
--- a/extra/rxvt-unicode/PKGBUILD
+++ b/extra/rxvt-unicode/PKGBUILD
@@ -1,28 +1,27 @@
-# $Id: PKGBUILD 122865 2011-05-07 00:01:55Z eric $
-# Maintainer: tobias <tobias@archlinux.org>
+# $Id: PKGBUILD 124251 2011-05-18 04:52:29Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: tobias <tobias@archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
 pkgname=rxvt-unicode
 pkgver=9.11
-pkgrel=1
+pkgrel=2
 pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://software.schmorp.de/pkg/rxvt-unicode.html"
 license=('GPL')
 depends=('gcc-libs' 'libxft' 'gdk-pixbuf2')
 optdepends=('perl: lots of utilities' 'gtk2-perl: to use the urxvt-tabbed')
+changelog=ChangeLog
 source=(http://dist.schmorp.de/rxvt-unicode/${pkgname}-${pkgver}.tar.bz2 \
-        ${pkgname}.desktop popup-menu-hang.diff)
+        ${pkgname}.desktop)
 md5sums=('1bed5bfeed026e0bfafa0e9e4f62aa37'
-         '3de6c13126a45bc3bc9f6bba077a1311'
-         'aead33ba3b08eeb251fb0c1427a4a024')
+         '3de6c13126a45bc3bc9f6bba077a1311')
 sha1sums=('21d0fad9a6032dbcf2c43a85f288543c6bd5ab3d'
-          '962aebc88982dbeb62a7c4a051ff567e015f61a0'
-          'ec4013f4af3a45da928b75f40fbf6389070e7fdd')
+          '962aebc88982dbeb62a7c4a051ff567e015f61a0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 < ../popup-menu-hang.diff
   ./configure --prefix=/usr \
     --with-terminfo=/usr/share/terminfo \
     --enable-256-color \
diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD
index c235a694d..bbf5c4e21 100644
--- a/extra/seahorse/PKGBUILD
+++ b/extra/seahorse/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120604 2011-04-25 18:04:11Z ibiru $
+# $Id: PKGBUILD 124485 2011-05-22 15:13:07Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Michel Brabants <michel.linux@tiscali.be>
 
 pkgname=seahorse
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="GNOME application for managing PGP keys."
 arch=(i686 x86_64 'mips64el')
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 groups=('gnome-extra')
 install=seahorse.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('79efc22f9fe7db3d53a02be8bcf910be25aef0e321a49ec87a3a709f8aaaa912')
+sha256sums=('78b38d6e7220d1957af34eac79c21423f1f4be066853126d30cc030d8407a1bf')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD
index 3f8d411f3..577657653 100644
--- a/extra/sox/PKGBUILD
+++ b/extra/sox/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 117296 2011-03-30 18:17:00Z schiv $
+# $Id: PKGBUILD 124581 2011-05-23 04:58:46Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=sox
 pkgver=14.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sox.sourceforge.net/"
 license=('GPL' 'LGPL')
 depends=('libtool' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr')
-makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack')
+makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse')
 optdepends=('libao: for ao plugin'
             'ffmpeg: for ffmpeg plugin'
             'libmad: for mp3 plugin'
             'libid3tag: for mp3 plugin'
-            'wavpack: for wavpack plugin')
+            'wavpack: for wavpack plugin'
+            'libpulse: for pulse plugin')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('f6e1999b05d9b0cc9bb47ce8d3208dee')
@@ -22,6 +23,7 @@ sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.am
   ./configure --prefix=/usr --sysconfdir=/etc \
     --with-dyn-default --with-distro="Arch Linux"
   make
@@ -30,6 +32,4 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  ln -sf play "${pkgdir}/usr/bin/rec"
-  ln -sf ../man1/sox.1.gz "${pkgdir}/usr/share/man/man7/soxeffect.7"
 }
diff --git a/extra/startup-notification/PKGBUILD b/extra/startup-notification/PKGBUILD
index de12bc3a4..4b1dccd98 100644
--- a/extra/startup-notification/PKGBUILD
+++ b/extra/startup-notification/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 111001 2011-02-23 15:59:58Z jgc $
+# $Id: PKGBUILD 124868 2011-05-24 20:23:38Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=startup-notification
-pkgver=0.10
-pkgrel=2
+pkgver=0.12
+pkgrel=1
 pkgdesc="Monitor and display application startup"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
@@ -12,13 +12,15 @@ depends=('libx11' 'xcb-util>=0.3.4')
 options=('!libtool')
 url="http://www.freedesktop.org"
 source=(http://www.freedesktop.org/software/startup-notification/releases/${pkgname}-${pkgver}.tar.gz)
-md5sums=('bca0ed1c74bc4e483ea2ed12a5717354')
+md5sums=('2cd77326d4dcaed9a5a23a1232fb38e9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e '/AC_PATH_XTRA/d' configure.in
-  autoreconf --force --install
   ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/telepathy-qt4/PKGBUILD b/extra/telepathy-qt4/PKGBUILD
index 0d98fcdec..42f52fb2b 100644
--- a/extra/telepathy-qt4/PKGBUILD
+++ b/extra/telepathy-qt4/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 122345 2011-05-03 23:56:05Z andrea $
+# $Id: PKGBUILD 124315 2011-05-19 11:49:47Z andrea $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-qt4
-pkgver=0.5.16
+pkgver=0.6.0
 pkgrel=1
 pkgdesc="A library for Qt-based Telepathy clients"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ options=('!libtool')
 depends=('qt' 'telepathy-farsight')
 makedepends=('libxslt' 'python2' 'cmake')
 source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('82e36c051c74d323b329f69ac2c5427f')
+md5sums=('2acb266af1a3f55f7104830ac8db2090')
 
 build() {
     cd "${srcdir}"
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index 501d31141..ec0c0d91f 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 124188 2011-05-17 15:28:51Z ibiru $
+# $Id: PKGBUILD 124261 2011-05-18 07:05:56Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
-pkgver=2.30
+pkgver=2.31
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.transmissionbt.com/"
 license=('MIT')
-makedepends=('gtk2' 'intltool' 'curl' 'libnotify' 'desktop-file-utils' 'qt' 'libevent' 'libcanberra' 'dbus-glib')
+makedepends=('gtk2' 'intltool' 'curl' 'libnotify' 'qt' 'libevent' 'libcanberra' 'dbus-glib')
 source=(http://mirrors.m0k.org/transmission/files/${pkgbase}-${pkgver}.tar.bz2
         transmissiond transmissiond.conf)
-md5sums=('d812539eb6e8547614ab7d0d5c6496a8'
+md5sums=('2785016d74bbecf842cef04883e56400'
          '08875299e3fbb68fc546c1f350ac1f06'
          'be39806c35b7544856fa4070b00fc960')
 build() {
diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD
index 2ad92d911..28eff256b 100644
--- a/extra/udisks/PKGBUILD
+++ b/extra/udisks/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 122326 2011-05-03 20:32:37Z ibiru $
+# $Id: PKGBUILD 124509 2011-05-22 17:12:02Z giovanni $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=udisks
 pkgver=1.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Disk Management Service"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/udisks"
diff --git a/extra/xaw3d/PKGBUILD b/extra/xaw3d/PKGBUILD
index 7744e668a..931513921 100644
--- a/extra/xaw3d/PKGBUILD
+++ b/extra/xaw3d/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 38896 2009-05-10 18:12:17Z jgc $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
+# $Id: PKGBUILD 124576 2011-05-23 03:13:29Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xaw3d
 pkgver=1.5E
-pkgrel=2
+pkgrel=3
 pkgdesc="Three-D Athena widgets"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://directory.fsf.org/project/xaw3d/"
 license=('MIT')
 depends=('libxmu' 'libxpm')
 makedepends=('imake')
-options=('!makeflags' 'force')
+options=('!makeflags')
 source=(ftp://ftp.visi.com/users/hawkeyd/X/Xaw3d-${pkgver}.tar.gz
         Xaw3d-1.5E-xorg-imake.patch
 	Xaw3d-1.5-i18n.patch
@@ -33,17 +32,20 @@ md5sums=('29ecfdcd6bcf47f62ecfd672d31269a1'
 
 build() {
   cd "${srcdir}/xc/lib/Xaw3d"
-  patch -Np0 -i "${srcdir}/Xaw3d-1.5E-xorg-imake.patch" || return 1
-  patch -Np4 -i "${srcdir}/xaw3d.patch" || return 1
-  patch -Np4 -i "${srcdir}/Xaw3d-ia64.patch" || return 1
-  patch -Np4 -i "${srcdir}/Xaw3d-1.5-i18n.patch" || return 1
-  patch -Np4 -i "${srcdir}/Xaw3d-1.5-box.c.patch" || return 1
-  patch -Np4 -i "${srcdir}/Xaw3d-1.5-debian-fixes.patch" || return 1
-  patch -Np4 -i "${srcdir}/Xaw3d-1.5E-warnings.patch" || return 1
-
+  patch -Np0 -i "${srcdir}/Xaw3d-1.5E-xorg-imake.patch"
+  patch -Np4 -i "${srcdir}/xaw3d.patch"
+  patch -Np4 -i "${srcdir}/Xaw3d-ia64.patch"
+  patch -Np4 -i "${srcdir}/Xaw3d-1.5-i18n.patch"
+  patch -Np4 -i "${srcdir}/Xaw3d-1.5-box.c.patch"
+  patch -Np4 -i "${srcdir}/Xaw3d-1.5-debian-fixes.patch"
+  patch -Np4 -i "${srcdir}/Xaw3d-1.5E-warnings.patch"
   ln -s .. X11
-  xmkmf || return 1
+  xmkmf
   make CDEBUGFLAGS="${CFLAGS} -DARROW_SCROLLBAR"
-  make DESTDIR="${pkgdir}" SHLIBDIR=/usr/lib INCDIR=/usr/include install || return 1
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+}
+
+package() {
+  cd "${srcdir}/xc/lib/Xaw3d"
+  make DESTDIR="${pkgdir}" SHLIBDIR=/usr/lib INCDIR=/usr/include install
+  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/xfce4-settings/PKGBUILD b/extra/xfce4-settings/PKGBUILD
index 4cf84194a..c12fdbd4c 100644
--- a/extra/xfce4-settings/PKGBUILD
+++ b/extra/xfce4-settings/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 112925 2011-03-07 18:53:16Z andyrtr $
+# $Id: PKGBUILD 124328 2011-05-19 16:30:23Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: tobias <tobias funnychar archlinux.org>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 
 pkgname=xfce4-settings
-pkgver=4.8.1
-pkgrel=2
+pkgver=4.8.2
+pkgrel=1
 pkgdesc="Settings manager for xfce"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -16,7 +16,7 @@ makedepends=('intltool')
 optdepends=('libcanberra: for sound control')
 source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2
 	xfce4-settings-4.6.0.patch)
-md5sums=('0097476baadcc9bc9841d6b8e687b8eb'
+md5sums=('a45420fea20f29265ab6785cb1d07377'
          '3046732e5d73c9939e7674602eadb1e2')
 
 build() {
diff --git a/extra/xscreensaver/PKGBUILD b/extra/xscreensaver/PKGBUILD
index 65db6d384..ff9f3e5a4 100644
--- a/extra/xscreensaver/PKGBUILD
+++ b/extra/xscreensaver/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 123881 2011-05-14 00:52:40Z eric $
+# $Id: PKGBUILD 124565 2011-05-22 23:54:17Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xscreensaver
-pkgver=5.13
+pkgver=5.14
 pkgrel=1
 pkgdesc="Screen saver and locker for the X Window System"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,11 +13,11 @@ makedepends=('bc')
 backup=('etc/pam.d/xscreensaver')
 source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz \
         add-electricsheep.diff xscreensaver.pam LICENSE)
-md5sums=('a1a55b763e17c5c83a2b7cb5ddf23560'
+md5sums=('7777f2a50d6797f9757b6e078a7bea83'
          'f82524626ed8a6832cd279e0548a9b46'
          '367a3538f54db71f108b34cfa31088ac'
          '5e7f3f2a63d20a484742f5b4cb5d572c')
-sha1sums=('3bdac6122e5b7b0cffcc90b3b75dc7fa001c0181'
+sha1sums=('bfa37a9e7b2e93f54922191bb93dbc70c2f73772'
           '65c2933380267475f2c4560bc22f4350393b00ce'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           '4209ea586b204fd1d81c382a0522c654f9fd9134')
diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD
index c68a296b4..07c965bff 100644
--- a/extra/yelp/PKGBUILD
+++ b/extra/yelp/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 120703 2011-04-26 05:18:34Z jgc $
+# $Id: PKGBUILD 124709 2011-05-24 06:57:26Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=yelp
-pkgver=3.0.2
+pkgver=3.0.3
 pkgrel=1
 pkgdesc="A help browser for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 install=yelp.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('6de6c45439b21a3042236d5d836de9dd44d59c2d4c324982c316b4b6834ce0a4')
+sha256sums=('938b50b63f2783d8f87ce2e6ebb622dcfc7cb2d81b39278d1298c5f3bdf236b9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
author	Joshua Ismael Haase Hernandez <hahj87@gmail.com>	2011-05-26 11:13:51 -0500
committer	Joshua Ismael Haase Hernandez <hahj87@gmail.com>	2011-05-26 11:13:51 -0500
commit	b18caf89fb235f174419d578a7da0237e456ef3d (patch)
tree	9a9f7e391135f5ce2b05b3956ced1a00bd664bbb /extra
parent	a084559f421a288dd77f81e458161f95ae8d1be9 (diff)
parent	6e35be4b44d90f92ddceb8b067cbbf03fc652a35 (diff)