Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/percona-server/PKGBUILD
	community/libdnet/PKGBUILD
	extra/libxfce4ui/PKGBUILD
	extra/libxi/PKGBUILD
	extra/live-media/PKGBUILD
	extra/python-urwid/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/rhythmbox/PKGBUILD
	extra/xfconf/PKGBUILD
	kde-unstable/kactivities/PKGBUILD
	kde-unstable/kdeaccessibility-jovie/PKGBUILD
	kde-unstable/kdeaccessibility-kaccessible/PKGBUILD
	kde-unstable/kdeaccessibility-kmag/PKGBUILD
	kde-unstable/kdeaccessibility-kmousetool/PKGBUILD
	kde-unstable/kdeaccessibility-kmouth/PKGBUILD
	kde-unstable/kdeadmin/PKGBUILD
	kde-unstable/kdeartwork/PKGBUILD
	kde-unstable/kdebase-konsole/PKGBUILD
	kde-unstable/kdebase-runtime/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase/PKGBUILD
	kde-unstable/kdebindings-kimono/PKGBUILD
	kde-unstable/kdebindings-kross/PKGBUILD
	kde-unstable/kdebindings-perlkde/PKGBUILD
	kde-unstable/kdebindings-perlqt/PKGBUILD
	kde-unstable/kdebindings-python/PKGBUILD
	kde-unstable/kdebindings-qtruby/PKGBUILD
	kde-unstable/kdebindings-qyoto/PKGBUILD
	kde-unstable/kdebindings-smokegen/PKGBUILD
	kde-unstable/kdebindings-smokekde/PKGBUILD
	kde-unstable/kdebindings-smokeqt/PKGBUILD
	kde-unstable/kdeedu-analitza/PKGBUILD
	kde-unstable/kdeedu-blinken/PKGBUILD
	kde-unstable/kdeedu-cantor/PKGBUILD
	kde-unstable/kdeedu-kalgebra/PKGBUILD
	kde-unstable/kdeedu-kalzium/PKGBUILD
	kde-unstable/kdeedu-kanagram/PKGBUILD
	kde-unstable/kdeedu-kbruch/PKGBUILD
	kde-unstable/kdeedu-kgeography/PKGBUILD
	kde-unstable/kdeedu-khangman/PKGBUILD
	kde-unstable/kdeedu-kig/PKGBUILD
	kde-unstable/kdeedu-kiten/PKGBUILD
	kde-unstable/kdeedu-klettres/PKGBUILD
	kde-unstable/kdeedu-kmplot/PKGBUILD
	kde-unstable/kdeedu-kstars/PKGBUILD
	kde-unstable/kdeedu-ktouch/PKGBUILD
	kde-unstable/kdeedu-kturtle/PKGBUILD
	kde-unstable/kdeedu-kwordquiz/PKGBUILD
	kde-unstable/kdeedu-marble/PKGBUILD
	kde-unstable/kdeedu-parley/PKGBUILD
	kde-unstable/kdeedu-rocs/PKGBUILD
	kde-unstable/kdeedu-step/PKGBUILD
	kde-unstable/kdegames/PKGBUILD
	kde-unstable/kdegraphics-gwenview/PKGBUILD
	kde-unstable/kdegraphics-kamera/PKGBUILD
	kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
	kde-unstable/kdegraphics-kgamma/PKGBUILD
	kde-unstable/kdegraphics-kolourpaint/PKGBUILD
	kde-unstable/kdegraphics-kruler/PKGBUILD
	kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
	kde-unstable/kdegraphics-ksnapshot/PKGBUILD
	kde-unstable/kdegraphics-mobipocket/PKGBUILD
	kde-unstable/kdegraphics-okular/PKGBUILD
	kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
	kde-unstable/kdegraphics-svgpart/PKGBUILD
	kde-unstable/kdegraphics-thumbnailers/PKGBUILD
	kde-unstable/kdelibs/PKGBUILD
	kde-unstable/kdemultimedia/PKGBUILD
	kde-unstable/kdenetwork/PKGBUILD
	kde-unstable/kdepim-runtime/PKGBUILD
	kde-unstable/kdepim/PKGBUILD
	kde-unstable/kdepimlibs/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	kde-unstable/kdesdk-kate/PKGBUILD
	kde-unstable/kdesdk-kate/kdesdk-kate.install
	kde-unstable/kdesdk/PKGBUILD
	kde-unstable/kdetoys/PKGBUILD
	kde-unstable/kdeutils-filelight/PKGBUILD
	kde-unstable/kdeutils-kcalc/PKGBUILD
	kde-unstable/kdeutils-kcharselect/PKGBUILD
	kde-unstable/kdeutils-kdf/PKGBUILD
	kde-unstable/kdeutils-kfloppy/PKGBUILD
	kde-unstable/kdeutils-kgpg/PKGBUILD
	kde-unstable/kdeutils-kremotecontrol/PKGBUILD
	kde-unstable/kdeutils-ktimer/PKGBUILD
	kde-unstable/kdeutils-kwallet/PKGBUILD
	kde-unstable/kdeutils-printer-applet/PKGBUILD
	kde-unstable/kdeutils-superkaramba/PKGBUILD
	kde-unstable/kdeutils-sweeper/PKGBUILD
	kde-unstable/kdewebdev/PKGBUILD
	kde-unstable/libkdcraw/PKGBUILD
	kde-unstable/libkdeedu/PKGBUILD
	kde-unstable/libkexiv2/PKGBUILD
	kde-unstable/libkipi/PKGBUILD
	kde-unstable/libksane/PKGBUILD
	multilib/lib32-attr/PKGBUILD
	multilib/lib32-libldap/PKGBUILD
	multilib/lib32-libxi/PKGBUILD
	~lukeshu/android-udev/51-android.rules
	~lukeshu/android-udev/PKGBUILD

22 files changed, 201 insertions, 140 deletions

diff --git a/extra/botan/PKGBUILD b/extra/botan/PKGBUILD
index 1623c55c4..5b21ffbe5 100644
--- a/extra/botan/PKGBUILD
+++ b/extra/botan/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 128341 2011-06-23 05:31:14Z angvp $
+# $Id: PKGBUILD 145616 2011-12-24 05:45:52Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: d'Ronin <daronin@2600.com>
 pkgname=botan
-pkgver=1.10.0
+pkgver=1.10.1
 pkgrel=1
 pkgdesc="BSD-licensed crypto library written in C++"
 license=('BSD')
@@ -12,7 +12,7 @@ url="http://botan.randombit.net/"
 depends=('gcc-libs' 'sh')
 makedepends=('python2')
 source=(http://files.randombit.net/botan/Botan-${pkgver}.tgz)
-md5sums=('1f03a6a84f402a12e50665868dddae99')
+md5sums=('5e1e7f3458e2e6aa56f7e41941eefb9d')
 
 build() {
   cd ${srcdir}/Botan-${pkgver}
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index eb145f5c0..ab0301ad7 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145112 2011-12-17 04:54:41Z bisson $
+# $Id: PKGBUILD 145630 2011-12-24 17:43:03Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
-pkgver=2.6.0
+pkgver=2.6.6
 pkgrel=1
 pkgdesc='Input method server supporting various input methods'
 url='http://hyperrate.com/dir.php?eid=67'
@@ -18,8 +18,8 @@ optdepends=('qt: support for qt4 input method'
             'libchewing: support for chewing input method')
 source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz"
         'qt4-lib64.patch')
-sha1sums=('4abef8d37492b68d54ba40420f65d04779ee2ec5'
-          '4b121e9a86a2ca25869c69b7d4d9623a0c8f55fc')
+sha1sums=('ef2ba1af83ce5f25cf54a7d3e84a5739d3a9e5e0'
+          '3d1b769dcd8820c8351f239ec32ee5bcd9d98b70')
 
 install=install
 
diff --git a/extra/gcin/qt4-lib64.patch b/extra/gcin/qt4-lib64.patch
index abc15950e..c47248beb 100644
--- a/extra/gcin/qt4-lib64.patch
+++ b/extra/gcin/qt4-lib64.patch
@@ -1,6 +1,6 @@
 diff -aur old/configure new/configure
---- old/configure	2011-11-07 06:51:12.000000000 +1100
-+++ new/configure	2011-11-25 14:02:10.819256960 +1100
+--- old/configure	2011-12-21 00:48:03.000000000 +1100
++++ new/configure	2011-12-25 04:06:14.424317251 +1100
 @@ -188,7 +188,7 @@
  
  
@@ -10,9 +10,18 @@ diff -aur old/configure new/configure
  echo "testing if you have qt4 support"
  pkg-config --libs QtCore QtGui > /dev/null 2> /dev/null
  if [ $? = 0 ]; then
+@@ -245,7 +245,7 @@
+   mv gcin.spec gcin.spec.tmp
+   grep -v qt4/plugins/inputmethods gcin.spec.tmp > gcin.spec
+ else
+-  for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc
++  for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc /usr/bin/moc
+   do
+ 	[ -x $i ] && QT4_MOC=$i
+   done
 diff -aur old/qt4-im/Makefile new/qt4-im/Makefile
---- old/qt4-im/Makefile	2011-06-08 23:03:50.000000000 +1000
-+++ new/qt4-im/Makefile	2011-11-25 14:05:28.844110772 +1100
+--- old/qt4-im/Makefile	2011-12-19 14:52:46.000000000 +1100
++++ new/qt4-im/Makefile	2011-12-25 04:06:14.424317251 +1100
 @@ -1,5 +1,5 @@
  include ../config.mak
 -QT=qt4
@@ -20,12 +29,3 @@ diff -aur old/qt4-im/Makefile new/qt4-im/Makefile
  QTIM=$(QT)/plugins/inputmethods
  IMMODULES=$(libdir)/$(QTIM)
  
-@@ -15,7 +15,7 @@
- 	$(CXX) -E $(CFLAGS) $(INCS) $< > $@
- 
- moc_gcin-qt.cpp:	gcin-qt.h
--	/usr/$(LIB)/$(QT)/bin/moc $< -o moc_gcin-qt.cpp
-+	/usr/bin/moc $< -o moc_gcin-qt.cpp
- 
- im-gcin.so: $(OBJS)
- 	export LD_RUN_PATH=$(gcinlibdir) ;\
diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
index 7d809f25d..8a32428f4 100644
--- a/extra/kdebindings-python/PKGBUILD
+++ b/extra/kdebindings-python/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 144629 2011-12-08 09:18:34Z andrea $
+# $Id: PKGBUILD 145595 2011-12-23 10:46:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-python
 pkgver=4.7.4
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE bindings for Python"
 url="http://kde.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
-depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs')
+depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
 makedepends=('cmake' 'automoc4' 'boost')
 source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2")
 sha1sums=('cac4b94098dba73d58fb4f7d73d7c65c306517d1')
diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD
index 78018661f..2dd96a307 100644
--- a/extra/libmtp/PKGBUILD
+++ b/extra/libmtp/PKGBUILD
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD 127351 2011-06-13 11:09:19Z stephane $
+# $Id: PKGBUILD 145614 2011-12-24 03:54:58Z dreisner $
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 
 pkgname=libmtp
-pkgver=1.1.0
+pkgver=1.1.1
 pkgrel=1
 pkgdesc="library implementation of the Media Transfer Protocol"
 arch=("i686" "x86_64" 'mips64el')
 url="http://libmtp.sourceforge.net"
 license=('LGPL')
 depends=('libusb-compat')
-makedepends=('doxygen')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('fd7b293436528f4c780a9da6e5cc5398')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('073e1c2a00ba377f68dce47727e185ae')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --with-udev-rules=52-libmtp.rules
+  ./configure --prefix=/usr
   make
 }
 
diff --git a/extra/libmythes/PKGBUILD b/extra/libmythes/PKGBUILD
index 8a86b2f38..c5e5899da 100644
--- a/extra/libmythes/PKGBUILD
+++ b/extra/libmythes/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 144883 2011-12-08 21:25:55Z andyrtr $
+# $Id: PKGBUILD 145626 2011-12-24 14:41:49Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=libmythes
-pkgver=1.2.1
-pkgrel=2
+pkgver=1.2.2
+pkgrel=1
 epoch=1
 pkgdesc="a simple thesaurus"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('hunspell')
 options=('!libtool')
 provides=('mythes')
 source=(http://downloads.sourceforge.net/hunspell/${pkgname/lib/}-${pkgver}.tar.gz)
-md5sums=('54b310488dda6929cf31ae859928c945')
+md5sums=('e1e255dc43dbcbb34cb19e8a0eba90ae')
 
 build() {
   cd ${srcdir}/${pkgname/lib/}-$pkgver
diff --git a/extra/libxfce4ui/PKGBUILD b/extra/libxfce4ui/PKGBUILD
index e6051915a..069eb2ea6 100644
--- a/extra/libxfce4ui/PKGBUILD
+++ b/extra/libxfce4ui/PKGBUILD
@@ -1,35 +1,39 @@
-# $Id: PKGBUILD 124354 2011-05-20 06:47:50Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# $Id: PKGBUILD 145607 2011-12-23 17:37:26Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>
 
 pkgname=libxfce4ui
-pkgver=4.8.0
-pkgrel=3.1
-pkgdesc="share commonly used Xfce widgets among the Xfce applications"
+pkgver=4.8.1
+pkgrel=1
+pkgdesc="Commonly used Xfce widgets among Xfce applications"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
 url="http://www.xfce.org/"
-depends=('libxfce4util>=4.8.0' 'gtk2' "xfconf>=4.8.0" 'libsm' 'startup-notification') 
+license=('GPL2')
+depends=('libxfce4util' 'gtk2' 'xfconf' 'libsm' 'startup-notification')
 makedepends=('intltool' 'gtk-doc' 'glade')
 optdepends=('glade: for using the included glade module')
 #replaces=('libxfcegui4') - later when all is ported
 options=('!libtool')
-source=(http://archive.xfce.org/src/xfce/libxfce4ui/4.8/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('df9acb3328dff905bd0777b84532b69f')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2)
+sha256sums=('39cbed29da06960074014b74abc2ba57db49dc81ab8995fb2160579c51669956')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--enable-gtk-doc \
-	--disable-debug
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-gtk-doc \
+    --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/libxi/PKGBUILD b/extra/libxi/PKGBUILD
index 90eee20de..d500fb58a 100644
--- a/extra/libxi/PKGBUILD
+++ b/extra/libxi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 145122 2011-12-17 08:47:23Z andyrtr $
+# $Id: PKGBUILD 145628 2011-12-24 14:44:56Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxi
-pkgver=1.4.4
+pkgver=1.4.5
 pkgrel=1
 pkgdesc="X11 Input extension library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ options=(!libtool)
 license=('custom')
 source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2
         XExtInt-align-classes-n32.diff)
-sha1sums=('e4ca1b45368214ba246bfad398ea087125c79f31'
+sha1sums=('8ac24dec8e488f49fd6a6b256c815da9ceec9737'
           '30931831efa9a7f8a888f41bb9284fa32f2e2392')
 
 build() {
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 8b5dbf8b6..de3e672d2 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 144603 2011-12-07 21:23:41Z giovanni $
+# $Id: PKGBUILD 145447 2011-12-22 13:02:48Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2011.12.02
+pkgver=2011.12.20
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,6 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
+md5sums=('1bcbd2e45149c0d918c63df8f6d7d0e0')
 
 build() {
   cd ${srcdir}/live
@@ -37,4 +38,3 @@ package() {
     install ${testprog} ${pkgdir}/usr/bin
   done
 }
-md5sums=('4f10d93d33f6714a980fd1655ead69cd')
diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD
index a257a5c38..3a7e1755d 100644
--- a/extra/phonon/PKGBUILD
+++ b/extra/phonon/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145248 2011-12-20 07:59:43Z andrea $
+# $Id: PKGBUILD 145472 2011-12-22 22:17:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon
@@ -11,7 +11,7 @@ license=('LGPL')
 pkgdesc="The multimedia framework for KDE"
 depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist')
 optdepends=('pulseaudio: PulseAudio support')
-makedepends=('cmake' 'automoc4' 'pulseaudio')
+makedepends=('cmake' 'automoc4' 'pulseaudio' 'qtwebkit')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
 md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173')
 
@@ -22,7 +22,7 @@ build() {
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_PREFIX=/usr
     -DPHONON_QT_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \
     -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib/qt/plugins/designer
   make
diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD
index f3523f20f..e44555352 100644
--- a/extra/pyqt/PKGBUILD
+++ b/extra/pyqt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145329 2011-12-21 20:47:08Z andrea $
+# $Id: PKGBUILD 145605 2011-12-23 14:48:45Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
@@ -6,18 +6,23 @@
 
 pkgbase=pyqt
 pkgname=('pyqt' 'python2-pyqt')
-pkgver=4.8.6
+pkgver=4.9
 pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
 makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
              'python-opengl' 'qt-assistant-compat' 'qtwebkit')
-source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('9bfd7b08b8e438b83cc50d5c58191f97')
+source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz"
+        'fix-qthelp-build.patch')
+md5sums=('61619500d09d87b6c2a25bd3ea994504'
+         '356a453331a33c507b1baba4a9771764')
 
 build() {
   cd "${srcdir}"
+
+  patch -p0 -i "${srcdir}"/fix-qthelp-build.patch
+
   cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
 
   cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
diff --git a/extra/pyqt/fix-qthelp-build.patch b/extra/pyqt/fix-qthelp-build.patch
new file mode 100644
index 000000000..cd565e646
--- /dev/null
+++ b/extra/pyqt/fix-qthelp-build.patch
@@ -0,0 +1,11 @@
+--- PyQt-x11-gpl-4.9/configure.py~	2011-12-23 14:53:07.981490550 +0100
++++ PyQt-x11-gpl-4.9/configure.py	2011-12-23 14:52:38.384984221 +0100
+@@ -1264,7 +1264,7 @@
+     opengl = (mname == "QtOpenGL")
+ 
+     qt = [mname]
+-    if mname in ("QtOpenGL", "QtWebKit"):
++    if mname in ("QtHelp", "QtOpenGL", "QtWebKit"):
+         qt.append("QtCore")
+ 
+     makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0,
diff --git a/extra/python-markupsafe/PKGBUILD b/extra/python-markupsafe/PKGBUILD
index a71fc67fb..ca5cfcea0 100644
--- a/extra/python-markupsafe/PKGBUILD
+++ b/extra/python-markupsafe/PKGBUILD
@@ -1,22 +1,41 @@
-# $Id: PKGBUILD 113450 2011-03-08 17:36:15Z ibiru $
+# $Id: PKGBUILD 145461 2011-12-22 18:14:12Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alex Anthony <alex.anthony28991@gmail.com>
 
-pkgname=python-markupsafe
-pkgver=0.12
-pkgrel=0
+pkgname=('python-markupsafe' 'python2-markupsafe')
+pkgver=0.15
+pkgrel=1
 pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pypi.python.org/pypi/MarkupSafe"
 license=('custom')
-depends=('python2')
-makedepends=('setuptools')
-source=(http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz)
-md5sums=('edd4b6950f6d4ddc6e23fa322f8f0f53')
+makedepends=('python-distribute' 'python2-distribute')
+source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz")
+md5sums=('4e7c4d965fe5e033fa2d7bb7746bb186')
 
 build() {
+  cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver}
   cd ${srcdir}/MarkupSafe-${pkgver}
+  python setup.py build
+
+  cd ${srcdir}/python2-MarkupSafe-${pkgver}
+  python2 setup.py build
+}
+
+package_python-markupsafe() {
+  depends=('python')
+
+  cd ${srcdir}/MarkupSafe-${pkgver}
+  python setup.py install --root=${pkgdir} --optimize=1
+
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/python-markupsafe/LICENSE
+}
+
+package_python2-markupsafe() {
+  depends=('python2')
+
+  cd ${srcdir}/python2-MarkupSafe-${pkgver}
   python2 setup.py install --root=${pkgdir} --optimize=1
 
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE
 }
diff --git a/extra/python-urwid/PKGBUILD b/extra/python-urwid/PKGBUILD
index b29fdccd6..08fec228f 100644
--- a/extra/python-urwid/PKGBUILD
+++ b/extra/python-urwid/PKGBUILD
@@ -3,21 +3,40 @@
 # Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
 # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com>
 
-pkgname=python-urwid
-pkgver=0.9.9.2
+pkgname=('python-urwid' 'python2-urwid')
+pkgver=1.0.1
 pkgrel=1
 pkgdesc="Urwid is a curses-based user interface library."
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('python2')
+makedepends=('python2-distribute' 'python-distribute')
 url="http://excess.org/urwid/"
 source=(http://excess.org/urwid/urwid-$pkgver.tar.gz)
-md5sums=('e58b86a983fe5474a07749501748b728')
+md5sums=('828f7144b94920205e755c249d2e297f')
 
 build() {
-  cd $startdir/src/urwid-$pkgver
+  cp -r urwid-$pkgver python2-urwid-$pkgver
+
+  cd $srcdir/urwid-$pkgver
+  python setup.py build
+
+  cd $srcdir/python2-urwid-$pkgver
   sed -i 's#bin/python#bin/python2#' urwid/*.py
-  python2 setup.py install --prefix=/usr --root=$startdir/pkg || return 1
+  
+  python2 setup.py build
+}
+
+package_python-urwid() {
+  depends=('python')
 
-  rm -rf $startdir/src/$_hgname-build
+  cd $srcdir/urwid-$pkgver
+  python setup.py install --prefix=/usr --root=$pkgdir --optimize=1
 }
+
+package_python2-urwid() {
+  depends=('python2')
+ 
+  cd $srcdir/python2-urwid-$pkgver
+  python2 setup.py install --prefix=/usr --root=$pkgdir --optimize=1
+}
+
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index 657199f72..47e381721 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 142563 2011-11-12 08:13:52Z andrea $
+# $Id: PKGBUILD 145611 2011-12-23 20:54:15Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
@@ -6,7 +6,7 @@
 pkgbase=qscintilla
 pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla')
 pkgver=2.6
-pkgrel=1
+pkgrel=2
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
@@ -58,9 +58,6 @@ package_python-qscintilla() {
     cd "${srcdir}/QScintilla-gpl-${pkgver}/Python"
     install -Dm755 Qsci.so \
       "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so"
-
-    # Fix RPATH
-    chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python3.2/site-packages/PyQt4/Qsci.so
 }
 
 package_python2-qscintilla() {
@@ -69,7 +66,4 @@ package_python2-qscintilla() {
 
     cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2"
     make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-    # Fix RPATH
-    chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so
 }
diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD
index ad8e6471d..651370de9 100644
--- a/extra/qtwebkit/PKGBUILD
+++ b/extra/qtwebkit/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 145321 2011-12-21 20:46:56Z andrea $
+# $Id: PKGBUILD 145469 2011-12-22 22:02:51Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qtwebkit
-pkgver=2.2.0
-pkgrel=3
+pkgver=2.2.1
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 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')
+depends=('qt' 'gperf' 'bison' 'gstreamer0.10-base')
 makedepends=('python2' 'mesa' 'chrpath')
 conflicts=('qt<4.8')
-source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz"
+#source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz"
+source=("ftp://ftp.archlinux.org/other/${pkgname}/QtWebKit-${pkgver}.tar.gz"
         'python2-path.patch')
-sha1sums=('3582f3a8b593140af004a19479f5ec19693b3df7'
+sha1sums=('283fc116882157df0474af496be73bb9b34cb001'
           'b0ef3d5596171e3900a685df9bcfac3068ad6330')
 
 build() {
diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD
index 6eb3ce681..f95604103 100644
--- a/extra/rhythmbox/PKGBUILD
+++ b/extra/rhythmbox/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 139425 2011-10-01 19:01:11Z ibiru $
+# $Id: PKGBUILD 145457 2011-12-22 17:55:49Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rhythmbox
-pkgver=2.90.1.git20110928
+pkgver=2.90.1.git20111222
 pkgrel=1
-pkgdesc="An iTunes-like music player/libary"
+pkgdesc="An iTunes-like music playback and management application"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.rhythmbox.org"
 depends=('libgpod' 'gvfs-afc' 'totem-plparser' 'libmusicbrainz3' 'libmtp' 'lirc-utils' 'libwebkit3' 'libdmapsharing' 'media-player-info' 'python2-gobject'
-         'python-gnomekeyring' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'json-glib' 'desktop-file-utils' 'libpeas' 'python-mako' 'grilo' 'dconf')
+         'python-gnomekeyring' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'json-glib' 'desktop-file-utils' 'libpeas' 'python2-mako' 'grilo' 'dconf' 'libnotify')
 makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.1' 'intltool' 'brasero' 'gnome-common' 'gtk-doc' 'gobject-introspection')
 optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
             'gstreamer0.10-bad-plugins: Extra media codecs'
@@ -19,11 +19,11 @@ optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
 options=('!libtool' '!emptydirs' '!strip')
 install=rhythmbox.install
 #source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.13/${pkgname}-${pkgver}.tar.bz2)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('b95b2aed0cd485198fbefdcb8dbf2a1ca3d4eb7d31b1e02d610fb16384191e8a')
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz)
+sha256sums=('06cb3dda1871060c192e32c7f8237c046d120946a3647ebe2041695bce90a839')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   export CFLAGS="$CFLAGS -g -O1"
   export CXXFLAGS="$CXXFLAGS -g -O1"
   PYTHON=/usr/bin/python2 ./autogen.sh
@@ -36,7 +36,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/rxvt-unicode/ChangeLog b/extra/rxvt-unicode/ChangeLog
index a374f7b27..f343b86cb 100644
--- a/extra/rxvt-unicode/ChangeLog
+++ b/extra/rxvt-unicode/ChangeLog
@@ -1,4 +1,7 @@
 2011-12-02  Angel Velasquez <angvp@archlinux.org>
+	* Version bump to 9.14
+
+2011-12-02  Angel Velasquez <angvp@archlinux.org>
 	* Moved perl from optdepend to depend (closes FS#25782)
 
 2011-05-22  Angel Velasquez <angvp@archlinux.org>
diff --git a/extra/rxvt-unicode/PKGBUILD b/extra/rxvt-unicode/PKGBUILD
index ef8c89f59..9f688a959 100644
--- a/extra/rxvt-unicode/PKGBUILD
+++ b/extra/rxvt-unicode/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 144079 2011-12-03 04:45:00Z angvp $
+# $Id: PKGBUILD 145618 2011-12-24 05:53:53Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
 pkgname=rxvt-unicode
-pkgver=9.12
-pkgrel=2
+pkgver=9.14
+pkgrel=1
 pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://software.schmorp.de/pkg/rxvt-unicode.html"
@@ -15,9 +15,9 @@ optdepends=('gtk2-perl: to use the urxvt-tabbed')
 changelog=ChangeLog
 source=(http://dist.schmorp.de/rxvt-unicode/${pkgname}-${pkgver}.tar.bz2 \
         ${pkgname}.desktop)
-md5sums=('945af37d661c8c45a7cac292160e7c70'
+md5sums=('022235a9a8b012c29e72c49177be6ce4'
          '3de6c13126a45bc3bc9f6bba077a1311')
-sha1sums=('4cbf0516b8304dfb041b9f3e5aaba662fee4b979'
+sha1sums=('e303b7591225b06bc04e18a875461438c635014e'
           '962aebc88982dbeb62a7c4a051ff567e015f61a0')
 
 build() {
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index bd17db2be..9b061a986 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 141389 2011-10-30 11:14:14Z andrea $
+# $Id: PKGBUILD 145600 2011-12-23 10:58:52Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
@@ -6,14 +6,14 @@
 
 pkgbase=sip
 pkgname=('sip' 'python2-sip')
-pkgver=4.13
+pkgver=4.13.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 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')
+md5sums=('3f61fd39d5b0c8fa9e43b59af04de924')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/xfconf/PKGBUILD b/extra/xfconf/PKGBUILD
index 8f57230a6..1f253d1d0 100644
--- a/extra/xfconf/PKGBUILD
+++ b/extra/xfconf/PKGBUILD
@@ -1,43 +1,49 @@
-# $Id: PKGBUILD 130064 2011-07-01 20:39:13Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# $Id: PKGBUILD 145609 2011-12-23 17:39:17Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfconf
-pkgver=4.8.0
-pkgrel=3
-pkgdesc="a simple client-server configuration storage and query system"
+pkgver=4.8.1
+pkgrel=1
+pkgdesc="A simple client-server configuration storage and query system"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
 url="http://www.xfce.org/"
+license=('GPL2')
 groups=('xfce4')
 # http://www.xfce.org/documentation/requirements
-# keep dbus and gtk2, see also http://bugs.archlinux.org/task/14536
-depends=( "libxfce4util>=4.8.0" "dbus-glib" 'dbus' 'gtk2')
+# keep dbus, see also http://bugs.archlinux.org/task/14536
+depends=('libxfce4util' 'dbus-glib' 'dbus')
 makedepends=('pkgconfig' 'perl-extutils-depends' 'perl-extutils-pkgconfig'
-'perl-xml-parser' 'glib-perl' 'intltool' 'gtk-doc' 'chrpath')
+             'glib-perl' 'intltool' 'gtk-doc' 'chrpath')
 options=('!libtool' '!emptydirs')
-source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('0f11ed1ec7789c5c4c3fcc7cdb3c2940')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2)
+sha256sums=('9860737539fab2b852e8c07c50c205a5fbe894b08bcb4488a70e3fd6c75993cb')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/xfce4 \
-	--localstatedir=/var \
-	--disable-static \
-	--enable-gtk-doc \
-	--with-perl-options=INSTALLDIRS="vendor" \
-	--disable-debug
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/xfce4 \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-gtk-doc \
+    --with-perl-options=INSTALLDIRS="vendor" \
+    --disable-debug
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
   # remove unneeded dynloader bootstrap file
-  rm ${pkgdir}/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.bs 
-  
+  rm "$pkgdir/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.bs"
+
   # fix insecure rpath, http://bugs.archlinux.org/task/19980
-  chrpath -d ${pkgdir}/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.so
+  chrpath -d "$pkgdir/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.so"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD
index 3bb44bf29..a387ab785 100644
--- a/extra/xulrunner/PKGBUILD
+++ b/extra/xulrunner/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 145292 2011-12-21 10:20:13Z ibiru $
+# $Id: PKGBUILD 145467 2011-12-22 20:32:10Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=xulrunner
-pkgver=9.0
+pkgver=9.0.1
 pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//$pkgver/source/f
         mozilla-pkgconfig.patch)
 options=('!emptydirs')
 replaces=('xulrunner-oss')
-md5sums=('d8d0c8c79660752b02d9e9ab69a68f94'
+md5sums=('7cf2bd379792a9b232267c6a79680566'
          '8dfb78c5bd0581c8cf4753813132bf0b'
          '27271ce647a83906ef7a24605e840d61')