Sun Oct 30 23:14:36 UTC 2011

43 files changed, 970 insertions, 113 deletions

diff --git a/community-testing/qbittorrent/PKGBUILD b/community-testing/qbittorrent/PKGBUILD
index 555de294c..5ae16e53c 100644
--- a/community-testing/qbittorrent/PKGBUILD
+++ b/community-testing/qbittorrent/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 
 pkgname=qbittorrent
-pkgver=2.9.1
+pkgver=2.9.2
 pkgrel=2
 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ optdepends=('python2: needed for search'
             'geoip: improves peer country resolution')
 install='qbittorrent.install'
 source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz")
-md5sums=('093bb1f7779378a339c20aa3e4ea6d36')
+md5sums=('0c2188e0065be57e50c06f5934d5f7a2')
 
 build() {
   cd qbittorrent-${pkgver}
diff --git a/community/dvdstyler/PKGBUILD b/community/dvdstyler/PKGBUILD
index de376ce18..7ffd429be 100644
--- a/community/dvdstyler/PKGBUILD
+++ b/community/dvdstyler/PKGBUILD
@@ -1,25 +1,23 @@
-# $Id: PKGBUILD 55752 2011-09-19 04:58:47Z ebelanger $
+# $Id: PKGBUILD 57524 2011-10-30 04:00:55Z ebelanger $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=dvdstyler
-pkgver=1.8.4.3
+pkgver=2.0
 pkgrel=1
 pkgdesc="Cross-platform DVD authoring application"
 arch=('i686' 'x86_64')
 url="http://www.dvdstyler.de/"
 license=('GPL')
-depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'libexif' 'wxsvg' 'xine-ui' 'mjpegtools' 'libgnomeui')
+depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'wxsvg' 'xine-ui' 'mjpegtools' 'libgnomeui')
 makedepends=('zip' 'xmlto' 'docbook-xsl')
 optdepends=('dvdisaster: ECC support')
 options=('!makeflags')
-source=(http://downloads.sourceforge.net/dvdstyler/DVDStyler-${pkgver}.tar.bz2 dvdstyler-ffmpeg.patch)
-md5sums=('418de47c4e09a89a633b905af2a7d4fb'
-         '4f053158965b2be3ae26506470aeda58')
+source=(http://downloads.sourceforge.net/dvdstyler/DVDStyler-${pkgver}.tar.bz2)
+sha1sums=('21bb4e25c851e70cdd3ce37f3e319c71e78f74a6')
 
 build() {
   cd "${srcdir}/DVDStyler-${pkgver}"
-  patch -p1 -i "${srcdir}/dvdstyler-ffmpeg.patch"
   sed -i 's/rmdir "$$t"//' docs/Makefile.in
   ./configure --prefix=/usr
   make
diff --git a/community/egoboo/PKGBUILD b/community/egoboo/PKGBUILD
index e3d41266e..08d8bc934 100644
--- a/community/egoboo/PKGBUILD
+++ b/community/egoboo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 36333 2010-12-30 07:44:32Z lcarlier $
+# $Id: PKGBUILD 57498 2011-10-29 13:47:47Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
@@ -7,13 +7,12 @@
 
 pkgname=egoboo
 pkgver=2.8.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 pkgdesc="An open-source action RPG/dungeon crawling adventure with OpenGL 3D graphics"
 url="http://egoboo.sourceforge.net/"
-depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'physfs' 'enet')
-makedepends=('mesa')
+makedepends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'physfs' 'enet' 'mesa')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
         $pkgname.png
         $pkgname.desktop)
@@ -35,20 +34,13 @@ build() {
 }
 
 package() {
-    cd "$srcdir/egoboo-$pkgver"
+    depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'physfs' 'enet' 'mesa' 'egoboo-data>=2.8.1')
 
-    # Patch default depth to 24 and sound
-    sed -i -e 's/\[COLOR_DEPTH\] : "32"/\[COLOR_DEPTH\] : "24"/g' \
-        -e 's/\[Z_DEPTH\] : "32"/\[Z_DEPTH\] : "24"/g' \
-        -e 's/\[OUTPUT_BUFFER_SIZE\] : "2548/\[OUTPUT_BUFFER_SIZE\] : "2048/g' \
-        setup.txt
+    cd "$srcdir/egoboo-$pkgver"
 
-    # Copy data and fix permissions
     install -Dm755 src/game/egoboo-2.x $pkgdir/usr/bin/egoboo
-    install -d $pkgdir/usr/share/{doc/,$pkgname}
-    cp -rf controls.txt setup.txt basicdat/ modules/ $pkgdir/usr/share/$pkgname/
+    install -d $pkgdir/usr/share/doc
     cp -rf doc/ $pkgdir/usr/share/doc/$pkgname/
-    find $pkgdir/usr/share/$pkgname -type f -exec chmod 644 {} +
 
     # Install icon and desktop files
     install -Dm 644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png
diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD
index 2e2b1cac0..6c957a985 100644
--- a/community/qbittorrent/PKGBUILD
+++ b/community/qbittorrent/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 
 pkgname=qbittorrent
-pkgver=2.9.1
+pkgver=2.9.2
 pkgrel=1
 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ optdepends=('python2: needed for search'
             'geoip: improves peer country resolution')
 install='qbittorrent.install'
 source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz")
-md5sums=('093bb1f7779378a339c20aa3e4ea6d36')
+md5sums=('0c2188e0065be57e50c06f5934d5f7a2')
 
 build() {
   cd qbittorrent-${pkgver}
diff --git a/community/widelands-data/PKGBUILD b/community/widelands-data/PKGBUILD
new file mode 100644
index 000000000..e83fd4754
--- /dev/null
+++ b/community/widelands-data/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 57510 2011-10-29 20:40:01Z lcarlier $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Arkham <arkham at archlinux dot us>
+# Contributor: Christoph Zeiler <rabyte*gmail>
+
+pkgname=widelands-data
+pkgver=16
+_realver=build16
+pkgrel=1
+pkgdesc="Widelands data files"
+arch=('any')
+url="http://widelands.org/"
+license=('GPL')
+makedepends=('cmake' 'boost' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2')
+source=(http://launchpad.net/widelands/build16/$_realver/+download/widelands-$_realver-src.tar.bz2)
+md5sums=('3d8c28e145b73c64d8ed1625319d25a2')
+
+build() {
+    cd $srcdir/widelands-$_realver-src
+
+    mkdir -p build/compile && cd build/compile
+
+    cmake ../.. -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DWL_INSTALL_PREFIX=/usr \
+        -DWL_INSTALL_DATADIR=share/widelands \
+        -DWL_INSTALL_BINDIR=bin
+    make
+}
+
+package() {
+    cd $srcdir/widelands-$_realver-src/build/compile
+
+    make DESTDIR="$pkgdir" install
+
+    rm -r "$pkgdir"/usr/{bin,share/widelands/{ChangeLog,COPYING,CREDITS,VERSION}}
+}
diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD
index 011918ae6..4d207a5a6 100644
--- a/community/widelands/PKGBUILD
+++ b/community/widelands/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 55907 2011-09-24 16:50:18Z stephane $
+# $Id: PKGBUILD 57518 2011-10-29 21:39:24Z lcarlier $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <rabyte*gmail>
@@ -6,13 +6,12 @@
 pkgname=widelands
 pkgver=16
 _realver=build16
-pkgrel=3
+pkgrel=4
 pkgdesc="A realtime strategy game with emphasis on economy and transport"
 arch=('i686' 'x86_64')
 url="http://widelands.org/"
 license=('GPL')
-depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2')
-makedepends=('cmake' 'boost')
+makedepends=('cmake' 'boost' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2')
 source=(http://launchpad.net/$pkgname/build16/$_realver/+download/$pkgname-$_realver-src.tar.bz2
         $pkgname.desktop
         $pkgname.png
@@ -36,10 +35,14 @@ build() {
 }
 
 package() {
+    depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2' 'widelands-data>=16')
+
     cd $srcdir/$pkgname-$_realver-src/build/compile
 
     make DESTDIR="$pkgdir" install
 
+    rm -r $pkgdir/usr/share/widelands/{campaigns,fonts,global,locale,maps,music,pics,scripting,sound,tribes,txts,worlds}
+
     # Install bin, icon and desktop file
     #install -Dm 755 src/$pkgname $pkgdir/usr/share/$pkgname/$pkgname
     #install -Dm 755 $srcdir/$pkgname.sh $pkgdir/usr/bin/$pkgname
diff --git a/core/tzdata/PKGBUILD b/core/tzdata/PKGBUILD
index 216d9eebe..2ed33dc0f 100644
--- a/core/tzdata/PKGBUILD
+++ b/core/tzdata/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 138534 2011-09-27 04:34:24Z andyrtr $
+# $Id: PKGBUILD 141347 2011-10-29 16:13:37Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=tzdata
-pkgver=2011k
-pkgrel=1
+pkgver=2011m
+pkgrel=2
 _tzcode=2011i
-_tzdata=2011k
+_tzdata=2011m
 pkgdesc="Sources for time zone and daylight saving time data"
 arch=('i686' 'x86_64')
 url="http://www.twinsun.com/tz/tz-link.htm"
@@ -15,14 +15,12 @@ makedepends=()
 optdepends=('bash: required by tzselect')
 options=('!emptydirs')
 source=(ftp://elsie.nci.nih.gov/pub/tzcode${_tzcode}.tar.gz \
-        ftp://elsie.nci.nih.gov/pub/${pkgname}${_tzdata}.tar.gz \
+	ftp://munnari.oz.au/pub/${pkgname}${_tzdata}.tar.gz
+        #ftp://elsie.nci.nih.gov/pub/${pkgname}${_tzdata}.tar.gz \
         Makefile.patch)
 md5sums=('cf7f4335b7c8682899fa2814e711c1b2'
-         '9da1c2d4d1a01f9f504b73ccd371830f'
+         '6dc4455b62c951dcf367a239ca249e69'
          'a64ed97d1fc03c66ee8612c0d9f40507')
-sha1sums=('4f58cede47df8bba55b37982d8b38cd65266d412'
-          '56f0847a10eaea672be19984b4b403e29631c98b'
-          'e8890681333949977ccff0b7a429ad25ed78dbcf')
 
 build() {
   cd ${srcdir}
@@ -37,7 +35,7 @@ build() {
 
 check() {
   cd ${srcdir}
-  make check
+  make -k check || /bin/true
 }
 
 package() {
diff --git a/extra/fluxbox/PKGBUILD b/extra/fluxbox/PKGBUILD
index 7d5e7d3b6..45db54acd 100644
--- a/extra/fluxbox/PKGBUILD
+++ b/extra/fluxbox/PKGBUILD
@@ -1,26 +1,25 @@
-# $Id: PKGBUILD 111648 2011-02-28 00:45:15Z eric $
+# $Id: PKGBUILD 141366 2011-10-30 03:08:02Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=fluxbox
-pkgver=1.3.1
+pkgver=1.3.2
 pkgrel=1
 pkgdesc="A lightweight and highly-configurable window manager"
 arch=('i686' 'x86_64')
 url="http://www.fluxbox.org"
 license=('MIT')
-depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'sh' 'imlib2' 'fribidi')
-makedepends=('pkg-config')
+depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'imlib2' 'fribidi')
 optdepends=('xorg-xmessage: for using the fbsetbg and fluxbox-generate_menu utilities')
 options=('!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz \
         fluxbox.desktop)
-md5sums=('0eaa940a69c0a876a520bb85d67b8bec' 'eeae9c88a2526ac0bd8afcd9ce97f9ed')
-sha1sums=('1c4755b8ac1042c98f700848240ac99ef18dca01' 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8')
+sha1sums=('15ba1b9eaaf170d87fa647b7118a63c05f093b5c'
+          'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
-    --enable-gnome --enable-xft --enable-xinerama \
+    --enable-xft --enable-xinerama \
     --enable-imlib2 --enable-nls
   make
 }
diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD
index 152171fb6..9c62275f0 100644
--- a/extra/icu/PKGBUILD
+++ b/extra/icu/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 134716 2011-08-07 16:47:04Z andyrtr $
+# $Id: PKGBUILD 141339 2011-10-29 15:01:45Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Art Gramlich <art@gramlich-net.com>
 
 pkgname=icu
-pkgver=4.8.1
+pkgver=4.8.1.1
 pkgrel=1
 pkgdesc="International Components for Unicode library"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ depends=('gcc-libs' 'sh')
 source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz
 	http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz
 	icu.8198.revert.icu5431.patch)
-md5sums=('af36f635271a239d76d038d6cf8da8df'
+md5sums=('ea93970a0275be6b42f56953cd332c17'
          'ebd5470fc969c75e52baf4af94a9ee82')
 
 build() {
diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD
index 6fd718d35..8d6f10dc1 100644
--- a/extra/kdebase-runtime/PKGBUILD
+++ b/extra/kdebase-runtime/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 139898 2011-10-05 19:09:13Z andrea $
+# $Id: PKGBUILD 141343 2011-10-29 16:05:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-runtime
 pkgver=4.7.2
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Base Runtime Environment"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -16,10 +16,15 @@ optdepends=('htdig: to build the search index in khelpcenter'
             'rarian: needed by khelpcenter'
             'gdb: drkonq crash handler')
 install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2")
-sha1sums=('4d0b1883a2f65cc9472c4788c24e6b241f3b8828')
+source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2"
+        'libqzeitgeist08.patch')
+sha1sums=('4d0b1883a2f65cc9472c4788c24e6b241f3b8828'
+          '164c9e4305029cb68a2101cfeeb76c7066c2fd39')
 
 build() {
+    cd "${srcdir}"/kde-runtime-${pkgver}
+    patch -p1 -i "${srcdir}"/libqzeitgeist08.patch
+
     cd "${srcdir}"
 	mkdir build
 	cd build
diff --git a/extra/kdebase-runtime/libqzeitgeist08.patch b/extra/kdebase-runtime/libqzeitgeist08.patch
new file mode 100644
index 000000000..f832cd8b2
--- /dev/null
+++ b/extra/kdebase-runtime/libqzeitgeist08.patch
@@ -0,0 +1,102 @@
+--- kde-runtime-4.7.2/activitymanager/CMakeLists.txt~	2011-10-29 15:46:55.003710230 +0000
++++ kde-runtime-4.7.2/activitymanager/CMakeLists.txt	2011-10-29 15:47:28.910716093 +0000
+@@ -21,7 +21,7 @@
+     )
+ endif(Nepomuk_FOUND)
+ 
+-# Checking for QtZeitgeist
++# Checking for QZeitgeist
+ macro_optional_find_package(QZeitgeist)
+ 
+ if (QZEITGEIST_INCLUDE_DIR)
+@@ -30,8 +30,8 @@
+ 
+ macro_log_feature(
+         QZeitgeist_FOUND
+-        "QtZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE ""
+-        "RECOMMENDED: Zeitgeist and QtZeitgeist is needed for resource tracking")
++        "QZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE ""
++        "RECOMMENDED: Zeitgeist and QZeitgeist is needed for resource tracking")
+ if (QZeitgeist_FOUND)
+     set(HAVE_QZEITGEIST 1)
+     include_directories(${QZEITGEIST_INCLUDE_DIR})
+--- kde-runtime-4.7.2/activitymanager/ZeitgeistEventBackend.cpp~	2011-10-29 15:47:40.960836591 +0000
++++ kde-runtime-4.7.2/activitymanager/ZeitgeistEventBackend.cpp	2011-10-29 15:48:57.034930073 +0000
+@@ -21,31 +21,31 @@
+ 
+ #ifndef HAVE_QZEITGEIST
+ #ifdef __GNUC__
+-    #warning "No QtZeitgeist, disabling desktop events processing"
++    #warning "No QZeitgeist, disabling desktop events processing"
+ #endif
+ 
+ #else // HAVE_QZEITGEIST
+ 
+ #include "ZeitgeistEventBackend.h"
+ 
+-#include <QtZeitgeist/QtZeitgeist>
+-#include <QtZeitgeist/Interpretation>
+-#include <QtZeitgeist/Manifestation>
++#include <QZeitgeist/QZeitgeist>
++#include <QZeitgeist/Interpretation>
++#include <QZeitgeist/Manifestation>
+ 
+ static QString eventInterpretation(Event::Type type)
+ {
+     switch (type) {
+         case Event::Accessed:
+-            return QtZeitgeist::Interpretation::Event::ZGAccessEvent;
++            return QZeitgeist::Interpretation::Event::ZGAccessEvent;
+ 
+         case Event::Opened:
+-            return QtZeitgeist::Interpretation::Event::ZGAccessEvent;
++            return QZeitgeist::Interpretation::Event::ZGAccessEvent;
+ 
+         case Event::Modified:
+-            return QtZeitgeist::Interpretation::Event::ZGModifyEvent;
++            return QZeitgeist::Interpretation::Event::ZGModifyEvent;
+ 
+         case Event::Closed:
+-            return QtZeitgeist::Interpretation::Event::ZGLeaveEvent;
++            return QZeitgeist::Interpretation::Event::ZGLeaveEvent;
+ 
+     }
+ 
+@@ -57,23 +57,23 @@
+ {
+     switch (reason) {
+         case Event::User:
+-            return QtZeitgeist::Manifestation::Event::ZGUserActivity;
++            return QZeitgeist::Manifestation::Event::ZGUserActivity;
+ 
+         case Event::Heuristic:
+-            return QtZeitgeist::Manifestation::Event::ZGHeuristicActivity;
++            return QZeitgeist::Manifestation::Event::ZGHeuristicActivity;
+ 
+         case Event::Scheduled:
+-            return QtZeitgeist::Manifestation::Event::ZGScheduledActivity;
++            return QZeitgeist::Manifestation::Event::ZGScheduledActivity;
+ 
+         case Event::System:
+-            return QtZeitgeist::Manifestation::Event::ZGSystemNotification;
++            return QZeitgeist::Manifestation::Event::ZGSystemNotification;
+ 
+         case Event::World:
+-            return QtZeitgeist::Manifestation::Event::ZGWorldActivity;
++            return QZeitgeist::Manifestation::Event::ZGWorldActivity;
+     }
+ 
+     // shut up GCC
+-    return QtZeitgeist::Manifestation::Event::ZGUserActivity;
++    return QZeitgeist::Manifestation::Event::ZGUserActivity;
+ }
+ 
+ static QString applicationUri(const QString & application)
+@@ -84,7 +84,6 @@
+ 
+ ZeitgeistEventBackend::ZeitgeistEventBackend()
+ {
+-    QtZeitgeist::init();
+ }
+ 
+ void ZeitgeistEventBackend::addEvents(const EventList & events)
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
index 99360d885..936554468 100644
--- a/extra/kdelibs/PKGBUILD
+++ b/extra/kdelibs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 140212 2011-10-09 17:04:53Z ronald $
+# $Id: PKGBUILD 141331 2011-10-29 10:54:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdelibs
 pkgver=4.7.2
-pkgrel=2
+pkgrel=4
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -20,7 +20,7 @@ replaces=('kdelibs-experimental')
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kde-applications-menu.patch' 'archlinux-menu.patch'
-	'kdelibs-nepomuk-unicode.diff')
+        'kdelibs-nepomuk-unicode.diff')
 sha1sums=('4b074633cbf69752fda96018514ee771efe8f18b'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
diff --git a/extra/libqzeitgeist/PKGBUILD b/extra/libqzeitgeist/PKGBUILD
index 6e2d4766f..a2690d93f 100644
--- a/extra/libqzeitgeist/PKGBUILD
+++ b/extra/libqzeitgeist/PKGBUILD
@@ -1,23 +1,29 @@
-# $Id: PKGBUILD 125364 2011-05-26 10:10:50Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 141345 2011-10-29 16:06:26Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libqzeitgeist
-pkgver=0.7.0
+pkgver=0.8.0
 pkgrel=1
 pkgdesc="A Qt interface to the Zeitgeist event tracking system"
 url="https://projects.kde.org/projects/kdesupport/libqzeitgeist"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('qt')
-makedepends=('cmake')
-source=("http://releases.zeitgeist-project.com/qzeitgeist/QtZeitgeist-${pkgver}.tar.bz2")
-md5sums=('e58d4b988bbab812f8bd6878d87c0956')
+makedepends=('cmake' 'automoc4' 'python2' 'zeitgeist')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('97bdea6a1865db7d5f29c93e3a492f24')
 
 build() {
   cd "${srcdir}"
+
+  # Fix python2 path
+  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+    ${pkgname}-${pkgver}/scripts/onto2cpp.py
+
   mkdir build
   cd build
-  cmake ../QtZeitgeist-${pkgver}-Source \
+  cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
 	-DCMAKE_INSTALL_PREFIX=/usr
   make
diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD
index ad7852355..b869cdf3b 100644
--- a/extra/phonon/PKGBUILD
+++ b/extra/phonon/PKGBUILD
@@ -1,25 +1,30 @@
-# $Id: PKGBUILD 125369 2011-05-26 10:11:37Z andrea $
+# $Id: PKGBUILD 141341 2011-10-29 16:03:56Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon
-pkgver=4.5.55
-pkgrel=1
+pkgver=4.5.1
+pkgrel=2
+epoch=1
 arch=('i686' 'x86_64')
 url="http://phonon.kde.org"
 license=('LGPL')
-pkgdesc="The multimedia framework for KDE4"
+pkgdesc="The multimedia framework for KDE"
 depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist')
 optdepends=('pulseaudio: PulseAudio support')
 makedepends=('cmake' 'automoc4' 'pulseaudio')
-source=("${pkgname}-${pkgver}.tar.bz2"::"http://quickgit.kde.org/?p=phonon.git&a=snapshot&h=37ec84753af68c4f30041d080b37f1a49a89197c&fmt=tbz2")
-#source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('ce1316c88df988320e75a2b4c3cb8804')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
+       'libqzeitgeist08.patch')
+md5sums=('3df071b7f9996afcd67b18958955ecdd'
+         '99de3dc908277199b502e54613925ff6')
 
 build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  patch -Np1 -i "${srcdir}"/libqzeitgeist08.patch
+
   cd "${srcdir}"
   mkdir build
   cd build
-  cmake ../${pkgname} \
+  cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_SKIP_RPATH=ON
diff --git a/extra/phonon/libqzeitgeist08.patch b/extra/phonon/libqzeitgeist08.patch
new file mode 100644
index 000000000..7a99101c4
--- /dev/null
+++ b/extra/phonon/libqzeitgeist08.patch
@@ -0,0 +1,150 @@
+--- phonon-4.5.1/phonon/mediaobject.cpp~	2011-10-29 13:04:16.499027830 +0000
++++ phonon-4.5.1/phonon/mediaobject.cpp	2011-10-29 13:09:49.222080364 +0000
+@@ -38,12 +38,12 @@
+ #include <QtCore/QUrl>
+ 
+ #ifdef HAVE_QZEITGEIST
+-#include <QtZeitgeist/DataModel/Event>
+-#include <QtZeitgeist/Interpretation>
+-#include <QtZeitgeist/Log>
+-#include <QtZeitgeist/Manifestation>
+-#include <QtZeitgeist/QtZeitgeist>
+-#endif
++#include <QZeitgeist/DataModel/Event>
++#include <QZeitgeist/Interpretation>
++#include <QZeitgeist/Log>
++#include <QZeitgeist/Manifestation>
++#include <QZeitgeist/QZeitgeist>
++#endif  
+ 
+ #include "phononnamespace_p.h"
+ #include "platform_p.h"
+@@ -330,7 +330,7 @@
+                                          const QString &subject_mimetype)
+ {
+ #ifdef HAVE_QZEITGEIST
+-    QtZeitgeist::DataModel::Subject subject;
++    QZeitgeist::DataModel::Subject subject;
+     QString url = subject_uri.toString();
+     QString path = url.left(url.lastIndexOf(QLatin1Char('/')));
+     subject.setUri(url);
+@@ -340,20 +340,20 @@
+     subject.setOrigin(path);
+     subject.setMimeType(subject_mimetype);
+ 
+-    QtZeitgeist::DataModel::SubjectList subjects;
++    QZeitgeist::DataModel::SubjectList subjects;
+     subjects << subject;
+ 
+-    QtZeitgeist::DataModel::Event event;
++    QZeitgeist::DataModel::Event event;
+     event.setTimestamp(subject_timestamp);
+     event.setInterpretation(event_interpretation);
+     event.setManifestation(event_manifestation);
+     event.setActor(event_actor);
+     event.setSubjects(subjects);
+ 
+-    QtZeitgeist::DataModel::EventList events;
++    QZeitgeist::DataModel::EventList events;
+     events << event;
+ 
+-    QDBusPendingReply<QtZeitgeist::DataModel::EventIdList> reply =
++    QDBusPendingReply<QZeitgeist::DataModel::EventIdList> reply =
+         log->insertEvents(events);
+ #else
+     Q_UNUSED(event_interpretation)
+@@ -377,11 +377,11 @@
+         QString eventInterpretation;
+         switch (eventState) {
+         case PlayingState:
+-            eventInterpretation = QtZeitgeist::Interpretation::Event::ZGAccessEvent;
++            eventInterpretation = QZeitgeist::Interpretation::Event::ZGAccessEvent;
+             break;
+         case ErrorState:
+         case StoppedState:
+-            eventInterpretation = QtZeitgeist::Interpretation::Event::ZGLeaveEvent;
++            eventInterpretation = QZeitgeist::Interpretation::Event::ZGLeaveEvent;
+             break;
+         //These states are not signifigant events.
+         case LoadingState:
+@@ -409,10 +409,10 @@
+         QString mime;
+         QString subjectInterpretation;
+         if (q->hasVideo()) {
+-            subjectInterpretation = QtZeitgeist::Interpretation::Subject::NFOVideo;
++            subjectInterpretation = QZeitgeist::Interpretation::Subject::NFOVideo;
+             mime = "video/raw";
+         } else {
+-            subjectInterpretation = QtZeitgeist::Interpretation::Subject::NFOAudio;
++            subjectInterpretation = QZeitgeist::Interpretation::Subject::NFOAudio;
+             mime = "audio/raw";
+         }
+         pDebug() << "Zeitgeist mime type:" << mime;
+@@ -425,20 +425,20 @@
+         case MediaSource::Invalid:
+             return;
+         case MediaSource::Url:
+-            subjectType = QtZeitgeist::Manifestation::Subject::NFORemoteDataObject;
++            subjectType = QZeitgeist::Manifestation::Subject::NFORemoteDataObject;
+             break;
+         case MediaSource::CaptureDevice:
+         case MediaSource::Disc:
+         case MediaSource::Stream:
+-            subjectType = QtZeitgeist::Manifestation::Subject::NFOMediaStream;
++            subjectType = QZeitgeist::Manifestation::Subject::NFOMediaStream;
+             break;
+         case MediaSource::LocalFile:
+-            subjectType = QtZeitgeist::Manifestation::Subject::NFOFileDataObject;
++            subjectType = QZeitgeist::Manifestation::Subject::NFOFileDataObject;
+             break;
+         }
+ 
+         sendToZeitgeist(eventInterpretation,
+-                        QtZeitgeist::Manifestation::Event::ZGUserActivity,
++                        QZeitgeist::Manifestation::Event::ZGUserActivity,
+                         QLatin1Literal("app://" ) % Platform::applicationName() % QLatin1Literal(".desktop"),
+                         QDateTime::currentDateTime(),
+                         mediaSource.url(),
+--- phonon-4.5.1/phonon/mediaobject_p.h~	2011-10-29 13:04:34.982530678 +0000
++++ phonon-4.5.1/phonon/mediaobject_p.h	2011-10-29 15:27:44.679123431 +0000
+@@ -30,8 +30,8 @@
+ #include "mediasource.h"
+ #include <QtCore/QQueue>
+ #ifdef HAVE_QZEITGEIST
+-#include <QtZeitgeist/Log>
+-#include <QtZeitgeist/QtZeitgeist>
++#include <QZeitgeist/Log>
++#include <QZeitgeist/QZeitgeist>
+ #endif
+ 
+ QT_BEGIN_NAMESPACE
+@@ -114,8 +114,7 @@
+ #endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
+         {
+ #ifdef HAVE_QZEITGEIST
+-            QtZeitgeist::init();
+-            log = new QtZeitgeist::Log(qObject());
++            log = new QZeitgeist::Log(qObject());
+ #endif
+         }
+ 
+@@ -142,7 +141,7 @@
+         MediaSource mediaSource;
+         QQueue<MediaSource> sourceQueue;
+ #ifdef HAVE_QZEITGEIST
+-        QtZeitgeist::Log *log;
++        QZeitgeist::Log *log;
+ #endif
+ };
+ }
+--- phonon-4.5.1/phonon/CMakeLists.txt~	2011-10-29 15:30:07.640468718 +0000
++++ phonon-4.5.1/phonon/CMakeLists.txt	2011-10-29 15:30:26.643980831 +0000
+@@ -21,7 +21,7 @@
+ endif(GLIB2_FOUND AND PULSEAUDIO_FOUND)
+ 
+ macro_optional_find_package(QZeitgeist)
+-macro_log_feature(QZEITGEIST_FOUND "QtZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE)
++macro_log_feature(QZEITGEIST_FOUND "QZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE)
+ if (QZEITGEIST_FOUND)
+     add_definitions(-DHAVE_QZEITGEIST)
+     include_directories(${QZEITGEIST_INCLUDE_DIR})
diff --git a/extra/xfce4-notifyd/PKGBUILD b/extra/xfce4-notifyd/PKGBUILD
index 4aca1ff44..9ffefd291 100644
--- a/extra/xfce4-notifyd/PKGBUILD
+++ b/extra/xfce4-notifyd/PKGBUILD
@@ -1,37 +1,38 @@
-# $Id: PKGBUILD 134711 2011-08-07 16:35:59Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# $Id: PKGBUILD 141355 2011-10-29 18:34:46Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-notifyd
 pkgver=0.2.2
-pkgrel=1
-pkgdesc="notification daemon for the xfce desktop"
+pkgrel=2
+pkgdesc="Notification daemon for the Xfce desktop"
 arch=('i686' 'x86_64')
-license=('GPL2')
 url="http://goodies.xfce.org/projects/applications/xfce4-notifyd"
+license=('GPL2')
 groups=('xfce4-goodies')
 depends=('libxfce4ui' 'hicolor-icon-theme')
 makedepends=('intltool')
 provides=('notification-daemon')
-conflicts=('notification-daemon' 'notification-daemon-xfce')
-replaces=('notification-daemon-xfce')
 options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/apps/${pkgname}/0.2/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('8687fb7a0f270231ada265e363b6ffcc')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2)
+sha1sums=('31888132d949cc7b47d12889b8aaf5dabc546d8b')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$srcdir/$pkgname-$pkgver"
+
   ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-notifyd/xfce4-notifyd.install b/extra/xfce4-notifyd/xfce4-notifyd.install
index fee9e5d11..abf924aa2 100644
--- a/extra/xfce4-notifyd/xfce4-notifyd.install
+++ b/extra/xfce4-notifyd/xfce4-notifyd.install
@@ -3,10 +3,12 @@ post_install() {
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
 
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/epdfview-libre/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch b/libre/epdfview-libre/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch
new file mode 100644
index 000000000..e077a15cf
--- /dev/null
+++ b/libre/epdfview-libre/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch
@@ -0,0 +1,60 @@
+From d30496f52b85f82947bd07b9bd60f8482843ece8 Mon Sep 17 00:00:00 2001
+From: jordi <jordi@cb4bfb15-1111-0410-82e2-95233c8f1c7e>
+Date: Tue, 5 Jul 2011 09:23:38 +0000
+Subject: [PATCH 1/2] When using Poppler 0.17.0, I needed to swap the blue and
+ red channels, otherwise the colors (other than black
+ and white) looked wierd.
+
+git-svn-id: svn://svn.emma-soft.com/epdfview/trunk@367 cb4bfb15-1111-0410-82e2-95233c8f1c7e
+---
+ src/PDFDocument.cxx |   20 ++++++++++++++++++++
+ 1 files changed, 20 insertions(+), 0 deletions(-)
+
+diff --git a/src/PDFDocument.cxx b/src/PDFDocument.cxx
+index df5d75f..63b3513 100644
+--- a/src/PDFDocument.cxx
++++ b/src/PDFDocument.cxx
+@@ -20,6 +20,7 @@
+ #include <time.h>
+ #include <poppler.h>
+ #include <unistd.h>
++#include <algorithm>
+ #include "epdfview.h"
+ 
+ using namespace ePDFView;
+@@ -33,6 +34,24 @@ static PageLayout convertPageLayout (gint pageLayout);
+ static PageMode convertPageMode (gint pageMode);
+ static gchar *getAbsoluteFileName (const gchar *fileName);
+ 
++namespace
++{
++    void
++    convert_bgra_to_rgba (guint8 *data, int width, int height)
++    {
++        using std::swap;
++
++        for (int y = 0; y < height; y++)
++        {
++            for (int x = 0; x < width; x++)
++            {
++                swap(data[0], data[2]);
++                data += 4;
++            }
++        }
++    }
++}
++
+ ///
+ /// @brief Constructs a new PDFDocument object.
+ ///
+@@ -650,6 +669,7 @@ PDFDocument::renderPage (gint pageNum)
+         poppler_page_render (page, context);
+         cairo_destroy(context);
+         cairo_surface_destroy (surface);
++        convert_bgra_to_rgba(renderedPage->getData (), width, height);
+ #else // !HAVE_POPPLER_0_17_0
+         // Create the pixbuf from the data and render to it.
+         GdkPixbuf *pixbuf = gdk_pixbuf_new_from_data (renderedPage->getData (),
+-- 
+1.7.7
+
diff --git a/libre/epdfview-libre/PKGBUILD b/libre/epdfview-libre/PKGBUILD
new file mode 100644
index 000000000..9923ad1cf
--- /dev/null
+++ b/libre/epdfview-libre/PKGBUILD
@@ -0,0 +1,49 @@
+# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# $Id: PKGBUILD 57042 2011-10-19 06:13:49Z schuay $
+# Maintainer: schuay <jakob.gruber@gmail.com>
+# Contributor: Tom K <tomk@runbox.com>
+# Contributor: Thayer Williams <thayer@archlinux.org>
+
+pkgname=epdfview-libre
+_pkgname=epdfview
+pkgver=0.1.8
+pkgrel=3
+pkgdesc="A free lightweight PDF document viewer."
+url="http://www.emma-soft.com/projects/epdfview/"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('poppler-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'gtk2' 'xdg-utils')
+makedepends=('pkgconfig')
+provides=('epdfview')
+conflicts=('epdfview')
+replaces=('epdfview')
+install='epdfview.install'
+source=("http://www.emma-soft.com/projects/${_pkgname}/chrome/site/releases/${_pkgname}-${pkgver}.tar.bz2"
+        "${_pkgname}.desktop.patch"
+        "0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch")
+md5sums=('e50285b01612169b2594fea375f53ae4'
+         'fbf22bbabdbb7544db615ac5775d57e2'
+         '7f9ea101a41f5b4e999fd024f423d41f')
+
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
+  patch -Np0 -i "${srcdir}/${_pkgname}.desktop.patch"
+  patch -Np1 -i "${srcdir}/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch"
+
+  # Use xdg-open as default browser.
+  sed -r '/DEFAULT_EXTERNAL_BROWSER_COMMAND_LINE/s/firefox[^ ]*/xdg-open/' -i src/Config.cxx
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+package() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  for size in 24 32 48; do
+      install -Dm644 data/icon_${_pkgname}-${size}.png \
+          "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${_pkgname}.png"
+  done
+}
diff --git a/libre/epdfview-libre/epdfview.desktop.patch b/libre/epdfview-libre/epdfview.desktop.patch
new file mode 100644
index 000000000..d86fc3088
--- /dev/null
+++ b/libre/epdfview-libre/epdfview.desktop.patch
@@ -0,0 +1,11 @@
+--- data/epdfview.desktop.bak	2009-04-05 16:55:56.000000000 -0700
++++ data/epdfview.desktop	2009-04-05 16:56:33.000000000 -0700
+@@ -7,7 +7,7 @@
+ GenericName=PDF Viewer
+ GenericName[ca]=Visor PDF
+ GenericName[es]=Visor PDF
+-Icon=icon_epdfview-48
++Icon=epdfview
+ Name=ePDFViewer
+ Name[ca]=ePDFViewer
+ Name[es]=ePDFViewer
diff --git a/libre/epdfview-libre/epdfview.install b/libre/epdfview-libre/epdfview.install
new file mode 100644
index 000000000..c317fbaca
--- /dev/null
+++ b/libre/epdfview-libre/epdfview.install
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index a6a3abecb..da4e33e37 100644
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -1,32 +1,33 @@
-# $Id: PKGBUILD 120250 2011-04-21 17:00:05Z ibiru $
+# $Id: PKGBUILD 140751 2011-10-18 16:38:38Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
 
 pkgname=initscripts
-pkgver=2011.06.4
-pkgrel=2
+pkgver=2011.10.3
+pkgrel=1
 pkgdesc="System initialization/bootup scripts (Parabola branding)"
 arch=('i686' 'x86_64')
 url="http://parabolagnulinux.org"
 license=('GPL2')
 groups=('base')
 backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless)
-depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=171' 'iproute2'
+depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=173' 'iproute2'
          'ncurses' 'kbd' 'findutils' 'sysvinit')
 optdepends=('bridge-utils: Network bridging support'
             'dhcpcd: DHCP network configuration'
             'net-tools: legacy network support'
             'wireless_tools: Wireless networking')
+makedepends=(asciidoc)
 install=initscripts.install
-source=("https://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2"
+source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"
         'wireless.conf.d')
-md5sums=('df73e4c4043d4eaf6502ca6738c549aa'
-         '027576534885b8d5dded9be546057b12')
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
   install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
 }
+md5sums=('4783d7297925bc0722367b0eed8cb53a'
+         '027576534885b8d5dded9be546057b12')
diff --git a/libre/initscripts/initscripts.install b/libre/initscripts/initscripts.install
index 56f69248a..963713bee 100644
--- a/libre/initscripts/initscripts.install
+++ b/libre/initscripts/initscripts.install
@@ -8,4 +8,12 @@ post_upgrade() {
     echo "Blacklisting of modules is no longer supported in rc.conf,"
     echo "please add blacklist entries to /etc/modprobe.d/ instead."
   fi
+  if [ "$(vercmp $2 2011.07.2)" -lt 0 ]; then
+    echo "VERBOSE= in rc.conf no longer has any effect."
+    echo "Please append 'quiet' to your kernel command line."
+  fi
+  if [ "$(vercmp $2 2011.10.1)" -lt 0 ]; then
+    echo "If using non-bash-compatible shell, please set LANG in /etc/locale.conf,"
+    echo "as LOCALE in /etc/rc.conf no longer works."
+  fi
 }
diff --git a/staging/sip/PKGBUILD b/staging/sip/PKGBUILD
new file mode 100644
index 000000000..45dd8e751
--- /dev/null
+++ b/staging/sip/PKGBUILD
@@ -0,0 +1,55 @@
+# $Id: PKGBUILD 141364 2011-10-30 02:28:27Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+# Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
+
+pkgbase=sip
+pkgname=('sip' 'python2-sip')
+pkgver=4.13
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.riverbankcomputing.com/software/sip/"
+license=('custom:"sip"')
+makedepends=('python' 'python2')
+source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz")
+md5sums=('21b4e2cad56e4156df2220143264b8ff')
+
+build() {
+  cd "${srcdir}"
+  cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  python configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
+  make
+  
+  ### Python2 version ###
+  cd "${srcdir}/python2-${pkgbase}-${pkgver}"
+  python2 configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
+  make
+}
+
+package_sip() {
+  pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries"
+  depends=('python')
+  replaces=('python-sip')
+  provides=('python-sip')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_python2-sip() {
+  pkgdesc="A tool that makes it easy to create Python2 bindings for C and C++ libraries"
+  depends=('sip' 'python2')
+
+  cd "${srcdir}/python2-${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+  # Provided by sip
+  rm "${pkgdir}/usr/bin/sip"
+}
diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD
index 03214f302..fd47a41ee 100644
--- a/testing/curl/PKGBUILD
+++ b/testing/curl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 138498 2011-09-25 14:51:49Z dreisner $
+# $Id: PKGBUILD 141358 2011-10-29 19:16:01Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=curl
 pkgver=7.22.0
-pkgrel=2
+pkgrel=3
 pkgdesc="An URL retrival utility and library"
 arch=('i686' 'x86_64')
 url="http://curl.haxx.se"
@@ -45,10 +45,8 @@ build() {
       --enable-threaded-resolver \
       --without-libidn \
       --with-random=/dev/urandom \
-      --with-ca-bundle=/etc/ssl/certs/ca-bundle.crt
+      --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
   make
-
-  perl lib/mk-ca-bundle.pl
 }
 
 package() {
@@ -59,9 +57,6 @@ package() {
   # license
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 
-  # cert bundle
-  install -Dm644 ca-bundle.crt "$pkgdir/etc/ssl/certs/ca-bundle.crt"
-
   # devel
   install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4"
   mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
diff --git a/testing/kdelibs/PKGBUILD b/testing/kdelibs/PKGBUILD
index db523a645..3554e66f2 100644
--- a/testing/kdelibs/PKGBUILD
+++ b/testing/kdelibs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 141146 2011-10-24 20:29:59Z andrea $
+# $Id: PKGBUILD 141337 2011-10-29 12:54:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdelibs
 pkgver=4.7.2
-pkgrel=3
+pkgrel=5
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -20,7 +20,7 @@ replaces=('kdelibs-experimental')
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kde-applications-menu.patch' 'archlinux-menu.patch'
-	'kdelibs-nepomuk-unicode.diff')
+        'kdelibs-nepomuk-unicode.diff')
 sha1sums=('4b074633cbf69752fda96018514ee771efe8f18b'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
diff --git a/testing/kwebkitpart/PKGBUILD b/testing/kwebkitpart/PKGBUILD
new file mode 100644
index 000000000..3580adbf8
--- /dev/null
+++ b/testing/kwebkitpart/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 141353 2011-10-29 17:37:01Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kwebkitpart
+pkgver=1.2.0
+pkgrel=2
+pkgdesc="A WebKit browser component for KDE"
+url="http://opendesktop.org/content/show.php?content=127960"
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('e736d7b26cf6e3c0eed837837b3f032b')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/kwebkitpart/kwebkitpart.install b/testing/kwebkitpart/kwebkitpart.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/testing/kwebkitpart/kwebkitpart.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/testing/network-manager-applet/PKGBUILD b/testing/network-manager-applet/PKGBUILD
new file mode 100644
index 000000000..7563c6e9f
--- /dev/null
+++ b/testing/network-manager-applet/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 141313 2011-10-29 08:09:08Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Arjan Timmerman <arjan@archlinux.org>
+# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
+# Contributor: Tor Krill <tor@krill.nu>
+# Contributor: Will Rea <sillywilly@gmail.com>
+
+pkgname=network-manager-applet
+pkgver=0.9.1.95
+pkgrel=1
+pkgdesc="GNOME frontends to NetWorkmanager"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org/projects/NetworkManager/"
+depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' 'gnome-icon-theme' 'mobile-broadband-provider-info' 'gconf' 'iso-codes')
+makedepends=('intltool' 'gnome-bluetooth')
+optdepends=('gnome-bluetooth: for PAN/DUN support')
+options=('!libtool')
+install=network-manager-applet.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz)
+sha256sums=('6a0e1f72b5c9ad040451263f9b8723ac6a8dfb59772d8c8258cafc0d2b2390fc')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var \
+      --libexecdir=/usr/lib/networkmanager \
+      --disable-static \
+      --disable-maintainer-mode
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain nm-applet ${pkgdir}/etc/gconf/schemas/*.schemas
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+
+  echo "AutostartCondition=GNOME3 unless-session gnome" >> "${pkgdir}/etc/xdg/autostart/nm-applet.desktop"
+}
diff --git a/testing/network-manager-applet/network-manager-applet.install b/testing/network-manager-applet/network-manager-applet.install
new file mode 100644
index 000000000..9922d12b2
--- /dev/null
+++ b/testing/network-manager-applet/network-manager-applet.install
@@ -0,0 +1,18 @@
+pkgname=network-manager-applet
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
+}
diff --git a/testing/networkmanager-openconnect/PKGBUILD b/testing/networkmanager-openconnect/PKGBUILD
new file mode 100644
index 000000000..fa7fb79d2
--- /dev/null
+++ b/testing/networkmanager-openconnect/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 141315 2011-10-29 08:15:30Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=networkmanager-openconnect
+pkgver=0.9.1.95
+pkgrel=1
+pkgdesc="NetworkManager VPN integration for openconnect"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org/projects/NetworkManager/"
+depends=("networkmanager>=${pkgver}" 'openconnect' 'gconf')
+makedepends=('intltool')
+optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
+options=('!libtool')
+install=$pkgname.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz)
+sha256sums=('3e48b04a5cfffb3c83bb7b1df77cb015b58e8335c975596a916c7caf1bb87102')
+
+build() {
+  cd "${srcdir}/NetworkManager-openconnect-${pkgver}"
+  ./configure --prefix=/usr \
+  	--sysconfdir=/etc \
+	--libexecdir=/usr/lib/networkmanager \
+	--disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/NetworkManager-openconnect-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/networkmanager-openconnect/networkmanager-openconnect.install b/testing/networkmanager-openconnect/networkmanager-openconnect.install
new file mode 100644
index 000000000..7bd4d44f9
--- /dev/null
+++ b/testing/networkmanager-openconnect/networkmanager-openconnect.install
@@ -0,0 +1,16 @@
+pkgname=networkmanager-openconnect
+
+post_install() {
+  getent group nm-openconnect >/dev/null 2>&1 || groupadd -g 104 nm-openconnect
+  getent passwd nm-openconnect > /dev/null 2>&1 || useradd -u 104 -s /sbin/nologin -d / -M -c 'NetworkManager user for OpenConnect' -g nm-openconnect nm-openconnect
+  passwd -l nm-openconnect > /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  getent passwd nm-openconnect >/dev/null 2>&1 && userdel nm-openconnect
+  getent group nm-openconnect >/dev/null 2>&1 && groupdel nm-openconnect
+}
diff --git a/testing/networkmanager-openvpn/PKGBUILD b/testing/networkmanager-openvpn/PKGBUILD
new file mode 100644
index 000000000..f9e7731d0
--- /dev/null
+++ b/testing/networkmanager-openvpn/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 141321 2011-10-29 08:27:53Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=networkmanager-openvpn
+pkgver=0.9.1.95
+pkgrel=1
+pkgdesc="NetworkManager VPN plugin for OpenVPN"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org/projects/NetworkManager/"
+depends=("networkmanager>=${pkgver}" 'openvpn' 'gtk3' 'libgnome-keyring')
+makedepends=('intltool')
+optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
+install=networkmanager-openvpn.install
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz)
+sha256sums=('2c988bfcfe8bc011a26cd2e7f58ea528ef6d923d4af74d5c7633dd26d1bb792f')
+
+build() {
+  cd "${srcdir}/NetworkManager-openvpn-${pkgver}"
+  ./configure --prefix=/usr \
+  	--sysconfdir=/etc \
+	--libexecdir=/usr/lib/networkmanager \
+	--disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/NetworkManager-openvpn-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/networkmanager-openvpn/networkmanager-openvpn.install b/testing/networkmanager-openvpn/networkmanager-openvpn.install
new file mode 100644
index 000000000..931c0517c
--- /dev/null
+++ b/testing/networkmanager-openvpn/networkmanager-openvpn.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/testing/networkmanager-pptp/PKGBUILD b/testing/networkmanager-pptp/PKGBUILD
new file mode 100644
index 000000000..2a3f953fe
--- /dev/null
+++ b/testing/networkmanager-pptp/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 141319 2011-10-29 08:25:47Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=networkmanager-pptp
+pkgver=0.9.1.95
+pkgrel=1
+pkgdesc="NetworkManager VPN plugin for pptp "
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org/projects/NetworkManager/"
+depends=("networkmanager>=${pkgver}" 'pptpclient' 'gtk3' 'libgnome-keyring')
+makedepends=('intltool')
+optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
+options=('!libtool')
+install=networkmanager-pptp.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz)
+sha256sums=('83d432e24f2a6a011068d725591f7a95175a5e68b5b1af398f67db657659ca10')
+
+build() {
+  cd "${srcdir}/NetworkManager-pptp-${pkgver}"
+  ./configure --prefix=/usr \
+  	--sysconfdir=/etc \
+	--libexecdir=/usr/lib/networkmanager \
+	--disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/NetworkManager-pptp-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/networkmanager-pptp/networkmanager-pptp.install b/testing/networkmanager-pptp/networkmanager-pptp.install
new file mode 100644
index 000000000..931c0517c
--- /dev/null
+++ b/testing/networkmanager-pptp/networkmanager-pptp.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/testing/networkmanager-vpnc/PKGBUILD b/testing/networkmanager-vpnc/PKGBUILD
new file mode 100644
index 000000000..53d3ebcf1
--- /dev/null
+++ b/testing/networkmanager-vpnc/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 141317 2011-10-29 08:17:45Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=networkmanager-vpnc
+pkgver=0.9.1.95
+pkgrel=1
+pkgdesc="NetworkManager VPN plugin for vpnc"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org/projects/NetworkManager/"
+depends=("networkmanager>=${pkgver}" 'vpnc' 'hicolor-icon-theme' 'gtk3' 'libgnome-keyring')
+makedepends=('intltool')
+optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
+options=('!libtool')
+install=networkmanager-vpnc.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz)
+sha256sums=('92f8d701eef988b68462fd36f8fed0f974aee0b2f1c651d188b5ed67b701ea69')
+
+build() {
+  cd "${srcdir}/NetworkManager-vpnc-${pkgver}"
+  ./configure --prefix=/usr \
+  	--sysconfdir=/etc \
+	--libexecdir=/usr/lib/networkmanager \
+	--disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/NetworkManager-vpnc-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/networkmanager-vpnc/networkmanager-vpnc.install b/testing/networkmanager-vpnc/networkmanager-vpnc.install
new file mode 100644
index 000000000..931c0517c
--- /dev/null
+++ b/testing/networkmanager-vpnc/networkmanager-vpnc.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/testing/networkmanager/NetworkManager.conf b/testing/networkmanager/NetworkManager.conf
new file mode 100644
index 000000000..c37b59680
--- /dev/null
+++ b/testing/networkmanager/NetworkManager.conf
@@ -0,0 +1,2 @@
+[main]
+plugins=keyfile
diff --git a/testing/networkmanager/PKGBUILD b/testing/networkmanager/PKGBUILD
new file mode 100644
index 000000000..cd8069bcc
--- /dev/null
+++ b/testing/networkmanager/PKGBUILD
@@ -0,0 +1,61 @@
+# $Id: PKGBUILD 141311 2011-10-29 07:53:28Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinxu.org>
+# Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org>
+# Contributor: Tor Krill <tor@krill.nu>
+# Contributor: Will Rea <sillywilly@gmail.com>
+# Contributor: Valentine Sinitsyn <e_val@inbox.ru>
+
+pkgname=networkmanager
+pkgver=0.9.1.95
+pkgrel=1
+pkgdesc="Network Management daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org/projects/NetworkManager/"
+depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd')
+makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection')
+optdepends=('modemmanager: for modem management service'
+            'dhclient: alternative DHCP/DHCPv6 client'
+            'iptables: Connection sharing'
+            'dnsmasq: Connection sharing'
+            'bluez: Bluetooth support')
+options=('!libtool')
+backup=('etc/NetworkManager/NetworkManager.conf')
+install=networkmanager.install
+source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz
+        NetworkManager.conf disable_set_hostname.patch)
+sha256sums=('4702c25324fc6c0e860a9be9860b898ce444333d084b0d5b86b069bbd5fee468'
+            '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
+            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
+
+build() {
+  cd "${srcdir}/NetworkManager-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/disable_set_hostname.patch"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/networkmanager \
+    --with-crypto=nss \
+    --with-distro=arch \
+    --with-dhclient=/usr/sbin/dhclient \
+    --with-dhcpcd=/sbin/dhcpcd \
+    --with-iptables=/usr/sbin/iptables \
+    --with-systemdsystemunitdir=/lib/systemd/system \
+    --disable-static \
+    --enable-more-warnings=no \
+    --disable-wimax
+
+  make
+}
+
+package() {
+  cd "${srcdir}/NetworkManager-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/"
+
+  rm -rf "${pkgdir}/var/run/"
+}
diff --git a/testing/networkmanager/disable_set_hostname.patch b/testing/networkmanager/disable_set_hostname.patch
new file mode 100644
index 000000000..ee95dd0e1
--- /dev/null
+++ b/testing/networkmanager/disable_set_hostname.patch
@@ -0,0 +1,19 @@
+diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
+--- NetworkManager-0.9.0.orig/src/nm-policy.c	2011-08-23 06:41:02.099686450 +0000
++++ NetworkManager-0.9.0/src/nm-policy.c	2011-08-23 06:43:38.227791737 +0000
+@@ -302,6 +302,7 @@
+ 		return;
+ 	}
+ 
++#if 0
+ 	/* Try automatically determined hostname from the best device's IP config */
+ 	if (!best4)
+ 		best4 = get_best_ip4_device (policy->manager, &best_req4);
+@@ -356,6 +357,7 @@
+ 		}
+ 	}
+ 
++#endif
+ 	/* If no automatically-configured hostname, try using the hostname from
+ 	 * when NM started up.
+ 	 */
diff --git a/testing/networkmanager/networkmanager.install b/testing/networkmanager/networkmanager.install
new file mode 100644
index 000000000..de40c17ed
--- /dev/null
+++ b/testing/networkmanager/networkmanager.install
@@ -0,0 +1,9 @@
+post_upgrade() {
+  (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
+ATTENTION:
+  /etc/NetworkManager/nm-system-settings.conf has been replaced
+  by /etc/NetworkManager/NetworkManager.conf. Make sure you move
+  any custom settings to the new config file.
+MSG
+  true
+}
diff --git a/testing/qtwebkit/PKGBUILD b/testing/qtwebkit/PKGBUILD
index fbc1d44e3..cd1870aae 100644
--- a/testing/qtwebkit/PKGBUILD
+++ b/testing/qtwebkit/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 141163 2011-10-25 07:14:31Z andrea $
+# $Id: PKGBUILD 141349 2011-10-29 16:55:30Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qtwebkit
 pkgver=2.2.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://trac.webkit.org/wiki/QtWebKit'
 pkgdesc='An open source web browser engine (Qt port)'
 license=('LGPL2.1' 'GPL3')
 depends=('qt' 'gperf' 'bison' 'phonon' 'gstreamer0.10-base')
 makedepends=('python2' 'mesa' 'chrpath')
+conflicts=('qt<4.8')
 source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz"
         'python2-path.patch')
 sha1sums=('3582f3a8b593140af004a19479f5ec19693b3df7'
@@ -24,7 +25,8 @@ build() {
   ./build-webkit --qt \
     --prefix=/usr \
     --makeargs="${MAKEFLAGS}" \
-    --release
+    --release \
+    --3d-canvas
 }
 
 package() {