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

Conflicts: community/egoboo/PKGBUILD extra/gnutls/PKGBUILD extra/kdelibs/PKGBUILD extra/maxima/PKGBUILD extra/phonon/PKGBUILD extra/rest/PKGBUILD extra/ristretto/PKGBUILD extra/samba/PKGBUILD extra/sbcl/PKGBUILD extra/xfce4-clipman-plugin/PKGBUILD extra/xfce4-notifyd/PKGBUILD libre/linux-libre/PKGBUILD
author: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2011-10-31 13:45:10 -0300
committer: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2011-10-31 13:45:10 -0300
commit: 97a832ff546d30bb6eec34f23fd94aecab9ac738 (patch)
tree: 90bbef126bf86efce995dfa00dadd9707baa8222
parent: 9879fa51372849ca7b637a1c22010584ca552274 (diff)
parent: f935ebf41c626e4832f86c5f3f7ed1cc35128f6b (diff)
130 files changed, 3562 insertions, 599 deletions
diff --git a/community-staging/libraw/PKGBUILD b/community-staging/libraw/PKGBUILD
new file mode 100644
index 000000000..c37c8e9a0
--- /dev/null
+++ b/community-staging/libraw/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 57457 2011-10-28 07:42:04Z lcarlier $
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
+# Maintainer: Brad Fanella <bradfanella@archlinux.us>
+
+pkgname=libraw
+_pkgbasename=LibRaw
+pkgver=0.14.3
+pkgrel=1
+pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"
+arch=('i686' 'x86_64')
+url="http://www.libraw.org/"
+license=('CDDL' 'LGPL' 'custom')
+depends=('lcms')
+options=('!makeflags')
+source=(http://www.libraw.org/data/${_pkgbasename}-${pkgver}.tar.gz)
+md5sums=('d8f81a52b0fada9d5bf7e659e21e3a57')
+
+build() {
+  	cd ${srcdir}/${_pkgbasename}-${pkgver}
+  
+	./configure --prefix=/usr
+	make
+}
+
+package() {
+  	cd ${srcdir}/${_pkgbasename}-${pkgver}
+
+  	make DESTDIR=${pkgdir} install
+}
diff --git a/community-staging/shotwell/PKGBUILD b/community-staging/shotwell/PKGBUILD
new file mode 100644
index 000000000..635643525
--- /dev/null
+++ b/community-staging/shotwell/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 57463 2011-10-28 09:01:56Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
+
+pkgname=shotwell
+pkgver=0.11.4
+pkgrel=5
+pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
+arch=('i686' 'x86_64')
+url="http://yorba.org/shotwell/"
+license=('LGPL2.1')
+depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libraw'
+	 'librsvg' 'json-glib' 'desktop-file-utils' 'dconf')
+makedepends=('intltool' 'vala')
+install=shotwell.install
+source=("http://yorba.org/download/shotwell/0.11/shotwell-${pkgver}.tar.bz2"
+	"http://ftp.gnome.org/pub/gnome/sources/vala/0.12/vala-0.12.1.tar.bz2"
+	"build-hack.patch")
+md5sums=('150899574f8fd96b6a5b87173a6ef3e0'
+         'bf35262cc611de447147d01cbac33767'
+         'afc8657b3fb3803d40f5e621e7857af8')
+
+build() {
+  cd "${srcdir}/vala-0.12.1"
+  ./configure --prefix=$srcdir/vala --enable-vapigen
+  make
+  make install
+  export PATH=$srcdir/vala/bin:$PATH
+
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+	--with-gconf-schema-file-dir=/usr/share/gconf/schemas \
+	--disable-schemas-install \
+	--disable-desktop-update \
+	--disable-icon-update
+  # hack
+  make || true
+  patch -p1 <$srcdir/build-hack.patch
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  rm -f $pkgdir/usr/share/glib-2.0/schemas/gschemas.compiled
+}
diff --git a/community-staging/shotwell/build-hack.patch b/community-staging/shotwell/build-hack.patch
new file mode 100644
index 000000000..8c65f6a8f
--- /dev/null
+++ b/community-staging/shotwell/build-hack.patch
@@ -0,0 +1,81 @@
+diff -wbBur shotwell-0.11.4/src/photos/GRaw.c shotwell-0.11.4.my/src/photos/GRaw.c
+--- shotwell-0.11.4/src/photos/GRaw.c	2011-10-28 12:44:04.000000000 +0400
++++ shotwell-0.11.4.my/src/photos/GRaw.c	2011-10-28 12:41:48.000000000 +0400
+@@ -210,7 +210,7 @@
+ };
+ GRawProcessor* graw_processor_new (enum LibRaw_constructor_flags options);
+ GRawProcessor* graw_processor_construct (GType object_type, enum LibRaw_constructor_flags options);
+-void graw_processor_add_masked_borders_to_bitmap (GRawProcessor* self);
++//void graw_processor_add_masked_borders_to_bitmap (GRawProcessor* self);
+ void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error);
+ void graw_processor_document_mode_processing (GRawProcessor* self, GError** error);
+ libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self);
+@@ -223,7 +223,7 @@
+ void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GError** error);
+ void graw_processor_process (GRawProcessor* self, GError** error);
+ void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename, GError** error);
+-void graw_processor_rotate_fuji_raw (GRawProcessor* self, GError** error);
++//void graw_processor_rotate_fuji_raw (GRawProcessor* self, GError** error);
+ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GError** error);
+ void graw_processor_recycle (GRawProcessor* self);
+ void graw_processor_unpack (GRawProcessor* self, GError** error);
+@@ -677,12 +677,12 @@
+ 	return graw_processor_construct (GRAW_TYPE_PROCESSOR, options);
+ }
+ 
+-
++#if 0
+ void graw_processor_add_masked_borders_to_bitmap (GRawProcessor* self) {
+ 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
+ 	libraw_add_masked_borders_to_bitmap (self->priv->proc);
+ }
+-
++#endif
+ 
+ void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error) {
+ 	enum LibRaw_errors _tmp0_;
+@@ -909,7 +909,7 @@
+ 	}
+ }
+ 
+-
++#if 0
+ void graw_processor_rotate_fuji_raw (GRawProcessor* self, GError** error) {
+ 	enum LibRaw_errors _tmp0_;
+ 	GError * _inner_error_ = NULL;
+@@ -927,7 +927,7 @@
+ 		}
+ 	}
+ }
+-
++#endif
+ 
+ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GError** error) {
+ 	enum LibRaw_errors _tmp0_;
+@@ -1044,8 +1044,8 @@
+ 	(*_tmp8_).use_camera_matrix = TRUE;
+ 	_tmp9_ = graw_processor_get_output_params (self);
+ 	(*_tmp9_).output_color = (gint) GRAW_COLORSPACE_SRGB;
+-	_tmp10_ = graw_processor_get_output_params (self);
+-	(*_tmp10_).filtering_mode = LIBRAW_FILTERING_AUTOMATIC;
++//	_tmp10_ = graw_processor_get_output_params (self);
++//	(*_tmp10_).filtering_mode = LIBRAW_FILTERING_AUTOMATIC;
+ 	_tmp11_ = graw_processor_get_output_params (self);
+ 	(*_tmp11_).output_bps = 8;
+ 	_tmp12_ = graw_processor_get_output_params (self);
+@@ -1356,6 +1356,7 @@
+ 				return;
+ 			}
+ 		}
++#if 0
+ 		case LIBRAW_CANNOT_ADDMASK:
+ 		{
+ 			GError* _tmp10_ = NULL;
+@@ -1372,6 +1373,7 @@
+ 				return;
+ 			}
+ 		}
++#endif
+ 		case LIBRAW_UNSUFFICIENT_MEMORY:
+ 		{
+ 			GError* _tmp11_ = NULL;
diff --git a/community-staging/shotwell/shotwell.install b/community-staging/shotwell/shotwell.install
new file mode 100644
index 000000000..bab8ecd29
--- /dev/null
+++ b/community-staging/shotwell/shotwell.install
@@ -0,0 +1,17 @@
+pkgname=shotwell
+
+post_install() {
+  gtk-update-icon-cache -fq -t usr/share/icons/hicolor
+  update-desktop-database -q
+  glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  update-desktop-database -q
+  gtk-update-icon-cache -fq -t usr/share/icons/hicolor
+  glib-compile-schemas usr/share/glib-2.0/schemas
+}
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/atop/PKGBUILD b/community/atop/PKGBUILD
index 273bc34c2..909c10bd3 100644
--- a/community/atop/PKGBUILD
+++ b/community/atop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 38572 2011-01-28 12:11:54Z spupykin $
+# $Id: PKGBUILD 57413 2011-10-27 08:43:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: John Gerritse <john.gerritse@gmail.com>
 
 pkgname=atop
 pkgver=1.26
-pkgrel=1
+pkgrel=2
 pkgdesc="A system and process level monitor."
 arch=(i686 x86_64 'mips64el')
 url="http://www.atoptool.nl/"
@@ -15,6 +15,11 @@ md5sums=('9a72baf4c8f330973f1e2703f5a6c041')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  sed -i 's#root ##' atop.cron
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir INIPATH=/etc/rc.d install
 }
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index 212ad291b..2b7be9e93 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 57135 2011-10-22 11:01:48Z giovanni $
+# $Id: PKGBUILD 57448 2011-10-27 21:24:16Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
-pkgver=0.8.23
+pkgver=0.8.24
 pkgrel=1
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug')
 install=calibre.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'desktop_integration.patch')
-md5sums=('a8841578d16786af3c797fa2422905e9'
+md5sums=('9ab82f7d4d072cc6858ef92f29d6029a'
          '253ce4fe5d01f8ff76b63cd3825755ea')
 
 build() {
diff --git a/community/dvdstyler/PKGBUILD b/community/dvdstyler/PKGBUILD
index fe017a95c..63bb86166 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' 'mips64el')
 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/e4rat/PKGBUILD b/community/e4rat/PKGBUILD
index 128defb93..9d3464f89 100644
--- a/community/e4rat/PKGBUILD
+++ b/community/e4rat/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 57392 2011-10-26 21:18:24Z mtorromeo $
+# $Id: PKGBUILD 57458 2011-10-28 07:42:34Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: graysky <graysky AT archlinux DOT us>
 
 pkgname=e4rat
 pkgver=0.2.1
-pkgrel=3
-pkgdesc="Toolset to accelerate the boot process and application startups.  Root partition must be ext4 ONLY!"
+pkgrel=4
+pkgdesc="Toolset to accelerate the boot process and application startups for systems with ext4 root partitions."
 arch=('i686' 'x86_64')
 url="http://e4rat.sourceforge.net/"
 license=('GPL')
 depends=('e2fsprogs' 'util-linux')
 makedepends=('audit' 'boost' 'cmake' 'e2fsprogs' 'perl' 'util-linux')
 options=(!strip)
-install=("$pkgname.install")
 source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/e4rat_"$pkgver"_src.tar.gz)
 
 build() {
diff --git a/community/egoboo/PKGBUILD b/community/egoboo/PKGBUILD
index 4a2b991bb..0c5796b84 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' 'mips64el')
 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/emesene/PKGBUILD b/community/emesene/PKGBUILD
index 5fab60f2a..2e9b856fa 100755
--- a/community/emesene/PKGBUILD
+++ b/community/emesene/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55723 2011-09-18 07:15:35Z rvanharen $
+# $Id: PKGBUILD 57431 2011-10-27 18:18:52Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Claudio Riva <firetux83@gmail.com>
 
 pkgname=emesene
-pkgver=2.11.7
-pkgrel=2
+pkgver=2.11.9
+pkgrel=1
 pkgdesc="A pygtk MSN Messenger client"
 url="http://www.emesene.org/"
 license=('custom:PSF' 'GPL' 'LGPL2.1')
@@ -23,7 +23,7 @@ source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}
         'emesene.run')
 install=emesene.install
 options=('!libtool')
-sha1sums=('ba18b6a40003c1e0407dc1395a237db84ce4efa1'
+sha1sums=('b79ee47962db7927f2fcfdcb5fb5b042bced4b94'
           '2bd13ada86aa0af6307a41047f0d7caf2995660d')
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -53,3 +53,4 @@ package() {
   # create executable
   install -Dm755 ${srcdir}/emesene.run ${pkgdir}/usr/bin/emesene
 }
+
diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD
new file mode 100644
index 000000000..889f2cb87
--- /dev/null
+++ b/community/glfw/PKGBUILD
@@ -0,0 +1,41 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: philefou <tuxication AT gmail DOT com>
+# Contributor: lindquist <tomas@famolsen.dk>
+# Contributor: Christoph Siegenthaler <csi@gmx.ch>
+# Contributor: Mihai Militaru <mihai.militaru@ephemeros.org>
+# Contributor: SpepS <dreamspepser at yahoo dot it>
+
+pkgname=glfw
+pkgver=2.7.2
+pkgrel=2
+pkgdesc="A free, open source, portable framework for OpenGL application development"
+arch=('i686' 'x86_64')
+url="http://www.glfw.org/"
+license=('custom:ZLIB')
+depends=('libgl' 'libxrandr')
+makedepends=('mesa')
+source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2")
+md5sums=('bb4f33b43e40f8cd3015a653dca02ed1')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make x11
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make PREFIX="$pkgdir/usr" x11-dist-install
+
+  # license
+  install -Dm644 COPYING.txt \
+    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
+  # docs
+  install -d "$pkgdir/usr/share/doc/$pkgname"
+  install -Dm644 docs/*.pdf "$pkgdir/usr/share/doc/$pkgname"
+
+  # fix pc file prefix path
+  sed -i "s|$pkgdir||g" "$pkgdir/usr/lib/pkgconfig/lib$pkgname.pc"
+}
diff --git a/community/gromacs/PKGBUILD b/community/gromacs/PKGBUILD
index 22a806f8c..663fba240 100644
--- a/community/gromacs/PKGBUILD
+++ b/community/gromacs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 43416 2011-03-25 21:35:12Z ebelanger $
+# $Id: PKGBUILD 57441 2011-10-27 20:16:45Z lcarlier $
 # Maintainer: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: Ricardo <rikardo.horo@gmail.com>
 
 pkgname=gromacs
-pkgver=4.5.4
+pkgver=4.5.5
 pkgrel=1
 pkgdesc='A fast Molecular Dynamics program based on the GROMOS force field'
 url='http://www.gromacs.org/'
@@ -12,8 +12,8 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=('fftw' 'lesstif' 'perl' 'libxml2' 'libsm' 'libx11')
 options=('!libtool')
 source=(ftp://ftp.gromacs.org/pub/gromacs/${pkgname}-${pkgver}.tar.gz)
-md5sums=('5013de941017e014b92d41f82c7e86d6')
-sha1sums=('c7b3fbd2f3ddf915bc082e7effe76a8276563726')
+md5sums=('6a87e7cdfb25d81afa9fea073eb28468')
+sha1sums=('ce4b4f9a0453dd2ffea72f28ea0bc7bb7a72f479')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD
index 51ba68cfe..7ebff81e4 100644
--- a/community/gtranslator/PKGBUILD
+++ b/community/gtranslator/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 56273 2011-10-04 13:27:12Z jelle $
+# $Id: PKGBUILD 57477 2011-10-28 12:30:44Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Contributor: Christer Solskogen (solskogen@carebears.mine.nu)
 
 pkgname=gtranslator
-pkgver=2.90.5
-pkgrel=2
+pkgver=2.90.7
+pkgrel=1
 pkgdesc="An enhanced gettext po file editor for the GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.gnome.org/gtranslator/"
@@ -19,7 +19,7 @@ options=('!libtool')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.90/$pkgname-$pkgver.tar.bz2)
-sha256sums=('26425b2687f00658dd34eb5cc598d456f9e13bcc432991f455258cb0770b0505')
+sha256sums=('55845ad665f5e55265dd017d1c96e41a72c4c5691eb218ba9db6985b66afa556')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/gtranslator/gtranslator.changelog b/community/gtranslator/gtranslator.changelog
index 4b715e6b1..f78e2aab5 100644
--- a/community/gtranslator/gtranslator.changelog
+++ b/community/gtranslator/gtranslator.changelog
@@ -1,3 +1,6 @@
+2011-10-28 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
+	* gtranslator 2.90.7-1
+
 2011-08-20 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
 	* gtranslator 2.90.5-1
 
diff --git a/community/iasl/PKGBUILD b/community/iasl/PKGBUILD
index 81ddf0964..20821d7bf 100644
--- a/community/iasl/PKGBUILD
+++ b/community/iasl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55855 2011-09-23 21:20:50Z lcarlier $
+# $Id: PKGBUILD 57443 2011-10-27 20:27:47Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alessio 'mOlOk' Bolognino <themolok@gmail.com>
 
 pkgname=iasl
-pkgver=20110623
+pkgver=20110922
 pkgrel=1
 pkgdesc="Intel ACPI Source Language compiler"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ options=('!makeflags')
 install=iasl.install
 source=(http://acpica.org/download/acpica-unix-${pkgver}.tar.gz
 	LICENSE)
-md5sums=('93e827bf4b1f1971a1b3c2074c5f9ccb'
+md5sums=('b95af67bb277657ae01844db01f2f9c7'
          '8615526144f69ea4e870d9bc37df9b29')
 
 build() {
diff --git a/community/kmymoney/PKGBUILD b/community/kmymoney/PKGBUILD
index 9c3b2fc4d..fb7b59bc3 100644
--- a/community/kmymoney/PKGBUILD
+++ b/community/kmymoney/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 40038 2011-02-19 15:18:41Z jlichtblau $
+# $Id: PKGBUILD 57452 2011-10-27 21:53:29Z lcarlier $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Vamp898 <vamp898@web.de>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
@@ -6,30 +6,35 @@
 # Contributor: Todd Maynard <arch@toddmaynard.com>
 
 pkgname=kmymoney
-pkgver=4.5.3
+pkgver=4.6.0
 pkgrel=1
 pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kmymoney2.sourceforge.net/"
 license=('GPL')
-depends=('boost' 'kdebase-workspace' 'shared-mime-info' 'aqbanking' 'libofx')
-makedepends=('cmake' 'automoc4' 'docbook-xml' 'docbook-xsl' 'gwenhywfar')
+depends=('kdebase-workspace' 'shared-mime-info' 'aqbanking' 'libofx' 'libalkimia' 'boost-libs')
+makedepends=('cmake' 'automoc4' 'docbook-xml' 'docbook-xsl' 'boost')
 replaces=('kmymoney2')
 install=$pkgname.install
 changelog=$pkgname.changelog
 options=('!makeflags')
 source=(http://downloads.sourceforge.net/project/kmymoney2/KMyMoney-KDE4/$pkgver/$pkgname-$pkgver.tar.bz2)
-sha256sums=('a9b37275cf3cdcd5ce865d94391df44c7822639b830fccb9962a54b7fcf76ffb')
+sha256sums=('8f034a92682cc61dfa76c2593893524d00658c49360b17ddc67671e32ec7edf8')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd ${srcdir}
 
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE
+  mkdir build
+  cd build
+
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=RELEASE
   make
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd ${srcdir}/build
 
   make DESTDIR=${pkgdir} install
 }
diff --git a/community/leptonica/PKGBUILD b/community/leptonica/PKGBUILD
index b19320316..d5e3fec82 100644
--- a/community/leptonica/PKGBUILD
+++ b/community/leptonica/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 57293 2011-10-25 10:37:42Z spupykin $
+# $Id: PKGBUILD 57411 2011-10-27 08:39:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Christoph Drexler <chrdr at gmx dot at>
 
 pkgname=leptonica
 pkgver=1.68
-pkgrel=1
+pkgrel=2
 pkgdesc="Software that is broadly useful for image processing and image analysis applications"
 arch=('i686' 'x86_64')
 url="http://www.leptonica.com/"
 license=('custom')
 depends=('glibc')
+makedepends=('giflib' 'gnuplot' 'libjpeg' 'libpng' 'libtiff' 'zlib')
+# 'webp'
 optdepends=('giflib:  for supporting gif files'
 	    'gnuplot: gnuplot support'
 	    'libjpeg: for supporting jpeg files'
 	    'libpng:  for supporting png files'
 	    'libtiff: for supporting tiff files'
-	    'webp:    for supporting webp files'
 	    'zlib:    for supporting compressed files')
+#	    'webp:    for supporting webp files'
 source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz)
 md5sums=('5cd7092f9ff2ca7e3f3e73bfcd556403')
 
diff --git a/community/libalkimia/PKGBUILD b/community/libalkimia/PKGBUILD
new file mode 100644
index 000000000..18a86ae47
--- /dev/null
+++ b/community/libalkimia/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 57450 2011-10-27 21:27:30Z lcarlier $
+# Contributor: gumper <gumper1034@gmail.com>
+
+pkgname=libalkimia
+pkgver=4.3.1
+pkgrel=1
+pkgdesc="A library with common classes and functionality used by finance applications for the KDE SC."
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4' 'doxygen')
+url=('http://kde-apps.org/content/show.php/libalkimia?content=137323')
+license=('LGPL')
+arch=('i686' 'x86_64')
+source=("http://kde-apps.org/CONTENT/content-files/137323-libalkimia-$pkgver.tar.bz2")
+md5sums=('73d7f1365118019030b2045d95c92456')
+
+build() {
+  cd "${srcdir}"
+
+  mkdir build
+  cd build
+
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=DebugFull \
+    -Wno-dev
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+ 
+  make DESTDIR="${pkgdir}" install  
+}
+
diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD
index f02bca829..f623ce692 100644
--- a/community/libmemcached/PKGBUILD
+++ b/community/libmemcached/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 56051 2011-09-29 17:22:52Z foutrelis $
+# $Id: PKGBUILD 57420 2011-10-27 12:32:11Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=libmemcached
-pkgver=0.53
+pkgver=1.0.2
 pkgrel=1
 pkgdesc="C and C++ client library to the memcached server"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('glibc')
 makedepends=('perl')
 options=('!libtool')
 source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-sha1sums=('52e0422a8916814b7c416d1671018e9aab50e9cc')
+sha1sums=('d992845fe71210e2e93147ba8f29df1fca14e716')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD
index 007389ad9..b741f675b 100644
--- a/community/libraw/PKGBUILD
+++ b/community/libraw/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 55740 2011-09-18 19:52:04Z bfanella $
+# $Id: PKGBUILD 57461 2011-10-28 07:54:07Z lcarlier $
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
@@ -28,3 +28,4 @@ package() {
 
   	make DESTDIR=${pkgdir} install
 }
+
diff --git a/community/libwww/PKGBUILD b/community/libwww/PKGBUILD
index fe00f8360..a0d1852ac 100644
--- a/community/libwww/PKGBUILD
+++ b/community/libwww/PKGBUILD
@@ -1,11 +1,14 @@
+# $Id: PKGBUILD 57429 2011-10-27 16:42:35Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Buharev Vasilij <buharev.v.p@gmail.com>
+
 pkgname=libwww
 pkgver=5.4.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A general-purpose client side WEB API"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.w3.org/Library/"
-license=('custom')
+license=('W3C')
 depends=()
 makedepends=('gcc pkgconfig perl zlib openssl')
 options=('!libtool')
@@ -13,13 +16,10 @@ source=(http://www.w3.org/Library/Distribution/w3c-$pkgname-$pkgver.tgz)
 md5sums=('c3734ca6caa405707e134cc8c6d7e422')
 
 build() {
-  cd "$startdir/src/w3c-$pkgname-$pkgver"
-
-  #export ac_cv_header_appkit_appkit_h=no
-  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --with-md5 --with-zlib --with-expat --with-regex --with-ssl
+  cd "$srcdir/w3c-$pkgname-$pkgver"
+  [ -f Makefile ] || ./configure --prefix=/usr \
+	--with-md5 --with-zlib --with-expat --with-regex --with-ssl
   sed -i 's#Examples##' Library/Makefile
-  make || return 1
-  make DESTDIR="$startdir/pkg" install || return 1
-
-  install -D -m 0644 COPYRIGHT.html $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT.html
+  make
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/lomoco/PKGBUILD b/community/lomoco/PKGBUILD
new file mode 100644
index 000000000..094547913
--- /dev/null
+++ b/community/lomoco/PKGBUILD
@@ -0,0 +1,36 @@
+# Maintainer: Jeff Mickey <j@codemac.net>
+# Contributor: Shadowhand <woody.gilk@gmail.com>
+
+pkgname=lomoco
+pkgver=1.0
+pkgrel=6
+url="http://www.lomoco.org/"
+pkgdesc="Logitech USB mouse configuration program"
+license=('GPL')
+depends=('libusb-compat')
+replaces=('lmctl')
+arch=('i686' 'x86_64')
+options=(!libtool)
+backup=(etc/udev/lomoco_mouse.conf)
+source=(http://www.lomoco.org/${pkgname}-${pkgver}.tar.gz
+	lomoco_mouse.conf
+	lomoco.sh)
+md5sums=('f5197d0a3ee81229c3eecc1e03f7b08d'
+         '182b10a7e4a1828a93c1d55ef7f81b97'
+         'bc92f661641265b33b27895ef24028fd')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./autogen.sh --prefix=/usr --mandir=/usr/share/man
+  make
+  make udev-rules
+  make DESTDIR=${pkgdir} install
+
+  # Fix and install udev rules and helpers
+  sed -i 's|/etc/sysconfig/logitech_mouse|/etc/udev/lomoco_mouse.conf|g' udev/udev.lomoco
+  sed -i 's|RUN="lomoco"|RUN+="lomoco.sh"|g' udev/lomoco.rules
+  sed -i 's|SYSFS|ATTR|' udev/lomoco.rules
+  install -D -m 644 udev/lomoco.rules ${pkgdir}/etc/udev/rules.d/80-lomoco.rules
+  install -D -m 755 ../lomoco.sh ${pkgdir}/lib/udev/lomoco.sh
+  install -D -m 644 ../lomoco_mouse.conf ${pkgdir}/etc/udev/
+}
diff --git a/community/lomoco/lomoco.sh b/community/lomoco/lomoco.sh
new file mode 100644
index 000000000..76e2392da
--- /dev/null
+++ b/community/lomoco/lomoco.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+if [ -n "$BUSNUM" -a -n "$DEVNUM" ]; then
+	. /etc/udev/lomoco_mouse.conf
+
+	options=
+
+	if [ -n "$LOGITECH_MOUSE_RESOLUTION" ]; then
+		options="--$LOGITECH_MOUSE_RESOLUTION"
+	fi
+
+	case "$LOGITECH_MOUSE_SMS" in
+		yes) options="$options --sms" ;;
+		no) options="$options --no-sms" ;;
+	esac
+
+	if [ -n "$options" ]; then
+		/usr/bin/lomoco -b $BUSNUM -d $DEVNUM $options
+	fi
+
+fi 2>&1 | /usr/bin/logger -t lomoco
diff --git a/community/lomoco/lomoco_mouse.conf b/community/lomoco/lomoco_mouse.conf
new file mode 100644
index 000000000..b8c534ec2
--- /dev/null
+++ b/community/lomoco/lomoco_mouse.conf
@@ -0,0 +1,5 @@
+# Possible Resolutions Are: 400 800 1200 1600 2000
+#LOGITECH_MOUSE_RESOLUTION="800"
+
+# SmartScroll/Cruise Control (SMS command set): yes or no
+#LOGITECH_MOUSE_SMS="no"
diff --git a/community/ndisc6/PKGBUILD b/community/ndisc6/PKGBUILD
new file mode 100644
index 000000000..206db2574
--- /dev/null
+++ b/community/ndisc6/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 57422 2011-10-27 13:12:24Z cbrannon $
+# Maintainer: Chris Brannon <chris@the-brannons.com>
+# Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
+pkgname=ndisc6
+pkgver=1.0.2
+pkgrel=1
+pkgdesc="A collection of IPv6 networking utilities - ndisc6, rdisc6, tcptraceroute6, tracert6, rltraceroute6, tcpspray6"
+arch=('i686' 'x86_64')
+url="http://www.remlab.net/ndisc6/"
+license=("GPL")
+depends=('glibc')
+makedepends=('glibc' 'gcc')
+source=(http://www.remlab.net/files/ndisc6/$pkgname-$pkgver.tar.bz2
+        rdnssd.rc.d
+	rdnssd.confd)
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --localstatedir=/var --sysconfdir=/etc --prefix=/usr
+  make
+
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  install -Dm755 "$srcdir/rdnssd.rc.d" "$pkgdir/etc/rc.d/rdnssd"
+  install -Dm644 "$srcdir/rdnssd.confd" "$pkgdir/etc/conf.d/rdnssd"
+
+}
+
+md5sums=('50cb4c19606cf6ff2b7388e71832f579'
+         '3421fd731c4da4f9e07fc6b6ff4e5084'
+         'f1910902932e2622fc166960819db6c4')
diff --git a/community/ndisc6/rdnssd.confd b/community/ndisc6/rdnssd.confd
new file mode 100644
index 000000000..306c3d7f6
--- /dev/null
+++ b/community/ndisc6/rdnssd.confd
@@ -0,0 +1,8 @@
+
+# This default merge hook adds IPv6 DNS resolvers
+# before the existing IPv4 ones in /etc/resolv.conf.
+MERGEHOOK="/etc/rdnssd/merge-hook"
+
+# User who runs rdnssd.
+RUN_AS="nobody"
+
diff --git a/community/ndisc6/rdnssd.rc.d b/community/ndisc6/rdnssd.rc.d
new file mode 100644
index 000000000..3c0a6a53c
--- /dev/null
+++ b/community/ndisc6/rdnssd.rc.d
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/rdnssd
+
+PIDFILE="/var/run/rdnssd.pid"
+PID=`cat "$PIDFILE" 2>/dev/null`
+case "$1" in
+  start)
+    stat_busy "Starting RDNSS Daemon"
+    if [ ! -z "$PID" -a -e "/proc/$PID" ]; then
+      stat_append "-- Already running"
+      stat_die
+    else
+      /usr/sbin/rdnssd -p "$PIDFILE"    \
+        ${MERGEHOOK/*/-H}  "$MERGEHOOK" \
+        ${RUN_AS/*/-u}     "$RUN_AS"
+
+      if [ $? -gt 0 ]; then
+        stat_fail
+      else
+        add_daemon rdnssd
+        stat_done
+      fi
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping RDNSS Daemon"
+    if [ -z "$PID" ]; then
+      stat_append "-- Not running"
+      stat_die
+    else
+      kill $PID &> /dev/null
+      if [ $? -gt 0 ]; then
+        stat_fail
+      else
+        rm_daemon sshd
+        stat_done
+      fi
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD
index aa37fdf10..bc023dddf 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' 'mips64el')
@@ -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/quassel/PKGBUILD b/community/quassel/PKGBUILD
index 1eb57c63f..9c87260ae 100644
--- a/community/quassel/PKGBUILD
+++ b/community/quassel/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 52032 2011-07-19 19:58:15Z jlichtblau $
+# $Id: PKGBUILD 57415 2011-10-27 10:22:06Z lcarlier $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 
 pkgname=quassel
-pkgver=0.7.2
+pkgver=0.7.3
 pkgrel=1
 pkgdesc="QT4 irc client with a separated core"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,11 +11,11 @@ license=('GPL')
 depends=('kdelibs' 'oxygen-icons' 'hicolor-icon-theme')
 makedepends=('cmake' 'automoc4')
 install=$pkgname.install
-backup=(etc/conf.d/quassel.conf)
+backup=(etc/conf.d/quassel)
 source=(http://quassel-irc.org/pub/$pkgname-$pkgver.tar.bz2
         rc.$pkgname
         $pkgname.conf)
-sha256sums=('b9e4a094c46715dd68152cd98a4e0778e308a0ec653eb8b5476ec429d128d55c'
+sha256sums=('9e78dbc28bfeda2ed66fa3082392951cbd002f851ef1a7f1228988bb18c7c98d'
             '845e621448a51ec181554e9327bfcc3a3de1501ae8f70410f0b9b8991ac171b0'
             'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
 
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index 7831c6c90..a2f563c6c 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56852 2011-10-14 21:13:51Z spupykin $
+# $Id: PKGBUILD 57479 2011-10-28 13:24:44Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
 # Contributor: nofxx <x@<nick>.com>
 
 pkgname=redis
-pkgver=2.4.0
+pkgver=2.4.2
 pkgrel=1
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ backup=("etc/redis.conf"
 source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
 	"redis.d"
 	"redis.logrotate")
-md5sums=('efdfa0d40fc7676199005bd0178cf6a9'
+md5sums=('c4b0b5e4953a11a503cb54cf6b09670e'
          '9726d06d0a0c60cb5d55a31b3dc1e55d'
          '9e2d75b7a9dc421122d673fe520ef17f')
 
diff --git a/community/solfege/PKGBUILD b/community/solfege/PKGBUILD
index 135bd42d8..fe0e9511f 100644
--- a/community/solfege/PKGBUILD
+++ b/community/solfege/PKGBUILD
@@ -1,13 +1,12 @@
-# $Id: PKGBUILD 55949 2011-09-26 18:58:53Z schiv $
+# $Id: PKGBUILD 57439 2011-10-27 19:55:33Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: sickhate <sickhate@tux-linux.net>
 
 # TODO:
 #   bring in pyalsa, csound, mma
-options=('!makeflags')
 pkgname=solfege
-pkgver=3.20.3
+pkgver=3.20.4
 pkgrel=1
 pkgdesc="Music education and ear training software"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,16 +14,15 @@ url="http://www.solfege.org/"
 license=('GPL3')
 depends=('pygtk' 'libgtkhtml')
 makedepends=('ghostscript' 'gnome-doc-utils' 'librsvg' 'libxslt'
-             'swig' 'texinfo' 'txt2man' 'pkg-config')
+             'swig' 'texinfo' 'txt2man')
 optdepends=('timidity++: or any MIDI player & MIDI-WAV converter'
             'mpg123: or any MP3 player'
             'lame: or any WAV-MP3 converter'
             'vorbis-tools: or any OGG player & WAV-OGG converter'
-            #'lilypond: for generating print-outs & score sheets'
+            'lilypond: for generating print-outs & score sheets'
             'texlive-bin: use LaTeX to replace HTML reports with DVI')
-changelog=$pkgname.changelog
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('b6546691d0e34595e3c87c0e38a8ae15')
+md5sums=('3a1914158ad218ad5b119ee4f719b567')
 
 build() {
   cd "$srcdir/$pkgname-$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 fd9cf1416..b06dbf980 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' 'mips64el')
 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/community/xmoto/PKGBUILD b/community/xmoto/PKGBUILD
index 8eec6369d..3f13d611e 100644
--- a/community/xmoto/PKGBUILD
+++ b/community/xmoto/PKGBUILD
@@ -4,17 +4,17 @@
 # Contributor: Denis (dtonator@gmail.com)
 
 pkgname=xmoto
-pkgver=0.5.7
+pkgver=0.5.8
 pkgrel=1
 pkgdesc="A challenging 2D motocross platform game, where physics play an important role."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xmoto.tuxfamily.org"
 license=('GPL')
 depends=('bzip2' 'libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode=0.11.1' 'curl' 
-	 'mesa' 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net' 'libxdg-basedir')
+	 'mesa' 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net' 'libxdg-basedir' 'libxml++')
 install=xmoto.install
 source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz")
-sha1sums=('e781b42480a96187b5aca4126d17ecf0610ca5ac')
+sha1sums=('a5197e10f0c37cfefbab55723c8d0760234fb4ce')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD
index f8bbaf00c..097eac49c 100644
--- a/core/pam/PKGBUILD
+++ b/core/pam/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 134648 2011-08-07 10:12:55Z tpowa $
+# $Id: PKGBUILD 141297 2011-10-28 10:57:26Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=pam
-pkgver=1.1.4
+pkgver=1.1.5
 pkgrel=1
 pkgdesc="PAM (Pluggable Authentication Modules) library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,11 +14,12 @@ makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
 [ "$CARCH" = "mips64el" ] && \
 makedepends=('flex' 'docbook-xml>=4.4' 'docbook-xsl')
 backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/pam.d/other etc/default/passwd etc/environment)
-source=(http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2
+source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2
+        #http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2
         ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2
         other)
 options=('!libtool' '!emptydirs')
-md5sums=('e9af5fb27bb22edb55d077e2888b3ebc'
+md5sums=('927ee5585bdec5256c75117e9348aa47'
          'e2788389a6c59224110a45fcff30e02b'
          '6e6c8719e5989d976a14610f340bd33a')
 
@@ -56,3 +57,6 @@ _EOT
   # set unix_chkpwd uid
   chmod +s $pkgdir/sbin/unix_chkpwd
 }
+md5sums=('927ee5585bdec5256c75117e9348aa47'
+         'e2788389a6c59224110a45fcff30e02b'
+         '6e6c8719e5989d976a14610f340bd33a')
diff --git a/core/tzdata/PKGBUILD b/core/tzdata/PKGBUILD
index 119c133ea..969ba3a2d 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' 'mips64el')
 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/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD
index 8fbba74df..69602c83c 100644
--- a/extra/accountsservice/PKGBUILD
+++ b/extra/accountsservice/PKGBUILD
@@ -1,7 +1,8 @@
-# $Id: PKGBUILD 139213 2011-10-01 18:55:35Z ibiru $
+# $Id: PKGBUILD 141268 2011-10-27 16:31:57Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
+
 pkgname=accountsservice
-pkgver=0.6.14
+pkgver=0.6.15
 pkgrel=1
 pkgdesc="D-Bus interface for user account query and manipulation"
 arch=(i686 x86_64 'mips64el')
@@ -11,7 +12,7 @@ depends=('dbus-glib' 'polkit')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('88f4d5d0d1f0ce0fa6a180cbff936041')
+md5sums=('939e58e57334801ca578b182a09141c4')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD
index 806a08c5e..7f7524a58 100644
--- a/extra/blender/PKGBUILD
+++ b/extra/blender/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 140830 2011-10-20 05:01:46Z eric $
+# $Id: PKGBUILD 141279 2011-10-28 02:04:28Z eric $
 # Contributor: John Sowiak <john@archlinux.org>
 # Maintainer: tobias <tobias@archlinux.org>
 
@@ -12,9 +12,9 @@
 _svn=false
 
 pkgname=blender
-pkgver=2.60
+pkgver=2.60a
 pkgrel=1
-epoch=2
+epoch=3
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -26,7 +26,7 @@ makedepends=('cmake')
 install=blender.install
 if [ $_svn = false ]; then
   source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-  md5sums=('2951df9d5f004c5e0375b53969205a38')
+  md5sums=('cc7e4a56c9f7941c33c958ff0338f9a6')
 else
   source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
   md5sums=('7579d1139d0d6025df8afcfca64a65c4')
diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD
index b8c6c2ee2..6f61bdd74 100644
--- a/extra/clutter-gst/PKGBUILD
+++ b/extra/clutter-gst/PKGBUILD
@@ -1,7 +1,8 @@
-# $Id: PKGBUILD 139555 2011-10-03 12:43:44Z ibiru $
+# $Id: PKGBUILD 141289 2011-10-28 07:37:23Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+
 pkgname=clutter-gst
-pkgver=1.4.2
+pkgver=1.4.4
 pkgrel=1
 pkgdesc="GStreamer bindings for clutter"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +12,7 @@ depends=('clutter' 'gstreamer0.10-base' 'libxdamage')
 makedepends=('gobject-introspection' 'gtk-doc')
 options=('!libtool')
 source=(http://clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('48f623a08a6793ab688ef6b899a2d889ef68053718ba44aac7997a1f9f619e7e')
+sha256sums=('9fdcf8d8531d4d78342e7ac901d1768c7a8f78124f74dd6be8e51961169b8fb5')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/fluxbox/PKGBUILD b/extra/fluxbox/PKGBUILD
index e6c39b586..59b098efe 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' 'mips64el')
 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/fuse/PKGBUILD b/extra/fuse/PKGBUILD
index ef08b69d6..92d96cdf0 100644
--- a/extra/fuse/PKGBUILD
+++ b/extra/fuse/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 94450 2010-10-07 10:30:45Z ronald $
+# $Id: PKGBUILD 141256 2011-10-27 14:45:14Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Mark Rosenstand <mark@archlinux.org>
 
 pkgname=fuse
-pkgver=2.8.5
+pkgver=2.8.6
 pkgrel=1
 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,20 +16,23 @@ install=fuse.install
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	'fuse.conf')
 options=(!libtool)
-sha1sums=('862320b56d6bc4ad5e7be2b1e0b5029166aae09b'
+sha1sums=('c2c0f9fff8bfee217da200888123e5abb5b498f2'
           '3b42e37a741d4651099225987dc40e7f02a716ad')
-
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+
+  # fix building with glibc-2.14
+  sed -i '1i#define _GNU_SOURCE' util/fusermount.c
+
   ./configure --prefix=/usr --enable-lib \
               --enable-util --bindir=/bin
-  make || return 1
+  make
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 
   # static device nodes will cause collision.
   rm -rf ${pkgdir}/dev
@@ -40,16 +43,19 @@ package() {
   #install -D -m755 ${srcdir}/fuse.rc.d ${pkgdir}/etc/rc.d/fuse
 
   install -d ${pkgdir}/lib
-  mv ${pkgdir}/usr/lib/libfuse.so.${pkgver} ${pkgdir}/lib/ || return 1
-  ln -s ../../lib/libfuse.so.${pkgver} ${pkgdir}/usr/lib/libfuse.so.${pkgver} || return 1
-  ln -s libfuse.so.${pkgver} ${pkgdir}/lib/libfuse.so.2 || return 1
-  mv ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 ${pkgdir}/lib/ || return 1
-  ln -s ../../lib/libulockmgr.so.1.0.1 ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 || return 1
-  ln -s libulockmgr.so.1.0.1 ${pkgdir}/lib/libulockmgr.so.1 || return 1
+  mv ${pkgdir}/usr/lib/libfuse.so.${pkgver} ${pkgdir}/lib/
+  ln -s ../../lib/libfuse.so.${pkgver} ${pkgdir}/usr/lib/libfuse.so.${pkgver}
+  ln -s libfuse.so.${pkgver} ${pkgdir}/lib/libfuse.so.2
+  mv ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 ${pkgdir}/lib/
+  ln -s ../../lib/libulockmgr.so.1.0.1 ${pkgdir}/usr/lib/libulockmgr.so.1.0.1
+  ln -s libulockmgr.so.1.0.1 ${pkgdir}/lib/libulockmgr.so.1
 
   # install sample config file
-  install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf || return 1
+  install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf
   # Fix udev rule location
   install -d -m755 "${pkgdir}/lib"
   mv "${pkgdir}/etc/udev" "${pkgdir}/lib/"
+
+  # remove udev rules (should already be in udev package}
+  rm -f ${pkgdir}/lib/udev/rules.d/99-fuse.rules
 }
diff --git a/extra/fuse/fuse.install b/extra/fuse/fuse.install
index 595ac7c12..f186d64c7 100644
--- a/extra/fuse/fuse.install
+++ b/extra/fuse/fuse.install
@@ -8,7 +8,3 @@ post_install() {
  -> For a static /dev, run: mknod /dev/fuse -m 0666 c 10 229
 EOM
 }
-
-op=$1
-shift
-$op $*
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 388da42fd..a78b96d08 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140493 2011-10-15 19:34:21Z andyrtr $
+# $Id: PKGBUILD 141300 2011-10-28 13:49:24Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.0.4
-pkgrel=2
+pkgver=3.0.5
+pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3' 'LGPL')
@@ -12,14 +12,11 @@ install=gnutls.install
 options=('!libtool' '!zipman')
 depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit')
 [ "$CARCH" = "mips64el" ] || makedepends=('valgrind')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz
-	addGNU-stack.diff)
-md5sums=('748d537027978abcb7dd33ec396dc511'
-         '19b92429e8d1639cfc4dfad0883298cb')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
+md5sums=('c2d4e6344974545c228a1df2147bf334')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/addGNU-stack.diff
   ./configure --prefix=/usr \
 	--with-zlib \
 	--disable-static \
diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD
index fb61387a9..6689b196a 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 'mips64el')
@@ -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 184c783d3..4cca56251 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' 'mips64el')
 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 16d13fea9..36b07bb92 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' 'mips64el')
 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'
-	'kdelibs-nepomuk-unicode.diff')
+        'kdelibs-nepomuk-unicode.diff')
 sha1sums=('4b074633cbf69752fda96018514ee771efe8f18b'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           'e24aae17ef0d83085199ad7c7623afef9919b8ff')
diff --git a/extra/libqzeitgeist/PKGBUILD b/extra/libqzeitgeist/PKGBUILD
index 7dddbaeea..c2aca401d 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' 'mips64el')
 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/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index adab6db53..e2001bd5a 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 137078 2011-09-05 23:07:50Z dreisner $
+# $Id: PKGBUILD 141252 2011-10-27 12:55:01Z juergen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=maxima
 pkgver=5.24.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Maxima - a sophisticated computer algebra system"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net"
 if [ "${CARCH}" == "mips64el" ] ; then
     depends=('clisp' 'texinfo' 'sh')
 else
-    depends=('sbcl=1.0.51' 'texinfo' 'sh')
+    depends=('sbcl=1.0.52' 'texinfo' 'sh')
 fi
 makedepends=('python2')
 optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD
index 0bc2c252d..8f94e064b 100644
--- a/extra/octave/PKGBUILD
+++ b/extra/octave/PKGBUILD
@@ -1,37 +1,34 @@
-# $Id: PKGBUILD 131750 2011-07-14 12:35:49Z ronald $
+# $Id: PKGBUILD 141254 2011-10-27 14:28:28Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor : shining <shiningxc.at.gmail.com>
 # Contributor : cyberdune <cyberdune@gmail.com>
 
 pkgname=octave
-pkgver=3.4.2
-pkgrel=2
+pkgver=3.4.3
+pkgrel=1
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.octave.org"
 license=('GPL')
 depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull')
-makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core')
+makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core' 'fltk')
 optdepends=('texinfo: for help-support in octave'
             'gnuplot: alternative plotting'
-	    'umfpack: LU decomposition of some large sparse matrices')
-source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2" "curlfix.patch")
+	    'umfpack: LU decomposition of some large sparse matrices'
+	    'fltk: alternative plotting')
+source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2")
 options=('!emptydirs')
 install=octave.install
-sha1sums=('12cac29ef7d1ab8374980e1e2fd14637b2f15ba5'
-          '3f856798f5f8aa15bce1200b8abd059154f3d909')
+sha1sums=('fe622c28a38f8730c59e46211bc7b18e7f51a679')
 	
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  # remove curl/types.h include
-  patch -Np0 -i ${srcdir}/curlfix.patch
-
   # http://www.nabble.com/Random-rounding-errors-td16010966.html
   FFLAGS="-O -ffloat-store" \
 
   ./configure --prefix=/usr --libexecdir=/usr/lib \
-  --enable-shared --disable-static
+  --enable-shared --disable-static --with-quantum-depth=16
 
   LANG=C make
 }
diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD
index bd6391e64..cc259d36f 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' 'mips64el')
 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/polkit-gnome/PKGBUILD b/extra/polkit-gnome/PKGBUILD
index 47c0062f7..585d1008a 100644
--- a/extra/polkit-gnome/PKGBUILD
+++ b/extra/polkit-gnome/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140948 2011-10-20 05:44:11Z ibiru $
+# $Id: PKGBUILD 141266 2011-10-27 16:27:38Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: onestep_ua <onestep@ukr.net>
 
 pkgname=polkit-gnome
-pkgver=0.104
+pkgver=0.105
 pkgrel=1
 pkgdesc="PolicyKit integration for the GNOME desktop"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('intltool' 'gobject-introspection')
 options=(!libtool)
 source=(http://download.gnome.org/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz
         polkit-gnome-authentication-agent-1.desktop)
-sha256sums=('5a59d47cbc87e3e5ac24e5e28b4fa9fc07d6d0096e53fa53d8e6b3fd06854d94'
+sha256sums=('1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369'
             'ad19e73ae8eba00a8f66bd9afd3e0e1fd7ca22f716e29b97f097d9c01711e0de')
 
 build() {
diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD
index d5e74a955..819226d3c 100644
--- a/extra/qemu-kvm/PKGBUILD
+++ b/extra/qemu-kvm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 135806 2011-08-18 15:04:40Z andyrtr $
+# $Id: PKGBUILD 141295 2011-10-28 08:03:30Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu-kvm
-pkgver=0.15.0
-pkgrel=2
+pkgver=0.15.1
+pkgrel=1
 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=(i686 x86_64 'mips64el')
 license=('GPL2' 'LGPL2.1')
@@ -54,5 +54,5 @@ package()
       esac
     done
 }
-md5sums=('b45b0deebba4ce47dcaaab3807f6ed47'
+md5sums=('8800a7d6b3aa4a168ea7f78dc66c0320'
          'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index bdad22843..b949c6ee0 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 135804 2011-08-18 15:04:37Z andyrtr $
+# $Id: PKGBUILD 141293 2011-10-28 08:03:28Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu
-pkgver=0.15.0
-pkgrel=2
+pkgver=0.15.1
+pkgrel=1
 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'LGPL2.1')
@@ -40,5 +40,5 @@ package() {
     done
 
 }
-md5sums=('dbc55b014bcd21b98e347f6a90f7fb6d'
+md5sums=('34f17737baaf1b3495c89cd6d4a607ed'
          'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index 0f8597943..34b5af780 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 132100 2011-07-20 07:19:13Z ronald $
+# $Id: PKGBUILD 141249 2011-10-27 10:32:50Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: K. Piche <kpiche@rogers.com>
 
 pkgname=r
-pkgver=2.13.1
+pkgver=2.13.2
 pkgrel=1
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,7 +20,7 @@ source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
 	'r.desktop'
 	'r.png')
 install=r.install
-sha1sums=('8b9d48c7a654186064f369652ea34a085eff239b'
+sha1sums=('3c8e3055b2d76cf79627325af8846848ca9a7e90'
           '13aa29219bcaa102e575de8c1c8e0833d233e836'
           'a69a07ec363440efc18ce0a7f2af103375dea978')
 build() {
diff --git a/extra/rest/PKGBUILD b/extra/rest/PKGBUILD
index 721a90b53..c5b485f8b 100644
--- a/extra/rest/PKGBUILD
+++ b/extra/rest/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 120404 2011-04-23 20:50:45Z ibiru $
+# $Id: PKGBUILD 141264 2011-10-27 16:23:45Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+
 pkgname=rest
-pkgver=0.7.10
+pkgver=0.7.11
 pkgrel=1
-pkgdesc="rest"
+pkgdesc="A helper library for RESTful services."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 license=('GPL2')
 depends=('glib2' 'libxml2' 'libsoup-gnome')
-makedepends=('gobject-introspection' 'gtk-doc')
+makedepends=('gobject-introspection')
 options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2)
-sha256sums=('2908f974ae6cc71af1152d419209f307bcce8ca2dfe0b4b55b3fad8ba4a646a5')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
+sha256sums=('3a57a56433761c87ccdbfe6d57119361dc004286356c12815dc7a22b7b315490')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/ristretto/PKGBUILD b/extra/ristretto/PKGBUILD
index 9e75c2104..886adb619 100644
--- a/extra/ristretto/PKGBUILD
+++ b/extra/ristretto/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 141037 2011-10-22 08:22:04Z andyrtr $
+# $Id: PKGBUILD 141238 2011-10-27 04:35:26Z eric $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=ristretto
-pkgver=0.2.0
+pkgver=0.2.1
 pkgrel=1
-pkgdesc="Ristretto is a image viewer for Xfce"
+pkgdesc="An image viewer for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/applications/ristretto"
-license=('GPL2')
+license=('GPL')
 depends=('libxfce4ui' 'libexif' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('intltool' 'gettext' 'pkg-config')
 options=('!libtool')
 groups=('xfce4-goodies')
-source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2)
 install=ristretto.install
-md5sums=('85e9b3d83309cdd84898f35b8d223121')
+source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2)
+md5sums=('df5c2082013f4ad2fc49cd7c25965741')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}/$pkgname-$pkgver"
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
@@ -27,6 +27,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/$pkgname-$pkgver"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index a8b626e22..9592c0e52 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 136436 2011-08-29 09:26:26Z tpowa $
+# $Id: PKGBUILD 141291 2011-10-28 08:03:24Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
 pkgname=('smbclient' 'samba')
-pkgver=3.6.0
+pkgver=3.6.1
 # We use the 'A' to fake out pacman's version comparators.  Samba chooses
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.6.0
-pkgrel=8
+_realver=3.6.1
+pkgrel=1
 arch=(i686 x86_64 mips64el)
 url="http://www.samba.org"
 license=('GPL3')
@@ -137,7 +137,7 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr
   # copy ldap example
   install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
 }
-md5sums=('e297e0ea7923c7de8d7c1d8fd0ec0a05'
+md5sums=('5291717be0734e07dc07b6110e162e87'
          'a3da19515a234c703876cf850c44e996'
          '5697da77590ec092cc8a883bae06093c'
          'a4bbfa39fee95bba2e7ad6b535fae7e6'
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index 7fd330474..70ea00d74 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 137076 2011-09-05 23:05:51Z dreisner $
+# $Id: PKGBUILD 141251 2011-10-27 12:54:01Z juergen $
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Daniel White <daniel@whitehouse.id.au>
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Leslie Polzer (skypher)
 
 pkgname=sbcl
-pkgver=1.0.51
+pkgver=1.0.52
 pkgrel=1
 pkgdesc="Steel Bank Common Lisp"
 url="http://www.sbcl.org/"
@@ -20,7 +20,7 @@ install=sbcl.install
 source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
         "arch-fixes.lisp"
         "mips-arch.h.diff")
-md5sums=('08032cc777f1236953cb901e24775457'
+md5sums=('e9e186637155184ec662b5a37634b457'
          '7ac0c1936547f4278198b8bf7725204d'
          'a456535d65d6c5b85b1b646f11455fce')
 
diff --git a/extra/texmacs/PKGBUILD b/extra/texmacs/PKGBUILD
index 0a36ede79..cbd773d3f 100644
--- a/extra/texmacs/PKGBUILD
+++ b/extra/texmacs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 137567 2011-09-09 18:36:00Z ronald $
+# $Id: PKGBUILD 141258 2011-10-27 15:06:09Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=texmacs
-pkgver=1.0.7.12
+pkgver=1.0.7.14
 pkgrel=1
 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor TeX-fonts and CAS-interface (Giac, GTybalt, Macaulay 2, Maxima, Octave, Pari, Qcl, R and Yacas) in one."
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ depends=('perl' 'guile' 'texlive-core' 'python2' 'libxext' 'freetype2')
 # do not remove texlive-core dependency, as it is needed!
 optdepends=('transfig: convert images using fig2ps')
 #source=(ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-${pkgver}-src.tar.gz)
-source=(http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-1.0.7.12-src.tar.gz)
-sha1sums=('9a6560dc2d8e685b97f4afe468b38d89bd29ca9d')
+source=(http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${pkgver}-src.tar.gz)
+sha1sums=('5bbe0458d2ab73fa8cea8e12fee788b17b6f279a')
 
 build() {
   cd ${srcdir}/TeXmacs-${pkgver}-src
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index 7494ce1fc..574fd836c 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 141014 2011-10-21 15:49:31Z heftig $
+# $Id: PKGBUILD 141260 2011-10-27 15:31:43Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgbase=tracker
 pkgname=(tracker libtracker-sparql)
-pkgver=0.12.6
+pkgver=0.12.7
 _tver=${pkgver%.*}
 pkgrel=1
 pkgdesc="All-in-one indexer, search tool and metadata database"
@@ -19,7 +19,7 @@ makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
 url="http://www.gnome.org"
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('4dc5fe0fe97d4095653935969b12c15888e620e5b6ef135331ce7f55af3654b8')
+sha256sums=('e7a4d016326bc0a1b6aea07e48c3de73ffc29119812149e2dee5eac35104f1b4')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
diff --git a/extra/xfce4-clipman-plugin/PKGBUILD b/extra/xfce4-clipman-plugin/PKGBUILD
index 0c6eb27fe..c9526b61e 100644
--- a/extra/xfce4-clipman-plugin/PKGBUILD
+++ b/extra/xfce4-clipman-plugin/PKGBUILD
@@ -1,26 +1,25 @@
-# $Id: PKGBUILD 105771 2011-01-11 17:17:59Z andyrtr $
+# $Id: PKGBUILD 141285 2011-10-28 04:36:42Z eric $
 # Maintainer: tobias <tobias at archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-clipman-plugin
-pkgver=1.1.3
-pkgrel=2
+pkgver=1.2.0
+pkgrel=1
 pkgdesc="A clipboard plugin for the Xfce4 panel"
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
 groups=('xfce4-goodies')
-depends=('libxfcegui4' 'xfce4-panel' 'libunique' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool')
+depends=('xfce4-panel' 'libunique' 'libxtst')
+makedepends=('intltool')
 options=('!libtool')
 install=${pkgname}.install
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.1/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2ba70c6bd710e2a18cba5add66d297dc')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('9df2441d188e90d5304e5da84dca9969')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  # fix for exo 0.5.6
-  sed -i -e "s/exo-0.3/exo-1/g" configure
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|$(TARGET_DIR)/C/media|$(docdir)/html/C/media|' doc/Makefile.in
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
@@ -32,7 +31,8 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+
 }
diff --git a/extra/xfce4-notifyd/PKGBUILD b/extra/xfce4-notifyd/PKGBUILD
index dfdf4695b..41d99d932 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' 'mips64el')
-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 7828e7eb4..3c5212895 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' 'mips64el')
 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/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 9e6713828..123c463d4 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -8,17 +8,16 @@ pkgbase=linux-libre
 pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux-libre}
-_basekernel=3.0
-pkgver=${_basekernel}.7
-[ "$CARCH" = "mips64el" ] && pkgver=${_basekernel}.4
-pkgrel=1
+_basekernel=3.1
+pkgver=${_basekernel}
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz"
-        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
+        # "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${pkgver}-libre-lemote_0lxo_mipsel.tar.bz2"
         # the main kernel config files
         'config.i686' 'config.x86_64'
@@ -27,20 +26,16 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li
         'Kbuild'
         'Kbuild.platforms'
         'boot-logo.patch'
-        'fix-i915.patch'
         'change-default-console-loglevel.patch')
 
 build() {
   cd "${srcdir}/linux-${_basekernel}"
 
-  patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
+#  patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
 
   # Add freedo as boot logo
   patch -Np1 -i "${srcdir}/boot-logo.patch"
 
-  # fix #19234 i1915 display size
-  patch -Np1 -i "${srcdir}/fix-i915.patch"
-
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
@@ -63,15 +58,8 @@ build() {
     sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
   fi
 
-  # remove the "-libre" extraversion from Makefile
-  sed -i 's|^EXTRAVERSION =.*$|EXTRAVERSION =|g' Makefile
-  sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|# CONFIG_LOCALVERSION_AUTO is not set|g" ./.config
-
-  # remove the sublevel from Makefile
-  # this ensures our kernel version is always 3.X-LIBRE
-  # this way, minor kernel updates will not break external modules
-  # we need to change this soon, see FS#16702
-  sed -ri 's|^(SUBLEVEL =).*|\1|' Makefile
+  # set extraversion to pkgrel
+  sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
 
   # get kernel version
   make prepare
@@ -157,8 +145,13 @@ package_linux-libre() {
   rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
   # remove the firmware
   rm -rf "${pkgdir}/lib/firmware"
-  # gzip -9 all modules to safe 100MB of space
+  # gzip -9 all modules to save 100MB of space
   find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+  # make room for external modules
+  ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  # add real version for building modules and running depmod from post_install/upgrade
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}/version"
 }
 
 package_linux-libre-headers() {
@@ -321,29 +314,10 @@ package_linux-libre-docs() {
   cd "${srcdir}/linux-${_basekernel}"
 
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}"
-  cp -r Documentation "${pkgdir}/usr/src/linux-${_kernver}"
+  cp -al Documentation "${pkgdir}/usr/src/linux-${_kernver}"
   find "${pkgdir}" -type f -exec chmod 444 {} \;
   find "${pkgdir}" -type d -exec chmod 755 {} \;
 
   # remove a file already in linux package
   rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
 }
-md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
-         '8840c46301f6eb425b9ab456d1ca7b7f'
-         '8089b63fdecf93735f178eb2907ce61e'
-         '4cc90e12cab492c1d61183c47683bd52'
-         'a8a3843046926eb7ab81312cd438c5c5'
-         '04b21c79df0a952c22d681dd4f4562df'
-         '263725f20c0b9eb9c353040792d644e5'
-         '9d3c56a4b999c8bfbd4018089a62f662')
-md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
-         'f17e9c5f801be0b17efe78aaff0f2a0e'
-         'ca4d3f7b23e3b7ebbf6da7edf2d9b292'
-         '8089b63fdecf93735f178eb2907ce61e'
-         '4cc90e12cab492c1d61183c47683bd52'
-         'a8a3843046926eb7ab81312cd438c5c5'
-         '2967cecc3af9f954ccc822fd63dca6ff'
-         '8267264d9a8966e57fdacd1fa1fc65c4'
-         '04b21c79df0a952c22d681dd4f4562df'
-         '263725f20c0b9eb9c353040792d644e5'
-         '9d3c56a4b999c8bfbd4018089a62f662')
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 4cc6d10cc..86fe20b40 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
 #
-# Automatically generated make config: don't edit
-# Linux/i386 3.0 Kernel Configuration
+# Automatically generated file; DO NOT EDIT.
+# Linux/i386 3.1.0 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -164,6 +164,7 @@ CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_PCSPKR_PLATFORM=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -210,6 +211,7 @@ CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
 CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_PERF_EVENTS_NMI=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 
 #
 # GCOV-based kernel profiling
@@ -223,12 +225,13 @@ CONFIG_MODULES=y
 CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
+CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
 CONFIG_LBDAF=y
 CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_BSGLIB is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
 CONFIG_BLK_DEV_THROTTLING=y
 
@@ -291,6 +294,7 @@ CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_X86_32_IRIS=m
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_PARAVIRT_GUEST=y
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 # CONFIG_XEN_PRIVILEGED_GUEST is not set
 CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
@@ -330,6 +334,7 @@ CONFIG_X86_GENERIC=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_CMPXCHG=y
 CONFIG_CMPXCHG_LOCAL=y
+CONFIG_CMPXCHG_DOUBLE=y
 CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_XADD=y
 # CONFIG_X86_PPRO_FENCE is not set
@@ -354,7 +359,6 @@ CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
 # CONFIG_IOMMU_HELPER is not set
-CONFIG_IOMMU_API=y
 CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
@@ -362,6 +366,7 @@ CONFIG_SCHED_MC=y
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
@@ -469,10 +474,10 @@ CONFIG_CAN_PM_TRACE=y
 # CONFIG_PM_TRACE_RTC is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_PROCFS=y
+# CONFIG_ACPI_PROCFS is not set
 # CONFIG_ACPI_PROCFS_POWER is not set
 CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_PROC_EVENT=y
+# CONFIG_ACPI_PROC_EVENT is not set
 CONFIG_ACPI_AC=m
 CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BUTTON=m
@@ -491,11 +496,12 @@ CONFIG_ACPI_PCI_SLOT=m
 CONFIG_X86_PM_TIMER=y
 CONFIG_ACPI_CONTAINER=m
 CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=m
+CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
 CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_APEI_EINJ=m
 CONFIG_ACPI_APEI_ERST_DEBUG=m
 CONFIG_SFI=y
@@ -511,7 +517,7 @@ CONFIG_APM_DO_ENABLE=y
 # CPU Frequency scaling
 #
 CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_TABLE=m
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
@@ -568,9 +574,6 @@ CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_OLPC=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCI_CNB20LE_QUIRK is not set
-CONFIG_DMAR=y
-# CONFIG_DMAR_DEFAULT_ON is not set
-CONFIG_DMAR_FLOPPY_WA=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_PCIEAER=y
@@ -593,7 +596,10 @@ CONFIG_ISA=y
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
 CONFIG_OLPC=y
-CONFIG_OLPC_XO1=m
+CONFIG_OLPC_XO1_PM=y
+CONFIG_OLPC_XO1_RTC=y
+CONFIG_OLPC_XO1_SCI=y
+CONFIG_OLPC_XO15_SCI=y
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
@@ -854,6 +860,7 @@ CONFIG_IP_SET_HASH_IPPORTIP=m
 CONFIG_IP_SET_HASH_IPPORTNET=m
 CONFIG_IP_SET_HASH_NET=m
 CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
 CONFIG_IP_SET_LIST_SET=m
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_IPV6 is not set
@@ -1245,6 +1252,13 @@ CONFIG_CAIF=m
 CONFIG_CAIF_NETDEV=m
 CONFIG_CEPH_LIB=m
 # CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+CONFIG_NFC=m
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_PN544_NFC=m
+CONFIG_NFC_PN533=m
 
 #
 # Device Drivers
@@ -1264,6 +1278,8 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
 CONFIG_CONNECTOR=m
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
@@ -1410,6 +1426,7 @@ CONFIG_OF_NET=y
 CONFIG_OF_SPI=y
 CONFIG_OF_MDIO=m
 CONFIG_OF_PCI=y
+CONFIG_OF_PCI_IRQ=y
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
@@ -1440,6 +1457,7 @@ CONFIG_BLK_DEV_DAC960=m
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DRBD=m
 # CONFIG_DRBD_FAULT_INJECTION is not set
@@ -1488,6 +1506,7 @@ CONFIG_TI_DAC7512=m
 CONFIG_VMWARE_BALLOON=m
 CONFIG_BMP085=m
 # CONFIG_PCH_PHUB is not set
+CONFIG_USB_SWITCH_FSA9480=m
 CONFIG_C2PORT=m
 CONFIG_C2PORT_DURAMAR_2150=m
 
@@ -1499,6 +1518,7 @@ CONFIG_EEPROM_AT25=m
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EEPROM_93CX6=m
+CONFIG_EEPROM_93XX46=m
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -1512,89 +1532,7 @@ CONFIG_IWMC3200TOP=m
 CONFIG_TI_ST=m
 CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_HAVE_IDE=y
-CONFIG_IDE=m
-
-#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-CONFIG_IDE_XFER_MODE=y
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_ATAPI=y
-CONFIG_IDE_LEGACY=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=m
-CONFIG_IDE_GD_ATA=y
-CONFIG_IDE_GD_ATAPI=y
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_DELKIN=m
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEACPI=y
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=m
-CONFIG_BLK_DEV_PLATFORM=m
-CONFIG_BLK_DEV_CMD640=m
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=m
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=m
-CONFIG_BLK_DEV_OPTI621=m
-CONFIG_BLK_DEV_RZ1000=m
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_BLK_DEV_ALI15X3=m
-CONFIG_BLK_DEV_AMD74XX=m
-CONFIG_BLK_DEV_ATIIXP=m
-CONFIG_BLK_DEV_CMD64X=m
-CONFIG_BLK_DEV_TRIFLEX=m
-CONFIG_BLK_DEV_CS5520=m
-CONFIG_BLK_DEV_CS5530=m
-CONFIG_BLK_DEV_CS5535=m
-CONFIG_BLK_DEV_CS5536=m
-CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_JMICRON=m
-CONFIG_BLK_DEV_SC1200=m
-CONFIG_BLK_DEV_PIIX=m
-CONFIG_BLK_DEV_IT8172=m
-CONFIG_BLK_DEV_IT8213=m
-CONFIG_BLK_DEV_IT821X=m
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_BLK_DEV_SVWKS=m
-CONFIG_BLK_DEV_SIIMAGE=m
-CONFIG_BLK_DEV_SIS5513=m
-CONFIG_BLK_DEV_SLC90E66=m
-CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
-CONFIG_BLK_DEV_TC86C001=m
-
-#
-# Other IDE chipsets support
-#
-
-#
-# Note: most of these also require special kernel boot parameters
-#
-CONFIG_BLK_DEV_4DRIVES=m
-CONFIG_BLK_DEV_ALI14XX=m
-CONFIG_BLK_DEV_DTC2278=m
-CONFIG_BLK_DEV_HT6560B=m
-CONFIG_BLK_DEV_QD65XX=m
-CONFIG_BLK_DEV_UMC8672=m
-CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDE is not set
 
 #
 # SCSI device support
@@ -1671,6 +1609,7 @@ CONFIG_SCSI_AIC94XX=m
 # CONFIG_AIC94XX_DEBUG is not set
 CONFIG_SCSI_MVSAS=m
 # CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_MVSAS_TASKLET=y
 CONFIG_SCSI_DPT_I2O=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_IN2000=m
@@ -1888,8 +1827,8 @@ CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_PSCSI=m
 CONFIG_LOOPBACK_TARGET=m
-# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set
 CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
@@ -2067,6 +2006,7 @@ CONFIG_R8169=m
 CONFIG_SIS190=m
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
 CONFIG_SKY2=m
 # CONFIG_SKY2_DEBUG is not set
 CONFIG_VIA_VELOCITY=m
@@ -2153,10 +2093,13 @@ CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 CONFIG_CARL9170_WPC=y
 CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
 CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_PIO=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_LP=y
@@ -2260,6 +2203,7 @@ CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
 CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
 CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
 CONFIG_RTL8192C_COMMON=m
@@ -2372,6 +2316,7 @@ CONFIG_IEEE802154_FAKEHARD=m
 CONFIG_CAIF_TTY=m
 CONFIG_CAIF_SPI_SLAVE=m
 CONFIG_CAIF_SPI_SYNC=y
+CONFIG_CAIF_HSI=m
 CONFIG_RIONET=m
 CONFIG_RIONET_TX_SIZE=128
 CONFIG_RIONET_RX_SIZE=128
@@ -2713,12 +2658,16 @@ CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
 CONFIG_INPUT_AD714X_SPI=m
 CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_WISTRON_BTNS=m
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
 CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
@@ -2988,13 +2937,13 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIOLIB=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_GENERIC=m
 CONFIG_GPIO_MAX730X=m
 
 #
 # Memory mapped GPIO drivers:
 #
-CONFIG_GPIO_BASIC_MMIO_CORE=m
-CONFIG_GPIO_BASIC_MMIO=m
+CONFIG_GPIO_GENERIC_PLATFORM=m
 CONFIG_GPIO_IT8761E=m
 CONFIG_GPIO_SCH=m
 CONFIG_GPIO_VX855=m
@@ -3006,13 +2955,14 @@ CONFIG_GPIO_MAX7300=m
 CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_TPS65912=m
 CONFIG_GPIO_WM831X=m
 CONFIG_GPIO_ADP5588=m
 
 #
 # PCI GPIO expanders:
 #
-CONFIG_GPIO_CS5535=m
+CONFIG_GPIO_CS5535=y
 CONFIG_GPIO_LANGWELL=y
 CONFIG_GPIO_PCH=m
 CONFIG_GPIO_ML_IOH=m
@@ -3144,18 +3094,22 @@ CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_LTC4261=m
 CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
 CONFIG_SENSORS_MAX1111=m
 CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
 CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_MAX16064=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
@@ -3172,7 +3126,9 @@ CONFIG_SENSORS_EMC6W201=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
 CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
 CONFIG_SENSORS_ADS1015=m
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
@@ -3207,6 +3163,7 @@ CONFIG_SENSORS_ATK0110=m
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
 CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 
 #
@@ -3292,6 +3249,7 @@ CONFIG_BCMA_POSSIBLE=y
 # Broadcom specific AMBA
 #
 CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
 CONFIG_BCMA_HOST_PCI_POSSIBLE=y
 CONFIG_BCMA_HOST_PCI=y
 # CONFIG_BCMA_DEBUG is not set
@@ -3304,6 +3262,8 @@ CONFIG_UCB1400_CORE=m
 CONFIG_TPS6105X=m
 CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
+CONFIG_MFD_TPS65912=y
+CONFIG_MFD_TPS65912_SPI=y
 # CONFIG_MFD_TMIO is not set
 CONFIG_MFD_WM8400=m
 CONFIG_MFD_WM831X=y
@@ -3348,6 +3308,7 @@ CONFIG_REGULATOR_MC13892=m
 CONFIG_REGULATOR_TPS6105X=m
 CONFIG_REGULATOR_TPS65023=m
 CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65912=m
 CONFIG_REGULATOR_ISL6271A=m
 CONFIG_REGULATOR_AD5398=m
 CONFIG_REGULATOR_AB8500=y
@@ -3362,6 +3323,7 @@ CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_DVB_CORE=m
+CONFIG_DVB_NET=y
 CONFIG_VIDEO_MEDIA=m
 
 #
@@ -3378,6 +3340,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
 CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
@@ -3406,6 +3369,7 @@ CONFIG_MEDIA_TUNER_MT2131=m
 CONFIG_MEDIA_TUNER_QT1010=m
 CONFIG_MEDIA_TUNER_XC2028=m
 CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
 CONFIG_MEDIA_TUNER_MC44S803=m
@@ -3424,6 +3388,7 @@ CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_MEM2MEM_DEV=m
 CONFIG_VIDEOBUF2_CORE=m
 CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
 CONFIG_VIDEOBUF2_VMALLOC=m
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
@@ -3502,6 +3467,11 @@ CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_TCM825X=m
 
 #
+# Flash devices
+#
+CONFIG_VIDEO_ADP1653=m
+
+#
 # Video improvement chips
 #
 CONFIG_VIDEO_UPD64031A=m
@@ -3567,6 +3537,7 @@ CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
 CONFIG_SOC_CAMERA_PLATFORM=m
 CONFIG_SOC_CAMERA_OV2640=m
+CONFIG_SOC_CAMERA_OV5642=m
 CONFIG_SOC_CAMERA_OV6650=m
 CONFIG_SOC_CAMERA_OV772X=m
 CONFIG_SOC_CAMERA_OV9640=m
@@ -3595,6 +3566,7 @@ CONFIG_USB_GSPCA_OV534_9=m
 CONFIG_USB_GSPCA_PAC207=m
 CONFIG_USB_GSPCA_PAC7302=m
 CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
 CONFIG_USB_GSPCA_SN9C2028=m
 CONFIG_USB_GSPCA_SN9C20X=m
 CONFIG_USB_GSPCA_SONIXB=m
@@ -3626,6 +3598,7 @@ CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_EM28XX=m
 CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=y
 CONFIG_VIDEO_TLG2300=m
 CONFIG_VIDEO_CX231XX=m
 CONFIG_VIDEO_CX231XX_RC=y
@@ -3782,6 +3755,11 @@ CONFIG_DVB_HOPPER=m
 CONFIG_DVB_NGENE=m
 
 #
+# Supported ddbridge ('Octopus') Adapters
+#
+CONFIG_DVB_DDBRIDGE=m
+
+#
 # Supported DVB Frontends
 #
 # CONFIG_DVB_FE_CUSTOMISE is not set
@@ -3795,6 +3773,12 @@ CONFIG_DVB_STV090x=m
 CONFIG_DVB_STV6110x=m
 
 #
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+
+#
 # DVB-S (satellite) frontends
 #
 CONFIG_DVB_CX24110=m
@@ -4033,6 +4017,7 @@ CONFIG_LCD_VGG2432A4=m
 CONFIG_LCD_PLATFORM=m
 CONFIG_LCD_S6E63M0=m
 CONFIG_LCD_LD9040=m
+CONFIG_LCD_AMS369FG06=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PROGEAR=m
@@ -4074,7 +4059,7 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
+# CONFIG_LOGO is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
@@ -4159,6 +4144,7 @@ CONFIG_SND_SSCAPE=m
 CONFIG_SND_WAVEFRONT=m
 CONFIG_SND_MSND_PINNACLE=m
 CONFIG_SND_MSND_CLASSIC=m
+CONFIG_SND_TEA575X=m
 CONFIG_SND_PCI=y
 CONFIG_SND_AD1889=m
 CONFIG_SND_ALS300=m
@@ -4208,8 +4194,8 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_TEA575X=m
 CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_PREALLOC_SIZE=4096
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDA_INPUT_BEEP=y
@@ -4217,6 +4203,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=1
 CONFIG_SND_HDA_INPUT_JACK=y
 CONFIG_SND_HDA_PATCH_LOADER=y
 CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
 CONFIG_SND_HDA_CODEC_VIA=y
@@ -4224,6 +4211,7 @@ CONFIG_SND_HDA_CODEC_HDMI=y
 CONFIG_SND_HDA_CODEC_CIRRUS=y
 CONFIG_SND_HDA_CODEC_CONEXANT=y
 CONFIG_SND_HDA_CODEC_CA0110=y
+CONFIG_SND_HDA_CODEC_CA0132=y
 CONFIG_SND_HDA_CODEC_CMEDIA=y
 CONFIG_SND_HDA_CODEC_SI3054=y
 CONFIG_SND_HDA_GENERIC=y
@@ -4305,6 +4293,8 @@ CONFIG_DRAGONRISE_FF=y
 CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_EZKEY=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
 CONFIG_HID_UCLOGIC=m
@@ -4342,6 +4332,7 @@ CONFIG_HID_ROCCAT_KOVAPLUS=m
 CONFIG_HID_ROCCAT_PYRA=m
 CONFIG_HID_SAMSUNG=m
 CONFIG_HID_SONY=m
+CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_GREENASIA=m
 CONFIG_GREENASIA_FF=y
@@ -4352,6 +4343,7 @@ CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_WACOM=m
 CONFIG_HID_WACOM_POWER_SUPPLY=y
+CONFIG_HID_WIIMOTE=m
 CONFIG_HID_ZEROPLUS=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
@@ -4547,20 +4539,20 @@ CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_SELECTED=y
-# CONFIG_USB_GADGET_FUSB300 is not set
-# CONFIG_USB_GADGET_R8A66597 is not set
-# CONFIG_USB_GADGET_PXA_U2O is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_CI13XXX_PCI is not set
-CONFIG_USB_GADGET_NET2280=y
+CONFIG_USB_FUSB300=m
+CONFIG_USB_R8A66597=m
+CONFIG_USB_M66592=m
+CONFIG_USB_AMD5536UDC=m
+CONFIG_USB_CI13XXX_PCI=m
+CONFIG_USB_NET2272=m
+CONFIG_USB_NET2272_DMA=y
 CONFIG_USB_NET2280=m
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LANGWELL is not set
-# CONFIG_USB_GADGET_EG20T is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
+CONFIG_USB_GOKU=m
+CONFIG_USB_LANGWELL=m
+CONFIG_USB_EG20T=m
+CONFIG_USB_DUMMY_HCD=m
 CONFIG_USB_GADGET_DUALSPEED=y
+CONFIG_USB_GADGET_SUPERSPEED=y
 # CONFIG_USB_ZERO is not set
 CONFIG_USB_AUDIO=m
 CONFIG_USB_ETH=m
@@ -4618,7 +4610,6 @@ CONFIG_SDIO_UART=m
 CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_OF=m
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMC_TIFM_SD=m
@@ -4650,12 +4641,9 @@ CONFIG_LEDS_CLASS=y
 #
 CONFIG_LEDS_LM3530=m
 CONFIG_LEDS_NET5501=m
-CONFIG_LEDS_ALIX2=m
 CONFIG_LEDS_PCA9532=m
 CONFIG_LEDS_PCA9532_GPIO=y
 CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_GPIO_PLATFORM=y
-CONFIG_LEDS_GPIO_OF=y
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP5521=m
 CONFIG_LEDS_LP5523=m
@@ -4675,7 +4663,6 @@ CONFIG_LEDS_TRIGGERS=y
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_GPIO=m
@@ -4684,8 +4671,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 #
 # iptables trigger is under Netfilter config (LED target)
 #
-CONFIG_NFC_DEVICES=y
-CONFIG_PN544_NFC=m
 CONFIG_ACCESSIBILITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 # CONFIG_INFINIBAND is not set
@@ -4824,11 +4809,15 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_NETX=m
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_RING=y
+
+#
+# Virtio drivers
+#
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
 CONFIG_STAGING=y
-# CONFIG_DIGIEPCA is not set
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
-# CONFIG_COMPUTONE is not set
 CONFIG_ET131X=m
 # CONFIG_ET131X_DEBUG is not set
 CONFIG_SLICOSS=m
@@ -4941,6 +4930,7 @@ CONFIG_COMEDI_AMPLC_PCI224=m
 CONFIG_COMEDI_AMPLC_PCI230=m
 CONFIG_COMEDI_CONTEC_PCI_DIO=m
 CONFIG_COMEDI_DT3000=m
+CONFIG_COMEDI_DYNA_PCI10XX=m
 CONFIG_COMEDI_UNIOXX5=m
 CONFIG_COMEDI_GSC_HPDI=m
 CONFIG_COMEDI_ICP_MULTI=m
@@ -5033,7 +5023,6 @@ CONFIG_HYPERV_MOUSE=m
 # CONFIG_VME_BUS is not set
 CONFIG_DX_SEP=m
 # CONFIG_IIO is not set
-CONFIG_CS5535_GPIO=m
 CONFIG_XVMALLOC=y
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_DEBUG is not set
@@ -5043,6 +5032,7 @@ CONFIG_WLAGS49_H25=m
 CONFIG_FB_SM7XX=m
 CONFIG_VIDEO_DT3155=m
 CONFIG_DT3155_CCIR=y
+CONFIG_DT3155_STREAMING=y
 CONFIG_CRYSTALHD=m
 CONFIG_FB_XGI=m
 CONFIG_LIRC_STAGING=y
@@ -5057,12 +5047,9 @@ CONFIG_LIRC_SIR=m
 CONFIG_LIRC_TTUSBIR=m
 CONFIG_LIRC_ZILOG=m
 CONFIG_EASYCAP=m
-CONFIG_EASYCAP_SND=y
-# CONFIG_EASYCAP_OSS is not set
 # CONFIG_EASYCAP_DEBUG is not set
 CONFIG_SOLO6X10=m
 CONFIG_ACPI_QUICKSTART=m
-CONFIG_MACH_NO_WESTBRIDGE=y
 CONFIG_ATH6K_LEGACY=m
 CONFIG_AR600x_SD31_XXX=y
 # CONFIG_AR600x_WB31_XXX is not set
@@ -5109,10 +5096,9 @@ CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
 CONFIG_DRM_PSB=m
-
-#
-# Altera FPGA firmware download module
-#
+CONFIG_DRM_PSB_MRST=y
+CONFIG_DRM_PSB_MFLD=y
+CONFIG_DRM_PSB_CDV=y
 CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
 CONFIG_X86_PLATFORM_DEVICES=y
@@ -5160,7 +5146,17 @@ CONFIG_XO15_EBOOK=m
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
 CONFIG_CLKSRC_I8253=y
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+CONFIG_DMAR=y
+# CONFIG_DMAR_DEFAULT_ON is not set
+CONFIG_DMAR_FLOPPY_WA=y
+CONFIG_VIRT_DRIVERS=y
 
 #
 # Firmware Drivers
@@ -5326,6 +5322,7 @@ CONFIG_LOGFS=m
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -5341,6 +5338,7 @@ CONFIG_PSTORE=y
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 # CONFIG_UFS_DEBUG is not set
+CONFIG_ORE=m
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
 CONFIG_NETWORK_FILESYSTEMS=y
@@ -5354,7 +5352,6 @@ CONFIG_NFS_FSCACHE=y
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFS_USE_NEW_IDMAPPER is not set
 CONFIG_NFSD=m
-# CONFIG_NFSD_DEPRECATED is not set
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
@@ -5503,7 +5500,7 @@ CONFIG_DEBUG_MUTEXES=y
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_STACK_USAGE is not set
@@ -5631,6 +5628,11 @@ CONFIG_SECURITY_PATH=y
 # CONFIG_SECURITY_SELINUX is not set
 # CONFIG_SECURITY_SMACK is not set
 CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
 # CONFIG_IMA is not set
@@ -5776,10 +5778,6 @@ CONFIG_KVM_AMD=m
 CONFIG_KVM_MMU_AUDIT=y
 CONFIG_VHOST_NET=m
 CONFIG_LGUEST=m
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_RING=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -5795,6 +5793,7 @@ CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
 CONFIG_AUDIT_GENERIC=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
@@ -5814,6 +5813,7 @@ CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
+CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_TEXTSEARCH=y
@@ -5829,3 +5829,5 @@ CONFIG_CPU_RMAP=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
+CONFIG_CORDIC=m
+CONFIG_LLIST=y
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index de4d3a424..4ec38fd52 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
-# Automatically generated make config: don't edit
-# Linux/x86_64 3.0 Kernel Configuration
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86_64 3.1.0 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -12,6 +12,7 @@ CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
@@ -165,6 +166,7 @@ CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_PCSPKR_PLATFORM=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -211,6 +213,7 @@ CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
 CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_PERF_EVENTS_NMI=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 
 #
 # GCOV-based kernel profiling
@@ -224,11 +227,12 @@ CONFIG_MODULES=y
 CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
+CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
 CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_BSGLIB is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLOCK_COMPAT=y
@@ -290,6 +294,7 @@ CONFIG_X86_MPPARSE=y
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_PARAVIRT_GUEST=y
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_XEN=y
 CONFIG_XEN_DOM0=y
 CONFIG_XEN_PRIVILEGED_GUEST=y
@@ -314,6 +319,7 @@ CONFIG_GENERIC_CPU=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=7
 CONFIG_X86_CMPXCHG=y
 CONFIG_CMPXCHG_LOCAL=y
+CONFIG_CMPXCHG_DOUBLE=y
 CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_XADD=y
 CONFIG_X86_WP_WORKS_OK=y
@@ -331,11 +337,8 @@ CONFIG_DMI=y
 CONFIG_GART_IOMMU=y
 CONFIG_CALGARY_IOMMU=y
 CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
-CONFIG_AMD_IOMMU=y
-# CONFIG_AMD_IOMMU_STATS is not set
 CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
-CONFIG_IOMMU_API=y
 # CONFIG_MAXSMP is not set
 CONFIG_NR_CPUS=64
 CONFIG_SCHED_SMT=y
@@ -344,6 +347,7 @@ CONFIG_SCHED_MC=y
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
@@ -457,10 +461,10 @@ CONFIG_CAN_PM_TRACE=y
 # CONFIG_PM_TRACE_RTC is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_PROCFS=y
+# CONFIG_ACPI_PROCFS is not set
 # CONFIG_ACPI_PROCFS_POWER is not set
 CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_PROC_EVENT=y
+# CONFIG_ACPI_PROC_EVENT is not set
 CONFIG_ACPI_AC=m
 CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BUTTON=m
@@ -481,11 +485,12 @@ CONFIG_X86_PM_TIMER=y
 CONFIG_ACPI_CONTAINER=m
 CONFIG_ACPI_HOTPLUG_MEMORY=m
 CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=m
+CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
 CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_APEI_EINJ=m
 CONFIG_ACPI_APEI_ERST_DEBUG=m
 CONFIG_SFI=y
@@ -540,10 +545,6 @@ CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_XEN=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCI_CNB20LE_QUIRK is not set
-CONFIG_DMAR=y
-# CONFIG_DMAR_DEFAULT_ON is not set
-CONFIG_DMAR_FLOPPY_WA=y
-# CONFIG_INTR_REMAP is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_PCIEAER=y
@@ -822,6 +823,7 @@ CONFIG_IP_SET_HASH_IPPORTIP=m
 CONFIG_IP_SET_HASH_IPPORTNET=m
 CONFIG_IP_SET_HASH_NET=m
 CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
 CONFIG_IP_SET_LIST_SET=m
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_IPV6 is not set
@@ -1210,6 +1212,13 @@ CONFIG_CAIF=m
 CONFIG_CAIF_NETDEV=m
 CONFIG_CEPH_LIB=m
 # CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+CONFIG_NFC=m
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_PN544_NFC=m
+CONFIG_NFC_PN533=m
 
 #
 # Device Drivers
@@ -1229,6 +1238,8 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 CONFIG_SYS_HYPERVISOR=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
 CONFIG_CONNECTOR=m
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
@@ -1383,6 +1394,7 @@ CONFIG_BLK_DEV_DAC960=m
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DRBD=m
 # CONFIG_DRBD_FAULT_INJECTION is not set
@@ -1433,6 +1445,7 @@ CONFIG_TI_DAC7512=m
 CONFIG_VMWARE_BALLOON=m
 CONFIG_BMP085=m
 CONFIG_PCH_PHUB=m
+CONFIG_USB_SWITCH_FSA9480=m
 CONFIG_C2PORT=m
 CONFIG_C2PORT_DURAMAR_2150=m
 
@@ -1444,6 +1457,7 @@ CONFIG_EEPROM_AT25=m
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EEPROM_93CX6=m
+CONFIG_EEPROM_93XX46=m
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -1457,72 +1471,7 @@ CONFIG_IWMC3200TOP=m
 CONFIG_TI_ST=m
 CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_HAVE_IDE=y
-CONFIG_IDE=m
-
-#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-CONFIG_IDE_XFER_MODE=y
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_ATAPI=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=m
-CONFIG_IDE_GD_ATA=y
-CONFIG_IDE_GD_ATAPI=y
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_DELKIN=m
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEACPI=y
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=m
-CONFIG_BLK_DEV_PLATFORM=m
-CONFIG_BLK_DEV_CMD640=m
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=m
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=m
-CONFIG_BLK_DEV_OPTI621=m
-CONFIG_BLK_DEV_RZ1000=m
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_BLK_DEV_ALI15X3=m
-CONFIG_BLK_DEV_AMD74XX=m
-CONFIG_BLK_DEV_ATIIXP=m
-CONFIG_BLK_DEV_CMD64X=m
-CONFIG_BLK_DEV_TRIFLEX=m
-CONFIG_BLK_DEV_CS5520=m
-CONFIG_BLK_DEV_CS5530=m
-CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_JMICRON=m
-CONFIG_BLK_DEV_SC1200=m
-CONFIG_BLK_DEV_PIIX=m
-CONFIG_BLK_DEV_IT8172=m
-CONFIG_BLK_DEV_IT8213=m
-CONFIG_BLK_DEV_IT821X=m
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_BLK_DEV_SVWKS=m
-CONFIG_BLK_DEV_SIIMAGE=m
-CONFIG_BLK_DEV_SIS5513=m
-CONFIG_BLK_DEV_SLC90E66=m
-CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
-CONFIG_BLK_DEV_TC86C001=m
-CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDE is not set
 
 #
 # SCSI device support
@@ -1596,6 +1545,7 @@ CONFIG_SCSI_AIC94XX=m
 # CONFIG_AIC94XX_DEBUG is not set
 CONFIG_SCSI_MVSAS=m
 # CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_MVSAS_TASKLET=y
 CONFIG_SCSI_DPT_I2O=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_ARCMSR=m
@@ -1791,8 +1741,8 @@ CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_PSCSI=m
 CONFIG_LOOPBACK_TARGET=m
-# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set
 CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
@@ -1940,6 +1890,7 @@ CONFIG_R8169=m
 CONFIG_SIS190=m
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
 CONFIG_SKY2=m
 # CONFIG_SKY2_DEBUG is not set
 CONFIG_VIA_VELOCITY=m
@@ -2026,10 +1977,13 @@ CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 CONFIG_CARL9170_WPC=y
 CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
 CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_PIO=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_LP=y
@@ -2133,6 +2087,7 @@ CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
 CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
 CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
 CONFIG_RTL8192C_COMMON=m
@@ -2245,6 +2200,7 @@ CONFIG_IEEE802154_FAKEHARD=m
 CONFIG_CAIF_TTY=m
 CONFIG_CAIF_SPI_SLAVE=m
 CONFIG_CAIF_SPI_SYNC=y
+CONFIG_CAIF_HSI=m
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_RIONET=m
@@ -2566,11 +2522,15 @@ CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
 CONFIG_INPUT_AD714X_SPI=m
 CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
 CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
@@ -2833,13 +2793,13 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIOLIB=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_GENERIC=m
 CONFIG_GPIO_MAX730X=m
 
 #
 # Memory mapped GPIO drivers:
 #
-CONFIG_GPIO_BASIC_MMIO_CORE=m
-CONFIG_GPIO_BASIC_MMIO=m
+CONFIG_GPIO_GENERIC_PLATFORM=m
 CONFIG_GPIO_IT8761E=m
 CONFIG_GPIO_SCH=m
 CONFIG_GPIO_VX855=m
@@ -2851,6 +2811,7 @@ CONFIG_GPIO_MAX7300=m
 CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_TPS65912=m
 CONFIG_GPIO_WM831X=m
 CONFIG_GPIO_ADP5588=m
 
@@ -2988,18 +2949,22 @@ CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_LTC4261=m
 CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
 CONFIG_SENSORS_MAX1111=m
 CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
 CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_MAX16064=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
@@ -3016,7 +2981,9 @@ CONFIG_SENSORS_EMC6W201=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
 CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
 CONFIG_SENSORS_ADS1015=m
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
@@ -3051,6 +3018,7 @@ CONFIG_SENSORS_ATK0110=m
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
 CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 
 #
@@ -3129,6 +3097,7 @@ CONFIG_BCMA_POSSIBLE=y
 # Broadcom specific AMBA
 #
 CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
 CONFIG_BCMA_HOST_PCI_POSSIBLE=y
 CONFIG_BCMA_HOST_PCI=y
 # CONFIG_BCMA_DEBUG is not set
@@ -3141,6 +3110,8 @@ CONFIG_UCB1400_CORE=m
 CONFIG_TPS6105X=m
 CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
+CONFIG_MFD_TPS65912=y
+CONFIG_MFD_TPS65912_SPI=y
 # CONFIG_MFD_TMIO is not set
 CONFIG_MFD_WM8400=m
 CONFIG_MFD_WM831X=y
@@ -3185,6 +3156,7 @@ CONFIG_REGULATOR_MC13892=m
 CONFIG_REGULATOR_TPS6105X=m
 CONFIG_REGULATOR_TPS65023=m
 CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65912=m
 CONFIG_REGULATOR_ISL6271A=m
 CONFIG_REGULATOR_AD5398=m
 CONFIG_REGULATOR_AB8500=y
@@ -3199,6 +3171,7 @@ CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_DVB_CORE=m
+CONFIG_DVB_NET=y
 CONFIG_VIDEO_MEDIA=m
 
 #
@@ -3215,6 +3188,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
 CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
@@ -3243,6 +3217,7 @@ CONFIG_MEDIA_TUNER_MT2131=m
 CONFIG_MEDIA_TUNER_QT1010=m
 CONFIG_MEDIA_TUNER_XC2028=m
 CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
 CONFIG_MEDIA_TUNER_MC44S803=m
@@ -3261,6 +3236,7 @@ CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_MEM2MEM_DEV=m
 CONFIG_VIDEOBUF2_CORE=m
 CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
 CONFIG_VIDEOBUF2_VMALLOC=m
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
@@ -3339,6 +3315,11 @@ CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_TCM825X=m
 
 #
+# Flash devices
+#
+CONFIG_VIDEO_ADP1653=m
+
+#
 # Video improvement chips
 #
 CONFIG_VIDEO_UPD64031A=m
@@ -3403,6 +3384,7 @@ CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
 CONFIG_SOC_CAMERA_PLATFORM=m
 CONFIG_SOC_CAMERA_OV2640=m
+CONFIG_SOC_CAMERA_OV5642=m
 CONFIG_SOC_CAMERA_OV6650=m
 CONFIG_SOC_CAMERA_OV772X=m
 CONFIG_SOC_CAMERA_OV9640=m
@@ -3431,6 +3413,7 @@ CONFIG_USB_GSPCA_OV534_9=m
 CONFIG_USB_GSPCA_PAC207=m
 CONFIG_USB_GSPCA_PAC7302=m
 CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
 CONFIG_USB_GSPCA_SN9C2028=m
 CONFIG_USB_GSPCA_SN9C20X=m
 CONFIG_USB_GSPCA_SONIXB=m
@@ -3462,6 +3445,7 @@ CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_EM28XX=m
 CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=y
 CONFIG_VIDEO_TLG2300=m
 CONFIG_VIDEO_CX231XX=m
 CONFIG_VIDEO_CX231XX_RC=y
@@ -3606,6 +3590,11 @@ CONFIG_DVB_HOPPER=m
 CONFIG_DVB_NGENE=m
 
 #
+# Supported ddbridge ('Octopus') Adapters
+#
+CONFIG_DVB_DDBRIDGE=m
+
+#
 # Supported DVB Frontends
 #
 # CONFIG_DVB_FE_CUSTOMISE is not set
@@ -3619,6 +3608,12 @@ CONFIG_DVB_STV090x=m
 CONFIG_DVB_STV6110x=m
 
 #
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+
+#
 # DVB-S (satellite) frontends
 #
 CONFIG_DVB_CX24110=m
@@ -3850,6 +3845,7 @@ CONFIG_LCD_VGG2432A4=m
 CONFIG_LCD_PLATFORM=m
 CONFIG_LCD_S6E63M0=m
 CONFIG_LCD_LD9040=m
+CONFIG_LCD_AMS369FG06=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PROGEAR=m
@@ -3890,7 +3886,7 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
+# CONFIG_LOGO is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
@@ -3939,6 +3935,7 @@ CONFIG_SND_AC97_POWER_SAVE=y
 CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 CONFIG_SND_SB_COMMON=m
 CONFIG_SND_SB16_DSP=m
+CONFIG_SND_TEA575X=m
 CONFIG_SND_PCI=y
 CONFIG_SND_AD1889=m
 CONFIG_SND_ALS300=m
@@ -3988,8 +3985,8 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_TEA575X=m
 CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_PREALLOC_SIZE=4096
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDA_INPUT_BEEP=y
@@ -3997,6 +3994,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=1
 CONFIG_SND_HDA_INPUT_JACK=y
 CONFIG_SND_HDA_PATCH_LOADER=y
 CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
 CONFIG_SND_HDA_CODEC_VIA=y
@@ -4004,6 +4002,7 @@ CONFIG_SND_HDA_CODEC_HDMI=y
 CONFIG_SND_HDA_CODEC_CIRRUS=y
 CONFIG_SND_HDA_CODEC_CONEXANT=y
 CONFIG_SND_HDA_CODEC_CA0110=y
+CONFIG_SND_HDA_CODEC_CA0132=y
 CONFIG_SND_HDA_CODEC_CMEDIA=y
 CONFIG_SND_HDA_CODEC_SI3054=y
 CONFIG_SND_HDA_GENERIC=y
@@ -4084,6 +4083,8 @@ CONFIG_DRAGONRISE_FF=y
 CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_EZKEY=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
 CONFIG_HID_UCLOGIC=m
@@ -4121,6 +4122,7 @@ CONFIG_HID_ROCCAT_KOVAPLUS=m
 CONFIG_HID_ROCCAT_PYRA=m
 CONFIG_HID_SAMSUNG=m
 CONFIG_HID_SONY=m
+CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_GREENASIA=m
 CONFIG_GREENASIA_FF=y
@@ -4131,6 +4133,7 @@ CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_WACOM=m
 CONFIG_HID_WACOM_POWER_SUPPLY=y
+CONFIG_HID_WIIMOTE=m
 CONFIG_HID_ZEROPLUS=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
@@ -4326,20 +4329,18 @@ CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_SELECTED=y
-# CONFIG_USB_GADGET_FUSB300 is not set
-# CONFIG_USB_GADGET_R8A66597 is not set
-# CONFIG_USB_GADGET_PXA_U2O is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_CI13XXX_PCI is not set
-CONFIG_USB_GADGET_NET2280=y
+CONFIG_USB_R8A66597=m
+CONFIG_USB_M66592=m
+CONFIG_USB_AMD5536UDC=m
+CONFIG_USB_CI13XXX_PCI=m
+CONFIG_USB_NET2272=m
+CONFIG_USB_NET2272_DMA=y
 CONFIG_USB_NET2280=m
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LANGWELL is not set
-# CONFIG_USB_GADGET_EG20T is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
+CONFIG_USB_GOKU=m
+CONFIG_USB_EG20T=m
+CONFIG_USB_DUMMY_HCD=m
 CONFIG_USB_GADGET_DUALSPEED=y
+CONFIG_USB_GADGET_SUPERSPEED=y
 # CONFIG_USB_ZERO is not set
 CONFIG_USB_AUDIO=m
 CONFIG_USB_ETH=m
@@ -4433,7 +4434,6 @@ CONFIG_LEDS_ALIX2=m
 CONFIG_LEDS_PCA9532=m
 CONFIG_LEDS_PCA9532_GPIO=y
 CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_GPIO_PLATFORM=y
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP5521=m
 CONFIG_LEDS_LP5523=m
@@ -4453,7 +4453,6 @@ CONFIG_LEDS_TRIGGERS=y
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_GPIO=m
@@ -4462,8 +4461,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 #
 # iptables trigger is under Netfilter config (LED target)
 #
-CONFIG_NFC_DEVICES=y
-CONFIG_PN544_NFC=m
 CONFIG_ACCESSIBILITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 # CONFIG_INFINIBAND is not set
@@ -4599,11 +4596,21 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_NETX=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
+
+#
+# Virtio drivers
+#
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
 
 #
 # Xen driver support
 #
 CONFIG_XEN_BALLOON=y
+# CONFIG_XEN_SELFBALLOONING is not set
+CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_DEV_EVTCHN=m
 CONFIG_XEN_BACKEND=y
@@ -4615,11 +4622,9 @@ CONFIG_XEN_GNTDEV=m
 CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_XEN_PLATFORM_PCI=m
 CONFIG_SWIOTLB_XEN=y
+CONFIG_XEN_TMEM=y
+CONFIG_XEN_PCIDEV_BACKEND=m
 CONFIG_STAGING=y
-# CONFIG_DIGIEPCA is not set
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
-# CONFIG_COMPUTONE is not set
 CONFIG_ET131X=m
 # CONFIG_ET131X_DEBUG is not set
 CONFIG_SLICOSS=m
@@ -4690,6 +4695,7 @@ CONFIG_COMEDI_AMPLC_PCI224=m
 CONFIG_COMEDI_AMPLC_PCI230=m
 CONFIG_COMEDI_CONTEC_PCI_DIO=m
 CONFIG_COMEDI_DT3000=m
+CONFIG_COMEDI_DYNA_PCI10XX=m
 CONFIG_COMEDI_UNIOXX5=m
 CONFIG_COMEDI_GSC_HPDI=m
 CONFIG_COMEDI_ICP_MULTI=m
@@ -4788,6 +4794,7 @@ CONFIG_WLAGS49_H25=m
 CONFIG_FB_SM7XX=m
 CONFIG_VIDEO_DT3155=m
 CONFIG_DT3155_CCIR=y
+CONFIG_DT3155_STREAMING=y
 CONFIG_CRYSTALHD=m
 CONFIG_FB_XGI=m
 CONFIG_LIRC_STAGING=y
@@ -4802,12 +4809,9 @@ CONFIG_LIRC_SIR=m
 CONFIG_LIRC_TTUSBIR=m
 CONFIG_LIRC_ZILOG=m
 CONFIG_EASYCAP=m
-CONFIG_EASYCAP_SND=y
-# CONFIG_EASYCAP_OSS is not set
 # CONFIG_EASYCAP_DEBUG is not set
 CONFIG_SOLO6X10=m
 CONFIG_ACPI_QUICKSTART=m
-CONFIG_MACH_NO_WESTBRIDGE=y
 CONFIG_ATH6K_LEGACY=m
 CONFIG_AR600x_SD31_XXX=y
 # CONFIG_AR600x_WB31_XXX is not set
@@ -4854,10 +4858,9 @@ CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
 CONFIG_DRM_PSB=m
-
-#
-# Altera FPGA firmware download module
-#
+CONFIG_DRM_PSB_MRST=y
+CONFIG_DRM_PSB_MFLD=y
+CONFIG_DRM_PSB_CDV=y
 CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
 CONFIG_X86_PLATFORM_DEVICES=y
@@ -4903,6 +4906,19 @@ CONFIG_XO15_EBOOK=m
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+CONFIG_AMD_IOMMU=y
+# CONFIG_AMD_IOMMU_STATS is not set
+CONFIG_DMAR=y
+# CONFIG_DMAR_DEFAULT_ON is not set
+CONFIG_DMAR_FLOPPY_WA=y
+# CONFIG_INTR_REMAP is not set
+CONFIG_VIRT_DRIVERS=y
 
 #
 # Firmware Drivers
@@ -5069,6 +5085,7 @@ CONFIG_LOGFS=m
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -5084,6 +5101,7 @@ CONFIG_PSTORE=y
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 # CONFIG_UFS_DEBUG is not set
+CONFIG_ORE=m
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
 CONFIG_NETWORK_FILESYSTEMS=y
@@ -5097,7 +5115,6 @@ CONFIG_NFS_FSCACHE=y
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFS_USE_NEW_IDMAPPER is not set
 CONFIG_NFSD=m
-# CONFIG_NFSD_DEPRECATED is not set
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
@@ -5245,7 +5262,7 @@ CONFIG_DEBUG_MUTEXES=y
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_STACK_USAGE is not set
@@ -5372,6 +5389,11 @@ CONFIG_SECURITY_PATH=y
 # CONFIG_SECURITY_SELINUX is not set
 # CONFIG_SECURITY_SMACK is not set
 CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
 # CONFIG_IMA is not set
@@ -5516,10 +5538,6 @@ CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 CONFIG_KVM_MMU_AUDIT=y
 CONFIG_VHOST_NET=m
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_RING=m
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -5535,6 +5553,7 @@ CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_LZO_COMPRESS=y
@@ -5553,6 +5572,7 @@ CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
+CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_TEXTSEARCH=y
@@ -5568,3 +5588,5 @@ CONFIG_CPU_RMAP=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
+CONFIG_CORDIC=m
+CONFIG_LLIST=y
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 6f7ae815a..493a6e3a7 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.0-LIBRE
+KERNEL_VERSION=3.1.0-2-LIBRE
 
 post_install () {
   # updating module dependencies
diff --git a/multilib-testing/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD
new file mode 100644
index 000000000..3ace6a666
--- /dev/null
+++ b/multilib-testing/gcc-multilib/PKGBUILD
@@ -0,0 +1,303 @@
+# $Id: PKGBUILD 57474 2011-10-28 11:14:40Z heftig $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Allan McRae <allan@archlinux.org>
+
+# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
+# NOTE: libtool requires rebuilt with each new gcc version
+
+pkgbase='gcc-multilib'
+pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib')
+pkgver=4.6.2
+pkgrel=1
+#_snapshot=4.6-20110819
+_libstdcppmanver=20110814		# Note: check source directory name when updating this
+pkgdesc="The GNU Compiler Collection for multilib"
+arch=('x86_64')
+license=('GPL' 'LGPL' 'FDL' 'custom')
+url="http://gcc.gnu.org"
+makedepends=('binutils-multilib>=2.21.1' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib'
+             'lib32-glibc>=2.14')
+checkdepends=('dejagnu')
+options=('!libtool' '!emptydirs')
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+	#ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
+	gcc_pure64.patch
+	gcc-hash-style-both.patch)
+md5sums=('028115c4fbfb6cfd75d6369f4a90d87e'
+         'ce920d2550ff7e042b9f091d27764d8f'
+         '4030ee1c08dd1e843c0225b772360e76'
+         '4df25b623799b148a0703eaeec8fdf3f')
+
+if [ -n "${_snapshot}" ]; then
+  _basedir="${srcdir}/gcc-${_snapshot}"
+else
+  _basedir="${srcdir}/gcc-${pkgver}"
+fi
+
+build() {
+  cd ${_basedir}
+
+  # Do not install libiberty
+  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
+
+  # Do not run fixincludes
+  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+
+  patch -Np1 -i ${srcdir}/gcc_pure64.patch
+  patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
+
+  echo ${pkgver} > gcc/BASE-VER
+
+  cd ${srcdir}
+  mkdir gcc-build && cd gcc-build
+
+  ${_basedir}/configure --prefix=/usr \
+      --libdir=/usr/lib --libexecdir=/usr/lib \
+      --mandir=/usr/share/man --infodir=/usr/share/info \
+      --with-bugurl=https://bugs.archlinux.org/ \
+      --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
+      --enable-shared --enable-threads=posix \
+      --with-system-zlib --enable-__cxa_atexit \
+      --disable-libunwind-exceptions --enable-clocale=gnu \
+      --enable-gnu-unique-object --enable-linker-build-id \
+      --with-ppl --enable-cloog-backend=isl \
+      --enable-lto --enable-gold --enable-ld=default \
+      --enable-plugin --with-plugin-ld=ld.gold \
+      --enable-multilib --disable-libssp --disable-libstdcxx-pch \
+      --enable-checking=release
+  make
+}
+
+check() {
+  cd gcc-build
+
+  # increase stack size to prevent test failures
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
+  ulimit -s 32768
+
+  # do not abort on error as some are "expected"
+  make -k check || true
+  ${_basedir}/contrib/test_summary
+}
+
+package_gcc-libs-multilib()
+{
+  pkgdesc="Runtime libraries shipped by GCC for multilib"
+  depends=('glibc>=2.14' "lib32-gcc-libs=$pkgver-$pkgrel")
+  provides=("gcc-libs=$pkgver-$pkgrel")
+  conflicts=('gcc-libs')
+  install=gcc-libs.install
+
+  cd gcc-build
+  make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
+  for lib in libmudflap libgomp libstdc++-v3/src; do
+    make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
+  done
+  make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
+  make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
+
+  make -j1 DESTDIR=${pkgdir} install-target-libquadmath  
+  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
+  make -j1 DESTDIR=${pkgdir} install-target-libobjc
+
+  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
+  rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
+
+  # remove stuff in lib32-gcc-libs
+  rm -rf ${pkgdir}/usr/lib32
+
+  # remove static libraries
+  find ${pkgdir} -name *.a -delete
+  
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_lib32-gcc-libs()
+{
+  pkgdesc="Runtime libraries shipped by GCC (32-bit)"
+  depends=('lib32-glibc>=2.14' "gcc-libs>=$pkgver")
+
+  cd gcc-build
+  make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared
+  for lib in libmudflap libgomp libstdc++-v3/src; do
+    make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
+  done
+
+  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
+  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
+  make -j1 DESTDIR=${pkgdir} install-target-libobjc
+
+  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
+  rm ${pkgdir}/usr/lib32/libgfortran.spec
+
+  # remove stuff in gcc-libs-multilib
+  rm -rf ${pkgdir}/usr/lib
+  rm -rf ${pkgdir}/usr/share/info
+
+  # remove static libraries
+  find ${pkgdir} -name *.a -delete
+  
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-multilib()
+{
+  pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib"
+  depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils-multilib>=2.21.1' 'libmpc' 'cloog' 'ppl')
+  groups=('multilib-devel')
+  provides=("gcc=$pkgver-$pkgrel")
+  conflicts=('gcc')
+  install=gcc.install
+
+  cd gcc-build
+  
+  # unfortunately it is much, much easier to install the lot and clean-up the mess...
+  make -j1 DESTDIR=${pkgdir} install
+  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
+  rm $pkgdir/usr/lib{,32}/*.so*
+  rm $pkgdir/usr/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
+  rm $pkgdir/usr/lib{,32}/libgfortran.spec
+  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{{,32/}ada{include,lib},finclude,include/objc}
+  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
+  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,{,32/}libgfortranbegin.a}
+  rm -r $pkgdir/usr/lib{,32}/go
+  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
+  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
+  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
+  rm $pkgdir/usr/share/man/man3/ffi*
+
+  # many packages require these symlinks
+  install -dm755 ${pkgdir}/lib
+  ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp
+  ln -sf gcc ${pkgdir}/usr/bin/cc
+  ln -sf g++ ${pkgdir}/usr/bin/c++
+
+  # install gengtype for plugin support
+  install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
+  install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
+
+  # POSIX conformance launcher scripts for c89 and c99
+  cat > $pkgdir/usr/bin/c89 <<"EOF"
+#!/bin/sh
+fl="-std=c89"
+for opt; do
+  case "$opt" in
+    -ansi|-std=c89|-std=iso9899:1990) fl="";;
+    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
+	    exit 1;;
+  esac
+done
+exec gcc $fl ${1+"$@"}
+EOF
+
+  cat > $pkgdir/usr/bin/c99 <<"EOF"
+#!/bin/sh
+fl="-std=c99"
+for opt; do
+  case "$opt" in
+    -std=c99|-std=iso9899:1999) fl="";;
+    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
+	    exit 1;;
+  esac
+done
+exec gcc $fl ${1+"$@"}
+EOF
+
+  chmod 755 $pkgdir/usr/bin/c{8,9}9
+
+  # install the libstdc++ man pages
+  install -dm755 ${pkgdir}/usr/share/man/man3
+  install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-multilib/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-fortran-multilib()
+{
+  pkgdesc="Fortran front-end for GCC for multilib"
+  depends=("gcc-multilib=$pkgver-$pkgrel")
+  provides=("gcc-fortran=$pkgver-$pkgrel")
+  conflicts=('gcc-fortran')
+  install=gcc-fortran.install
+
+  cd gcc-build
+  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
+  make -j1 DESTDIR=$pkgdir install-target-libgfortran
+  make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
+  make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
+  install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
+  
+  # remove libraries included in gcc-libs
+  rm ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so*
+  rm ${pkgdir}/usr/share/info/libquadmath.info
+  
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-fortran-multilib/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-objc-multilib()
+{
+  pkgdesc="Objective-C front-end for GCC for multilib"
+  depends=("gcc-multilib=$pkgver-$pkgrel")
+  provides=("gcc-objc=$pkgver-$pkgrel")
+  conflicts=('gcc-objc')
+
+  cd gcc-build
+  make -j1 DESTDIR=$pkgdir install-target-libobjc
+  install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
+  install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
+
+  # remove libraries included in gcc-libs
+  rm ${pkgdir}/usr/lib{,32}/libobjc.so*
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-objc-multilib/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-ada-multilib()
+{
+  pkgdesc="Ada front-end for GCC (GNAT) for multilib"
+  depends=("gcc-multilib=$pkgver-$pkgrel")
+  provides=("gcc-ada=$pkgver-$pkgrel")
+  conflicts=('gcc-ada')
+  install=gcc-ada.install
+
+  cd gcc-build/gcc
+  make -j1 DESTDIR=$pkgdir ada.install-{common,info}
+  install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
+
+  cd ../$CHOST/32/libada
+  make -j1 DESTDIR=${pkgdir} INSTALL="install" \
+    INSTALL_DATA="install -m644" install-gnatlib
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-ada-multilib/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-go-multilib()
+{
+  pkgdesc="Go front-end for GCC for multilib"
+  depends=("gcc-multilib=$pkgver-$pkgrel")
+  provides=("gcc-go=$pkgver-$pkgrel")
+  conflicts=('gcc-go')
+  install=gcc-go.install
+
+  cd gcc-build
+  make -j1 DESTDIR=$pkgdir install-target-libgo
+  make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
+  install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
+}
diff --git a/multilib-testing/gcc-multilib/gcc-ada.install b/multilib-testing/gcc-multilib/gcc-ada.install
new file mode 100644
index 000000000..df0553a4f
--- /dev/null
+++ b/multilib-testing/gcc-multilib/gcc-ada.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/multilib-testing/gcc-multilib/gcc-fortran.install b/multilib-testing/gcc-multilib/gcc-fortran.install
new file mode 100644
index 000000000..b15d89a97
--- /dev/null
+++ b/multilib-testing/gcc-multilib/gcc-fortran.install
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+file="gfortran.info"
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+}
diff --git a/multilib-testing/gcc-multilib/gcc-go.install b/multilib-testing/gcc-multilib/gcc-go.install
new file mode 100644
index 000000000..7dc50dee5
--- /dev/null
+++ b/multilib-testing/gcc-multilib/gcc-go.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(gccgo.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch b/multilib-testing/gcc-multilib/gcc-hash-style-both.patch
new file mode 100644
index 000000000..8b59f4535
--- /dev/null
+++ b/multilib-testing/gcc-multilib/gcc-hash-style-both.patch
@@ -0,0 +1,122 @@
+--- gcc/config/alpha/linux-elf.h.orig	2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/alpha/linux-elf.h	2011-03-11 10:01:47.770000457 +1000
+@@ -41,7 +41,7 @@
+ 
+ #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
+ 
+-#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
++#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax}	\
+   %{O*:-O3} %{!O*:-O1}						\
+   %{shared:-shared}						\
+   %{!shared:							\
+--- gcc/config/i386/linux64.h.orig	2011-03-03 08:35:36.000000000 +1000
++++ gcc/config/i386/linux64.h	2011-03-11 10:01:47.770000457 +1000
+@@ -78,7 +78,7 @@
+  %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
+ 
+ #undef	LINK_SPEC
+-#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
++#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+--- gcc/config/i386/linux.h.orig	2011-01-15 04:45:06.000000000 +1000
++++ gcc/config/i386/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -104,7 +104,7 @@
+   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
+ 
+ #undef	LINK_SPEC
+-#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
++#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+--- gcc/config/ia64/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/ia64/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -64,7 +64,7 @@
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "\
++#define LINK_SPEC "--hash-style=both \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+--- gcc/config/rs6000/linux64.h.orig	2011-02-11 03:30:10.000000000 +1000
++++ gcc/config/rs6000/linux64.h	2011-03-11 10:03:34.280000457 +1000
+@@ -389,11 +389,11 @@
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
+ 
+ 
+-#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
+ 
+-#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
+ 
+--- gcc/config/rs6000/sysv4.h.orig	2011-01-28 04:36:03.000000000 +1000
++++ gcc/config/rs6000/sysv4.h	2011-03-11 10:01:47.773333792 +1000
+@@ -830,7 +830,7 @@
+ #define LINUX_DYNAMIC_LINKER \
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
+ 
+-#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
+ 
+--- gcc/config/s390/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/s390/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -77,7 +77,7 @@
+ 
+ #undef  LINK_SPEC
+ #define LINK_SPEC \
+-  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
++  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
+    %{shared:-shared} \
+    %{!shared: \
+       %{static:-static} \
+--- gcc/config/sparc/linux64.h.orig	2011-02-17 23:57:21.000000000 +1000
++++ gcc/config/sparc/linux64.h	2011-03-11 10:01:47.770000457 +1000
+@@ -113,7 +113,7 @@
+   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
+   { "link_arch",	 LINK_ARCH_SPEC },
+ 
+-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
++#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+@@ -121,7 +121,7 @@
+       %{static:-static}} \
+ "
+ 
+-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+@@ -193,7 +193,7 @@
+ #else /* !SPARC_BI_ARCH */
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+--- gcc/config/sparc/linux.h.orig	2011-01-27 06:30:12.000000000 +1000
++++ gcc/config/sparc/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -74,7 +74,7 @@
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+ #undef  LINK_SPEC
+-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
++#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
+   %{!mno-relax:%{!r:-relax}} \
+   %{!shared: \
+     %{!static: \
diff --git a/multilib-testing/gcc-multilib/gcc-libs.install b/multilib-testing/gcc-multilib/gcc-libs.install
new file mode 100644
index 000000000..23553b8f0
--- /dev/null
+++ b/multilib-testing/gcc-multilib/gcc-libs.install
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+filelist=(libgomp.info libquadmath.info)
+
+post_upgrade() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/multilib-testing/gcc-multilib/gcc.install b/multilib-testing/gcc-multilib/gcc.install
new file mode 100644
index 000000000..3407a5e1f
--- /dev/null
+++ b/multilib-testing/gcc-multilib/gcc.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/multilib-testing/gcc-multilib/gcc_pure64.patch b/multilib-testing/gcc-multilib/gcc_pure64.patch
new file mode 100644
index 000000000..8c0baf8e2
--- /dev/null
+++ b/multilib-testing/gcc-multilib/gcc_pure64.patch
@@ -0,0 +1,26 @@
+diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
+--- gcc-4.2.0.orig/gcc/config/i386/linux64.h	2007-05-16 19:21:19.000000000 -0400
++++ gcc-4.2.0/gcc/config/i386/linux64.h	2007-05-18 17:04:05.000000000 -0400
+@@ -49,8 +49,8 @@
+    When the -shared link option is used a final link is not being
+    done.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
+ 
+ #undef	LINK_SPEC
+ #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
+diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
+--- gcc-4.2.0.orig/gcc/config/i386/t-linux64	2007-05-16 19:21:19.000000000 -0400
++++ gcc-4.2.0/gcc/config/i386/t-linux64	2007-05-18 17:04:36.000000000 -0400
+@@ -6,7 +6,7 @@
+ 
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32 
+-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
++MULTILIB_OSDIRNAMES = ../lib ../lib32
+ 
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
diff --git a/multilib-testing/libtool-multilib/PKGBUILD b/multilib-testing/libtool-multilib/PKGBUILD
index 223d703e6..e733861f9 100644
--- a/multilib-testing/libtool-multilib/PKGBUILD
+++ b/multilib-testing/libtool-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 57023 2011-10-18 18:23:33Z heftig $
+# $Id: PKGBUILD 57473 2011-10-28 11:13:37Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
@@ -8,12 +8,12 @@
 pkgbase=libtool-multilib
 pkgname=(libtool-multilib lib32-libltdl)
 pkgver=2.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A generic library support script for multilib"
 arch=('x86_64')
 url="http://www.gnu.org/software/libtool"
 license=('GPL')
-_gccver=4.6.1
+_gccver=4.6.2
 makedepends=("gcc-multilib=$_gccver")
 options=('!libtool')
 source=(ftp://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz{,.sig})
diff --git a/social/strongswan/PKGBUILD b/social/strongswan/PKGBUILD
new file mode 100644
index 000000000..8c5e42885
--- /dev/null
+++ b/social/strongswan/PKGBUILD
@@ -0,0 +1,50 @@
+# Contributor: Jason Begley <jayray at digitalgoat dot com>
+# Contributor: Ray Kohler <ataraxia937 at gmail dot com>
+# Maintainer: Daniel Riedemann <daniel.riedemann [at] googlemail [dot] com>
+# Maintainer: Dhruv Desai <svenskaparadox [at] gmail dot com>
+
+pkgname=strongswan
+pkgver=4.5.3
+pkgrel=1
+pkgdesc="open source IPsec implementation"
+url='http://www.strongswan.org'
+license=("GPL")
+arch=('i686' 'x86_64')
+depends=('curl' 'gmp' 'iproute2' 'openssl' 'sqlite3' 'networkmanager')
+conflicts=('openswan')
+options=(!libtool)
+backup=(etc/ipsec.conf etc/strongswan.conf)
+source=(http://download.strongswan.org/${pkgname}-${pkgver}.tar.bz2
+        strongswan.rc)
+md5sums=('ee7c50a90c91307b111e8085f2479890'
+         '667ea2367cbe07c57721696e6b7e39df')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver} 
+
+  ./configure  	--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+        --with-ipsecdir=/usr/lib/strongswan \
+		--enable-sqlite --enable-smartcard --enable-cisco-quirks \
+		--enable-openssl --enable-nm --enable-curl \
+		--enable-sql --enable-attr-sql \
+		--enable-farp --enable-dhcp \
+		--enable-eap-sim --enable-eap-sim-file --enable-eap-simaka-pseudonym \
+		--enable-eap-simaka-reauth --enable-eap-identity --enable-eap-md5 \
+		--enable-eap-gtc --enable-eap-aka --enable-eap-aka-3gpp2 \
+		--enable-eap-mschapv2 --enable-eap-radius \
+		--enable-ha \
+		--disable-mysql --disable-ldap \
+		--disable-static --enable-shared 
+
+  make 
+}
+
+package(){
+  cd ${srcdir}/${pkgname}-${pkgver} 
+  make DESTDIR=${pkgdir} install 
+
+  install -d ${pkgdir}/etc/rc.d 
+  ln -s /usr/sbin/ipsec ${pkgdir}/etc/rc.d/ipsec 
+  install -Dm755 ${srcdir}/strongswan.rc ${pkgdir}/etc/rc.d/strongswan 
+}
+
diff --git a/social/strongswan/strongswan.rc b/social/strongswan/strongswan.rc
new file mode 100755
index 000000000..58c99c092
--- /dev/null
+++ b/social/strongswan/strongswan.rc
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+  start)
+    stat_busy "Starting strongSwan IPsec"
+    /usr/sbin/ipsec start
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      stat_done
+      add_daemon strongswan
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping strongSwan IPsec"
+    /usr/sbin/ipsec stop
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      stat_done
+      rm_daemon strongswan
+    fi
+    ;;
+  restart)
+    stat_busy "Restarting strongSwan IPsec"
+    /usr/sbin/ipsec restart
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      stat_done
+      add_daemon strongswan
+    fi
+    ;;
+  status)
+    /usr/sbin/ipsec status
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart|status}"  
+esac
+
diff --git a/staging/graphite/PKGBUILD b/staging/graphite/PKGBUILD
new file mode 100644
index 000000000..12cab4e69
--- /dev/null
+++ b/staging/graphite/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 141287 2011-10-28 05:35:50Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+
+pkgname=graphite
+pkgver=1.0.3
+pkgrel=1
+epoch=1
+arch=('i686' 'x86_64')
+url="http://graphite.sil.org/"
+pkgdesc='reimplementation of the SIL Graphite text processing engine'
+license=('custom_SIL Dual license')
+depends=('gcc-libs')
+makedepends=('cmake' 'freetype2')
+options=('!libtool' '!emptydirs')
+source=("http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz")
+md5sums=('3bf481ca95109b14435125c0dd1f2217')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake -G "Unix Makefiles" ../graphite2-${pkgver} \
+	-DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+check() {
+  cd "${srcdir}"/build
+  ctest
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="$pkgdir/" install
+
+  # licenses
+  mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -m644 "${srcdir}"/graphite2-${pkgver}/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
+}
diff --git a/staging/graphite/pango-graphite.install b/staging/graphite/pango-graphite.install
new file mode 100644
index 000000000..46bc44611
--- /dev/null
+++ b/staging/graphite/pango-graphite.install
@@ -0,0 +1,12 @@
+post_install() {
+	usr/bin/pango-querymodules >etc/pango/pango.modules
+}
+
+post_upgrade() {
+	post_install $1
+}
+
+pre_remove() {
+        post_install $1
+}
+
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/gcc/PKGBUILD b/testing/gcc/PKGBUILD
new file mode 100644
index 000000000..dfe8b0e92
--- /dev/null
+++ b/testing/gcc/PKGBUILD
@@ -0,0 +1,254 @@
+# $Id: PKGBUILD 141273 2011-10-28 00:55:51Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
+# NOTE: libtool requires rebuilt with each new gcc version
+
+pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
+pkgver=4.6.2
+pkgrel=1
+#_snapshot=4.6-20110819
+_libstdcppmanver=20110814		# Note: check source directory name when updating this
+pkgdesc="The GNU Compiler Collection"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL' 'custom')
+url="http://gcc.gnu.org"
+makedepends=('binutils>=2.21-9' 'libmpc' 'cloog' 'ppl' 'gcc-ada')
+checkdepends=('dejagnu')
+options=('!libtool' '!emptydirs')
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+	#ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
+	gcc_pure64.patch
+	gcc-hash-style-both.patch)
+md5sums=('028115c4fbfb6cfd75d6369f4a90d87e'
+         'ce920d2550ff7e042b9f091d27764d8f'
+         '4030ee1c08dd1e843c0225b772360e76'
+         '4df25b623799b148a0703eaeec8fdf3f')
+
+if [ -n "${_snapshot}" ]; then
+  _basedir="${srcdir}/gcc-${_snapshot}"
+else
+  _basedir="${srcdir}/gcc-${pkgver}"
+fi
+
+build() {
+  cd ${_basedir}
+
+  # Do not install libiberty
+  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
+
+  # Do not run fixincludes
+  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+
+  if [ "${CARCH}" = "x86_64" ]; then
+    patch -Np1 -i ${srcdir}/gcc_pure64.patch
+  fi
+  patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
+
+  echo ${pkgver} > gcc/BASE-VER
+
+  cd ${srcdir}
+  mkdir gcc-build && cd gcc-build
+
+  ${_basedir}/configure --prefix=/usr \
+      --libdir=/usr/lib --libexecdir=/usr/lib \
+      --mandir=/usr/share/man --infodir=/usr/share/info \
+      --with-bugurl=https://bugs.archlinux.org/ \
+      --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
+      --enable-shared --enable-threads=posix \
+      --with-system-zlib --enable-__cxa_atexit \
+      --disable-libunwind-exceptions --enable-clocale=gnu \
+      --enable-gnu-unique-object --enable-linker-build-id \
+      --with-ppl --enable-cloog-backend=isl \
+      --enable-lto --enable-gold --enable-ld=default \
+      --enable-plugin --with-plugin-ld=ld.gold \
+      --disable-multilib --disable-libssp --disable-libstdcxx-pch \
+      --enable-checking=release
+  make
+}
+
+check() {
+  cd gcc-build
+
+  # increase stack size to prevent test failures
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
+  ulimit -s 32768
+
+  # do not abort on error as some are "expected"
+  make -k check || true
+  ${_basedir}/contrib/test_summary
+}
+
+package_gcc-libs()
+{
+  pkgdesc="Runtime libraries shipped by GCC"
+  groups=('base')
+  depends=('glibc>=2.14')
+  install=gcc-libs.install
+
+  cd gcc-build
+  make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
+  for lib in libmudflap libgomp libstdc++-v3/src; do
+    make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
+  done
+  make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
+  make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
+
+  make -j1 DESTDIR=${pkgdir} install-target-libquadmath  
+  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
+  make -j1 DESTDIR=${pkgdir} install-target-libobjc
+
+  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
+  rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
+
+  # remove static libraries
+  find ${pkgdir} -name *.a -delete
+  
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc()
+{
+  pkgdesc="The GNU Compiler Collection - C and C++ frontends"
+  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.21.1' 'libmpc' 'cloog' 'ppl')
+  groups=('base-devel')
+  install=gcc.install
+
+  cd gcc-build
+  
+  # unfortunately it is much, much easier to install the lot and clean-up the mess...
+  make -j1 DESTDIR=${pkgdir} install
+  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
+  rm $pkgdir/usr/lib/*.so*
+  rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
+  rm $pkgdir/usr/lib/libgfortran.spec
+  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
+  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
+  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a}
+  rm -r $pkgdir/usr/lib/go
+  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
+  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
+  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
+  rm $pkgdir/usr/share/man/man3/ffi*
+
+  # many packages require these symlinks
+  install -dm755 ${pkgdir}/lib
+  ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp
+  ln -sf gcc ${pkgdir}/usr/bin/cc
+  ln -sf g++ ${pkgdir}/usr/bin/c++
+
+  # install gengtype for plugin support
+  install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
+  install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
+
+  # POSIX conformance launcher scripts for c89 and c99
+  cat > $pkgdir/usr/bin/c89 <<"EOF"
+#!/bin/sh
+fl="-std=c89"
+for opt; do
+  case "$opt" in
+    -ansi|-std=c89|-std=iso9899:1990) fl="";;
+    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
+	    exit 1;;
+  esac
+done
+exec gcc $fl ${1+"$@"}
+EOF
+
+  cat > $pkgdir/usr/bin/c99 <<"EOF"
+#!/bin/sh
+fl="-std=c99"
+for opt; do
+  case "$opt" in
+    -std=c99|-std=iso9899:1999) fl="";;
+    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
+	    exit 1;;
+  esac
+done
+exec gcc $fl ${1+"$@"}
+EOF
+
+  chmod 755 $pkgdir/usr/bin/c{8,9}9
+
+  # install the libstdc++ man pages
+  install -dm755 ${pkgdir}/usr/share/man/man3
+  install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-fortran()
+{
+  pkgdesc="Fortran front-end for GCC"
+  depends=("gcc=$pkgver-$pkgrel")
+  install=gcc-fortran.install
+
+  cd gcc-build
+  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
+  make -j1 DESTDIR=$pkgdir install-target-libgfortran
+  make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
+  make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
+  install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
+  
+  # remove libraries included in gcc-libs
+  rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so*
+  rm ${pkgdir}/usr/share/info/libquadmath.info
+  
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-objc()
+{
+  pkgdesc="Objective-C front-end for GCC"
+  depends=("gcc=$pkgver-$pkgrel")
+
+  cd gcc-build
+  make -j1 DESTDIR=$pkgdir install-target-libobjc
+  install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
+  install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
+
+  # remove libraries included in gcc-libs
+  rm ${pkgdir}/usr/lib/libobjc.so*
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-ada()
+{
+  pkgdesc="Ada front-end for GCC (GNAT)"
+  depends=("gcc=$pkgver-$pkgrel")
+  install=gcc-ada.install
+
+  cd gcc-build/gcc
+  make -j1 DESTDIR=$pkgdir ada.install-{common,info}
+  install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
+  
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-go()
+{
+  pkgdesc="Go front-end for GCC"
+  depends=("gcc=$pkgver-$pkgrel")
+  install=gcc-go.install
+
+  cd gcc-build
+  make -j1 DESTDIR=$pkgdir install-target-libgo
+  make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
+  install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
+}
diff --git a/testing/gcc/gcc-ada.install b/testing/gcc/gcc-ada.install
new file mode 100644
index 000000000..df0553a4f
--- /dev/null
+++ b/testing/gcc/gcc-ada.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/gcc/gcc-fortran.install b/testing/gcc/gcc-fortran.install
new file mode 100644
index 000000000..b15d89a97
--- /dev/null
+++ b/testing/gcc/gcc-fortran.install
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+file="gfortran.info"
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+}
diff --git a/testing/gcc/gcc-go.install b/testing/gcc/gcc-go.install
new file mode 100644
index 000000000..7dc50dee5
--- /dev/null
+++ b/testing/gcc/gcc-go.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(gccgo.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/gcc/gcc-hash-style-both.patch b/testing/gcc/gcc-hash-style-both.patch
new file mode 100644
index 000000000..8b59f4535
--- /dev/null
+++ b/testing/gcc/gcc-hash-style-both.patch
@@ -0,0 +1,122 @@
+--- gcc/config/alpha/linux-elf.h.orig	2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/alpha/linux-elf.h	2011-03-11 10:01:47.770000457 +1000
+@@ -41,7 +41,7 @@
+ 
+ #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
+ 
+-#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
++#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax}	\
+   %{O*:-O3} %{!O*:-O1}						\
+   %{shared:-shared}						\
+   %{!shared:							\
+--- gcc/config/i386/linux64.h.orig	2011-03-03 08:35:36.000000000 +1000
++++ gcc/config/i386/linux64.h	2011-03-11 10:01:47.770000457 +1000
+@@ -78,7 +78,7 @@
+  %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
+ 
+ #undef	LINK_SPEC
+-#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
++#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+--- gcc/config/i386/linux.h.orig	2011-01-15 04:45:06.000000000 +1000
++++ gcc/config/i386/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -104,7 +104,7 @@
+   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
+ 
+ #undef	LINK_SPEC
+-#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
++#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+--- gcc/config/ia64/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/ia64/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -64,7 +64,7 @@
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "\
++#define LINK_SPEC "--hash-style=both \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+--- gcc/config/rs6000/linux64.h.orig	2011-02-11 03:30:10.000000000 +1000
++++ gcc/config/rs6000/linux64.h	2011-03-11 10:03:34.280000457 +1000
+@@ -389,11 +389,11 @@
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
+ 
+ 
+-#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
+ 
+-#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
+ 
+--- gcc/config/rs6000/sysv4.h.orig	2011-01-28 04:36:03.000000000 +1000
++++ gcc/config/rs6000/sysv4.h	2011-03-11 10:01:47.773333792 +1000
+@@ -830,7 +830,7 @@
+ #define LINUX_DYNAMIC_LINKER \
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
+ 
+-#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
+ 
+--- gcc/config/s390/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/s390/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -77,7 +77,7 @@
+ 
+ #undef  LINK_SPEC
+ #define LINK_SPEC \
+-  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
++  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
+    %{shared:-shared} \
+    %{!shared: \
+       %{static:-static} \
+--- gcc/config/sparc/linux64.h.orig	2011-02-17 23:57:21.000000000 +1000
++++ gcc/config/sparc/linux64.h	2011-03-11 10:01:47.770000457 +1000
+@@ -113,7 +113,7 @@
+   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
+   { "link_arch",	 LINK_ARCH_SPEC },
+ 
+-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
++#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+@@ -121,7 +121,7 @@
+       %{static:-static}} \
+ "
+ 
+-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+@@ -193,7 +193,7 @@
+ #else /* !SPARC_BI_ARCH */
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+--- gcc/config/sparc/linux.h.orig	2011-01-27 06:30:12.000000000 +1000
++++ gcc/config/sparc/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -74,7 +74,7 @@
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+ #undef  LINK_SPEC
+-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
++#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
+   %{!mno-relax:%{!r:-relax}} \
+   %{!shared: \
+     %{!static: \
diff --git a/testing/gcc/gcc-libs.install b/testing/gcc/gcc-libs.install
new file mode 100644
index 000000000..23553b8f0
--- /dev/null
+++ b/testing/gcc/gcc-libs.install
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+filelist=(libgomp.info libquadmath.info)
+
+post_upgrade() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/gcc/gcc.install b/testing/gcc/gcc.install
new file mode 100644
index 000000000..3407a5e1f
--- /dev/null
+++ b/testing/gcc/gcc.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/gcc/gcc_pure64.patch b/testing/gcc/gcc_pure64.patch
new file mode 100644
index 000000000..8c0baf8e2
--- /dev/null
+++ b/testing/gcc/gcc_pure64.patch
@@ -0,0 +1,26 @@
+diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
+--- gcc-4.2.0.orig/gcc/config/i386/linux64.h	2007-05-16 19:21:19.000000000 -0400
++++ gcc-4.2.0/gcc/config/i386/linux64.h	2007-05-18 17:04:05.000000000 -0400
+@@ -49,8 +49,8 @@
+    When the -shared link option is used a final link is not being
+    done.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
+ 
+ #undef	LINK_SPEC
+ #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
+diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
+--- gcc-4.2.0.orig/gcc/config/i386/t-linux64	2007-05-16 19:21:19.000000000 -0400
++++ gcc-4.2.0/gcc/config/i386/t-linux64	2007-05-18 17:04:36.000000000 -0400
+@@ -6,7 +6,7 @@
+ 
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32 
+-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
++MULTILIB_OSDIRNAMES = ../lib ../lib32
+ 
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
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/libtool/PKGBUILD b/testing/libtool/PKGBUILD
index 05e15a9ea..5d21df0e2 100644
--- a/testing/libtool/PKGBUILD
+++ b/testing/libtool/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 140704 2011-10-18 13:20:12Z allan $
+# $Id: PKGBUILD 141275 2011-10-28 01:34:31Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
@@ -6,7 +6,7 @@
 
 pkgname=('libtool' 'libltdl')
 pkgver=2.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A generic library support script"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libtool"
@@ -28,7 +28,7 @@ check() {
 }
 
 package_libtool() {
-  depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.6.1')
+  depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.6.2')
   groups=('base-devel')
   install=libtool.install
 
diff --git a/testing/llvm/PKGBUILD b/testing/llvm/PKGBUILD
new file mode 100644
index 000000000..8420cdb6d
--- /dev/null
+++ b/testing/llvm/PKGBUILD
@@ -0,0 +1,231 @@
+# $Id: PKGBUILD 141302 2011-10-28 15:04:01Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Sebastian Nowicki <sebnow@gmail.com>
+# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>
+# Contributor: Tobias Kieslich <tobias@justdreams.de>
+# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
+# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk>
+# Contributor: Roberto Alsina <ralsina@kde.org>
+# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
+
+pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
+pkgver=2.9
+_gcc_ver=4.6.2
+pkgrel=7
+arch=('i686' 'x86_64')
+url="http://llvm.org/"
+license=('custom:University of Illinois/NCSA Open Source License')
+makedepends=('gcc-libs' 'libffi' 'python2' 'ocaml' "gcc=$_gcc_ver")
+source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.tgz
+        http://llvm.org/releases/$pkgver/clang-$pkgver.tgz
+        ftp://ftp.archlinux.org/other/community/clang/gcc-headers-4.5.2.tar.xz
+        clang-plugin-loader-registry.patch
+        cindexer-clang-path.patch
+        clang-toolchains-gcc-versions.patch
+        clang-pure64.patch
+        enable-lto.patch
+        bug-9869-operator-h-c++0x.patch)
+sha256sums=('661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779'
+            '70c41f3f782a71cbaa7bc8d6ea29fce4263ad3e8558dfecc6dc11cdef17909df'
+            '12cf0bfb128cd8bd2a308c3c03cf0e607aa47bd87d9a58b422b96bd387e476c1'
+            'a0a4494f2a692789670be37fd390906dcaa37b1824f740bdaaea21182f2f3a9c'
+            '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92'
+            '7c05788c02697f0cd05f7c74fe65b460530c0748851313eb950c5d4d17a8115a'
+            '5bba4964d0d832c9e97308beb45244ff6ed4e16ed3f9f771babe571f1b82fa33'
+            '1a308679edf3078b8f0c33c94d4e6d0c0db6d3baad91babce08bf5370aa052ef'
+            '1c37346b0f412556dc979fd510585f3e20d2d45319ec095dbdec37a582d590c7')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # At the present, clang must reside inside the LLVM source code tree to build
+  # See http://llvm.org/bugs/show_bug.cgi?id=4840
+  rm -rf tools/clang
+  cp -r "$srcdir/clang-$pkgver" tools/clang
+
+  # Fix symbolic links from OCaml bindings to LLVM libraries
+  sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml
+
+  # Fix installation directories, ./configure doesn't seem to set them right
+  sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \
+         -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib/llvm:' \
+         -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
+    Makefile.config.in
+
+  # Fix insecure rpath (http://bugs.archlinux.org/task/14017)
+  sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
+
+  # Get the correct list of symbols to export
+  # See http://lists.cs.uiuc.edu/pipermail/cfe-dev/2010-April/008559.html
+  patch -Np1 -i "$srcdir/clang-plugin-loader-registry.patch"
+
+  # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799)
+  patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch"
+
+  # Add GCC 4.6.1 to GccVersions (FS#23631)
+  patch -d tools/clang -Np1 -i "$srcdir/clang-toolchains-gcc-versions.patch"
+
+  if [[ $CARCH == x86_64 ]]; then
+    # Adjust lib paths
+    patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch"
+  fi
+
+  # Make -flto work
+  # Use gold instead of default linker, and always use the plugin
+  patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch"
+
+  # Fix upstream bug #9869:
+  #   Operator.h incompatibility with GCC 4.6 in C++0x mode
+  patch -Np2 -i "$srcdir/bug-9869-operator-h-c++0x.patch"
+
+  # Apply strip option to configure
+  _optimized_switch="enable"
+  [[ $(check_option strip) == n ]] && _optimized_switch="disable"
+
+  # Include location of libffi headers in CPPFLAGS
+  export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)"
+
+  # TODO: Uncomment when clang works with GCC 4.6+
+  #_cxx_headers="/usr/include/c++/$_gcc_ver"
+  #if [[ ! -d $_cxx_headers ]]; then
+  #  error "Couldn't find the C++ headers, PKGBUILD needs fixing!"
+  #  return 1
+  #fi
+  _cxx_headers="/usr/include/c++/clang-$pkgver"
+
+  _32bit_headers=""
+  if [[ $CARCH == x86_64 ]]; then
+    # Important for multilib
+    _32bit_headers="32"
+  fi
+
+  ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib/llvm \
+    --sysconfdir=/etc \
+    --enable-shared \
+    --enable-libffi \
+    --enable-targets=all \
+    --disable-expensive-checks \
+    --disable-debug-runtime \
+    --disable-assertions \
+    --with-binutils-include=/usr/include \
+    --with-cxx-include-root=$_cxx_headers \
+    --with-cxx-include-arch=$CHOST \
+    --with-cxx-include-32bit-dir=$_32bit_headers \
+    --$_optimized_switch-optimized
+
+  make REQUIRES_RTTI=1
+}
+
+package_llvm() {
+  pkgdesc="Low Level Virtual Machine"
+  depends=('perl' 'libffi')
+
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # We move the clang directory out of the tree so it won't get installed and
+  # then we bring it back in for the clang package
+  mv tools/clang "$srcdir"
+  # -j1 is due to race conditions during the installation of the OCaml bindings
+  make -j1 DESTDIR="$pkgdir" install
+  mv "$srcdir/clang" tools
+
+  # OCaml bindings go to a separate package
+  rm -rf "$srcdir"/{ocaml,ocamldoc}
+  mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir"
+
+  # Remove duplicate files installed by the OCaml bindings
+  rm "$pkgdir"/usr/{lib/llvm/libllvm*,share/doc/llvm/ocamldoc.tar.gz}
+
+  # Fix permissions of static libs
+  chmod -x "$pkgdir"/usr/lib/llvm/*.a
+
+  # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487)
+  sed -i 's:\(ABS_RUN_DIR/lib\):\1/llvm:' "$pkgdir/usr/bin/llvm-config"
+
+  # Get rid of example Hello transformation
+  rm "$pkgdir"/usr/lib/llvm/*LLVMHello.*
+
+  # Symlink the gold plugin where clang expects it
+  ln -s llvm/LLVMgold.so "$pkgdir/usr/lib/LLVMgold.so"
+
+  # Add ld.so.conf.d entry
+  install -d "$pkgdir/etc/ld.so.conf.d"
+  echo /usr/lib/llvm >"$pkgdir/etc/ld.so.conf.d/llvm.conf"
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_llvm-ocaml() {
+  pkgdesc="OCaml bindings for LLVM"
+  depends=("llvm=$pkgver-$pkgrel" 'ocaml')
+
+  cd "$srcdir/llvm-$pkgver"
+
+  install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm}
+  cp -r "$srcdir/ocaml" "$pkgdir/usr/lib"
+  cp -r "$srcdir/ocamldoc" "$pkgdir/usr/share/doc/llvm"
+
+  # Remove execute bit from static libraries
+  chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/llvm-ocaml/LICENSE"
+}
+
+package_clang() {
+  pkgdesc="C language family frontend for LLVM"
+  url="http://clang.llvm.org/"
+  # It looks like clang still needs GCC to assemble and link object files
+  # See http://old.nabble.com/%22clang--v%22-shows-a-GCC-call-td28378453.html
+  depends=("llvm=$pkgver-$pkgrel" "gcc=$_gcc_ver")
+
+  # Fix installation path for clang docs
+  sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \
+    "$srcdir/llvm-$pkgver/Makefile.config"
+
+  cd "$srcdir/llvm-$pkgver/tools/clang"
+  make DESTDIR="$pkgdir" install
+
+  # Fix permissions of static libs
+  chmod -x "$pkgdir"/usr/lib/llvm/*.a
+
+  # Revert the path change in case we want to do a repackage later
+  sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \
+    "$srcdir/llvm-$pkgver/Makefile.config"
+
+  # Install old libstdc++ headers. Contains combined headers from
+  # gcc 4.5.2-6-i686 and gcc-multilib-4.5.2-6-x86_64
+  install -d "$pkgdir/usr/include/c++"
+  cp -rd "$srcdir/gcc-headers-4.5.2" "$pkgdir/usr/include/c++/clang-$pkgver"
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE"
+}
+
+package_clang-analyzer() {
+  pkgdesc="A source code analysis framework"
+  url="http://clang-analyzer.llvm.org/"
+  depends=("clang=$pkgver-$pkgrel" 'python2')
+
+  cd "$srcdir/llvm-$pkgver/tools/clang"
+
+  install -d "$pkgdir"/usr/{bin,lib/clang-analyzer}
+  for _tool in scan-{build,view}; do
+    cp -r tools/$_tool "$pkgdir/usr/lib/clang-analyzer/"
+    ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/"
+  done
+
+  # Use Python 2
+  sed -i 's/env python$/&2/' \
+    "$pkgdir/usr/lib/clang-analyzer/scan-view/scan-view" \
+    "$pkgdir/usr/lib/clang-analyzer/scan-build/set-xcode-analyzer"
+
+  # Compile Python scripts
+  python2 -m compileall "$pkgdir/usr/lib/clang-analyzer"
+  python2 -O -m compileall "$pkgdir/usr/lib/clang-analyzer"
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang-analyzer/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/llvm/bug-9869-operator-h-c++0x.patch b/testing/llvm/bug-9869-operator-h-c++0x.patch
new file mode 100644
index 000000000..b95d7d772
--- /dev/null
+++ b/testing/llvm/bug-9869-operator-h-c++0x.patch
@@ -0,0 +1,57 @@
+--- llvm/trunk/include/llvm/Operator.h	2011/02/07 16:40:21	125006
++++ llvm/trunk/include/llvm/Operator.h	2011/05/08 01:59:22	131062
+@@ -186,28 +186,46 @@
+ };
+ 
+ class AddOperator
+-  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {};
++  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {
++  ~AddOperator(); // DO NOT IMPLEMENT
++};
+ class SubOperator
+-  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {};
++  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {
++  ~SubOperator(); // DO NOT IMPLEMENT
++};
+ class MulOperator
+-  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {};
++  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {
++  ~MulOperator(); // DO NOT IMPLEMENT
++};
+ class ShlOperator
+-  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {};
++  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {
++  ~ShlOperator(); // DO NOT IMPLEMENT
++};
+ 
+   
+ class SDivOperator
+-  : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {};
++  : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {
++  ~SDivOperator(); // DO NOT IMPLEMENT
++};
+ class UDivOperator
+-  : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {};
++  : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {
++  ~UDivOperator(); // DO NOT IMPLEMENT
++};
+ class AShrOperator
+-  : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {};
++  : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {
++  ~AShrOperator(); // DO NOT IMPLEMENT
++};
+ class LShrOperator
+-  : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {};
++  : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {
++  ~LShrOperator(); // DO NOT IMPLEMENT
++};
+   
+   
+   
+ class GEPOperator
+   : public ConcreteOperator<Operator, Instruction::GetElementPtr> {
++  ~GEPOperator(); // DO NOT IMPLEMENT
++
+   enum {
+     IsInBounds = (1 << 0)
+   };
diff --git a/testing/llvm/cindexer-clang-path.patch b/testing/llvm/cindexer-clang-path.patch
new file mode 100644
index 000000000..ddaab690e
--- /dev/null
+++ b/testing/llvm/cindexer-clang-path.patch
@@ -0,0 +1,10 @@
+--- tools/libclang/CIndexer.cpp.orig	2011-04-07 13:08:24.000000000 +0300
++++ tools/libclang/CIndexer.cpp	2011-04-07 13:11:52.224884642 +0300
+@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP
+   
+   // We now have the CIndex directory, locate clang relative to it.
+   LibClangPath.eraseComponent();
++  LibClangPath.eraseComponent();
+ #endif
+   
+   LibClangPath.appendComponent("clang");
diff --git a/testing/llvm/clang-plugin-loader-registry.patch b/testing/llvm/clang-plugin-loader-registry.patch
new file mode 100644
index 000000000..f46eb9fce
--- /dev/null
+++ b/testing/llvm/clang-plugin-loader-registry.patch
@@ -0,0 +1,11 @@
+diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map
+--- llvm-2.7.orig/autoconf/ExportMap.map	2010-02-25 00:33:41.000000000 +0200
++++ llvm-2.7/autoconf/ExportMap.map	2010-05-10 14:14:22.000000000 +0300
+@@ -2,6 +2,7 @@
+ 	global: main;
+ 		__progname;
+ 		environ;
++		_ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE;
+ 
+ 	local: *;
+ };
diff --git a/testing/llvm/clang-pure64.patch b/testing/llvm/clang-pure64.patch
new file mode 100644
index 000000000..da6178519
--- /dev/null
+++ b/testing/llvm/clang-pure64.patch
@@ -0,0 +1,38 @@
+Index: lib/Driver/Tools.cpp
+===================================================================
+--- lib/Driver/Tools.cpp	(revision 123373)
++++ lib/Driver/Tools.cpp	(working copy)
+@@ -3306,7 +3306,7 @@
+     else if (ToolChain.getArch() == llvm::Triple::arm)
+       CmdArgs.push_back("/lib/ld-linux.so.3");
+     else
+-      CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
++      CmdArgs.push_back("/lib/ld-linux-x86-64.so.2");
+   }
+ 
+   CmdArgs.push_back("-o");
+Index: lib/Driver/ToolChains.cpp
+===================================================================
+--- lib/Driver/ToolChains.cpp	(revision 123373)
++++ lib/Driver/ToolChains.cpp	(working copy)
+@@ -1317,18 +1317,10 @@
+   if (Arch == llvm::Triple::x86)
+     Suffix64 = "/64";
+ 
+-  std::string Lib32 = "lib";
+-
+-  bool Exists;
+-  if (!llvm::sys::fs::exists("/lib32", Exists) && Exists)
+-    Lib32 = "lib32";
+-
++  std::string Lib32 = "lib32";
+   std::string Lib64 = "lib";
+-  bool Symlink;
+-  if (!llvm::sys::fs::exists("/lib64", Exists) && Exists &&
+-      (llvm::sys::fs::is_symlink("/lib64", Symlink) || !Symlink))
+-    Lib64 = "lib64";
+ 
++  bool Exists;
+   std::string GccTriple = "";
+   if (Arch == llvm::Triple::arm) {
+     if (!llvm::sys::fs::exists("/usr/lib/gcc/arm-linux-gnueabi", Exists) &&
diff --git a/testing/llvm/clang-toolchains-gcc-versions.patch b/testing/llvm/clang-toolchains-gcc-versions.patch
new file mode 100644
index 000000000..7624842a8
--- /dev/null
+++ b/testing/llvm/clang-toolchains-gcc-versions.patch
@@ -0,0 +1,12 @@
+diff -upr clang-2.9.orig/lib/Driver/ToolChains.cpp clang-2.9/lib/Driver/ToolChains.cpp
+--- clang-2.9.orig/lib/Driver/ToolChains.cpp	2011-03-21 23:29:27.000000000 +0200
++++ clang-2.9/lib/Driver/ToolChains.cpp	2011-04-08 00:03:34.000000000 +0300
+@@ -1449,7 +1449,7 @@ Linux::Linux(const HostInfo &Host, const
+       GccTriple = "i586-suse-linux";
+   }
+ 
+-  const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
++  const char* GccVersions[] = {"4.6.2", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
+                                "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2",
+                                "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1",
+                                "4.2"};
diff --git a/testing/llvm/enable-lto.patch b/testing/llvm/enable-lto.patch
new file mode 100644
index 000000000..40d93104a
--- /dev/null
+++ b/testing/llvm/enable-lto.patch
@@ -0,0 +1,36 @@
+Index: lib/Driver/ToolChains.cpp
+===================================================================
+--- lib/Driver/ToolChains.cpp	(revision 123373)
++++ lib/Driver/ToolChains.cpp	(working copy)
+@@ -1398,11 +1398,11 @@
+     Lib = Lib64;
+   }
+ 
+-  llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld");
++  llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld.gold");
+   if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists)
+     Linker = LinkerPath.str();
+   else
+-    Linker = GetProgramPath("ld");
++    Linker = GetProgramPath("ld.gold");
+ 
+   LinuxDistro Distro = DetectLinuxDistro(Arch);
+ 
+Index: lib/Driver/Tools.cpp
+===================================================================
+--- lib/Driver/Tools.cpp	(revision 123373)
++++ lib/Driver/Tools.cpp	(working copy)
+@@ -3412,11 +3412,11 @@
+     }
+   }
+ 
+-  if (Args.hasArg(options::OPT_use_gold_plugin)) {
++  // if (Args.hasArg(options::OPT_use_gold_plugin)) {
+     CmdArgs.push_back("-plugin");
+     std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so";
+     CmdArgs.push_back(Args.MakeArgString(Plugin));
+-  }
++  // }
+ 
+   C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs));
+ }
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/pam/PKGBUILD b/testing/pam/PKGBUILD
new file mode 100644
index 000000000..ef5d172da
--- /dev/null
+++ b/testing/pam/PKGBUILD
@@ -0,0 +1,60 @@
+# $Id: PKGBUILD 141270 2011-10-27 19:34:15Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=pam
+pkgver=1.1.5
+pkgrel=1
+pkgdesc="PAM (Pluggable Authentication Modules) library"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.kernel.org/pub/linux/libs/pam/"
+depends=('glibc' 'db' 'cracklib' 'libtirpc')
+makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
+backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/pam.d/other etc/default/passwd etc/environment)
+source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2
+        #http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2
+        ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2
+        other)
+options=('!libtool' '!emptydirs')
+md5sums=('927ee5585bdec5256c75117e9348aa47'
+         'e2788389a6c59224110a45fcff30e02b'
+         '6e6c8719e5989d976a14610f340bd33a')
+
+build() {
+  cd $srcdir/Linux-PAM-$pkgver
+  ./configure --sysconfdir=/etc DESTDIR=$pkgdir --libdir=/lib
+  make
+}
+
+package() {
+  cd $srcdir/Linux-PAM-$pkgver
+  make INSTALL=/bin/install DESTDIR=$pkgdir install
+  install -D -m644 ../other $pkgdir/etc/pam.d/other
+  # build pam_unix2 module
+  # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2
+  cd $srcdir/pam_unix2-2.6
+  ./configure
+  make
+  make DESTDIR=$pkgdir install
+  # add the realtime permissions for audio users
+  sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf
+  cat >>$pkgdir/etc/security/limits.conf <<_EOT
+*               -       rtprio          0
+*               -       nice            0
+@audio          -       rtprio          65
+@audio          -       nice           -10
+@audio          -       memlock         40000
+_EOT
+  # fix some missing symlinks from old pam for compatibility
+  cd $pkgdir/lib/security
+  ln -s pam_unix.so pam_unix_acct.so
+  ln -s pam_unix.so pam_unix_auth.so
+  ln -s pam_unix.so pam_unix_passwd.so
+  ln -s pam_unix.so pam_unix_session.so
+  # set unix_chkpwd uid
+  chmod +s $pkgdir/sbin/unix_chkpwd
+}
+md5sums=('927ee5585bdec5256c75117e9348aa47'
+         'e2788389a6c59224110a45fcff30e02b'
+         '6e6c8719e5989d976a14610f340bd33a')
diff --git a/testing/pam/other b/testing/pam/other
new file mode 100644
index 000000000..08498b423
--- /dev/null
+++ b/testing/pam/other
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth		required	pam_unix.so
+account		required	pam_unix.so
+password	required	pam_unix.so
+session		required	pam_unix.so
diff --git a/testing/pam/pam.install b/testing/pam/pam.install
new file mode 100644
index 000000000..9d4588084
--- /dev/null
+++ b/testing/pam/pam.install
@@ -0,0 +1,12 @@
+# arg 1:  the new package version
+post_install() {
+  # need to run this immediately -- pacman only runs it at the end of
+  # all package installs
+  /sbin/ldconfig -r .
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  post_install $1
+}
diff --git a/testing/pciutils/PKGBUILD b/testing/pciutils/PKGBUILD
new file mode 100644
index 000000000..8e5089ccd
--- /dev/null
+++ b/testing/pciutils/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 141272 2011-10-27 19:51:53Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+pkgname=pciutils
+pkgver=3.1.8
+pkgrel=1
+pkgdesc="PCI bus configuration space access library and tools"
+arch=(i686 x86_64)
+license=('GPL2')
+groups=('base')
+url="http://mj.ucw.cz/pciutils.html"
+optdepends=('sh: required by update-pciids')
+makedepends=('wget')
+depends=('glibc')
+source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+       ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz)
+md5sums=('79312f138311d29291c7d44d624cd37e')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./update-pciids.sh
+  make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+  cp lib/libpci.a "${srcdir}/"
+  make clean
+  make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
+  install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/"
+}
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() {
diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD
index bb7635aaa..c48c0cccb 100644
--- a/testing/sudo/PKGBUILD
+++ b/testing/sudo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141045 2011-10-22 13:25:45Z allan $
+# $Id: PKGBUILD 141277 2011-10-28 01:35:38Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sudo
-_ver=1.8.3
+_ver=1.8.3p1
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
 pkgdesc="Give certain users the ability to run some commands as root"
@@ -15,8 +15,8 @@ backup=('etc/sudoers' 'etc/pam.d/sudo')
 options=('!libtool' '!makeflags')
 source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig}
         sudo.pam)
-md5sums=('9e5517bbf3aee420b38c2d1d7a71bcad'
-         '9320510b4fde1c98a1846d9a21c5442a'
+md5sums=('7becc572fa97f94cf721a2ee8299c45b'
+         'b0726a25694fb2cdd5e1c146eb024e9c'
          '4e7ad4ec8f2fe6a40e12bcb2c0b256e3')
 
 build() {
author	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2011-10-31 13:45:10 -0300
committer	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2011-10-31 13:45:10 -0300
commit	97a832ff546d30bb6eec34f23fd94aecab9ac738 (patch)
tree	90bbef126bf86efce995dfa00dadd9707baa8222
parent	9879fa51372849ca7b637a1c22010584ca552274 (diff)
parent	f935ebf41c626e4832f86c5f3f7ed1cc35128f6b (diff)