Sun Sep 4 23:14:34 UTC 2011

25 files changed, 393 insertions, 90 deletions

diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD
index eef8c410d..41558627b 100644
--- a/community/intellij-idea-libs/PKGBUILD
+++ b/community/intellij-idea-libs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 50795 2011-07-01 12:20:10Z stativ $
+# $Id: PKGBUILD 55128 2011-09-03 06:53:25Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=intellij-idea-libs
-pkgver=10.5.1
-_pkgver=107.322
+pkgver=10.5.2
+_pkgver=107.587
 pkgrel=1
 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url="http://www.jetbrains.org/"
 license=('apache')
 depends=('glibc')
 source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz)
-md5sums=('f90ce6b7a2b8d2191156dd111fe6a63d')
+md5sums=('fe1bbc5c9a2f1e8be8682aff05d89be4')
 
 build() {
   cd "$srcdir"
diff --git a/community/jansson/PKGBUILD b/community/jansson/PKGBUILD
index 0d4060211..975b3d6d5 100644
--- a/community/jansson/PKGBUILD
+++ b/community/jansson/PKGBUILD
@@ -1,8 +1,9 @@
+# $Id: PKGBUILD 55139 2011-09-04 02:28:01Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Dave Reisner <d@falconindy.com>
 
 pkgname=jansson
-pkgver=2.1
+pkgver=2.2
 pkgrel=1
 pkgdesc='C library for encoding, decoding and manipulating JSON data'
 arch=('i686' 'x86_64')
@@ -10,7 +11,7 @@ url='http://www.digip.org/jansson/'
 license=('MIT')
 options=('!libtool')
 source=("$url/releases/$pkgname-$pkgver.tar.bz2")
-md5sums=('a7830e5b104fe6d95643516a625436f9')
+md5sums=('0e91c6867f49dbc3ef0bbf21d26812ee')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD
index 2b34f225f..68629172d 100644
--- a/extra/fcitx/PKGBUILD
+++ b/extra/fcitx/PKGBUILD
@@ -1,27 +1,64 @@
-# $Id: PKGBUILD 103288 2010-12-17 09:19:33Z andrea $
+# $Id: PKGBUILD 136943 2011-09-03 10:34:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
+# Contributor: csslayer <wengxt AT gmail com>
 
-pkgname=fcitx
-pkgver=4.0.1
+pkgbase=fcitx
+pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
+pkgver=4.1.0
 pkgrel=1
-pkgdesc="Free Chinese Input Toy of X, a collection of Simplified Chinese input methods for Linux"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/fcitx/"
 license=('GPL')
-depends=('dbus-core' 'pango')
-makedepends=('intltool')
-options=('!libtool')
-source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('22d48cd65ae6ee36e49c0ed07761a3cb2f7e2669')
+makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'dbus-glib' 'icu')
+source=("http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('d6aa9ce3344582ba92e850940c20dd28bf98e264')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DENABLE_OPENCC=OFF \
+    -DENABLE_GTK3_IM_MODULE=ON \
+    -DENABLE_QT_IM_MODULE=ON
   make
 }
 
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+package_fcitx() {
+  pkgdesc="Free Chinese Input Toy of X - Input Method Server for X window system"
+  depends=('dbus-core' 'pango')
+  install=fcitx.install
+
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+
+  rm -r "${pkgdir}"/usr/lib/{gtk-2.0,gtk-3.0,qt}
+}
+
+package_fcitx-gtk2() {
+  pkgdesc='GTK2 IM Module for fcitx'
+  depends=('gtk2' 'dbus-glib' 'fcitx')
+  install=fcitx-gtk2.install
+
+  cd "${srcdir}"/build/src/frontend/gtk2
+  make DESTDIR="${pkgdir}" install
+}
+
+package_fcitx-gtk3() {
+  pkgdesc='GTK3 IM Module for fcitx'
+  depends=('gtk3' 'dbus-glib' 'fcitx')
+  install=fcitx-gtk3.install
+
+  cd "${srcdir}"/build/src/frontend/gtk3
+  make DESTDIR="${pkgdir}" install
+}
+
+package_fcitx-qt() {
+  pkgdesc='QT IM Module for fcitx'
+  depends=('qt' 'icu' 'fcitx')
+
+  cd "${srcdir}"/build/src/frontend/qt
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/fcitx/fcitx-gtk2.install b/extra/fcitx/fcitx-gtk2.install
new file mode 100644
index 000000000..7503c05eb
--- /dev/null
+++ b/extra/fcitx/fcitx-gtk2.install
@@ -0,0 +1,11 @@
+post_install() {
+    usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/fcitx/fcitx-gtk3.install b/extra/fcitx/fcitx-gtk3.install
new file mode 100644
index 000000000..b44958797
--- /dev/null
+++ b/extra/fcitx/fcitx-gtk3.install
@@ -0,0 +1,11 @@
+post_install() {
+    usr/bin/gtk-query-immodules-3.0 --update-cache
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/fcitx/fcitx.install b/extra/fcitx/fcitx.install
new file mode 100644
index 000000000..316bccffe
--- /dev/null
+++ b/extra/fcitx/fcitx.install
@@ -0,0 +1,12 @@
+post_install() {
+  [[ -x usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor || true
+  [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/geoip/PKGBUILD b/extra/geoip/PKGBUILD
index bfbeec073..d969c256c 100644
--- a/extra/geoip/PKGBUILD
+++ b/extra/geoip/PKGBUILD
@@ -1,25 +1,36 @@
-# $Id: PKGBUILD 123437 2011-05-11 11:45:24Z juergen $
+# $Id: PKGBUILD 136949 2011-09-03 12:23:55Z foutrelis $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Manolis Tzanidakis <manolis@archlinux.org>
 
 pkgname=geoip
-pkgver=1.4.7
+pkgver=1.4.8
 pkgrel=1
 pkgdesc="Non-DNS IP-to-country resolver C library & utils"
-arch=(i686 x86_64)
-license=('GPL')
+arch=('i686' 'x86_64')
 url="http://www.maxmind.com/app/c"
+license=('GPL')
 depends=('zlib')
-backup=(etc/geoip/GeoIP.conf)
+backup=('etc/geoip/GeoIP.conf')
 options=('!libtool')
 source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-${pkgver}.tar.gz)
-md5sums=('a802175d5b7e2b57b540a7dd308d9205')
+md5sums=('05b7300435336231b556df5ab36f326d')
 
 build() {
-  cd ${startdir}/src/GeoIP-${pkgver}
+  cd "${srcdir}/GeoIP-${pkgver}"
+
+  autoreconf -i
   ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc/geoip
-  make || return 1
-  make check || return 1
-  make DESTDIR=${startdir}/pkg install
+  make
+}
+
+check() {
+  cd "${srcdir}/GeoIP-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/GeoIP-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
 
+# vim:set ts=2 sw=2 et:
diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD
index 03075191b..030f74f2d 100644
--- a/extra/imlib2/PKGBUILD
+++ b/extra/imlib2/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 79752 2010-05-06 13:39:04Z ronald $
+# $Id: PKGBUILD 136939 2011-09-03 09:44:35Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Arjan Timmerman <arjan.archlinux.org>
 # Contributor: Tom Newsom <Jeepster.gmx.co.uk>
 
 pkgname=imlib2
-pkgver=1.4.4
+pkgver=1.4.5
 pkgrel=1
 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
 url="http://sourceforge.net/projects/enlightenment/"
 arch=('i686' 'x86_64')
 license=('BSD')
-depends=('libtiff>=3.9.2-2' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng>=1.4.0' 'libid3tag' 'libjpeg>=8')
+depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 'libjpeg-turbo')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2")
-sha1sums=('aca2cf5d40ddcd8a3acfde605f319fccce7c2a2b')
+sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -25,9 +25,13 @@ build() {
   # Configure and Build
   ./configure --prefix=/usr \
               --sysconfdir=/etc/imlib2 \
-              --x-libraries=/usr/lib $EXTRAOPTS || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+              --x-libraries=/usr/lib $EXTRAOPTS
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
 
   # Install License
   install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
diff --git a/extra/kdiff3/PKGBUILD b/extra/kdiff3/PKGBUILD
index 0bf620978..456888917 100644
--- a/extra/kdiff3/PKGBUILD
+++ b/extra/kdiff3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 100978 2010-11-27 05:30:04Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 136960 2011-09-03 21:15:57Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=kdiff3
-pkgver=0.9.95
-pkgrel=2
+pkgver=0.9.96
+pkgrel=1
 pkgdesc="A KDE file comparator/merge tool"
 arch=('i686' 'x86_64')
 url="http://kdiff3.sourceforge.net/"
@@ -12,14 +12,12 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'kdebase-lib' 'docbook-xml')
 optdepends=('kdebase-lib: for the plugin')
 install=kdiff3.install
-source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz docbook.patch)
-md5sums=('652a98bf79ba762a8a646d4a0fddb323' '7a91d1ab6f62c41dc65082ae99bdeff0')
-sha1sums=('1fb27e8b42463ea23ad0169e20819352c1c476b7' '96a856fc7d9829f64bb59853a6dffba8a70d794e')
+source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz)
+md5sums=('46b96befddf3448a3cb673f018c6f6f9')
+sha1sums=('d7efdacdfd7ea3c7ec9f7dee32aba5962c1709a5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../docbook.patch
-  sed -i 's|kdiff3_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3|kdiff3_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3part|' src-QT4/CMakeLists.txt
   mkdir release
   cd release
   cmake .. -DCMAKE_INSTALL_PREFIX=/usr
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index e48ce2510..2d93ebfe8 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 130701 2011-07-07 21:12:32Z bisson $
+# $Id: PKGBUILD 136958 2011-09-03 21:03:54Z bisson $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgname=postfix
-pkgver=2.8.4
+pkgver=2.8.5
 pkgrel=1
-pkgdesc='Secure, fast, easy to administer drop in replacement for Sendmail (MTA)'
+pkgdesc='Secure, fast, easy to administer alternative to Sendmail'
 url='http://www.postfix.org/'
 arch=('i686' 'x86_64')
 license=('custom')
@@ -15,7 +15,7 @@ backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,ma
 source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \
         'aliases.patch' \
         'rc.d')
-sha1sums=('48d077ad2614098f39411cb965a74d8ce2f3e5be'
+sha1sums=('49ef711c80b5a3434258ab24ae00940932503e80'
           '5fc3de6c7df1e5851a0a379e825148868808318b'
           '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
 
diff --git a/extra/postfix/install b/extra/postfix/install
index f5d81a565..c276e0919 100644
--- a/extra/postfix/install
+++ b/extra/postfix/install
@@ -18,11 +18,10 @@ post_install() {
 post_upgrade() {
 	post_install
 
-	if [ `vercmp $2 2.8` = -1 ]; then cat <<EOF
+	if [ `vercmp $2 2.8.3` = -1 ]; then cat <<EOF
 
 ==> You must now execute "/etc/rc.d/postfix reload" (or restart).
-==> This is needed because the queue manager to delivery agent
-==> protocol has changed.
+==> This is needed because of an inter-daemon protocol change.
 
 EOF
 	fi
diff --git a/gnome-unstable/caribou/PKGBUILD b/gnome-unstable/caribou/PKGBUILD
new file mode 100644
index 000000000..df2fee8f6
--- /dev/null
+++ b/gnome-unstable/caribou/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 136946 2011-09-03 11:36:21Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Adam Hani Schakaki <krzd@krzd.net>
+
+pkgname=caribou
+pkgver=0.3.5
+pkgrel=2
+pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard."
+arch=('i686' 'x86_64')
+url="http://live.gnome.org/Caribou"
+license=('LGPL')
+depends=('pyatspi' 'dbus-python' 'python2-gobject2' 'gtk3' 'libxklavier' 'libgee' 'dconf')
+makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'python2-gobject' 'clutter')
+install=caribou.install
+options=(!libtool !emptydirs)
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.3/$pkgname-$pkgver.tar.xz)
+sha256sums=('729aa2e896a434490b9728911a1087013c829f7d41259684518e101abd90a9d4')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  sed -i s'|#!/usr/bin/python|#!/usr/bin/python2|'g tools/{fix_gir,make_schema}.py
+  export PYTHON=/usr/bin/python2
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --libexecdir=/usr/lib/caribou \
+    --disable-gtk2-module \
+    --disable-static \
+    --disable-schemas-compile
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/caribou/caribou.install b/gnome-unstable/caribou/caribou.install
new file mode 100644
index 000000000..22ca274a5
--- /dev/null
+++ b/gnome-unstable/caribou/caribou.install
@@ -0,0 +1,13 @@
+pkgname=caribou
+
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+}
diff --git a/gnome-unstable/epiphany/PKGBUILD b/gnome-unstable/epiphany/PKGBUILD
new file mode 100644
index 000000000..cb1fea9d8
--- /dev/null
+++ b/gnome-unstable/epiphany/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 136951 2011-09-03 17:04:39Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=epiphany
+pkgver=3.1.90
+pkgrel=1
+install=epiphany.install
+pkgdesc="A GNOME web browser based on the WebKit rendering engine."
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libsoup-gnome' 'libnotify' 'gsettings-desktop-schemas' 'libwebkit3' 'nss'
+         'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils'
+         'hicolor-icon-theme' 'seed')
+makedepends=('intltool' 'networkmanager' 'gnome-doc-utils' 'startup-notification')
+options=('!libtool' '!emptydirs')
+groups=('gnome')
+url="http://www.gnome.org/projects/epiphany/"
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('00351a3f23c53b83ff8fffe8ed6dbec7f300588622d51c8326b89b93b5d5abc6')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var \
+      --disable-scrollkeeper \
+      --enable-network-manager \
+      --enable-seed
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/gnome-unstable/epiphany/epiphany.install b/gnome-unstable/epiphany/epiphany.install
new file mode 100644
index 000000000..00b1abb96
--- /dev/null
+++ b/gnome-unstable/epiphany/epiphany.install
@@ -0,0 +1,20 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  if [ -f usr/share/gconf/schemas/epiphany.schemas ]; then
+    usr/sbin/gconfpkg --uninstall epiphany
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/gnome-unstable/gdm/PKGBUILD b/gnome-unstable/gdm/PKGBUILD
index 5c668372f..88097b4fc 100644
--- a/gnome-unstable/gdm/PKGBUILD
+++ b/gnome-unstable/gdm/PKGBUILD
@@ -1,29 +1,32 @@
-# $Id: PKGBUILD 136868 2011-09-02 14:23:08Z ibiru $
+# $Id: PKGBUILD 136953 2011-09-03 20:03:13Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=gdm
 pkgver=3.1.90
-pkgrel=1
+pkgrel=3
 pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnome.org"
-backup=('etc/pam.d/gdm' 'etc/pam.d/gdm-autologin' 'etc/gdm/custom.conf')
+backup=('etc/pam.d/gdm-autologin' 'etc/pam.d/gdm-fingerprint' 'etc/pam.d/gdm' 'etc/pam.d/gdm-password'
+        'etc/pam.d/gdm-smartcard' 'etc/pam.d/gdm-welcome' 'etc/gdm/custom.conf')
 groups=('gnome-extra')
 options=('!libtool')
-depends=('libcanberra' 'libxklavier' 'gnome-session' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss')
-makedepends=('intltool' 'gnome-doc-utils' 'xorg-server')
+depends=('caribou' 'libcanberra' 'libxklavier' 'gnome-session' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss')
+makedepends=('intltool' 'gnome-doc-utils' 'xorg-server' 'gobject-introspection')
 install=gdm.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
         fix_external_program_directories.patch
-        gdm.pam
-        gdm-autologin.pam
-        gdm)
+        gdm
+        gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam)
 sha256sums=('3fb9c52b8a18f39539c53d84645b89836de25a3eb3a0b84388e76a4f988178bf'
-            'c02af756912f744a0b32c05f2b552fd425b4d30cf9f8fe22e04be8746c325fc0'
+            'b7c19ab68dc38216f751be6d1e66d617fb9011e23185590e52ac1974d3bc1afb'
+            '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
+            'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d'
+            '5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e'
             'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
-            '3daff680ff6b7ea56f84f40843e46e72477c81e9e405028203c942af04d07ae5'
-            '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550')
-
+            '0dbb37b4e2a2a2dd2305f0f69cf32d63d353d34aacaf805d2c2ec52fbe558bb4'
+            'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd'
+            '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/fix_external_program_directories.patch"
@@ -43,16 +46,13 @@ package() {
   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 gdm ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -r "${pkgdir}/etc/gconf/"
 
-  install -m644 "${srcdir}/gdm.pam" "${pkgdir}/etc/pam.d/gdm"
-  install -m644 "${srcdir}/gdm-autologin.pam" "${pkgdir}/etc/pam.d/gdm-autologin"
-  sed -e 's/include\s*system-auth/required\tpam_unix.so/' -i "${pkgdir}/etc/pam.d/gdm-welcome"
+  for i in gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam;do
+      install -m644 "${srcdir}/${i}" "${pkgdir}/etc/pam.d/${i%.pam}"
+  done
 
-  install -m755 -d "${pkgdir}/etc/rc.d"
-  install -m755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/"
+  install -Dm755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/gdm"
 
-  rmdir "${pkgdir}/var/gdm"
   chmod 1770 "${pkgdir}/var/log/gdm"
-  rm -rf "${pkgdir}/var/run"
+  rm -rf "${pkgdir}/var/run" "${pkgdir}/var/gdm" "${pkgdir}/etc/gconf"
 }
diff --git a/gnome-unstable/gdm/fix_external_program_directories.patch b/gnome-unstable/gdm/fix_external_program_directories.patch
index e6f03c438..ce55b1d20 100644
--- a/gnome-unstable/gdm/fix_external_program_directories.patch
+++ b/gnome-unstable/gdm/fix_external_program_directories.patch
@@ -1,6 +1,6 @@
 diff -Nur gdm-3.1.90.orig/daemon/gdm-server.c gdm-3.1.90/daemon/gdm-server.c
 --- gdm-3.1.90.orig/daemon/gdm-server.c	2011-09-02 13:13:16.132989960 +0000
-+++ gdm-3.1.90/daemon/gdm-server.c	2011-09-02 13:18:17.495996840 +0000
++++ gdm-3.1.90/daemon/gdm-server.c	2011-09-03 08:00:30.007431483 +0000
 @@ -131,7 +131,7 @@
          g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
  
@@ -10,9 +10,19 @@ diff -Nur gdm-3.1.90.orig/daemon/gdm-server.c gdm-3.1.90/daemon/gdm-server.c
                                     server->priv->display_name);
  
          g_debug ("GdmServer: Running helper %s", command);
+diff -Nur gdm-3.1.90.orig/data/gdm-shell.session.in gdm-3.1.90/data/gdm-shell.session.in
+--- gdm-3.1.90.orig/data/gdm-shell.session.in	2011-09-02 13:13:16.136323327 +0000
++++ gdm-3.1.90/data/gdm-shell.session.in	2011-09-03 08:01:06.721067234 +0000
+@@ -1,5 +1,5 @@
+ [GNOME Session]
+ Name=Display Manager
+ RequiredComponents=gnome-shell;gnome-settings-daemon;
+-IsRunnableHelper=bash -c "gnome-shell --help | grep -q gdm-mode && (gnome-shell --version | grep -q '3.1.90$' && false || true) && (mutter --version | grep -q '3.1.90$' && false || true) && @libexecdir@/gnome-session-check-accelerated"
++IsRunnableHelper=bash -c "gnome-shell --help | grep -q gdm-mode && (gnome-shell --version | grep -q '3.1.90$' && false || true) && (mutter --version | grep -q '3.1.90$' && false || true) && /usr/lib/gnome-session/gnome-session-check-accelerated"
+ FallbackSession=gdm-fallback
 diff -Nur gdm-3.1.90.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.1.90/gui/simple-chooser/gdm-chooser-session.c
 --- gdm-3.1.90.orig/gui/simple-chooser/gdm-chooser-session.c	2011-09-02 13:13:16.136323327 +0000
-+++ gdm-3.1.90/gui/simple-chooser/gdm-chooser-session.c	2011-09-02 13:22:54.168703021 +0000
++++ gdm-3.1.90/gui/simple-chooser/gdm-chooser-session.c	2011-09-03 08:00:30.010764843 +0000
 @@ -131,7 +131,7 @@
          ret = FALSE;
  
diff --git a/gnome-unstable/gdm/gdm-autologin.pam b/gnome-unstable/gdm/gdm-autologin.pam
index 7c2f9a985..c77c78917 100644
--- a/gnome-unstable/gdm/gdm-autologin.pam
+++ b/gnome-unstable/gdm/gdm-autologin.pam
@@ -1,8 +1,18 @@
 #%PAM-1.0
-auth		requisite	pam_nologin.so
-auth		required	pam_env.so
-auth		required	pam_permit.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_limits.so
-session		required	pam_unix.so
+auth            requisite       pam_nologin.so
+auth            required        pam_env.so
+
+auth            requisite       pam_permit.so
+
+auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
+auth            required        pam_deny.so
+
+account         required        pam_unix.so
+
+password        required        pam_deny.so
+
+session         required        pam_loginuid.so
+-session        optional        pam_systemd.so
+session         optional        pam_keyinit.so revoke
+session         required        pam_limits.so
+session         required        pam_unix.so
diff --git a/gnome-unstable/gdm/gdm-fingerprint.pam b/gnome-unstable/gdm/gdm-fingerprint.pam
new file mode 100644
index 000000000..5b74bf6d6
--- /dev/null
+++ b/gnome-unstable/gdm/gdm-fingerprint.pam
@@ -0,0 +1,18 @@
+#%PAM-1.0
+auth            requisite       pam_nologin.so
+auth            required        pam_env.so
+
+auth            requisite       pam_fprintd.so
+
+auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
+auth            required        pam_deny.so
+
+account         required        pam_unix.so
+
+password        required        pam_deny.so
+
+session         required        pam_loginuid.so
+-session        optional        pam_systemd.so
+session         optional        pam_keyinit.so revoke
+session         required        pam_limits.so
+session         required        pam_unix.so
diff --git a/gnome-unstable/gdm/gdm-password.pam b/gnome-unstable/gdm/gdm-password.pam
new file mode 100644
index 000000000..7beda835a
--- /dev/null
+++ b/gnome-unstable/gdm/gdm-password.pam
@@ -0,0 +1,20 @@
+#%PAM-1.0
+auth            requisite       pam_nologin.so
+auth            required        pam_env.so
+
+auth            requisite       pam_unix.so nullok
+auth            optional        pam_gnome_keyring.so
+
+auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
+auth            required        pam_deny.so
+
+account         required        pam_unix.so
+
+password        required        pam_unix.so
+
+session         required        pam_loginuid.so
+-session        optional        pam_systemd.so
+session         optional        pam_keyinit.so revoke
+session         required        pam_limits.so
+session         required        pam_unix.so
+session         optional        pam_gnome_keyring.so auto_start
diff --git a/gnome-unstable/gdm/gdm-smartcard.pam b/gnome-unstable/gdm/gdm-smartcard.pam
new file mode 100644
index 000000000..baacb8bed
--- /dev/null
+++ b/gnome-unstable/gdm/gdm-smartcard.pam
@@ -0,0 +1,18 @@
+#%PAM-1.0
+auth            requisite       pam_nologin.so
+auth            required        pam_env.so
+
+auth            requisite       pam_pkcs11.so wait_for_card card_only
+
+auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
+auth            required        pam_deny.so
+
+account         required        pam_unix.so
+
+password        required        pam_pkcs11.so
+
+session         required        pam_loginuid.so
+-session        optional        pam_systemd.so
+session         optional        pam_keyinit.so revoke
+session         required        pam_limits.so
+session         required        pam_unix.so
diff --git a/gnome-unstable/gdm/gdm-welcome.pam b/gnome-unstable/gdm/gdm-welcome.pam
new file mode 100644
index 000000000..cc3811c19
--- /dev/null
+++ b/gnome-unstable/gdm/gdm-welcome.pam
@@ -0,0 +1,12 @@
+#%PAM-1.0
+auth            required        pam_env.so
+auth            required        pam_permit.so
+
+account         required        pam_nologin.so
+account         required        pam_unix.so
+
+password        required        pam_deny.so
+
+session         required        pam_loginuid.so
+-session        optional        pam_systemd.so
+session         optional        pam_keyinit.so force revoke
diff --git a/gnome-unstable/gnome-contacts/PKGBUILD b/gnome-unstable/gnome-contacts/PKGBUILD
new file mode 100644
index 000000000..81aae1ef1
--- /dev/null
+++ b/gnome-unstable/gnome-contacts/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 136955 2011-09-03 20:21:17Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+pkgname=gnome-contacts
+pkgver=0.1.3
+pkgrel=1
+pkgdesc="Contacts Manager for GNOME"
+arch=(i686 x86_64)
+url="http://www.gnome.org"
+license=('GPL2')
+groups=(gnome-extra)
+depends=('gtk3' 'folks' 'libnotify')
+makedepends=('intltool' 'vala')
+install=
+source=(http://download.gnome.org/sources/$pkgname/0.1/$pkgname-$pkgver.tar.xz)
+sha256sums=('3de2987af8bad5dce9d165bc07be1080ef2922f68ab0f93157c28fb7ad9af778')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/multilib/lib32-libcups/PKGBUILD b/multilib/lib32-libcups/PKGBUILD
index f3ec15e39..3d744f140 100644
--- a/multilib/lib32-libcups/PKGBUILD
+++ b/multilib/lib32-libcups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 49583 2011-06-18 08:21:51Z bluewind $
+# $Id: PKGBUILD 55132 2011-09-03 08:41:17Z bluewind $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 _pkgbasename=libcups
 pkgname=lib32-$_pkgbasename
-pkgver=1.4.5
-pkgrel=2
+pkgver=1.5.0
+pkgrel=1
 pkgdesc="The CUPS Printing System - client libraries (32-bit)"
 arch=('x86_64')
 license=('GPL')
@@ -12,7 +12,7 @@ url="http://www.cups.org/"
 depends=(lib32-krb5 lib32-libtiff lib32-libpng $_pkgbasename)
 makedepends=(gcc-multilib)
 source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2)
-md5sums=('50729f6fc46ba54223e0eaf5009f3419')
+md5sums=('e54ed09ede2340fc3014913333520fe4')
 
 build() {
   export CC="gcc -m32"
@@ -26,7 +26,7 @@ build() {
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
      --disable-ldap --enable-raw-printing --disable-gssapi --disable-dbus \
-     --enable-ssl=no --disable-gnutls --disable-threads \
+     --enable-ssl=no --disable-gnutls --enable-threads \
      --with-optim="$CFLAGS" --libdir=/usr/lib32
   make
 }
diff --git a/multilib/lib32-qt/PKGBUILD b/multilib/lib32-qt/PKGBUILD
index 388a9a17e..90518ecf5 100644
--- a/multilib/lib32-qt/PKGBUILD
+++ b/multilib/lib32-qt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 46350 2011-05-05 17:50:49Z bluewind $
+# $Id: PKGBUILD 55134 2011-09-03 13:56:53Z bluewind $
 # Maintainer: Florian Pritz <flo@xssn.at>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 _pkgbasename=qt
 pkgname=lib32-$_pkgbasename
-pkgver=4.7.3
+pkgver=4.7.4
 pkgrel=1
 pkgdesc='A cross-platform application and UI framework (32-bit)'
 arch=('x86_64')
@@ -20,7 +20,7 @@ makedepends=(cups gcc-multilib lib32-{mesa,libcups,libxfixes,gtk2})
 options=('!libtool')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz")
-md5sums=('49b96eefb1224cc529af6fe5608654fe')
+md5sums=('ddf7d83f912cf1283aa066368464fa22')
 
 build() {
   unset QMAKESPEC