Wed May 25 22:48:05 UTC 2011

17 files changed, 134 insertions, 79 deletions

diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD
index 493ed8cd4..9e67ecb21 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')
@@ -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 30d380643..4cda3965f 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')
@@ -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/bind/PKGBUILD b/extra/bind/PKGBUILD
index 371393099..5af689c41 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')
@@ -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/ecasound/PKGBUILD b/extra/ecasound/PKGBUILD
index 2b7c0b06a..185581224 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')
@@ -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/gcalctool/PKGBUILD b/extra/gcalctool/PKGBUILD
index 6c027742d..c4c19605c 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')
@@ -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/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index ca121a0f4..c4757a5df 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 124506 2011-05-22 17:04:27Z 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=3
+pkgver=0.8.1
+pkgrel=1
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64')
 url="http://gparted.sourceforge.net"
@@ -21,7 +21,7 @@ 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}"
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 8211dd1d7..0bc1f7a37 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')
 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 0f4a867d4..006f488d8 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')
 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 f371a1859..a0628a309 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')
@@ -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/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index f2f5025d5..f0d957de4 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')
 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/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD
index 8362e9f18..e3227ab9d 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')
@@ -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/startup-notification/PKGBUILD b/extra/startup-notification/PKGBUILD
index c3e5760a6..eac3df02e 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)
 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/yelp/PKGBUILD b/extra/yelp/PKGBUILD
index 1fb51459d..ebffe3b7f 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')
@@ -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}"