Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/chmsee/PKGBUILD
	extra/kdepim/PKGBUILD
	gnome-unstable/gnome-color-manager/PKGBUILD
	gnome-unstable/seahorse/PKGBUILD
	libre/pacman/PKGBUILD
	testing/libreoffice/PKGBUILD
	testing/util-linux/PKGBUILD
	testing/xf86-input-synaptics/PKGBUILD

15 files changed, 164 insertions, 74 deletions

diff --git a/extra/bzr/PKGBUILD b/extra/bzr/PKGBUILD
index d68c778a5..8fb18e305 100644
--- a/extra/bzr/PKGBUILD
+++ b/extra/bzr/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141925 2011-11-03 07:48:25Z andrea $
+# $Id: PKGBUILD 153560 2012-03-16 02:18:57Z eric $
 # Maintainer :
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=bzr
-pkgver=2.4.2
+pkgver=2.5.0
 pkgrel=1
 pkgdesc="A decentralized revision control system (bazaar)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ license=('GPL')
 depends=('python2')
 optdepends=('python-paramiko: for sftp support')
 source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig})
-md5sums=('cfc06fddd348445c65a247c0b33a05db'
-         '90294e34a45df20b16be47a32c800c89')
+md5sums=('44eb47b77995098a28f017e2daa606b6'
+         'b0d4a26a3dde94f30e142868b896fed5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index f6dcb12f2..b3547eb01 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 151572 2012-02-27 18:19:51Z andyrtr $
+# $Id: PKGBUILD 153549 2012-03-15 21:48:10Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
 # Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
 
 pkgname=dovecot
-pkgver=2.1.1
-pkgrel=3
+pkgver=2.1.2
+pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dovecot.org/"
@@ -20,8 +20,8 @@ provides=('imap-server' 'pop3-server')
 options=('!libtool')
 install=$pkgname.install
 source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh)
-md5sums=('db41a4de848d2bc834c30af0eb5575fd'
-         'e3bf2c4989ccb8a30a5d80ae89b06f76'
+md5sums=('6ab61b962ff7e732ea9faa0fa41a28cb'
+         'fb097826d991cd70894a914d01b0e2a1'
          '587159e84e2da6f83d70b3c706ba87cc')
 
 build() {
diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD
index 9d8416a66..d4e1868ee 100644
--- a/extra/fcitx/PKGBUILD
+++ b/extra/fcitx/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 148644 2012-02-05 01:57:05Z eric $
+# $Id: PKGBUILD 153564 2012-03-16 02:38:35Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: csslayer <wengxt AT gmail com>
 
 pkgbase=fcitx
 pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
-pkgver=4.2.0
+pkgver=4.2.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx/"
 license=('GPL')
 makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'dbus-glib' 'icu')
-source=("http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('b3c09f1eda7fb71208d348c34389dc824d6b2a80')
+source=("http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('74ad009cde48fb1efd48f8d2490fa36ddf36d215')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/fsarchiver/PKGBUILD b/extra/fsarchiver/PKGBUILD
index 7dfb92f6c..069ed910f 100644
--- a/extra/fsarchiver/PKGBUILD
+++ b/extra/fsarchiver/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 149589 2012-02-08 15:14:51Z andrea $
+# $Id: PKGBUILD 153566 2012-03-16 02:52:32Z eric $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=fsarchiver
-pkgver=0.6.12
-pkgrel=2
+pkgver=0.6.13
+pkgrel=1
 pkgdesc="A safe and flexible file-system backup and deployment tool"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fsarchiver.org/"
 license=('GPL')
 depends=('bzip2' 'e2fsprogs' 'lzo2' 'xz' 'libgcrypt')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('dc54cefcf9c2bc331063d82a7ad54133')
+md5sums=('49e974cbb18332bb67e6089d942eac66')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index 76fc82d19..e6ef1bc54 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 150685 2012-02-20 07:56:26Z bisson $
+# $Id: PKGBUILD 153551 2012-03-15 23:11:38Z eric $
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=inkscape
 pkgver=0.48.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 license=('GPL' 'LGPL')
@@ -16,7 +16,7 @@ depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib' 'p
 optdepends=('pstoedit: latex formulas'
             'texlive-core: latex formulas'
             'python2-numpy: some extensions'
-            'python-lxml: some extensions and filters'
+            'python2-lxml: some extensions and filters'
             'pyxml: some extensions'
             'uniconvertor: reading/writing to some proprietary formats')
 options=('!libtool')
diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index 52f2e3306..97b4dc9b1 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 153196 2012-03-12 09:37:49Z andrea $
+# $Id: PKGBUILD 153547 2012-03-15 21:42:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -20,17 +20,23 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-ktimetracker'
          'kdepim-libkdepim')
 pkgver=4.8.1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdepim')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
              'kde-agent')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('93222d56f9adde015cb202a1ad3b194ac52e6bda')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
+        'fix-kalarm-issue-with-alarms.patch')
+sha1sums=('93222d56f9adde015cb202a1ad3b194ac52e6bda'
+          'e9761e98fc5486a1a33cfa1eb122b54ca3446ded')
 
 build() {
+    # (FS#28891)
+    cd "${srcdir}"/${pkgbase}-${pkgver}
+    patch -p1 -i "${srcdir}"/fix-kalarm-issue-with-alarms.patch
+
     cd "${srcdir}"
 	mkdir build
 	cd build
diff --git a/extra/kdepim/fix-kalarm-issue-with-alarms.patch b/extra/kdepim/fix-kalarm-issue-with-alarms.patch
new file mode 100644
index 000000000..a69778b06
--- /dev/null
+++ b/extra/kdepim/fix-kalarm-issue-with-alarms.patch
@@ -0,0 +1,48 @@
+From: David Jarvie <djarvie@kde.org>
+Date: Wed, 07 Mar 2012 22:08:50 +0000
+Subject: Fix error saving changed alarms when closing Edit Alarm dialogue
+X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&amp;a=commitdiff&amp;h=ae66e32fb194e01e06521c78e9c72d772d291261
+---
+Fix error saving changed alarms when closing Edit Alarm dialogue
+---
+
+
+--- a/kalarm/Changelog
++++ b/kalarm/Changelog
+@@ -1,6 +1,10 @@
+ KAlarm Change Log
+ 
+-=== Version 2.8.1 --- 19 February 2012 ===
++=== Version 2.8.2 --- 7 March 2012 ===
++- [Akonadi] Fix error saving changed alarms when closing Edit Alarm dialogue.
++- [Akonadi] Show old-format calendars in read-only colour in calendar list.
++
++=== Version 2.8.1 (KDE 4.8.1) --- 19 February 2012 ===
+ - [Akonadi] Don't give option to save new alarms in old format calendars.
+ - [Akonadi] Prevent duplicate prompts to update format of new calendar resource.
+ - [Akonadi] Automatically disable duplicated calendar resources.
+
+--- a/kalarm/akonadimodel.cpp
++++ b/kalarm/akonadimodel.cpp
+@@ -1284,7 +1284,7 @@ KAEvent AkonadiModel::event(const Item&
+     if (e.isValid())
+     {
+ 
+-        Collection c = data(index, ParentCollectionRole).value<Collection>();
++        Collection c = data(ix, ParentCollectionRole).value<Collection>();
+         // Set collection ID using a const method, to avoid unnecessary copying of KAEvent
+         e.setCollectionId_const(c.id());
+         if (collection)
+
+--- a/kalarm/kalarm.h
++++ b/kalarm/kalarm.h
+@@ -28,7 +28,7 @@
+ #else
+ #define VERSION_SUFFIX "-res"
+ #endif
+-#define KALARM_VERSION "2.8.1" VERSION_SUFFIX
++#define KALARM_VERSION "2.8.2" VERSION_SUFFIX
+ 
+ #define KALARM_NAME "KAlarm"
+ #define KALARM_DBUS_SERVICE  "org.kde.kalarm"  // D-Bus service name of KAlarm application
+
diff --git a/extra/libsocialweb/PKGBUILD b/extra/libsocialweb/PKGBUILD
index 4d85c1103..da3b61637 100644
--- a/extra/libsocialweb/PKGBUILD
+++ b/extra/libsocialweb/PKGBUILD
@@ -1,33 +1,34 @@
-# $Id: PKGBUILD 139385 2011-10-01 19:00:09Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id: PKGBUILD 153544 2012-03-15 18:27:40Z ibiru $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
 pkgname=libsocialweb
-pkgver=0.25.19
-pkgrel=2
+pkgver=0.25.20
+pkgrel=0
 pkgdesc="A personal social data server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 license=('GPL2')
 depends=('glib2' 'gconf' 'libsoup-gnome' 'rest' 'dbus-glib' 'libgnome-keyring'
-         'json-glib')
+         'json-glib' 'networkmanager')
 makedepends=('intltool' 'gtk-doc' 'vala' 'gobject-introspection')
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('377b165fed92e1d4f6c7a2430191388633ad25421a72d640e9e60dfdf1d54625')
+sha256sums=('eb0078f44eb5fc4570fcee26c5670a433ca1bb83be0cead421a4a03e7d838ff5')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib/libsocialweb \
     --enable-all-services=yes \
-    --with-online=always \
+    --with-online=networkmanager \
     --enable-vala-bindings
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
 }
 
diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD
index d2ea6d729..1c0515059 100644
--- a/extra/lm_sensors/PKGBUILD
+++ b/extra/lm_sensors/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 134304 2011-08-02 20:34:25Z eric $
+# $Id: PKGBUILD 153558 2012-03-16 01:14:35Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=lm_sensors
-pkgver=3.3.1
-pkgrel=2
+pkgver=3.3.2
+pkgrel=1
 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lm-sensors.org/"
@@ -13,20 +13,11 @@ makedepends=('rrdtool')
 optdepends=('rrdtool: for logging with sensord')
 backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord')
 options=('!emptydirs')
-source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2 \
+source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \
 	sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \
         sensord.rc daemonarg.patch linux_3.0.patch)
-md5sums=('8c0eebda8524fc87da1393b4564d279b'
-         'c370f5e620bfe41113354a1e22c0c18c'
-         '232bedf043dd5dedde82df1a399c682c'
-         '6549050897c237514aeaa2bb6cfd29ea'
-         'f8af587038b0e2a89c441f7eeaa5e640'
-         '970408d2e509dc4138927020efefe323'
-         '96a8dd468e81d455ec9b165bdf33e0b7'
-         '41a5c20854bbff00ea7174bd2276b736'
-         '40c8eb16af8249a0f1d851fc1057ea15'
-         '5c1be382963145f7191d9c4e45ca9f67')
-sha1sums=('cb819e5a93adb36ef00e6d3c5363f5f474efa78a'
+sha1sums=('5d0f026ad763124e8c2ad733b6e1ad5e6473993d'
+          'a486d9fb6c5b0aff4520f6312106c67f5163f1cf'
           'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'
           'a068ac0a3115a6191a487e11422506baa922b40a'
           '78b5cd36c3cb8e98b972cdd8c4a12687d79a79a8'
diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD
index bf6bc7c58..0c4ffa285 100644
--- a/extra/modemmanager/PKGBUILD
+++ b/extra/modemmanager/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 134371 2011-08-03 08:01:01Z ibiru $
+# $Id: PKGBUILD 153526 2012-03-15 14:49:43Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=modemmanager
 _realname=ModemManager
-pkgver=0.5
+pkgver=0.5.2.0
 pkgrel=1
 pkgdesc="Mobile broadband modem management service"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,12 +11,12 @@ license=('GPL2')
 depends=('dbus-glib' 'udev' 'ppp')
 makedepends=('intltool')
 options=('!libtool')
-source=(http://download.gnome.org/sources/${_realname}/0.5/${_realname}-${pkgver}.tar.xz)
+source=(http://download.gnome.org/sources/$_realname/0.5/$_realname-$pkgver.tar.xz)
 optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
-sha256sums=('e7c7aed7c1484adee22f04dac358c1f971985f8413096c4d412d084aa2cd7c7f')
+sha256sums=('7f8b3e1996a24e031df7534e226a0f0c7c2dd8b30322e6c5f4611dc1a848e6c8')
 
 build() {
-  cd "$srcdir/${_realname}-${pkgver}"
+  cd "$_realname-$pkgver"
    ./configure --prefix=/usr \
    	--sysconfdir=/etc \
 	--localstatedir=/var \
@@ -25,6 +25,6 @@ build() {
 }
 
 package() {
-  cd "$srcdir/${_realname}-${pkgver}"
+  cd "$_realname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD
index 50653df35..ec44b2d94 100644
--- a/extra/python-lxml/PKGBUILD
+++ b/extra/python-lxml/PKGBUILD
@@ -1,21 +1,14 @@
-# $Id: PKGBUILD 146500 2012-01-12 05:14:02Z eric $
+# $Id: PKGBUILD 153553 2012-03-15 23:11:41Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Guillem Rieu <guillemr@gmx.net>
 
-pkgname=python-lxml
+pkgname=('python-lxml' 'python2-lxml')
 pkgver=2.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Python binding for the libxml2 and libxslt libraries"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD' 'custom')
 url="http://lxml.de/"
-depends=('python2' 'libxslt')
-optdepends=('python-beautifulsoup: support for parsing not well formed HTML')
-conflicts=('lxml')
-replaces=('lxml')
+makedepends=('python2' 'python' 'libxslt')
 source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc})
 md5sums=('a7825793c69d004f388ec6600bad7a6f'
          '5c4b1a05f6e46a4dd7ebed8b5ad9e32e')
@@ -23,11 +16,14 @@ md5sums=('a7825793c69d004f388ec6600bad7a6f'
 check() {
   cd "${srcdir}"/lxml-$pkgver
   make PYTHON=python2 test
+  make PYTHON=python test
 }
 
-package() {
-  cd "${srcdir}"/lxml-$pkgver
+package_python2-lxml() {
+  depends=('python2' 'libxslt')
+  optdepends=('python-beautifulsoup: support for parsing not well formed HTML')
 
+  cd "${srcdir}"/lxml-$pkgver
   python2 setup.py install --root="${pkgdir}" --optimize=1
 
   install -Dm644 LICENSES.txt \
@@ -37,3 +33,17 @@ package() {
   install -Dm644 doc/licenses/elementtree.txt \
     "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt
 }
+
+package_python-lxml() {
+  depends=('python' 'libxslt')
+
+  cd "${srcdir}"/lxml-$pkgver
+  python setup.py install --root="${pkgdir}" --optimize=1
+
+  install -Dm644 LICENSES.txt \
+    "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 doc/licenses/BSD.txt \
+    "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt
+  install -Dm644 doc/licenses/elementtree.txt \
+    "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt
+}
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 07621fb23..d9c01b475 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 150870 2012-02-23 13:25:51Z stephane $
+# $Id: PKGBUILD 153509 2012-03-15 09:58:34Z stephane $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
-pkgver=1.7.3
+pkgver=1.7.4
 pkgrel=1
 pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64' 'mips64el')
@@ -22,8 +22,8 @@ provides=('svn')
 options=('!makeflags' '!libtool')
 source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
         svnserve svn svnserve.conf subversion.rpath.fix.patch)
-sha1sums=('624d4070361c0e8d7cf4f5c667629e72459b122d'
-          'cac344ec6e717bab3d97e2f3f1206289d83b8e05'
+sha1sums=('57a3cd351c1dbedddd020e7a1952df6cd2674527'
+          'eebe0be6d539bf7dc37cf01b3c738072f1d9197b'
           '64ba3e6ebafc08ac62f59d788f7a825fdce69573'
           '73b36c046c09cec2093354911c89e3ba8056af6c'
           'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
diff --git a/extra/xdg-user-dirs/PKGBUILD b/extra/xdg-user-dirs/PKGBUILD
new file mode 100644
index 000000000..c3098d5df
--- /dev/null
+++ b/extra/xdg-user-dirs/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 153519 2012-03-15 14:03:02Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor:  <mathieu.clabaut@gmail.com>
+
+pkgname=xdg-user-dirs
+pkgver=0.14
+pkgrel=3
+pkgdesc="Manage user directories like ~/Desktop and ~/Music"
+arch=('i686' 'x86_64')
+depends=('sh')
+url="http://www.freedesktop.org/wiki/Software/xdg-user-dirs"
+license=('GPL')
+backup=('etc/xdg/user-dirs.conf' 'etc/xdg/user-dirs.defaults')
+source=(http://user-dirs.freedesktop.org/releases/$pkgname-$pkgver.tar.gz
+        xdg-user-dirs)
+sha256sums=('5f4e84f57c113f642ffdd646126855f45f1da955103119dbd2382edb516e6255'
+            'f0f27de23d849b2fa4ebf59e448b5a843b577d14dc2c1070e228999091fa7f5e')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install 
+  install -D ../xdg-user-dirs "$pkgdir/etc/X11/xinit/xinitrc.d/xdg-user-dirs"
+}
diff --git a/extra/xdg-user-dirs/xdg-user-dirs b/extra/xdg-user-dirs/xdg-user-dirs
new file mode 100755
index 000000000..dbe8abb48
--- /dev/null
+++ b/extra/xdg-user-dirs/xdg-user-dirs
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Set up user directories like ~/Desktop and ~/Music
+[ -x /usr/bin/xdg-user-dirs-update ] && /usr/bin/xdg-user-dirs-update
diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD
index dfb8f66c9..c106f6f25 100644
--- a/extra/xulrunner/PKGBUILD
+++ b/extra/xulrunner/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 150446 2012-02-17 22:05:32Z ibiru $
+# $Id: PKGBUILD 153514 2012-03-15 13:26:26Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=xulrunner
-pkgver=10.0.2
+pkgver=11.0
 pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/fi
         libvpx.patch)
 options=('!emptydirs')
 replaces=('xulrunner-oss')
-md5sums=('5ce038d591964f72c534fa33b75a62f5'
+md5sums=('4b07acf47857aff72776d805409cdd1b'
          '8dfb78c5bd0581c8cf4753813132bf0b'
          '27271ce647a83906ef7a24605e840d61'
          '5d418ecdbdb9f40597df6b978b0b5ee5')