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

Conflicts: community/freeimage/PKGBUILD community/gummi/PKGBUILD community/mfs/PKGBUILD community/nzbget/PKGBUILD community/openntpd/PKGBUILD community/proj/PKGBUILD community/yaws/PKGBUILD gnome-unstable/totem-plparser/PKGBUILD gnome-unstable/totem/PKGBUILD multilib/lib32-libice/PKGBUILD multilib/lib32-libx11/PKGBUILD multilib/lib32-libxcomposite/PKGBUILD multilib/lib32-libxdmcp/PKGBUILD multilib/lib32-libxext/PKGBUILD multilib/lib32-libxinerama/PKGBUILD multilib/lib32-libxrandr/PKGBUILD multilib/lib32-libxss/PKGBUILD multilib/lib32-libxtst/PKGBUILD multilib/lib32-libxxf86vm/PKGBUILD testing/bash/PKGBUILD testing/bash/system.bashrc
author: Michał Masłowski <mtjm@mtjm.eu> 2012-03-20 11:40:04 +0100
committer: Michał Masłowski <mtjm@mtjm.eu> 2012-03-20 11:40:04 +0100
commit: fa1021504c53eb066826883dab3918e432b93444 (patch)
tree: 312e7333a30cb09f648a85ec1a78bfb151ade116
parent: 65de768385d6ee97a2b45c807ab9955c642da7c0 (diff)
parent: 99136e3a2e9f6f07a7ff08d5721bce354b853c8b (diff)
54 files changed, 2814 insertions, 652 deletions
diff --git a/community/arm-elf-gcc-base/PKGBUILD b/community/arm-elf-gcc-base/PKGBUILD
index 67822acc7..13d63059a 100644
--- a/community/arm-elf-gcc-base/PKGBUILD
+++ b/community/arm-elf-gcc-base/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 67643 2012-03-13 15:01:14Z spupykin $
+# $Id: PKGBUILD 68141 2012-03-18 17:28:57Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=arm-elf-gcc-base
 pkgver=4.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNU Compiler Collection"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
@@ -56,5 +56,5 @@ package() {
 
   # strip it manually
   strip $pkgdir/usr/bin/* 2>/dev/null || true
-  find $pkgdir/usr/lib -type f -exec arm-elf-strip {} \; 2>/dev/null || true
+  find $pkgdir/usr/lib -type f -exec arm-elf-strip --strip-debug --strip-unneeded {} \; 2>/dev/null || true
 }
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index bd2e02c66..1c4124071 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 67914 2012-03-16 09:03:50Z giovanni $
+# $Id: PKGBUILD 68104 2012-03-18 06:04:46Z 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.43
-pkgrel=1
+pkgrel=2
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64' 'mips64el') 
 url="http://calibre-ebook.com/"
@@ -16,7 +16,7 @@ depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
          'python-imaging' 'shared-mime-info' 'python-dnspython' 
          'libunrar' 'python2-pyqt' 'icu')
 makedepends=('python2-pycountry')
-optdepends=('ipython: to use calibre-debug')
+optdepends=('ipython2: to use calibre-debug')
 install=calibre.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"
         'desktop_integration.patch'
diff --git a/community/directfb/DirectFB-1.4.9-libpng-1.5.patch b/community/directfb/DirectFB-1.4.9-libpng-1.5.patch
index e428afbaf..65470ea8f 100644
--- a/community/directfb/DirectFB-1.4.9-libpng-1.5.patch
+++ b/community/directfb/DirectFB-1.4.9-libpng-1.5.patch
@@ -115,39 +115,7 @@ index 6d65ea3..7d82c5c 100644
                      if (!trans[i]) {
                           palette[i].red   = (key & 0xff0000) >> 16;
                           palette[i].green = (key & 0x00ff00) >>  8;
-@@ -625,20 +636,23 @@ png_info_callback( png_structp png_read_ptr,
-           }
-           else {
-                /* ...or based on trans rgb value */
--               png_color_16p trans = &data->info_ptr->trans_color;
--
--               data->color_key = (((trans->red & 0xff00) << 8) |
--                                  ((trans->green & 0xff00)) |
--                                  ((trans->blue & 0xff00) >> 8));
-+               data->color_key = (((trans_color->red & 0xff00) << 8) |
-+                                  ((trans_color->green & 0xff00)) |
-+                                  ((trans_color->blue & 0xff00) >> 8));
-           }
-      }
- 
-      switch (data->color_type) {
-           case PNG_COLOR_TYPE_PALETTE: {
--               png_colorp palette    = data->info_ptr->palette;
--               png_bytep  trans      = data->info_ptr->trans_alpha;
--               int        num_trans  = data->info_ptr->num_trans;
--               int        num_colors = MIN( MAXCOLORMAPSIZE, data->info_ptr->num_palette );
-+               png_colorp    palette;
-+               png_bytep     trans;
-+               png_color_16p trans_color;
-+               int           num_trans;
-+               int           num_colors;
-+
-+               png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors );
-+               num_colors = MIN( MAXCOLORMAPSIZE, num_colors );
-+               png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color );
- 
-                for (i=0; i<num_colors; i++) {
-                     data->colors[i].a = (i < num_trans) ? trans[i] : 0xff;
+
 -- 
 1.7.4.1
 
@@ -242,3 +210,43 @@ index 96e4220..d4b6bf4 100644
 -- 
 1.7.4.1
 
+--- a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c	2012-02-14 19:04:52.000000000 -0500
++++ b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c	2012-02-14 19:07:18.000000000 -0500
+@@ -710,10 +709,15 @@
+ 
+      switch (data->color_type) {
+           case PNG_COLOR_TYPE_PALETTE: {
+-               png_colorp palette    = data->info_ptr->palette;
+-               png_bytep  trans      = data->info_ptr->trans_alpha;
+-               int        num_trans  = data->info_ptr->num_trans;
+-               int        num_colors = MIN( MAXCOLORMAPSIZE, data->info_ptr->num_palette );
++               png_colorp    palette;
++               png_bytep     trans;
++               png_color_16p trans_color;
++               int           num_trans;
++               int           num_colors;
++
++               png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors );
++               num_colors = MIN( MAXCOLORMAPSIZE, num_colors );
++               png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color );
+ 
+                for (i=0; i<num_colors; i++) {
+                     data->colors[i].a = (i < num_trans) ? trans[i] : 0xff;
+--- a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c.old	2012-02-14 22:40:30.000000000 -0500
++++ b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c	2012-02-14 23:37:19.000000000 -0500
+@@ -638,12 +638,10 @@
+                data->color_key = key;
+           }
+           else {
+-               /* ...or based on trans rgb value */
+-               png_color_16p trans = &data->info_ptr->trans_color;
+ 
+-               data->color_key = (((trans->red & 0xff00) << 8) |
+-                                  ((trans->green & 0xff00)) |
+-                                  ((trans->blue & 0xff00) >> 8));
++               data->color_key = (((trans_color->red & 0xff00) << 8) |
++                                  ((trans_color->green & 0xff00)) |
++                                  ((trans_color->blue & 0xff00) >> 8));
+           }
+      }
+ 
diff --git a/community/directfb/PKGBUILD b/community/directfb/PKGBUILD
index fa53e8385..48b5c271b 100644
--- a/community/directfb/PKGBUILD
+++ b/community/directfb/PKGBUILD
@@ -1,27 +1,29 @@
-# $Id: PKGBUILD 63532 2012-02-05 11:54:02Z ibiru $
+# $Id: PKGBUILD 68160 2012-03-18 19:39:44Z ebelanger $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=directfb
-pkgver=1.4.14
-pkgrel=3
+pkgver=1.5.3
+pkgrel=1
 pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.directfb.org"
 license=('LGPL')
 depends=('gcc-libs' 'libjpeg' 'sdl' 'sysfsutils' 'libpng' 'freetype2')
 options=('!libtool')
-changelog=$pkgname.changelog
-source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz DirectFB-1.4.9-libpng-1.5.patch)
-md5sums=('de0745d25a6ac9e337d4d5572df85471'
-         '84f3181e96692efc5ff68e5dac19541f')
+source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz \
+        DirectFB-1.4.9-libpng-1.5.patch directfb-missing_include.patch)
+md5sums=('54a9ec931c8e3c82adb924194e65120e'
+         '82f552ae306871382a6a8e05cffee723'
+         '6b7ceca416c28a3791a145c15bf6f462')
 
 build() {
   cd "${srcdir}/DirectFB-${pkgver}"
   patch -p1 -i ../DirectFB-1.4.9-libpng-1.5.patch
-   ./configure --prefix=/usr --sysconfdir=/etc --enable-static --enable-debug \
-     --enable-zlib --enable-x11 --enable-sdl --disable-vnc --disable-osx \
-     --enable-video4linux2 --enable-voodoo
+  patch -p1 -i ../directfb-missing_include.patch
+  CFLAGS+="-fno-inline" ./configure --prefix=/usr --sysconfdir=/etc --enable-static \
+    --enable-zlib --enable-x11 --enable-sdl --disable-vnc --disable-osx \
+    --enable-video4linux2 --enable-voodoo
   make
 } 
 
diff --git a/community/directfb/directfb-missing_include.patch b/community/directfb/directfb-missing_include.patch
new file mode 100644
index 000000000..4b1af5a30
--- /dev/null
+++ b/community/directfb/directfb-missing_include.patch
@@ -0,0 +1,376 @@
+--- /dev/null	2012-02-14 14:47:01.028967126 -0500
++++ b/lib/voodoo/link.h	2012-02-14 21:19:05.000000000 -0500
+@@ -0,0 +1,85 @@
++/*
++   (c) Copyright 2001-2009  The world wide DirectFB Open Source Community (directfb.org)
++   (c) Copyright 2000-2004  Convergence (integrated media) GmbH
++
++   All rights reserved.
++
++   Written by Denis Oliver Kropp <dok@directfb.org>,
++              Andreas Hundt <andi@fischlustig.de>,
++              Sven Neumann <neo@directfb.org>,
++              Ville Syrjälä <syrjala@sci.fi> and
++              Claudio Ciccani <klan@users.sf.net>.
++
++   This library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2 of the License, or (at your option) any later version.
++
++   This library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with this library; if not, write to the
++   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++   Boston, MA 02111-1307, USA.
++*/
++
++#ifndef __VOODOO__LINK_H__
++#define __VOODOO__LINK_H__
++
++#include <voodoo/types.h>
++
++
++typedef struct {
++     void   *ptr;
++     size_t  length;
++     size_t  done;
++} VoodooChunk;
++
++
++struct __V_VoodooLink {
++     void *priv;
++     u32   code;
++
++     void    (*Close)( VoodooLink *link );
++
++     /* See 'read(2)', blocking */
++     ssize_t (*Read) ( VoodooLink *link,
++                       void       *buffer,
++                       size_t      count );
++
++     /* See 'write(2)', blocking */
++     ssize_t (*Write)( VoodooLink *link,
++                       const void *buffer,
++                       size_t      count );
++
++
++     /* For later... */
++     DirectResult (*SendReceive)( VoodooLink  *link,
++                                  VoodooChunk *send,
++                                  size_t       num_send,
++                                  VoodooChunk *recv,
++                                  size_t       num_recv );
++
++     DirectResult (*WakeUp)     ( VoodooLink  *link );
++
++     DirectResult (*WaitForData)( VoodooLink  *link,
++                                  int          timeout_ms );
++};
++
++
++DirectResult VOODOO_API voodoo_link_init_connect( VoodooLink *link,
++                                                  const char *hostname,
++                                                  int         port,
++                                                  bool        raw );
++
++DirectResult VOODOO_API voodoo_link_init_local  ( VoodooLink *link,
++                                                  const char *path,
++                                                  bool        raw );
++
++DirectResult VOODOO_API voodoo_link_init_fd     ( VoodooLink *link,
++                                                  int         fd[2] );
++
++#endif
+--- /dev/null	2012-02-14 14:47:01.028967126 -0500
++++ b/lib/voodoo/packet.h	2012-02-14 21:37:45.000000000 -0500
+@@ -0,0 +1,285 @@
++/*
++   (c) Copyright 2001-2011  The world wide DirectFB Open Source Community (directfb.org)
++   (c) Copyright 2000-2004  Convergence (integrated media) GmbH
++
++   All rights reserved.
++
++   Written by Denis Oliver Kropp <dok@directfb.org>,
++              Andreas Hundt <andi@fischlustig.de>,
++              Sven Neumann <neo@directfb.org>,
++              Ville Syrjälä <syrjala@sci.fi> and
++              Claudio Ciccani <klan@users.sf.net>.
++
++   This library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2 of the License, or (at your option) any later version.
++
++   This library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with this library; if not, write to the
++   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++   Boston, MA 02111-1307, USA.
++*/
++
++#ifndef __VOODOO__PACKET_H__
++#define __VOODOO__PACKET_H__
++
++extern "C" {
++#include <direct/fastlz.h>
++#include <direct/list.h>
++#include <direct/mem.h>
++#include <direct/memcpy.h>
++
++
++#include <voodoo/types.h>
++}
++
++
++typedef enum {
++     VPHF_NONE       = 0x00000000,
++
++     VPHF_COMPRESSED = 0x00000001,
++
++     VPHF_ALL        = 0x00000001
++} VoodooPacketHeaderFlags;
++
++
++typedef struct {
++     u32  size;
++     u32  flags;
++     u32  uncompressed;
++     u32  align;
++} VoodooPacketHeader;
++
++
++class VoodooPacket {
++public:
++     DirectLink          link;
++     bool                sending;
++
++private:
++     void               *data;
++     void               *current;
++     VoodooPacketHeader  header;
++
++     VoodooPacket( u32   size,
++                   void *data )
++          :
++          sending(false),
++          data(data),
++          current(data)
++     {
++          memset( &link, 0, sizeof(link) );
++
++          header.size         = size;
++          header.flags        = VPHF_NONE;
++          header.uncompressed = size;
++     }
++
++     VoodooPacket( u32   size,
++                   u32   flags,
++                   u32   uncompressed,
++                   void *data )
++          :
++          sending(false),
++          data(data),
++          current(data)
++     {
++          memset( &link, 0, sizeof(link) );
++
++          header.size         = size;
++          header.flags        = VPHF_COMPRESSED;
++          header.uncompressed = uncompressed;
++     }
++
++     ~VoodooPacket() {};
++
++public:
++/*
++     static VoodooPacket *
++     New( u32 size )
++     {
++          VoodooPacket *packet = (VoodooPacket*) D_MALLOC( sizeof(VoodooPacket) + size );
++
++          if (!packet) {
++               D_OOM();
++               return NULL;
++          }
++
++          return new (packet) VoodooPacket( size, packet + 1 );
++
++
++          if (data)
++               this->data = data;
++          else
++               this->data = header + 1;
++     }
++*/
++     static VoodooPacket *
++     New( u32   size,
++          void *data )
++     {
++          return new VoodooPacket( size, data );
++     }
++
++     static VoodooPacket *
++     Reset( VoodooPacket *packet,
++            u32           size,
++            void         *data )
++     {
++          return new (packet) VoodooPacket( size, data );
++     }
++
++     static VoodooPacket *
++     New( void *header,
++          u32   size )
++     {
++          VoodooPacketHeader *h = (VoodooPacketHeader*) header;
++
++          h->size         = size;
++          h->flags        = VPHF_NONE;
++          h->uncompressed = size;
++
++          return new VoodooPacket( size, (char*) header + sizeof(VoodooPacketHeader) );
++     }
++
++     static VoodooPacket *
++     New( u32 size )
++     {
++          VoodooPacket *p = (VoodooPacket*) D_MALLOC( sizeof(VoodooPacket) + VOODOO_PACKET_MAX );
++
++          if (!p) {
++               D_OOM();
++               return NULL;
++          }
++
++          return new (p) VoodooPacket( size, p + 1 );
++     }
++
++     static VoodooPacket *
++     Compressed( VoodooPacket *packet )
++     {
++          VoodooPacket *p = (VoodooPacket*) D_MALLOC( sizeof(VoodooPacket) + packet->header.size * 4 / 3 );
++
++          if (!p) {
++               D_OOM();
++               return NULL;
++          }
++
++          int compressed = direct_fastlz_compress( packet->data, packet->header.uncompressed, p + 1 );
++
++          if ((size_t) compressed < packet->header.uncompressed)
++               return new (p) VoodooPacket( compressed, VPHF_COMPRESSED, packet->header.uncompressed, p + 1 );
++
++          D_FREE( p );
++
++          return packet;
++     }
++
++     static VoodooPacket *
++     Copy( VoodooPacket *packet )
++     {
++          VoodooPacket *p = (VoodooPacket*) D_MALLOC( sizeof(VoodooPacket) + packet->header.size );
++
++          if (!p) {
++               D_OOM();
++               return NULL;
++          }
++
++          direct_memcpy( p + 1, packet->data_start(), packet->header.size );
++
++          return new (p) VoodooPacket( packet->header.size, packet->header.flags, packet->header.uncompressed, p + 1 );
++     }
++
++     static VoodooPacket *
++     Copy( u32   size,
++           u32   flags,
++           u32   uncompressed,
++           void *data )
++     {
++          VoodooPacket *p = (VoodooPacket*) D_MALLOC( sizeof(VoodooPacket) + size );
++
++          if (!p) {
++               D_OOM();
++               return NULL;
++          }
++
++          direct_memcpy( p + 1, data, size );
++
++          return new (p) VoodooPacket( size, flags, uncompressed, p + 1 );
++     }
++
++     inline u32
++     size() const
++     {
++          return header.size;
++     }
++
++     inline u32
++     flags() const
++     {
++          return header.flags;
++     }
++
++     inline u32
++     uncompressed() const
++     {
++          return header.uncompressed;
++     }
++
++     inline const void *
++     data_header() const
++     {
++          D_ASSERT( data == this + 1 );
++
++          return &header;
++     }
++
++     inline const void *
++     data_start() const
++     {
++          return data;
++     }
++
++     inline void *
++     data_raw() const
++     {
++          return current;
++     }
++
++
++     inline bool
++     append( size_t size )
++     {
++          D_ASSERT( data == this + 1 );
++
++          if (header.size + size > VOODOO_PACKET_MAX)
++               return false;
++
++          current = (char*) data + header.size;
++
++          header.size         += size;
++          header.uncompressed += size;
++
++          return true;
++     }
++
++     inline void
++     reset( size_t size )
++     {
++          D_ASSERT( data == this + 1 );
++
++          current = (char*) data;
++
++          header.size         = size;
++          header.uncompressed = size;
++     }
++};
++
++
++#endif
diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD
index 79d4d0c51..c0e843c15 100644
--- a/community/dmd/PKGBUILD
+++ b/community/dmd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64556 2012-02-16 07:01:07Z svenstaro $
+# $Id: PKGBUILD 68172 2012-03-18 20:40:01Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -8,7 +8,7 @@
 pkgname=('dmd' 'libphobos')
 pkgbase=dmd
 pkgver=2.058
-pkgrel=1
+pkgrel=2
 pkgdesc="The Digital Mars D compiler"
 arch=('i686' 'x86_64')
 url="http://www.digitalmars.com/d/2.0/"
@@ -54,6 +54,9 @@ package_dmd() {
   mkdir -p $pkgdir/usr/share/d/samples/
   cp -r $srcdir/dmd2/samples/d/* $pkgdir/usr/share/d/samples/
 
+  find $pkgdir/usr -type f | xargs chmod 0644
+  chmod 755 $pkgdir/usr/bin/*
+
   install -Dm755 $srcdir/D-Programming-Language-tools-*/rdmd $pkgdir/usr/bin/rdmd
 }
 
@@ -70,6 +73,8 @@ package_libphobos() {
   mkdir -p $pkgdir/usr/share/doc/d/
   cp -r $srcdir/dmd2/html $pkgdir/usr/share/doc/d/
 
+  find $pkgdir/usr -type f | xargs chmod 0644
+
   install -Dm644 $srcdir/dmd2/src/druntime/LICENSE_1_0.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-druntime
   install -Dm644 $srcdir/dmd2/src/phobos/phoboslicense.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-phobos
 }
diff --git a/community/freeimage/PKGBUILD b/community/freeimage/PKGBUILD
index e80272b38..225791d59 100644
--- a/community/freeimage/PKGBUILD
+++ b/community/freeimage/PKGBUILD
@@ -1,44 +1,37 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Mihai Militaru <mihai.militaru@gmx.com>
 # Contributor: scippio <scippio@berounet.cz>
 
 pkgname=freeimage
-pkgver=3.15.1
+pkgver=3.15.3
 pkgrel=1
-pkgdesc="Library project for developers who would like to support popular graphics image formats."
+pkgdesc="Library project for developers who would like to support popular graphics image formats"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'custom:FIPL')
 url="http://freeimage.sourceforge.net/"
 depends=('gcc-libs')
 makedepends=('hd2u')
-source=("http://downloads.sourceforge.net/project/freeimage/Source%20Distribution/${pkgver}/FreeImage${pkgver//./}.zip"
-        'gcc4.5_ln.patch')
-md5sums=('450d2ff278690b0d1d7d7d58fad083cc'
-         'f85279b2572a0a9e03775909cd9cd759')
+source=("http://downloads.sourceforge.net/project/freeimage/Source%20Distribution/${pkgver}/FreeImage${pkgver//./}.zip")
+md5sums=('6c305b4086500ff8541c596ea6fc7cd7')
 
 build() {
   cp -r FreeImage FreeImagefip
 
   cd FreeImage
-  patch -Np1 < ${srcdir}/gcc4.5_ln.patch
   make
 
   cd ${srcdir}/FreeImagefip
-  patch -Np1 < ${srcdir}/gcc4.5_ln.patch
   make -f Makefile.fip 
 }
 
 package() {
   cd FreeImage
-  make DESTDIR=${pkgdir} install 
+  make DESTDIR=${pkgdir} install || true
 
   cd ${srcdir}/FreeImagefip
   make -f Makefile.fip DESTDIR=${pkgdir} install
 
-  install -D -m644 ${srcdir}/FreeImage/license-fi.txt \
-    ${pkgdir}/usr/share/licenses/${pkgname}/license-fi.txt
-
-  ln -s libfreeimage-${pkgver}.so ${pkgdir}/usr/lib/libfreeimage.so
-  ln -s libfreeimageplus-${pkgver}.so ${pkgdir}/usr/lib/libfreeimageplus.so
+  install -D -m644 ${srcdir}/FreeImage/license-fi.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/community/gnustep-back/PKGBUILD b/community/gnustep-back/PKGBUILD
index b7402377d..1f3e31fab 100644
--- a/community/gnustep-back/PKGBUILD
+++ b/community/gnustep-back/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56056 2011-09-29 17:43:50Z spupykin $
+# $Id: PKGBUILD 68152 2012-03-18 19:10:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=gnustep-back
-pkgver=0.20.1
+pkgver=0.22.0
 pkgrel=1
 pkgdesc="The GNUstep GUI Backend"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('gnustep-gui' 'libffi' 'gcc-objc')
 conflicts=('gnustep-back-svn')
 groups=('gnustep-core')
 source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz)
-md5sums=('6c6ab328de7612d0ca3fdfc2fedb1ceb')
+md5sums=('6ea64404d78766f93d192ff467162f53')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/gnustep-base/PKGBUILD b/community/gnustep-base/PKGBUILD
index eca6580d0..3b61278a3 100644
--- a/community/gnustep-base/PKGBUILD
+++ b/community/gnustep-base/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56058 2011-09-29 17:45:33Z spupykin $
+# $Id: PKGBUILD 68154 2012-03-18 19:11:35Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=gnustep-base
-pkgver=1.23.0
+pkgver=1.24.0
 pkgrel=1
 pkgdesc="The GNUstep base package"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ conflicts=('gnustep-base-svn')
 groups=('gnustep-core')
 options=('!emptydirs' '!makeflags')
 source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz)
-md5sums=('c898a1b6cdc98e83639f319876bdbba6')
+md5sums=('53cd117e9f64729870e906b66d2314ba')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gnustep-gui/PKGBUILD b/community/gnustep-gui/PKGBUILD
index 29530a677..16e366811 100644
--- a/community/gnustep-gui/PKGBUILD
+++ b/community/gnustep-gui/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 63604 2012-02-05 11:59:59Z ibiru $
+# $Id: PKGBUILD 68156 2012-03-18 19:12:25Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=gnustep-gui
-pkgver=0.20.0
-pkgrel=3
+pkgver=0.22.0
+pkgrel=1
 pkgdesc="The GNUstep GUI class library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnustep.org/"
@@ -16,7 +16,7 @@ conflicts=('gnustep-gui-svn')
 groups=('gnustep-core')
 options=('!makeflags')
 source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz)
-md5sums=('0d3765aa97db1dd20bdbd0690f4aca6b')
+md5sums=('3aa3346071736206ca144ce1ce8f063f')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD
index 7ebff81e4..6b3aed518 100644
--- a/community/gtranslator/PKGBUILD
+++ b/community/gtranslator/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 57477 2011-10-28 12:30:44Z jlichtblau $
+# $Id: PKGBUILD 68181 2012-03-18 21:14:51Z 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.7
+pkgver=2.90.8
 pkgrel=1
 pkgdesc="An enhanced gettext po file editor for the GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.gnome.org/gtranslator/"
 license=('GPL')
-depends=('desktop-file-utils' 'gdl' 'gettext' 'gtksourceview3' 'gtkspell' 'iso-codes' 'libgda4' 'libpeas' 'libunique' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'dconf')
+depends=('desktop-file-utils' 'gdl' 'gettext' 'gtksourceview3' 'gtkspell' 'iso-codes' 'libgda' 'libpeas' 'libunique' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'dconf')
 makedepends=('intltool' 'gnome-doc-utils' 'gnome-utils' 'gucharmap' 'json-glib')
 optdepends=('gtkspell: spell check'
             'gucharmap: for charmap plugin'
@@ -18,8 +18,8 @@ optdepends=('gtkspell: spell check'
 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=('55845ad665f5e55265dd017d1c96e41a72c4c5691eb218ba9db6985b66afa556')
+source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.90/$pkgname-$pkgver.tar.xz)
+sha256sums=('89f6be55d901d62e09065ed92f471eb569834eaa7babc8a48b2255c26a105037')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/gtranslator/gtranslator.changelog b/community/gtranslator/gtranslator.changelog
index f78e2aab5..301bec578 100644
--- a/community/gtranslator/gtranslator.changelog
+++ b/community/gtranslator/gtranslator.changelog
@@ -1,3 +1,6 @@
+2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* gtranslator 2.90.8-1
+
 2011-10-28 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
 	* gtranslator 2.90.7-1
 
diff --git a/community/gummi/PKGBUILD b/community/gummi/PKGBUILD
index e62b110a6..6cc2dfde7 100644
--- a/community/gummi/PKGBUILD
+++ b/community/gummi/PKGBUILD
@@ -1,32 +1,36 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
+# $Id: PKGBUILD 68113 2012-03-18 11:53:48Z arodseth $
+
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Sergio A. Morales <sergiomorales@archlinux.cl>
 # Contributor: soeren <nonick@posteo.de>
 
 pkgname=gummi
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc='Simple LaTex editor for GTK users'
-arch=('i686' 'x86_64' 'mips64el')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://gummi.midnightcoding.org/'
 license=('MIT')
-depends=('texlive-core' 'gtkspell' 'gtksourceview2' 'poppler-glib')
+depends=('texlive-core' 'gtkspell' 'gtksourceview2' 'poppler-glib' 'desktop-file-utils')
 makedepends=('glib2' 'gtk2' 'pango' 'poppler' 'intltool')
-source=("http://dev.midnightcoding.org/redmine/attachments/download/217/gummi-0.6.1.tar.gz")
-md5sums=('f9a257a4cec208642028ccde6b6514e0')
+install=$pkgname.install
+source=("http://dev.midnightcoding.org/attachments/download/258/$pkgname-$pkgver.tar.gz")
+sha256sums=('1d886e6036a9a480662f9cf3ae8afa4d1129929c16cb78081755ad1d10be8277')
  
 build() {
-  cd ${pkgname}-${pkgver}
+  cd "$pkgname-$pkgver"
 
   find . -type f -exec touch {} \;
-
-  ./configure \
-    --prefix=/usr
-
+  ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd "$pkgname-$pkgver"
 
-  make prefix=${pkgdir}/usr install
+  make prefix="$pkgdir/usr" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/gummi/gummi.install b/community/gummi/gummi.install
new file mode 100644
index 000000000..ef816a666
--- /dev/null
+++ b/community/gummi/gummi.install
@@ -0,0 +1,14 @@
+post_upgrade() {
+  gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_install() {
+  post_upgrade
+}
+
+post_remove() {
+  post_upgrade
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/luarocks/PKGBUILD b/community/luarocks/PKGBUILD
index 8f395f63f..5a1121a2b 100644
--- a/community/luarocks/PKGBUILD
+++ b/community/luarocks/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 62343 2012-01-19 11:02:08Z cbrannon $
+# $Id: PKGBUILD 68146 2012-03-18 18:24:42Z cbrannon $
 # Maintainer: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgname=luarocks
-pkgver=2.0.7.1
+pkgver=2.0.8
 pkgrel=1
 pkgdesc='Deployment and management system for Lua modules'
 arch=('i686' 'x86_64' 'mips64el')
@@ -33,4 +33,4 @@ package() {
   install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-md5sums=('37003e5c78792e353acde684426bdeac')
+md5sums=('07cf84e352d86fe161f7b2ec43f360cc')
diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD
index 1c5dc1b65..8a4ad7eb8 100644
--- a/community/luminancehdr/PKGBUILD
+++ b/community/luminancehdr/PKGBUILD
@@ -1,42 +1,33 @@
-# $Id: PKGBUILD 63654 2012-02-05 12:03:48Z ibiru $
+# $Id: PKGBUILD 68166 2012-03-18 20:30:56Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor: Dmitry N. Shilov <stormblast@land.ru>
 
 pkgname=luminancehdr
-pkgver=2.1.0
-pkgrel=7
+pkgver=2.2.1
+pkgrel=1
 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qtpfsgui.sourceforge.net/'
 license=('GPL')
 depends=('exiv2' 'fftw' 'gsl' 'libraw' 'openexr' 'qt' 'qtwebkit')
+makedepends=('cmake')
 optdepends=('hugin: align image stack functionality')
 install=$pkgname.install
 changelog=$pkgname.changelog
 options=('!emptydirs')
-source=(http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-${pkgver}.tar.gz
-        luminance-hdr-2.1.0-libraw.patch)
-sha256sums=('0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac'
-            'd3be7458713693382b64a6a1fa766c14bc16be2ff9c5a06567c0e5335581151c')
+source=(http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-v${pkgver}.tar.gz)
+sha256sums=('a8d781ca7a07737dfb1fe00702f948ecd044be6b8405a23d9e18fe46b27036f1')
 
 build() {
-  cd "${srcdir}/luminance-hdr-${pkgver}"
+  cd "${srcdir}/luminance-hdr-v${pkgver}"
 
-  # stolen from gentoo
-  patch -Np1 -i ../luminance-hdr-2.1.0-libraw.patch
-
-  if [ ${CARCH} = i686 ]; then
-    sed -i 's/ -msse2//' project.pro
-  fi
-
-  lrelease project.pro
-  qmake PREFIX=/usr
+  cmake -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/luminance-hdr-${pkgver}"
+  cd "${srcdir}/luminance-hdr-v${pkgver}"
 
-  make INSTALL_ROOT="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/luminancehdr/luminancehdr.changelog b/community/luminancehdr/luminancehdr.changelog
index 807541292..b649ab768 100644
--- a/community/luminancehdr/luminancehdr.changelog
+++ b/community/luminancehdr/luminancehdr.changelog
@@ -1,4 +1,7 @@
-2012-01-27  Eric Belanger  <eric@archlinux.org>
+2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* luminancehdr 2.2.1-1
+
+2012-01-27 Eric Belanger  <eric@archlinux.org>
 	* Rebuild against libpng 1.5 and libtiff 4.0
 
 2011-08-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
diff --git a/community/mfs/PKGBUILD b/community/mfs/PKGBUILD
index 857563518..d27bbe9b2 100644
--- a/community/mfs/PKGBUILD
+++ b/community/mfs/PKGBUILD
@@ -1,24 +1,27 @@
-# Maintainer: Thomas S Hatch <thatch45@gmail.com>
+# $Id: PKGBUILD 68131 2012-03-18 14:31:17Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Thomas S Hatch <thatch45@gmail.com>
+
 pkgbase=mfs
 pkgname=('mfs-client' 'mfs-chunkserver' 'mfs-master')
-pkgver=1.6.20
-pkgrel=8
+pkgver=1.6.24
+pkgrel=1
 pkgdesc="MooseFS, fault tolerant, network distributed file system"
 license=("GPL3")
-arch=('i686' 'x86_64' 'mips64el')
+arch=('x86_64' 'i686' 'mips64el')
 options=('!libtool')
-depends=('zlib' 'fuse' 'python2')
+depends=('zlib' 'fuse' 'python2' 'bash')
 url="http://www.moosefs.com/"
 source=("http://www.moosefs.org/tl_files/mfscode/mfs-$pkgver.tar.gz"
         "mfsmaster"
         "mfschunkserver"
         "mfsmetalogger"
         "mfscgiserv")
-md5sums=('c57bdb9d7d41eec57c2bee9a1ff872c2'
-         '5504cab151a1658489e5ece7ea9204c7'
-         '69c7e2d2bcaba94fecb4120272e7caf4'
-         '7e3da2f8015d54a202de99e52c88358c'
-         'babe045a94bf8bfaea602fe515a860b0')
+sha256sums=('823c2c63d66dc8ba9d409e8af0f6c452cebc3a073f1d89b034e65320104eaa25'
+            '6e75a33996120cb5d240075bcc92522d490892fae5f9f5c4f2d1b020db54c9c1'
+            '48dc7a4e2ba23668456a2593154a850cebca649412f8c11e8f1a94038831638e'
+            'aae5fdf39469eb47bb4962b51bbdb3c51772930f574010c29bb5a36f1820d0ee'
+            '357304173688536ab70b9978ae44317b07de1fdcf3736b31a94b2a6186e8e9fa')
 
 build() {
   cd "$srcdir"
@@ -66,14 +69,14 @@ build() {
 }
 
 package_mfs-client() {
-  depends=('zlib' 'fuse')
+  depends=('zlib' 'fuse' 'bash')
   cd "$srcdir/$pkgbase-client"
   make DESTDIR="$pkgdir" install
   rm -rf $pkgdir/usr/share/man/man7
 }
 
 package_mfs-chunkserver() {
-  depends=('zlib')
+  depends=('zlib' 'bash')
   cd "$srcdir/$pkgbase-chunk"
   make DESTDIR="$pkgdir" install
   rm -rf $pkgdir/usr/share/man/man7
@@ -96,3 +99,4 @@ package_mfs-master() {
     -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,'
 }
 
+# vim:set ts=2 sw=2 et:
diff --git a/community/monit/PKGBUILD b/community/monit/PKGBUILD
index d421c3f6d..65f363c77 100644
--- a/community/monit/PKGBUILD
+++ b/community/monit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 58923 2011-11-20 11:30:07Z jlichtblau $
+# $Id: PKGBUILD 68168 2012-03-18 20:38:00Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
 # Contributor: Marco Bartholomew <marco@marcobartholomew.com>
 
 pkgname=monit
-pkgver=5.3.1
+pkgver=5.3.2
 pkgrel=1
 pkgdesc="Utility for managing and monitoring, processes, files, directories and devices on a *NIX system"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ backup=('etc/monitrc')
 changelog=$pkgname.changelog
 source=(http://mmonit.com/$pkgname/dist/$pkgname-$pkgver.tar.gz \
         monitd)
-sha256sums=('91a3f15c11a9b9e60e6e3b963f9f4af2acf5ca50ac6dc047d94ce50e966addc6'
+sha256sums=('406a06ac912525c8e76066d07235c848466b331532b2b3de931b61fe455ae915'
             'b235b2fdeec49015d6b74f028d161b289663692f9ee2d2d78cf52d8db87ca496')
 
 build() {
diff --git a/community/monit/monit.changelog b/community/monit/monit.changelog
index 1481ef5da..004314b6d 100644
--- a/community/monit/monit.changelog
+++ b/community/monit/monit.changelog
@@ -1,3 +1,6 @@
+2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* monit 5.3.2-1
+
 2011-11-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* monit 5.3.1-1
 
diff --git a/community/nzbget/PKGBUILD b/community/nzbget/PKGBUILD
index a395c7a34..60ca3c6d0 100644
--- a/community/nzbget/PKGBUILD
+++ b/community/nzbget/PKGBUILD
@@ -1,33 +1,34 @@
-# $Id: PKGBUILD 54477 2011-08-18 15:08:22Z bluewind $
+# $Id: PKGBUILD 68199 2012-03-18 23:15:46Z arodseth $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=nzbget
 pkgver=0.7.0
-pkgrel=3
-pkgdesc="Downloads from Usenet using .nzb files"
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=4
+pkgdesc="Download from Usenet using .nzb files"
+arch=('x86_64' 'i686' 'mips64el')
 url="http://nzbget.sourceforge.net/"
 license=('GPL')
-depends=('gnutls' 'libpar2' 'libxml2' 'ncurses')
+depends=('gnutls' 'libpar2' 'libxml2' 'libsigc++' 'libgcrypt')
 makedepends=('autoconf' 'automake')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('27971846aba75f5e312d80dce7edbc5d')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
+sha256sums=('b798bbcc9f6816b4e19a95f74df067440f7ad49e1c16a3f33f99bddf7916771e')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
 
-#  autoreconf -fi || return 1
-#uudeview ("uulib") has been removed, and "it did not work well anyway"
-  ./configure --prefix=/usr --enable-parcheck || return 1
-  make 
+  ./configure --prefix=/usr --enable-parcheck
+  make CXXFLAGS="-lsigc-2.0"
 }
+
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
 
-#other files
-  install -d ${pkgdir}/usr/share/$pkgname || return 1
-  install -m644 -t ${pkgdir}/usr/share/$pkgname \
+  make DESTDIR="$pkgdir" install
+  install -d "$pkgdir/usr/share/$pkgname"
+  install -m644 -t "$pkgdir/usr/share/$pkgname" \
     AUTHORS postprocess-example.sh postprocess-example.conf \
-    ChangeLog nzbget.conf.example README || return 1
+    ChangeLog nzbget.conf.example README
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/openntpd/PKGBUILD b/community/openntpd/PKGBUILD
index 103c77db0..5e641e1c6 100644
--- a/community/openntpd/PKGBUILD
+++ b/community/openntpd/PKGBUILD
@@ -1,53 +1,49 @@
-# $Id: PKGBUILD 31923 2010-11-07 21:40:10Z lcarlier $
+# $Id: PKGBUILD 68196 2012-03-18 22:40:01Z arodseth $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Mark Rosenstand <mark@borkware.net>
 # Contributor: Giorgio Lando <patroclo7@gmail.com> (adjtimex patch)
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=openntpd
 pkgver=3.9p1
-pkgrel=13
+pkgrel=14
 pkgdesc="Free, easy to use implementation of the Network Time Protocol."
 url="http://www.openntpd.org/"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('x86_64' 'i686' 'mips64el')
 license=('BSD')
 depends=('openssl')
 backup=('etc/ntpd.conf' 'etc/conf.d/openntpd')
-install=openntpd.install
+install=$pkgname.install
 source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$pkgname-$pkgver.tar.gz
 	'openntpd' 'openntpd.conf' 'linux-adjtimex.patch')
-md5sums=('afc34175f38d08867c1403d9008600b3'
-         '2422b40f16acf8c92e9051e3e07fc96a'
-         'ab38a035cbebe7a52888db6c573944a5'
-         '6e04eecf89ee794d6f1ae79f03742cf9')
+sha256sums=('83dd7c1e8ec8b4567afe49af539271b5a73562fb7a3ca51df73eccba89ec8c49'
+            '14b08ad387b4e16293c43386f25758699461b8b57afe41a49cc795a5e517f71e'
+            '77a0d1f3439d779c2ce259becf3fa583c21a16682a4f5327094da2e9837f6f96'
+            '3abcec94c072b5913ef7156a22049d796ff04e19105befe1ea81a66522928fd2')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
 
   patch -Np1 -i ../linux-adjtimex.patch
-  
-  # fixes FS#19509 - [openntpd] builds without linux-adjtimex.patch
   autoreconf -fi
-  #autoconf
-
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
     --with-privsep-user=ntp \
     --with-privsep-path=/var/run/openntpd/ \
     --with-adjtimex
-
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
+  cd "$srcdir/$pkgname-$pkgver"
 
-  install -D -m755 $srcdir/openntpd $pkgdir/etc/rc.d/openntpd
-  install -D -m644 $srcdir/openntpd.conf $pkgdir/etc/conf.d/openntpd
-  install -D -m644 $srcdir/$pkgname-$pkgver/LICENCE  $pkgdir/usr/share/licenses/$pkgname/LICENCE
-
-  # FS#16893  
+  make DESTDIR="$pkgdir" install
+  install -Dm755 "$srcdir/$pkgname" "$pkgdir/etc/rc.d/$pkgname"
+  install -Dm644 "$srcdir/$pkgname.conf" "$pkgdir/etc/conf.d/$pkgname"
+  install -Dm644 "$srcdir/$pkgname-$pkgver/LICENCE" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENCE"
   sed -i 's/\*/0.0.0.0/' $pkgdir/etc/ntpd.conf
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/openntpd/openntpd.install b/community/openntpd/openntpd.install
index 837e4a1e3..99223f355 100644
--- a/community/openntpd/openntpd.install
+++ b/community/openntpd/openntpd.install
@@ -14,12 +14,4 @@ post_upgrade() {
   post_install $1
 }
 
-pre_remove() {
-  /bin/true
-}
-
-post_remove() {
-  /bin/true
-}
-
 # vim: ts=2 sw=2 et ft=sh
diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD
index 02455c007..71c6261a9 100644
--- a/community/plan9port/PKGBUILD
+++ b/community/plan9port/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 61945 2012-01-11 11:46:30Z cbrannon $
+# $Id: PKGBUILD 68148 2012-03-18 18:26:06Z cbrannon $
 # Contributor: phrakture <aaronmgriffin--gmail--com>
 # Contributor: Fazlul Shahriar
 # Contributor: Chris Brannon <cmbrannon79@gmail.com>
 pkgname=plan9port
-pkgver=20120106
+pkgver=20120307
 pkgrel=1
 pkgdesc="A port of many programs from Plan 9 to Unix-like operating systems"
 arch=('i686' 'x86_64' 'mips64el')
@@ -48,5 +48,5 @@ build()
     rm -f $i
   done
 }
-md5sums=('7e9ebe75c07a02b1710ee80ce0c4ac65'
+md5sums=('c806d048788b6beb65efd9f5179f1192'
          '9695eb15a247e23140e8a35ff52a5c20')
diff --git a/community/pork/PKGBUILD b/community/pork/PKGBUILD
index 91e4b4fcf..14cbd7551 100644
--- a/community/pork/PKGBUILD
+++ b/community/pork/PKGBUILD
@@ -1,24 +1,22 @@
-# $Id: PKGBUILD 47556 2011-05-23 19:46:39Z tdziedzic $
+# $Id: PKGBUILD 68186 2012-03-18 21:35:54Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=pork
 pkgver=0.99.8.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Console-based AOL Instant Messenger & IRC client"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dev.ojnk.net/"
 license=('GPL')
 depends=('ncurses' 'perl')
 source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz)
-md5sums=('0c720db7e4e843aeee0fa53ade7cdffd')
+sha256sums=('0c720db7e4e843aeee0fa53ade7cdffd')
 
 build() {
   cd $pkgname-$pkgver
 
-  ./configure \
-    --prefix=/usr
-
+  ./configure --prefix=/usr
   make
 }
 
@@ -27,3 +25,4 @@ package() {
 
   make DESTDIR=${pkgdir} install
 }
+sha256sums=('f0d4cad21017fd75b3c200342c54dd56d9ff7bc38d1e9b3c8ba686ba53d585ed')
diff --git a/community/proj/PKGBUILD b/community/proj/PKGBUILD
index cb0fbd6b5..978edf21a 100644
--- a/community/proj/PKGBUILD
+++ b/community/proj/PKGBUILD
@@ -1,33 +1,32 @@
-# $Id: PKGBUILD 5889 2009-11-22 12:14:56Z ibiru $
+# $Id: PKGBUILD 68205 2012-03-19 01:22:23Z lfleischer $
 # Maintainer:  Mateusz Herych <heniekk@gmail.com>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=proj
 pkgver=4.7.0
-pkgrel=1
-pkgdesc="Cartographic Projections library"
+pkgrel=2
+pkgdesc='Cartographic Projections library.'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://trac.osgeo.org/proj/"
 license=('MIT')
 options=('!libtool')
-source=(http://download.osgeo.org/proj/$pkgname-$pkgver.tar.gz
-	http://download.osgeo.org/proj/$pkgname-datumgrid-1.5.zip
-        http://www.swisstopo.admin.ch/internet/swisstopo/en/home/topics/survey/lv03-lv95/chenyx06/distortion_grids.parsys.65772.downloadList.94632.DownloadFile.tmp/chenyx06antv2.zip)
+source=("http://download.osgeo.org/proj/$pkgname-$pkgver.tar.gz"
+        "http://download.osgeo.org/proj/$pkgname-datumgrid-1.5.zip"
+        "chenyx06a.zip::http://www.swisstopo.admin.ch/internet/swisstopo/en/home/topics/survey/lv03-lv95/chenyx06/distortion_grids.parsys.65772.downloadList.94632.DownloadFile.tmp/chenyx06antv2.zip")
 md5sums=('927d34623b52e0209ba2bfcca18fe8cd'
          'f5bf28a2a9c6afe9a3f670f0c0adb783'
          'fbbfe2b6bcbc41168fe3bdc4a6c1082a')
 
-
 build() {
-  bsdtar -xzvf ${srcdir}/${pkgname}-datumgrid-1.5.zip -C ${srcdir}/proj-${pkgver}/nad
-  bsdtar -xzvf ${srcdir}/chenyx06.zip -C ${srcdir}/proj-${pkgver}/nad CHENYX06.gsb
+  bsdtar -xzvf "${srcdir}/${pkgname}-datumgrid-1.5.zip" -C "${srcdir}/proj-${pkgver}/nad"
+  bsdtar -xzvf "${srcdir}/chenyx06a.zip" -C "${srcdir}/proj-${pkgver}/nad" CHENYX06a.gsb
 
-  cd ${srcdir}/proj-${pkgver}
+  cd "${srcdir}/proj-${pkgver}"
 
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=${pkgdir} install
+  make
+  make DESTDIR="${pkgdir}" install
 
-  install -D COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -D COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/community/qingy/PKGBUILD b/community/qingy/PKGBUILD
index 81f1ab9a9..fa90a70ed 100644
--- a/community/qingy/PKGBUILD
+++ b/community/qingy/PKGBUILD
@@ -1,49 +1,35 @@
-# $Id: PKGBUILD 67766 2012-03-14 10:49:05Z giovanni $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 68162 2012-03-18 19:39:54Z ebelanger $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
 
 pkgname=qingy
 pkgver=1.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A DirectFB getty replacement"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://qingy.sourceforge.net/"
 license=('GPL')
-depends=('directfb' 'pam' 'openssl' 'ncurses' 'libxss')
+depends=('directfb' 'openssl' 'libxss')
+makedepends=('emacs')
 backup=('etc/qingy/settings' 'etc/qingy/welcomes')
 options=('!libtool')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/sourceforge/qingy/${pkgname}-${pkgver}.tar.bz2"
-        'qingy.logrotate'
-        'README')
+install=qingy.install
+source=(http://downloads.sourceforge.net/sourceforge/qingy/${pkgname}-${pkgver}.tar.bz2 \
+        qingy.logrotate)
 md5sums=('1e0912655e240adfd0ce5ced30bbc685'
-         'a9bdfd0ac9f29380eafa97a4a056789d'
-         'f54865d71ea34e2f68e53ef60248701b')
+         'a9bdfd0ac9f29380eafa97a4a056789d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i 's|/usr/share/xsessions|/etc/X11/sessions|' src/libraries/session.c
-  sed -i 's|/usr/X11R6/bin|/usr/X11R6/bin:/sbin:/usr/sbin:/opt/kde/bin:/opt/plt/bin:/usr/share/eclipse:/opt/java/bin:/opt/java/jre/bin:/opt/openoffice/program:/opt/NX/bin:/opt/qt/bin:/opt/plan9/bin:/opt/firebird/bin:/opt/glest/bin:/opt/grass/bin:/opt/maven/bin:/usr/share/netbeans/bin:/opt/qgis/bin:/opt/texlive/bin:/opt/torcs/bin:/opt/wildfire/bin|' src/libraries/session.c
-
-  ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc \
-              --disable-optimizations --enable-pam \
-              --disable-static-build --enable-gpm-lock --enable-emacs
+  XFREE=/usr/bin/Xorg XINIT=/usr/bin/xinit \
+    ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc \
+    --disable-optimizations --enable-pam \
+    --disable-static-build --enable-gpm-lock --enable-emacs
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-
-  install -d "${pkgdir}/var/lib/qingy"
   install -D -m644 "${srcdir}/qingy.logrotate" "${pkgdir}/etc/logrotate.d/qingy"
-  install -D -m644 "${srcdir}/README" "${pkgdir}/usr/share/doc/qingy/README"
-
-# fix settings for Arch
-  sed -i 's|/var/lib/misc|/var/lib/qingy|' "${pkgdir}/etc/qingy/settings"
-  sed -i 's|/usr/X11R6/bin/XFree86|/usr/bin/Xorg|' "${pkgdir}/etc/qingy/settings"
-  sed -i 's|/usr/X11R6/bin/xinit|/usr/bin/xinit|' "${pkgdir}/etc/qingy/settings"
-  sed -i 's|session    optional|#session    optional|' "${pkgdir}/etc/pam.d/qingy"
 }
diff --git a/community/qingy/qingy.install b/community/qingy/qingy.install
index 6f0cdaaad..5cf234b72 100644
--- a/community/qingy/qingy.install
+++ b/community/qingy/qingy.install
@@ -1,17 +1,14 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(qingy.info.gz)
 
 post_install() {
   for file in ${filelist[@]}; do
     install-info $infodir/$file $infodir/dir 2> /dev/null
   done
-  echo '==> To setup qingy, read /usr/share/doc/qingy/README'
 }
 
 post_upgrade() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
+  post_install
 }
 
 pre_remove() {
diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD
index 9c82c164a..6bd216ba3 100644
--- a/community/qmmp/PKGBUILD
+++ b/community/qmmp/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 66306 2012-02-23 13:45:20Z allan $
+#$Id: PKGBUILD 68175 2012-03-18 20:53:22Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=qmmp
-pkgver=0.5.3
+pkgver=0.5.4
 pkgrel=1
 pkgdesc="Qt4 based audio-player"
 arch=('i686' 'x86_64' 'mips64el')
@@ -22,7 +22,7 @@ optdepends=('flac: native FLAC support'
             'ffmpeg' 'libsamplerate' 'wavpack')
 install=$pkgname.install
 source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2)
-sha256sums=('6f0842d1dce9a259584b79a9f1368547e23292cd291cbccd105dd10d8bea5d6d')
+sha256sums=('6f95d1bb97cb1ef91b9d664f4d5ce013c6cc93f3aefb24cd64cf2500a525be0f')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog
index 379f85cbe..a69c0df58 100644
--- a/community/qmmp/qmmp.changelog
+++ b/community/qmmp/qmmp.changelog
@@ -1,3 +1,6 @@
+2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qmmp 0.5.4-1
+
 2011-11-12 Andrea Scarpino <andrea@archlinux.org>
     * qmmp 0.5.2-3
     * rebuild with qt 4.7
diff --git a/community/qtfm/PKGBUILD b/community/qtfm/PKGBUILD
index 1f69c5cb9..3aae9f231 100644
--- a/community/qtfm/PKGBUILD
+++ b/community/qtfm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 60761 2011-12-17 15:22:46Z jlichtblau $
+# $Id: PKGBUILD 68177 2012-03-18 20:55:22Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Wittfella <wittfella@wittfella.com>
 
 pkgname=qtfm
-pkgver=5.3
+pkgver=5.4
 pkgrel=1
 pkgdesc="A lightweight file manager"
 arch=('i686' 'x86_64' 'mips64el')
@@ -28,3 +28,4 @@ package() {
 
   make INSTALL_ROOT=${pkgdir} install
 }
+sha256sums=('8ef4c2464502959944e1b2476aa635b2a889d2859ba62dd61d8f591779c6fd0d')
diff --git a/community/qtfm/qtfm.changelog b/community/qtfm/qtfm.changelog
index d148864cf..8b142ac76 100644
--- a/community/qtfm/qtfm.changelog
+++ b/community/qtfm/qtfm.changelog
@@ -1,3 +1,6 @@
+2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qtfm 5.4-1
+
 2011-12-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* qtfm 5.3-1
 
diff --git a/community/raul/PKGBUILD b/community/raul/PKGBUILD
index ff583458c..ed4bade48 100644
--- a/community/raul/PKGBUILD
+++ b/community/raul/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 37632 2011-01-15 21:42:56Z schiv $
+# $Id: PKGBUILD 68139 2012-03-18 16:41:01Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Max a.k.a. Synthead <synthead@gmail.com>
 # Contributor: christhemonkey <christhemonkey at gmail dot com>
 
 pkgname=raul
 pkgver=0.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="C++ Realtime Audio Utility Library"
 arch=(i686 x86_64 'mips64el')
 url="http://drobilla.net/software/raul/"
diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD
index 0b6e61eea..7414ae8d3 100644
--- a/community/springlobby/PKGBUILD
+++ b/community/springlobby/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 67216 2012-03-05 08:59:53Z ibiru $
+# $Id: PKGBUILD 68098 2012-03-18 05:46:56Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: DuGi <dugi@irc.pl>
 
 pkgname=springlobby
-pkgver=0.141
-pkgrel=2
+pkgver=0.144
+pkgrel=1
 pkgdesc="A free cross-platform lobby client for the Spring RTS project."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://springlobby.info/"
@@ -13,12 +13,8 @@ depends=('hicolor-icon-theme' 'wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs'
 optdepends=('sdl' 'sdl_sound' 'sdl_mixer') 
 makedepends=('boost' 'asio' 'cmake')
 install=springlobby.install
-source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2 
-        springlobby.desktop
-        springlobby.png)
-md5sums=('a7e5a9b031a1e72a1df59575289fed3f'
-         '45f8b59d033931d02e734fe3bd7777dd'
-         '1f388187539aeb0358b51995e26ed890')
+source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('facde8ab25100e50be5fc9b33deceb5c')
 
 build() {
   cd $srcdir/${pkgname}-$pkgver
@@ -37,12 +33,12 @@ package() {
   cd $srcdir/${pkgname}-$pkgver
 
   make DESTDIR=$pkgdir install
-  
-  install -m755 -d $pkgdir/usr/share/applications
-  install -m644 $srcdir/springlobby.desktop $pkgdir/usr/share/applications
+ # 
+ # install -m755 -d $pkgdir/usr/share/applications
+ # install -m644 $srcdir/springlobby.desktop $pkgdir/usr/share/applications
 
-  install -m755 -d -p $pkgdir/usr/share/pixmaps
-  install -m644 $srcdir/springlobby.png $pkgdir/usr/share/pixmaps
+ # install -m755 -d -p $pkgdir/usr/share/pixmaps
+ # install -m644 $srcdir/springlobby.png $pkgdir/usr/share/pixmaps
 }
 
 # vim: sw=2:ts=2 et:
diff --git a/community/yaws/PKGBUILD b/community/yaws/PKGBUILD
index 3474a3ae8..52fc29143 100644
--- a/community/yaws/PKGBUILD
+++ b/community/yaws/PKGBUILD
@@ -1,38 +1,39 @@
-# $Id: PKGBUILD 26124 2010-09-13 17:23:11Z schuay $
-# Maintainer:
+# $Id: PKGBUILD 68192 2012-03-18 22:20:01Z arodseth $
+# Maintainer: Vesa Kaihlavirta
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=yaws
-pkgver=1.88
-pkgrel=3
+pkgver=1.92
+pkgrel=1
 pkgdesc='Yet Another Web Server -- The pure Erlang HTTP server/framework'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://yaws.hyber.org'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://yaws.hyber.org/'
 license=('BSD')
 depends=('pam' 'erlang')
 backup=('etc/yaws/yaws.conf')
-source=("http://yaws.hyber.org/download/${pkgname}-${pkgver}.tar.gz")
-md5sums=('950f8199592c6490556632e20e59a353')
+options=('!emptydirs')
+install=$pkgname.install
+source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz")
+sha256sums=('cde83ca55d8e1b10a89094e1cfdc3e78d91ba9b1036cb5ea4e1994f5922c2357')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd "$pkgname-$pkgver"
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-
-  # python2 fix
   for file in www/cgi.yaws www/cgi-bin/foo.py; do
-      sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file
+    # python2 fix
+    sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file
   done
-
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
+  cd "$pkgname-$pkgver"
 
-  install -d ${pkgdir}/usr/lib/erlang/lib
-  ln -s /usr/lib/yaws  ${pkgdir}/usr/lib/erlang/lib/${pkgname}-${pkgver}
-
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  make DESTDIR="$pkgdir" install
+  install -d "$pkgdir/usr/lib/erlang/lib"
+  ln -s /usr/lib/yaws "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/yaws/yaws.install b/community/yaws/yaws.install
new file mode 100644
index 000000000..2b28403e1
--- /dev/null
+++ b/community/yaws/yaws.install
@@ -0,0 +1,13 @@
+post_upgrade() {
+  mkdir -p /usr/var/log/yaws
+}
+
+post_install() {
+  post_upgrade
+}
+
+post_remove() {
+  rmdir --ignore-fail-on-non-empty /usr/var/log/yaws
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/iperf/PKGBUILD b/extra/iperf/PKGBUILD
index 9f80c9c06..7fadf98b6 100644
--- a/extra/iperf/PKGBUILD
+++ b/extra/iperf/PKGBUILD
@@ -1,20 +1,18 @@
-# $Id: PKGBUILD 143786 2011-11-29 11:18:28Z giovanni $
+# $Id: PKGBUILD 153712 2012-03-18 13:40:58Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Dale Blount <dale@archlinux.org>
 
 pkgname=iperf
 pkgver=2.0.5
-pkgrel=3
+pkgrel=4
 pkgdesc="A tool to measure maximum TCP bandwidth"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://iperf.sourceforge.net"
 depends=('gcc-libs')
 source=("http://downloads.sourceforge.net/iperf/iperf-2.0.5.tar.gz"
-        'license'
         'client.cpp.patch')
 md5sums=('44b5536b67719f4250faed632a3cd016'
-         'a2879f900b76668b28a1cc922909db18'
          '82ce63c87cc8bb2f0f94069857ac14a9')
 
 build() {
@@ -23,7 +21,9 @@ build() {
   # FS#25159
   patch -Np1 -i ${srcdir}/client.cpp.patch
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr \
+              --enable-ipv6 \
+              --enable-threads
   make
 }
 
@@ -31,5 +31,5 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
-  install -Dm644 ${srcdir}/license "${pkgdir}/usr/share/licenses/iperf/LICENSE"
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/iperf/LICENSE"
 }
diff --git a/extra/libreoffice-i18n/PKGBUILD b/extra/libreoffice-i18n/PKGBUILD
new file mode 100644
index 000000000..5751c4ddb
--- /dev/null
+++ b/extra/libreoffice-i18n/PKGBUILD
@@ -0,0 +1,1516 @@
+# $Id: PKGBUILD 153705 2012-03-18 09:00:45Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgbase="libreoffice-i18n"
+pkgname=('libreoffice-af'    'libreoffice-ar'    'libreoffice-as'    'libreoffice-ast'	 'libreoffice-be'    'libreoffice-bg'    'libreoffice-bn'
+	 'libreoffice-bo'    'libreoffice-br'    'libreoffice-brx'   'libreoffice-bs'    'libreoffice-ca'    'libreoffice-ca-XV' 'libreoffice-cs'
+	 'libreoffice-cy'    'libreoffice-da'    'libreoffice-de'    'libreoffice-dgo'	 'libreoffice-dz'    'libreoffice-el'
+	 'libreoffice-en-GB' 'libreoffice-en-ZA' 'libreoffice-eo'    'libreoffice-es'    'libreoffice-et'    'libreoffice-eu'
+	 'libreoffice-fa'    'libreoffice-fi'    'libreoffice-fr'    'libreoffice-ga'	 'libreoffice-gl' # 'libreoffice-gd'
+	 'libreoffice-gu'    'libreoffice-he'    'libreoffice-hi'    'libreoffice-hr'    'libreoffice-hu'    'libreoffice-id'    'libreoffice-is'
+	 'libreoffice-it'    'libreoffice-ja'    'libreoffice-ka'    'libreoffice-kk'    'libreoffice-km' #'libreoffice-kid'
+	 'libreoffice-kn'    'libreoffice-ko'    'libreoffice-kok'   'libreoffice-ks'    'libreoffice-ku' #   'libreoffice-ky'
+	 'libreoffice-lo'    'libreoffice-lt'    'libreoffice-lv'    'libreoffice-mai'   'libreoffice-mk'    'libreoffice-ml'
+	 'libreoffice-mn'    'libreoffice-mni'   'libreoffice-mr'    'libreoffice-my'    'libreoffice-nb' # 'libreoffice-ms'
+	 'libreoffice-ne'    'libreoffice-nl'    'libreoffice-nn'    'libreoffice-nr'    'libreoffice-nso'    'libreoffice-oc'
+	 'libreoffice-om'    'libreoffice-or'    'libreoffice-pa-IN' 'libreoffice-pl'  #  'libreoffice-ps' #'libreoffice-pap'
+	 'libreoffice-pt-BR' 'libreoffice-pt'    'libreoffice-ro'    'libreoffice-ru'    'libreoffice-rw'    'libreoffice-sa-IN'
+	 'libreoffice-sat'   'libreoffice-sd'    'libreoffice-sh'    'libreoffice-si'    'libreoffice-sk' #'libreoffice-sc'
+	 'libreoffice-sl'    'libreoffice-sq'    'libreoffice-sr'    'libreoffice-ss'    'libreoffice-st'    'libreoffice-sv'
+	 'libreoffice-sw-TZ' 'libreoffice-ta'    'libreoffice-te'    'libreoffice-tg'    'libreoffice-th' #    'libreoffice-ti'
+	 'libreoffice-tn'    'libreoffice-tr'    'libreoffice-ts'    'libreoffice-ug'    'libreoffice-uk' #   'libreoffice-ur'
+	 'libreoffice-uz'    'libreoffice-ve'    'libreoffice-vi'    'libreoffice-xh'    'libreoffice-zh-CN' 'libreoffice-zh-TW'
+	 'libreoffice-zu')
+pkgver=3.5.1
+pkgrel=1
+pkgdesc="LibreOffice language/localisation files"
+arch=('any')
+url="http://www.documentfoundation.org"
+license=('LGPL')
+#depends=('libreoffice-common') #>=${pkgver}")
+makedepends=('rpmextract')
+
+# http://wiki.documentfoundation.org/Language_Teams
+
+#http://download.documentfoundation.org/mirrors/all.html
+#_url="http://dev-builds.libreoffice.org/pre-releases"
+_url="http://download.documentfoundation.org/libreoffice/stable"
+#_url="http://download.documentfoundation.org/libreoffice/testing" 
+#_url="http://www.libreoffice.org/download/pre-releases"
+_oover="3.5.1"
+_oodlver="3.5.1rc2"
+_oomainver="3.5"
+_helpver=${_oodlver}
+_dirver="${_oodlver}"
+#_url+="/${pkgver}-rc2"
+_url+="/${pkgver}"
+
+source=(#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_af.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_af.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ar.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ar.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_as.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_as.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ast.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ast.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_be.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_be.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_bg.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_bn.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_bo.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_br.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_br.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_brx.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_brx.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_bs.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ca.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ca-XV.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_cs.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_cy.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_cy.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_da.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_de.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_dgo.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_dgo.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_dz.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_el.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_en-GB.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_en-ZA.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_eo.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_es.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_et.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_eu.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_fa.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_fa.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_fi.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_fr.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ga.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ga.tar.gz
+#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_gd.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_gl.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_gu.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_he.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_hi.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_hr.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_hu.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_id.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_is.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_it.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ja.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ka.tar.gz
+#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_kid.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_kk.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_kk.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_km.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_kn.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_kn.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ko.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_kok.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_kok.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ks.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ks.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ku.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ku.tar.gz
+#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ky.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_lo.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_lo.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_lt.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_lt.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_lv.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_lv.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_mai.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_mai.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_mk.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ml.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ml.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_mn.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_mn.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_mni.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_mni.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_mr.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_mr.tar.gz
+#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ms.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_my.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_my.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_nb.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ne.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_nl.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_nn.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_nr.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_nr.tar.gz
+#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_nso.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_nso.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_oc.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_oc.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_om.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_or.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_or.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_pa-IN.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_pa-IN.tar.gz
+#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_pap.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_pl.tar.gz
+#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ps.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_pt-BR.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_pt.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ro.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ro.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ru.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_rw.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_rw.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sa-IN.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_sa-IN.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sat.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_sat.tar.gz
+#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sc.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sd.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_sd.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sh.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_sh.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_si.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sk.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sl.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sq.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sr.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_sr.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ss.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ss.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_st.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_st.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sv.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sw-TZ.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_sw-TZ.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ta.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ta.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_te.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_te.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_tg.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_th.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_th.tar.gz
+#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ti.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_tn.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_tn.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_tr.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ts.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ts.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ug.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_uk.tar.gz
+#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ur.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_uz.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_uz.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ve.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ve.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_vi.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_xh.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_xh.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_zh-CN.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_zh-TW.tar.gz
+	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_zu.tar.gz
+	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_zu.tar.gz)
+md5sums=('7f7c20098cef08074621ace2d094ea31'
+         'd9da365aba23e4ba9272af0f975aef6a'
+         '33700c2de7bf93a244d93156ee68415c'
+         'c91333e958e92228a7322d8efdc403a7'
+         '23cf166396efc097dc9bfc28e2efaeb7'
+         'cc38d36e2c209905b8796b6c65751902'
+         '98a3e7343bd41d76ea35ca175e1dc617'
+         '5444bc87475deeeb8469838f664c3c99'
+         'c3659fd23b371060a37931b084df34d3'
+         '35e9cdd5b3081a494e6370378eb17a6c'
+         '7971d82da443d123c3f3d58fa82fbee4'
+         'a4064fce8ec70c90ae7c36a10c18c8a7'
+         'f74a4e41946ca7170caaf8552b94d98e'
+         '8ce7ed1da720f57c5f36cad49a603988'
+         '227db2189ec19bec26d5d7f7d40d16a4'
+         '961c8f16db4e54ed7b693fa953ec339f'
+         '56f28eabed7a4410638d5bf1a184b977'
+         '967e424a97121cfa450c8065fed7a2f2'
+         '01f9c8c2857f930fa1c2e8ff7f243c46'
+         '8a30300b997c430102a4d3a626f2d828'
+         '1a4d977b3a19e15c4c06b701d377a7ee'
+         '7a0800f444f736e5453158a3628a2214'
+         '86e1738c96301b85d897fd8dbec8525d'
+         '51658722f9de1becc136fceb89f0c5b1'
+         '0da38c79cd0d04f9f3f274ff494f9149'
+         '92a3a63ba45c834a652afffb0b2cbce6'
+         'a927cc7d714c3bd19ee00c44d43820a8'
+         'ddaa9ef62aebe8f6da65348a00438e89'
+         '31ee5eb38aca769cb1a54fc0f12d3346'
+         'c4e4ce4753b2103a9a8cf89a2288a4ed'
+         'b55e670c058f6e487f94f4c11dbaf6c4'
+         '2d6d038897d5b00f32b8cb00c0b34e42'
+         'af73050370dfa0133ffddf9d80d36c1f'
+         'c4374695b2a4184b3df40de8bc5f3e54'
+         'f7271273e1368c2f6b7f64ec9188c1da'
+         '9b054c89b87ee961e9a70f1d215ee68d'
+         '73cb365f04b4e640fe1b195478f9129c'
+         '9b62dd5ee618d1b81df7bb388f310536'
+         '07a24c9517b9d0a6ba9265acc1612a3b'
+         'c46137f48ef7bd9f6f1b56dc6ddea6c5'
+         'b377795238f10ecf5c7c9956cf550b9d'
+         '578960152f6cccbfd9c301f5c53ca472'
+         'efe2ce1e0027ad4c334322bda6abb949'
+         'b92f61047259d942724784e4c8477b7c'
+         '94800c565aca2a1a84c27554a0581788'
+         '98dde6f6e9bc9d2f2bae0aca5577ffdd'
+         '448086486a50155e6a1da1ebe4872a48'
+         'b3354c8a56dce30ed351767c9b5fe172'
+         '820043d781de782d0aeedde465ff5ff0'
+         '68e3579dc96b65129286596258d84e82'
+         'd6dc451fcfe8de71124370e886c164d5'
+         '9b5e9ac9808b317b72bf306eb36800f6'
+         '4a2546a7b490f77a09ad64eecddbe840'
+         '59f8425aafa21dda7c526c42ac5243a6'
+         'f5e5ca3d3b695303df89d22d79f64417'
+         '4e1205f5d0e0ad38402651d73da0626a'
+         'ebbf87de2eb6cf622a3b7297eac2cb7a'
+         'ee94ced34e6032582537f1ac6447b939'
+         '129dabaf3d69558bd5ec065b863fbcfe'
+         '43166858ac3725741bb6244a7ec45dc7'
+         '0c0757b7d4beaa3958e153e7bb9e29c0'
+         'e42f16201626fc03ac1dda8295a3bfbe'
+         '5a30a5403265fed3ec470b13c2396225'
+         '52f56e4baf21b89bc2c87e46907d6ff5'
+         '099d7c871aef460ac5a9172108a2a65a'
+         'a4b57c6ea335b9ede0f3fc69de536cf5'
+         '13658761b955c9a1edc42b7c0df977c5'
+         '86bbe011b089542ea4fcc24c990048a2'
+         '923333dc1b26951ee0c3947000fe09ba'
+         '6d089390c2e6dd94b06f3534963636bc'
+         'c359828593c0a6965e280df42341e8c5'
+         'aaf21c9f0e7bdaeee355a78e0afa57f9'
+         '964cd91fbdfb322f3c9be5eb46831413'
+         'a21249b96179c806510f66114d0a7edd'
+         '6c1d4a8aec5ab047e0c25cc31733b219'
+         'a7563af3f895f45003cb46744405d54b'
+         'cb867c1a6a33439bb940cf2781112536'
+         '684b6b2de1e44d1becae7c59d77800bc'
+         '41faae601b5487af8829cf4cb1ccfce9'
+         '2541f33385bc4c2e12c3c4f84456b187'
+         '9e06900f3440a2cacb160a4b1b4b63dd'
+         '5c37081bbb6e1548a6b609b67b358bd1'
+         'a63d83bedf1e88ec3a9349ca91140b69'
+         'b6dedb96f9a67654984b748f881c226c'
+         '67b95ed19403cecfd172deee96f96cd8'
+         '826fcb7cffd08f72193d2a4631a44549'
+         'a30d83c886be7ad46929aca501dab464'
+         '6b98b000d0004655e417b16176d83590'
+         'a4dc7c4e3ce9788d2a03a767ec74ca09'
+         'fd6a75dfa5a6a33ee98c1dd33776904a'
+         '5303045a16e2a93f8afb1e6f2c737717'
+         'c4e586cbf1b4b05b4af2c01802ea12ff'
+         '3a9f96d299b5e39f41265b2f0655a3f4'
+         '367b44c7102bc525361b558b52afbcc6'
+         'fca64b9927eabd5a89b3469be153eb14'
+         '784875f950b29c37fa0befe3f6c17497'
+         '960bff67ccb3d60699db1da8844f55e4'
+         'd0a3de17dd475f2eee0e332af0733fc7'
+         '08746cdec9a71b4c2cd9d7299d984f73'
+         '1daafbf90a956f61af1e0ffe5fef9d75'
+         '455be925daf8f36c85bd78ac7e7a0754'
+         'e66ac970e40b4a21f28293370ac30f24'
+         'f8832de55a9b00dc3427f917f2d1094f'
+         'caabfedfdb225d034a2da72f08072b2f'
+         'ebd679024ccade59c98327d6994a1c5f'
+         '57fdfa1fb7839b58d98e87d11b94e904'
+         'bbeba1455907fda8e7fb2d4f8f173d15'
+         'af7f18dbefb5f241880a71f1e3ff3410'
+         '8e51ee0ad50bb3dc2ba4a29489929b2d'
+         '1348facb77bef09d7d29a3975aa24fbc'
+         '271d87462683d25ee7242c688fd648af'
+         '2e42b59f823fe1923c2d0c57062e2081'
+         '4c03c6902d802b68d819526e19606cca'
+         '773b423f96e60efdbfec62e66056d07f'
+         '414b2bdfbc4759f8c2633c221a2b12b5'
+         '9019dfbeacd30bd48875b6c5f64feca6'
+         '53a926b86484356f66c7cb1b0ab98304'
+         '1dc3df40820ff960c091b4f0477e60fe'
+         '7fbed4c3455165ac0cccbbdb84d613fb'
+         '4bf17b83bc24e92d99c4bbfb4d0e7362'
+         '7d24b9550b8ca3ebdae3fdee7ef2dd43'
+         '2151c78cabd670c668114af9d115e9b6'
+         '60155f678e2d9100297d64479847d462'
+         '5ea84e7b97f6b21cf704448c27cb5d77'
+         '705f9c41046ec499463270beff2ffbad'
+         '4b87b090d9939fb5b2ed6d0bf2beb88d'
+         '941700fd1b86846d64537e21ee39c461'
+         '52d96e5641485e65051d66234438eeea'
+         '4955f2da1c49f00f0f4a4a80a4d6d94d'
+         '05e37592d91e1ce9b1c076dfe65a8d24'
+         '061df11a24b6756a7c19aa39547602a3'
+         '2b5385ff57d479b511c5d67909d53141'
+         '20c1b9d81629f65c61e92a70a72de596'
+         '208056e90fd5e0120c32f685f8a1de3f'
+         '3afa7f135a042934d9ed05ca347640c3'
+         'd750c7533da6a62b4e4a76b29b4d9bfc'
+         '6c21140cd09ccc02df086b17f36a0ffa'
+         '836285a841b30e5549a08ea29c9c314e'
+         '68ee8a8f877244bb64d5af5507b7611e'
+         'f5774090a254277d4007a2dbfefcbb6a'
+         '89c840e327f846d3528f9ad76e7ce614'
+         '4db5ebfb5defa12ac0c119ea798429e1'
+         '05d9bbfe5e0d90e65ce546b0a9a473f2'
+         '8ad36add10ff1d90520370eeed7fba92'
+         '5fc1006dfed7f5105efa1187b45fb081'
+         'd2d939b9a08be8dfb63da6dd0c7367ff'
+         '7dacd033acaa438724cf2f32dae1f315'
+         'e4bcd4e489d4e272b5060429f14ba7e6'
+         '4a2d3bc92bed3db53843b16f5b5b0673'
+         'f9742f14279ed582378834c67656ef99'
+         '1929c4d496e39308506ac4ca89fd17ed'
+         '28d0f1bebad98d434debd47da63744ea'
+         '6f11112f5479cfddbb1f4da2d656382c'
+         'ecbccc62f2cc08fd429a73a9e0ff05cf'
+         '2d90fd6735c69db33f358de39a9cc76e'
+         '0879ebe63824414f08d04e2755ba0694'
+         '4a8f28bce3937d834098a300abb35506')
+
+build() {
+  for i in ${pkgname[@]}
+   do _pkglang=${i#*-}
+    echo ${_pkglang} " unpacking..."
+    #cd ${srcdir}/LibO_${_oover/-/}_Linux_x86_langpack-rpm_${_pkglang}/RPMS
+    cd ${srcdir}/LibO_${_helpver}_Linux_x86_langpack-rpm_${_pkglang}/RPMS
+    # remove dictionaries if shipped - we ship them now in separate packages
+    rm libreoffice3.5-dict-*.rpm || /bin/true
+	for j in *.rpm
+	 do rpmextract.sh $j
+	done
+    # the helppack rpm goes also into the langpack dir - so far we don't want to split the helppacks separate
+#     rpmextract.sh ${srcdir}/LibO_${_oover/-/}_Linux_x86_helppack-rpm_${_pkglang}/RPMS/libobasis3.3-${_pkglang}-help-${_helpver}.i586.rpm
+    #rpmextract.sh ${srcdir}/LibO_${_oover/-/}_Linux_x86_helppack-rpm_${_pkglang}/RPMS/*.rpm
+    rpmextract.sh ${srcdir}/LibO_${_helpver/-/}_Linux_x86_helppack-rpm_${_pkglang}/RPMS/*.rpm || /bin/true
+  done
+}
+
+package_libreoffice-af() {
+  pkgdesc="Afrikaans language pack for LibreOffice"
+  provides=('openoffice-af' 'libreoffice-langpack')
+  replaces=(openoffice-af)
+  conflicts=(openoffice-af)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_af/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-ar() {
+  pkgdesc="Arabic language pack for LibreOffice"
+  provides=('openoffice-ar' 'libreoffice-langpack')
+  replaces=(openoffice-ar)
+  conflicts=(openoffice-ar)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ar/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-as() {
+  pkgdesc="Assamese (India) language pack for LibreOffice"
+  provides=('openoffice-as' 'libreoffice-langpack')
+  replaces=(openoffice-as)
+  conflicts=(openoffice-as)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_as/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-ast() {
+  pkgdesc="Asturianu language pack for LibreOffice"
+  provides=('openoffice-ast' 'libreoffice-langpack')
+  replaces=(openoffice-ast)
+  conflicts=(openoffice-ast)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ast/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-be() {
+  pkgdesc="Belarusian language pack for LibreOffice"
+  provides=('openoffice-be-BY' 'libreoffice-langpack')
+  replaces=(openoffice-be-BY)
+  conflicts=(openoffice-be-BY)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_be/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-bg() {
+  pkgdesc="Bulgarian language pack for LibreOffice"
+  provides=('openoffice-bg' 'libreoffice-langpack')
+  replaces=(openoffice-bg)
+  conflicts=(openoffice-bg)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_bg/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-bn() {
+  pkgdesc="Bengali language pack for LibreOffice"
+  provides=('openoffice-bn' 'libreoffice-langpack')
+  replaces=(openoffice-bn)
+  conflicts=(openoffice-bn)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_bn/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-bo() {
+  pkgdesc="Tibetan language pack for LibreOffice"
+  provides=('openoffice-bo' 'libreoffice-langpack')
+  replaces=(openoffice-bo)
+  conflicts=(openoffice-bo)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_bo/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-br() {
+  pkgdesc="Breton language pack for LibreOffice"
+  provides=('openoffice-br' 'libreoffice-langpack')
+  replaces=(openoffice-br)
+  conflicts=(openoffice-br)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_br/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-brx() {
+  pkgdesc="Bodo language pack for LibreOffice"
+  provides=('openoffice-brx' 'libreoffice-langpack')
+  replaces=(openoffice-brx)
+  conflicts=(openoffice-brx)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_brx/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-bs() {
+  pkgdesc="Bosnian language pack for LibreOffice"
+  provides=('openoffice-bs' 'libreoffice-langpack')
+  replaces=(openoffice-bs)
+  conflicts=(openoffice-bs)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_bs/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-ca() {
+  pkgdesc="Catalan language pack for LibreOffice"
+  provides=('openoffice-ca' 'libreoffice-langpack')
+  replaces=(openoffice-ca)
+  conflicts=(openoffice-ca)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ca/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-ca-XV() {
+  pkgdesc="Catalan (Valencia) language pack for LibreOffice"
+  provides=('openoffice-ca-XV' 'libreoffice-langpack')
+  replaces=(openoffice-ca-XV)
+  conflicts=(openoffice-ca-XV)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ca-XV/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-cs() {
+  pkgdesc="Czech language pack for LibreOffice"
+  provides=('openoffice-cs' 'libreoffice-langpack')
+  replaces=(openoffice-cs)
+  conflicts=(openoffice-cs)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_cs/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-cy() {
+  pkgdesc="Welsh language pack for LibreOffice"
+  provides=('openoffice-cy' 'libreoffice-langpack')
+  replaces=(openoffice-cy)
+  conflicts=(openoffice-cy)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_cy/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-da() {
+  pkgdesc="Danish language pack for LibreOffice"
+  provides=('openoffice-da' 'libreoffice-langpack')
+  replaces=(openoffice-da)
+  conflicts=(openoffice-da)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_da/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-de() {
+  pkgdesc="German language pack for LibreOffice"
+  provides=('openoffice-de' 'libreoffice-langpack')
+  replaces=(openoffice-de)
+  conflicts=(openoffice-de)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_de/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-dgo() {
+  pkgdesc="Dogri language pack for LibreOffice"
+  provides=('openoffice-dgo' 'libreoffice-langpack')
+  replaces=(openoffice-dgo)
+  conflicts=(openoffice-dgo)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_dgo/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-dz() {
+  pkgdesc="Dzongkha language pack for LibreOffice"
+  provides=('openoffice-dz' 'libreoffice-langpack')
+  replaces=(openoffice-dz)
+  conflicts=(openoffice-dz)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_dz/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-el() {
+  pkgdesc="Greek language pack for LibreOffice"
+  provides=('openoffice-el' 'libreoffice-langpack')
+  replaces=(openoffice-el)
+  conflicts=(openoffice-el)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_el/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-en-GB() {
+  pkgdesc="English (GB) language pack for LibreOffice"
+  provides=('openoffice-en-GB' 'libreoffice-langpack')
+  replaces=(openoffice-en-GB)
+  conflicts=(openoffice-en-GB)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_en-GB/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-en-ZA() {
+  pkgdesc="English (ZA) language pack for LibreOffice"
+  provides=('openoffice-en-ZA' 'libreoffice-langpack')
+  replaces=(openoffice-en-ZA)
+  conflicts=(openoffice-en-ZA)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_en-ZA/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-eo() {
+  pkgdesc="Esperanto language pack for LibreOffice"
+  provides=('openoffice-eo' 'libreoffice-langpack')
+  replaces=(openoffice-eo)
+  conflicts=(openoffice-eo)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_eo/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-es() {
+  pkgdesc="Spanish language pack for LibreOffice"
+  provides=('openoffice-es' 'libreoffice-langpack')
+  replaces=(openoffice-es)
+  conflicts=(openoffice-es)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_es/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-et() {
+  pkgdesc="Estonian language pack for LibreOffice"
+  provides=('openoffice-et' 'libreoffice-langpack')
+  replaces=(openoffice-et)
+  conflicts=(openoffice-et)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_et/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-eu() {
+  pkgdesc="Basque language pack for LibreOffice"
+  provides=('openoffice-eu' 'libreoffice-langpack')
+  replaces=(openoffice-eu)
+  conflicts=(openoffice-eu)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_eu/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-fa() {
+  pkgdesc="Persian language pack for LibreOffice"
+  provides=('openoffice-fa' 'libreoffice-langpack')
+  replaces=(openoffice-fa)
+  conflicts=(openoffice-fa)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_fa/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-fi() {
+  pkgdesc="Finnish language pack for LibreOffice"
+  provides=('openoffice-fi' 'libreoffice-langpack')
+  replaces=(openoffice-fi)
+  conflicts=(openoffice-fi)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_fi/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-fr() {
+  pkgdesc="French language pack for LibreOffice"
+  provides=('openoffice-fr' 'libreoffice-langpack')
+  replaces=(openoffice-fr)
+  conflicts=(openoffice-fr)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_fr/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-ga() {
+  pkgdesc="Irish language pack for LibreOffice"
+  provides=('openoffice-ga' 'libreoffice-langpack')
+  replaces=(openoffice-ga)
+  conflicts=(openoffice-ga)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ga/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-gl() {
+  pkgdesc="Galician language pack for LibreOffice"
+  provides=('openoffice-gl' 'libreoffice-langpack')
+  replaces=(openoffice-gl)
+  conflicts=(openoffice-gl)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_gl/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-gu() {
+  pkgdesc="Gujarati language pack for LibreOffice"
+  provides=('openoffice-gu' 'libreoffice-langpack')
+  replaces=(openoffice-gu)
+  conflicts=(openoffice-gu)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_gu/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-he() {
+  pkgdesc="Hebrew language pack for LibreOffice"
+  provides=('openoffice-he' 'libreoffice-langpack')
+  replaces=(openoffice-he)
+  conflicts=(openoffice-he)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_he/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-hi() {
+  pkgdesc="Hindi language pack for LibreOffice"
+  provides=('openoffice-hi' 'libreoffice-langpack')
+  replaces=(openoffice-hi)
+  conflicts=(openoffice-hi)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_hi/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-hr() {
+  pkgdesc="Croatian language pack for LibreOffice"
+  provides=('openoffice-hr' 'libreoffice-langpack')
+  replaces=(openoffice-hr)
+  conflicts=(openoffice-hr)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_hr/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-hu() {
+  pkgdesc="Hungarian language pack for LibreOffice"
+  provides=('openoffice-hu' 'libreoffice-langpack')
+  replaces=(openoffice-hu)
+  conflicts=(openoffice-hu)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_hu/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-id() {
+  pkgdesc="Bahasa Indonesia language pack for LibreOffice"
+  provides=('openoffice-id' 'libreoffice-langpack')
+  replaces=(openoffice-id)
+  conflicts=(openoffice-id)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_id/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-is() {
+  pkgdesc="Icelandic language pack for LibreOffice"
+  provides=('openoffice-is' 'libreoffice-langpack')
+  replaces=(openoffice-is)
+  conflicts=(openoffice-is)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_is/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-it() {
+  pkgdesc="Italian language pack for LibreOffice"
+  provides=('openoffice-it' 'libreoffice-langpack')
+  replaces=(openoffice-it)
+  conflicts=(openoffice-it)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_it/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-ja() {
+  pkgdesc="Japanese language pack for LibreOffice"
+  provides=('openoffice-ja' 'libreoffice-langpack')
+  replaces=(openoffice-ja)
+  conflicts=(openoffice-ja)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ja/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-ka() {
+  pkgdesc="Georgian language pack for LibreOffice"
+  provides=('openoffice-ka' 'libreoffice-langpack')
+  replaces=(openoffice-ka)
+  conflicts=(openoffice-ka)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ka/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-kk() {
+  pkgdesc="Kazakh language pack for LibreOffice"
+  provides=('openoffice-kk' 'libreoffice-langpack')
+  replaces=(openoffice-kk)
+  conflicts=(openoffice-kk)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_kk/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-km() {
+  pkgdesc="Khmer (Cambodia) language pack for LibreOffice"
+  provides=('openoffice-km' 'libreoffice-langpack')
+  replaces=(openoffice-km)
+  conflicts=(openoffice-km)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_km/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-kn() {
+  pkgdesc="Kannada language pack for LibreOffice"
+  provides=('openoffice-kn' 'libreoffice-langpack')
+  replaces=(openoffice-kn)
+  conflicts=(openoffice-kn)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_kn/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-ko() {
+  pkgdesc="Korean language pack for LibreOffice"
+  provides=('openoffice-ko' 'libreoffice-langpack')
+  replaces=(openoffice-ko)
+  conflicts=(openoffice-ko)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ko/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-kok() {
+  pkgdesc="Konkani language pack for LibreOffice"
+  provides=('openoffice-kok' 'libreoffice-langpack')
+  replaces=(openoffice-kok)
+  conflicts=(openoffice-kok)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_kok/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-ks() {
+  pkgdesc="Kashmiri language pack for LibreOffice"
+  provides=('openoffice-ks' 'libreoffice-langpack')
+  replaces=(openoffice-ks)
+  conflicts=(openoffice-ks)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ks/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-ku() {
+  pkgdesc="Kurdish language pack for LibreOffice"
+  provides=('openoffice-ku' 'libreoffice-langpack')
+  replaces=(openoffice-ku)
+  conflicts=(openoffice-ku)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ku/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-lo() {
+  pkgdesc="Lao language pack for LibreOffice"
+  provides=('openoffice-lo' 'libreoffice-langpack')
+  replaces=(openoffice-lo)
+  conflicts=(openoffice-lo)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_lo/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-lt() {
+  pkgdesc="Lithuanian language pack for LibreOffice"
+  provides=('openoffice-lt' 'libreoffice-langpack')
+  replaces=(openoffice-lt)
+  conflicts=(openoffice-lt)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_lt/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-lv() {
+  pkgdesc="Latvian language pack for LibreOffice"
+  provides=('openoffice-lv' 'libreoffice-langpack')
+  replaces=(openoffice-lv)
+  conflicts=(openoffice-lv)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_lv/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-mai() {
+  pkgdesc="Maithili language pack for LibreOffice"
+  provides=('openoffice-mai' 'libreoffice-langpack')
+  replaces=(openoffice-mai)
+  conflicts=(openoffice-mai)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_mai/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-mk() {
+  pkgdesc="Macedonian language pack for LibreOffice"
+  provides=('openoffice-mk' 'libreoffice-langpack')
+  replaces=(openoffice-mk)
+  conflicts=(openoffice-mk)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_mk/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-ml() {
+  pkgdesc="Malayalam language pack for LibreOffice"
+  provides=('openoffice-ml' 'libreoffice-langpack')
+  replaces=(openoffice-ml)
+  conflicts=(openoffice-ml)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ml/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-mn() {
+  pkgdesc="Mongolian language pack for LibreOffice"
+  provides=('openoffice-mn' 'libreoffice-langpack')
+  replaces=(openoffice-mn)
+  conflicts=(openoffice-mn)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_mn/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-mni() {
+  pkgdesc="Manipuri language pack for LibreOffice"
+  provides=('openoffice-mni' 'libreoffice-langpack')
+  replaces=(openoffice-mni)
+  conflicts=(openoffice-mni)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_mni/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-mr() {
+  pkgdesc="Marathi language pack for LibreOffice"
+  provides=('openoffice-mr' 'libreoffice-langpack')
+  replaces=(openoffice-mr)
+  conflicts=(openoffice-mr)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_mr/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-my() {
+  pkgdesc="Burmese language pack for LibreOffice"
+  provides=('openoffice-my' 'libreoffice-langpack')
+  replaces=(openoffice-my)
+  conflicts=(openoffice-my)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_my/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-nb() {
+  pkgdesc="Norwegian Bokmal language pack for LibreOffice"
+  provides=('openoffice-nb' 'libreoffice-langpack')
+  replaces=(openoffice-nb)
+  conflicts=(openoffice-nb)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_nb/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-ne() {
+  pkgdesc="Nepali language pack for LibreOffice"
+  provides=('openoffice-ne' 'libreoffice-langpack')
+  replaces=('openoffice-ne')
+  conflicts=(openoffice-ne)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ne/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-nl() {
+  pkgdesc="Dutch language pack for LibreOffice"
+  provides=('openoffice-nl' 'libreoffice-langpack')
+  replaces=(openoffice-nl)
+  conflicts=(openoffice-nl)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_nl/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-nn() {
+  pkgdesc="Norwegian Nynorsk language pack for LibreOffice"
+  provides=('openoffice-nn' 'libreoffice-langpack')
+  replaces=(openoffice-nn)
+  conflicts=(openoffice-nn)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_nn/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-nr() {
+  pkgdesc="Ndebele (South) language pack for LibreOffice"
+  provides=(openoffice-nr)
+  replaces=(openoffice-nr)
+  conflicts=(openoffice-nr)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_nr/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-nso() {
+  pkgdesc="Northern Sotho language pack for LibreOffice"
+  provides=('openoffice-ns' 'libreoffice-ns' 'libreoffice-langpack')
+  replaces=('openoffice-ns' 'libreoffice-ns')
+  conflicts=(openoffice-ns)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_nso/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-oc() {
+  pkgdesc="Occitan language pack for LibreOffice"
+  provides=('openoffice-oc' 'libreoffice-langpack')
+  replaces=(openoffice-oc)
+  conflicts=(openoffice-oc)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_oc/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-om() {
+  pkgdesc="Oromo language pack for LibreOffice"
+  provides=('openoffice-om' 'libreoffice-langpack')
+  replaces=(openoffice-om)
+  conflicts=(openoffice-om)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_om/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-or() {
+  pkgdesc="Oriya language pack for LibreOffice"
+  provides=('openoffice-or' 'libreoffice-langpack')
+  replaces=(openoffice-or)
+  conflicts=(openoffice-or)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_or/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-pa-IN() {
+  pkgdesc="Punjabi (India) language pack for LibreOffice"
+  provides=('openoffice-pa-IN' 'libreoffice-langpack')
+  replaces=(openoffice-pa-IN)
+  conflicts=(openoffice-pa-IN)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_pa-IN/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-pl() {
+  pkgdesc="Polish language pack for LibreOffice"
+  provides=('openoffice-pl' 'libreoffice-langpack')
+  replaces=(openoffice-pl)
+  conflicts=(openoffice-pl)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_pl/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-pt-BR() {
+  pkgdesc="Portuguese (Brasil) language pack for LibreOffice"
+  provides=('openoffice-pt-BR' 'libreoffice-langpack')
+  replaces=(openoffice-pt-BR)
+  conflicts=(openoffice-pt-BR)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_pt-BR/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-pt() {
+  pkgdesc="Portuguese language pack for LibreOffice"
+  provides=('openoffice-pt' 'libreoffice-langpack')
+  replaces=(openoffice-pt)
+  conflicts=(openoffice-pt)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_pt/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-ro() {
+  pkgdesc="Romanian language pack for LibreOffice"
+  provides=('openoffice-ro' 'libreoffice-langpack')
+  replaces=(openoffice-ro)
+  conflicts=(openoffice-ro)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ro/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-ru() {
+  pkgdesc="Russian language pack for LibreOffice"
+  provides=('openoffice-ru' 'libreoffice-langpack')
+  replaces=(openoffice-ru)
+  conflicts=(openoffice-ru)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ru/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-rw() {
+  pkgdesc="Kinyarwanda language pack for LibreOffice"
+  provides=('openoffice-rw' 'libreoffice-langpack')
+  replaces=(openoffice-rw)
+  conflicts=(openoffice-rw)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_rw/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-sa-IN() {
+  pkgdesc="Sanskrit (India) language pack for LibreOffice"
+  provides=('openoffice-sa-IN' 'libreoffice-langpack')
+  replaces=(openoffice-sa-IN)
+  conflicts=(openoffice-sa-IN)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sa-IN/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-sat() {
+  pkgdesc="Santali language pack for LibreOffice"
+  provides=('openoffice-sat' 'libreoffice-langpack')
+  replaces=(openoffice-sat)
+  conflicts=(openoffice-sat)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sat/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-sd() {
+  pkgdesc="Sindhi language pack for LibreOffice"
+  provides=('openoffice-sd' 'libreoffice-langpack')
+  replaces=(openoffice-sd)
+  conflicts=(openoffice-sd)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sd/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-sh() {
+  pkgdesc="Serbo-Croatian language pack for LibreOffice"
+  provides=('openoffice-sh' 'libreoffice-langpack')
+  replaces=(openoffice-sh)
+  conflicts=(openoffice-sh)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sh/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-si() {
+  pkgdesc="Singhalese language pack for LibreOffice"
+  provides=('openoffice-si' 'libreoffice-langpack')
+  replaces=(openoffice-si)
+  conflicts=(openoffice-si)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_si/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-sk() {
+  pkgdesc="Slovak language pack for LibreOffice"
+  provides=('openoffice-sk' 'libreoffice-langpack')
+  replaces=(openoffice-sk)
+  conflicts=(openoffice-sk)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sk/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-sl() {
+  pkgdesc="Slovenian language pack for LibreOffice"
+  provides=('openoffice-sl' 'libreoffice-langpack')
+  replaces=(openoffice-sl)
+  conflicts=(openoffice-sl)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sl/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-sq() {
+  pkgdesc="Albanien language pack for LibreOffice"
+  provides=('openoffice-sq' 'libreoffice-langpack')
+  replaces=(openoffice-sq)
+  conflicts=(openoffice-sq)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sq/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-sr() {
+  pkgdesc="Serbian language pack for LibreOffice"
+  provides=('openoffice-sr' 'libreoffice-langpack')
+  replaces=(openoffice-sr)
+  conflicts=(openoffice-sr)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sr/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-ss() {
+  pkgdesc="Swati language pack for LibreOffice"
+  provides=('openoffice-ss' 'libreoffice-langpack')
+  replaces=(openoffice-ss)
+  conflicts=(openoffice-ss)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ss/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-st() {
+  pkgdesc="Southern Sotho language pack for LibreOffice"
+  provides=('openoffice-st' 'libreoffice-langpack')
+  replaces=(openoffice-st)
+  conflicts=(openoffice-st)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_st/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-sv() {
+  pkgdesc="Swedish language pack for LibreOffice"
+  provides=('openoffice-sv' 'libreoffice-langpack')
+  replaces=(openoffice-sv)
+  conflicts=(openoffice-sv)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sv/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-sw-TZ() {
+  pkgdesc="Swahili (Tanzania) language pack for LibreOffice"
+  provides=('openoffice-sw-TZ' 'libreoffice-langpack')
+  replaces=(openoffice-sw-TZ)
+  conflicts=(openoffice-sw-TZ)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sw-TZ/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-ta() {
+  pkgdesc="Tamil language pack for LibreOffice"
+  provides=('openoffice-ta' 'libreoffice-langpack')
+  replaces=(openoffice-ta)
+  conflicts=(openoffice-ta)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ta/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-te() {
+  pkgdesc="Telugu language pack for LibreOffice"
+  provides=('openoffice-te' 'libreoffice-langpack')
+  replaces=(openoffice-te)
+  conflicts=(openoffice-te)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_te/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-tg() {
+  pkgdesc="Tajik language pack for LibreOffice"
+  provides=('openoffice-tg' 'libreoffice-langpack')
+  replaces=(openoffice-tg)
+  conflicts=(openoffice-tg)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_tg/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-th() {
+  pkgdesc="Thai language pack for LibreOffice"
+  provides=('openoffice-th' 'libreoffice-langpack')
+  replaces=(openoffice-th)
+  conflicts=(openoffice-th)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_th/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-tn() {
+  pkgdesc="Tswana language pack for LibreOffice"
+  provides=('openoffice-tn' 'libreoffice-langpack')
+  replaces=(openoffice-tn)
+  conflicts=(openoffice-tn)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_tn/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-tr() {
+  pkgdesc="Turkish language pack for LibreOffice"
+  provides=('openoffice-tr' 'libreoffice-langpack')
+  replaces=(openoffice-tr)
+  conflicts=(openoffice-tr)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_tr/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-ts() {
+  pkgdesc="Tsonga language pack for LibreOffice"
+  provides=('openoffice-ts' 'libreoffice-langpack')
+  replaces=(openoffice-ts)
+  conflicts=(openoffice-ts)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ts/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-ug() {
+  pkgdesc="Uighur language pack for LibreOffice"
+  provides=('openoffice-ug' 'libreoffice-langpack')
+  replaces=(openoffice-ug)
+  conflicts=(openoffice-ug)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ug/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-uk() {
+  pkgdesc="Ukrainian language pack for LibreOffice"
+  provides=('openoffice-uk' 'libreoffice-langpack')
+  replaces=(openoffice-uk)
+  conflicts=(openoffice-uk)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_uk/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-uz() {
+  pkgdesc="Uzbek language pack for LibreOffice"
+  provides=('openoffice-uz' 'libreoffice-langpack')
+  replaces=(openoffice-uz)
+  conflicts=(openoffice-uz)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_uz/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-ve() {
+  pkgdesc="Venda language pack for LibreOffice"
+  provides=('openoffice-ve' 'libreoffice-langpack')
+  replaces=(openoffice-ve)
+  conflicts=(openoffice-ve)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ve/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-vi() {
+  pkgdesc="Vietnamese language pack for LibreOffice"
+  provides=('openoffice-vi' 'libreoffice-langpack')
+  replaces=(openoffice-vi)
+  conflicts=(openoffice-vi)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_vi/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-xh() {
+  pkgdesc="Xhosa language pack for LibreOffice"
+  provides=('openoffice-xh' 'libreoffice-langpack')
+  replaces=(openoffice-xh)
+  conflicts=(openoffice-xh)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_xh/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-zh-CN() {
+  pkgdesc="Chinese (simplified) language pack for LibreOffice"
+  provides=('openoffice-zh-CN' 'libreoffice-langpack')
+  replaces=(openoffice-zh-CN)
+  conflicts=(openoffice-zh-CN)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_zh-CN/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-zh-TW() {
+  pkgdesc="Chinese (traditional) language pack for LibreOffice"
+  provides=('openoffice-zh-TW' 'libreoffice-langpack')
+  replaces=(openoffice-zh-TW)
+  conflicts=(openoffice-zh-TW)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_zh-TW/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
+
+package_libreoffice-zu() {
+  pkgdesc="Zulu language pack for LibreOffice"
+  provides=('openoffice-zu' 'libreoffice-langpack')
+  replaces=(openoffice-zu)
+  conflicts=(openoffice-zu)
+  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_zu/RPMS
+  mkdir -p "${pkgdir}"/usr/lib/libreoffice
+  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
+  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
+}
diff --git a/extra/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch b/extra/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch
new file mode 100644
index 000000000..8e54e02cb
--- /dev/null
+++ b/extra/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch
@@ -0,0 +1,18 @@
+The static VisPluginInfo in nastyfft was declared as const, but libvisual write
+to its refcount when it visual_object_unref()s it (nasty!).  This is broken at
+various levels: libvisual shouldn't be writing to this static plugin which is
+allocated by a dlopen()ed plugin, and it should also honor the "const
+VisPluginInfo" API...  Anyway, nastyfft was the only occurrence and this fixes
+the crash for now; LP: #287448.
+
+--- libvisual-plugins-0.4.0.dfsg.1.orig/plugins/actor/nastyfft/actor_nastyfft.c
++++ libvisual-plugins-0.4.0.dfsg.1/plugins/actor/nastyfft/actor_nastyfft.c
+@@ -80,7 +80,7 @@
+ 		.vidoptions.depth = VISUAL_VIDEO_DEPTH_GL
+ 	}};
+ 
+-	static const VisPluginInfo info[] = {{
++	static VisPluginInfo info[] = {{
+ 		.type = VISUAL_PLUGIN_TYPE_ACTOR,
+ 
+ 		.plugname = N_("nastyfft"),
diff --git a/extra/libvisual-plugins/PKGBUILD b/extra/libvisual-plugins/PKGBUILD
index 7c0010b8e..a929bdc64 100644
--- a/extra/libvisual-plugins/PKGBUILD
+++ b/extra/libvisual-plugins/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 148842 2012-02-05 11:52:32Z ibiru $
+# $Id: PKGBUILD 153728 2012-03-18 21:20:45Z jgc $
 # Maintainer: damir <damir@archlinux.org>
 
 pkgname=libvisual-plugins
 pkgver=0.4.0
-pkgrel=5
+pkgrel=6
 pkgdesc="plugins for libvisual"
 arch=("i686" "x86_64" 'mips64el')
 license=('GPL')
@@ -16,13 +16,15 @@ source=(http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-plugins
         03_build_against_gl_fixes.patch
         04_lv_analyzer_build_fix.patch
         05_fix_po.patch
-        050_all_automagic.patch)
+        050_all_automagic.patch
+        60_no-const-vispluginfo-in-nastyfft.patch)
 md5sums=('4330e9287f9d6fae02f482f428a1e77b'
          'f9cfb607bfcbfef60830fae4e7dc6963'
          '116701408747dbb87dc134434478ebe2'
          '01678a8f1584c76a44e59d81003a1109'
          '6189b7427c4e11c8b8d6c6266d6a1629'
-         'b50ae94c424a5f0af235deffa8451eb6')
+         'b50ae94c424a5f0af235deffa8451eb6'
+         '7012518727cb072a7e90a826a5577cc6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -30,6 +32,7 @@ build() {
   patch -Np1 -i "${srcdir}/03_build_against_gl_fixes.patch"
   patch -Np1 -i "${srcdir}/04_lv_analyzer_build_fix.patch"
   patch -Np0 -i "${srcdir}/050_all_automagic.patch"
+  patch -Np1 -i "${srcdir}/60_no-const-vispluginfo-in-nastyfft.patch"
 
   autoreconf -fi
   # Apply later as autoreconf overwrites po/Makefile.in.in
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD
index 28ae9a12e..1e271bb87 100644
--- a/extra/octave/PKGBUILD
+++ b/extra/octave/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 151390 2012-02-26 08:18:31Z ronald $
+# $Id: PKGBUILD 153724 2012-03-18 19:07:27Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor : shining <shiningxc.at.gmail.com>
 # Contributor : cyberdune <cyberdune@gmail.com>
 
 pkgname=octave
 pkgver=3.6.1
-pkgrel=1
+pkgrel=2
 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' 'fltk')
-makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core')
+depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull' 'fltk' 'suitesparse') 
+makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'suitesparse' 'texlive-core')
 optdepends=('texinfo: for help-support in octave'
-            'gnuplot: alternative plotting'
-	    'umfpack: LU decomposition of some large sparse matrices')
+            'gnuplot: alternative plotting')
 source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2")
 options=('!emptydirs')
 install=octave.install
@@ -27,7 +26,7 @@ build() {
   FFLAGS="-O -ffloat-store" \
 
   ./configure --prefix=/usr --libexecdir=/usr/lib \
-  --enable-shared --disable-static --with-quantum-depth=16
+  --enable-shared --disable-static
 
   LANG=C make
 }
diff --git a/extra/python-pygame/PKGBUILD b/extra/python-pygame/PKGBUILD
index 3bd8c4847..9bd6d385e 100644
--- a/extra/python-pygame/PKGBUILD
+++ b/extra/python-pygame/PKGBUILD
@@ -1,40 +1,37 @@
-# $Id: PKGBUILD 148892 2012-02-05 11:54:30Z ibiru $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: john(?)
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# $Id: PKGBUILD 153735 2012-03-19 03:45:07Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
 pkgname=python-pygame
 pkgver=1.9.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Python game library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pygame.org/"
 license=('LGPL')
-depends=('sdl_mixer' 'libvorbis' 'sdl_ttf' 'sdl_image' 'smpeg')
-makedepends=('python2' 'portmidi') 
-replaces=('pygame')
-provides=('pygame')
-changelog=ChangeLog
-source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz 'config.patch'
-'pygame-v4l.patch')
-md5sums=('1c4cdc708d17c8250a2d78ef997222fc'
-         'aaa668f3cd710d8604114501ea6a6f48'
-         '9915b63865c16519e80007909beed876')
+depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'python2' 'portmidi')
+source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz \
+        config.patch pygame-v4l.patch)
+sha1sums=('a45aeb0623e36ae7a1707b5f41ee6274f72ca4fa'
+          '285815e28705d5a2aea53c9d952d35fddf10dd13'
+          '7e693fb2ef5ef636f9965ba1a4eb854f8b0b5070')
 
 build() {
-	cd "${srcdir}/pygame-${pkgver}release"
-	patch -Np0 -i "${srcdir}/config.patch"
-    patch -Np1 -i "${srcdir}/pygame-v4l.patch"
+  cd "${srcdir}/pygame-${pkgver}release"
+  patch -Np0 -i "${srcdir}/config.patch"
+  patch -Np1 -i "${srcdir}/pygame-v4l.patch"
 }
 
 package() {
-	cd "${srcdir}/pygame-${pkgver}release"
-	python2 config.py -auto
-	python2 setup.py install --root="${pkgdir}" --prefix=/usr
-	# Copying the examples and tests
-	cp -R examples lib/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame"
-	cp -R test/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame/tests"
-	# Fixing permissions
-	chmod 644 "${pkgdir}"/usr/include/python2.7/pygame/*
+  cd "${srcdir}/pygame-${pkgver}release"
+  python2 config.py -auto
+  python2 setup.py install --root="${pkgdir}" --prefix=/usr
+
+# Copying the examples and tests
+  cp -R examples lib/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame"
+  cp -R test/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame/tests"
+
+  find "${pkgdir}" -type f -exec sed -i 's#/usr/bin/env python#/usr/bin/env python2#' {} +
+
+# Fixing permissions
+  chmod 644 "${pkgdir}"/usr/include/python2.7/pygame/*
 }
diff --git a/extra/qoauth/PKGBUILD b/extra/qoauth/PKGBUILD
new file mode 100644
index 000000000..86b4adc21
--- /dev/null
+++ b/extra/qoauth/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 153702 2012-03-18 08:58:10Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Peter Richard Lewis <plewis@aur.archlinux.org>
+
+pkgname=qoauth
+pkgver=1.0.1
+pkgrel=3
+pkgdesc="Support with OAuth-powered network services"
+url='http://github.com/ayoy/qoauth'
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('qca')
+makedepends=('cmake' 'automoc4')
+source=("http://files.ayoy.net/qoauth/release/current/src/${pkgname}-${pkgver}-src.tar.bz2")
+md5sums=('bcb6d01e6c9a6fb22099c9e0f5889578')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}-src"
+
+  # Install libraries in /usr/lib/
+  sed -i 's|lib64|lib|' src/src.pro
+
+  qmake
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}-src"
+  make INSTALL_ROOT="${pkgdir}" install
+}
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index a8ebc4110..742d7801a 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 151354 2012-02-25 16:38:53Z ronald $
+# $Id: PKGBUILD 153726 2012-03-18 19:57:52Z 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.14.1
-pkgrel=3
+pkgver=2.14.2
+pkgrel=1
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -20,9 +20,10 @@ source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
 	'r.desktop'
 	'r.png')
 install=r.install
-sha1sums=('5803a213480a749e36bccc155aecb13070ade096'
+sha1sums=('523dca7694e4d0c8701fcc783ea3767e46fe7a62'
           '13aa29219bcaa102e575de8c1c8e0833d233e836'
           'a69a07ec363440efc18ce0a7f2af103375dea978')
+
 build() {
    cd "${srcdir}/R-${pkgver}"
    sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c
diff --git a/extra/rox/PKGBUILD b/extra/rox/PKGBUILD
index 30d4e3554..e852a9f96 100644
--- a/extra/rox/PKGBUILD
+++ b/extra/rox/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 140263 2011-10-11 07:46:57Z eric $
+# $Id: PKGBUILD 153733 2012-03-19 00:48:00Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
@@ -20,7 +20,7 @@ md5sums=('0eebf05a67f7932367750ebf9faf215d'
 
 build() {
   cd "${srcdir}/rox-filer-${pkgver}"
-  ./ROX-Filer/AppRun --compile
+  ./ROX-Filer/AppRun --compile LIBS="-ldl -lm"
 # finally we render a png as fallback for svg unaware menu applications
 # Attention: always make sure you check the dimensions of the source-svg,
 # you can read the dimensions via inkscape's export function
diff --git a/extra/suitesparse/PKGBUILD b/extra/suitesparse/PKGBUILD
new file mode 100644
index 000000000..ab9b16cd1
--- /dev/null
+++ b/extra/suitesparse/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 153722 2012-03-18 17:12:55Z ronald $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=suitesparse
+pkgver=3.7.0
+pkgrel=1
+pkgdesc="A collection of sparse matrix libraries"
+url="http://www.cise.ufl.edu/research/sparse/SuiteSparse/"
+arch=('i686' 'x86_64')
+conflicts=('umfpack')
+provides=('umfpack')
+replaces=('umfpack')
+depends=('blas' 'lapack')
+makedepends=('gcc-fortran')
+license=('GPL')
+source=(http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-$pkgver.tar.gz)
+sha1sums=('d0eb24b43ee2f7def032e80eaa7a589f94f546fc')
+
+build() {
+   cd "$srcdir"/SuiteSparse
+   export CFLAGS=" ${CFLAGS} -DNPARTITION"
+   
+   make -C UFconfig/xerbla
+   make -C UFconfig 
+   for _lib in AMD CAMD COLAMD BTF KLU LDL CCOLAMD UMFPACK CHOLMOD CXSparse SPQR; do
+      make -C ${_lib} library
+   done
+}
+
+
+package() {
+   cd "${srcdir}"/SuiteSparse
+   install -dm755 "${pkgdir}"/usr/{lib,include}
+   
+   for _lib in UFconfig AMD CAMD COLAMD BTF KLU LDL CCOLAMD UMFPACK CHOLMOD CXSparse SPQR; do
+      make -C ${_lib} INSTALL_LIB="${pkgdir}"/usr/lib INSTALL_INCLUDE="${pkgdir}"/usr/include install
+   done
+
+   chmod 644 "${pkgdir}"/usr/include/*.{h,hpp}
+}
diff --git a/extra/xf86-input-evdev/Fix_inverted_horizontal_scroll.diff b/extra/xf86-input-evdev/Fix_inverted_horizontal_scroll.diff
new file mode 100644
index 000000000..93c54d300
--- /dev/null
+++ b/extra/xf86-input-evdev/Fix_inverted_horizontal_scroll.diff
@@ -0,0 +1,27 @@
+From 99340147b9092a5aaec997eca407282a51e1f063 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu, 15 Mar 2012 05:46:32 +0000
+Subject: Fix inverted horizontal scroll (#46205)
+
+REL_HWHEEL has a positive increment, not a negative one like REL_WHEEL.
+
+X.Org Bug 46205 <http://bugs.freedesktop.org/show_bug.cgi?id=46205>
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
+---
+diff --git a/src/evdev.c b/src/evdev.c
+index d540b87..8cf630c 100644
+--- a/src/evdev.c
++++ b/src/evdev.c
+@@ -1600,7 +1600,7 @@ EvdevAddRelValuatorClass(DeviceIntPtr device)
+         else if (axis == REL_DIAL)
+             SetScrollValuator(device, axnum, SCROLL_TYPE_VERTICAL, -1.0, SCROLL_FLAG_NONE);
+         else if (axis == REL_HWHEEL)
+-            SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, -1.0, SCROLL_FLAG_NONE);
++            SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, 1.0, SCROLL_FLAG_NONE);
+ #endif
+     }
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-input-evdev/PKGBUILD b/extra/xf86-input-evdev/PKGBUILD
index ed0d28da3..f8cfb55cf 100644
--- a/extra/xf86-input-evdev/PKGBUILD
+++ b/extra/xf86-input-evdev/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153303 2012-03-12 20:52:38Z andyrtr $
+# $Id: PKGBUILD 153700 2012-03-18 08:50:36Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <Alexander@archlinux.org
 
 pkgname=xf86-input-evdev
 pkgver=2.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org evdev input driver"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -14,11 +14,14 @@ makedepends=('xorg-server-devel>=1.11.99.902')
 conflicts=('xorg-server<1.11.99.902')
 options=('!libtool' '!makeflags')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('f0cb2d8400c33e8e83b538b53512e77ba73367fa')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        Fix_inverted_horizontal_scroll.diff)
+sha1sums=('f0cb2d8400c33e8e83b538b53512e77ba73367fa'
+          'e959e710d9a0c60a3af967148b9d5e014544993c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/Fix_inverted_horizontal_scroll.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/libre/linux-libre/.directory b/libre/linux-libre/.directory
new file mode 100644
index 000000000..73b1767da
--- /dev/null
+++ b/libre/linux-libre/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,3,19,13,36,16
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 36be2cd14..67e0f252c 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -11,18 +11,19 @@ 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=-LIBRE
-_basekernel=3.2
-_sublevel=11
-pkgver=${_basekernel}.${_sublevel}
-_lxopkgver=${_basekernel}.11 # nearly always the same as pkgver
+_basekernel=3.3
+#_sublevel=11
+#pkgver=${_basekernel}.${_sublevel}
+pkgver=${_basekernel}
+#_lxopkgver=${_basekernel}.11 # nearly always the same as pkgver
 pkgrel=1
 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"
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
+        #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
@@ -33,12 +34,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li
         'change-default-console-loglevel.patch'
         'i915-fix-ghost-tv-output.patch'
         'i915-gpu-finish.patch'
-        'ext4-options.patch'
-        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-libre-lemote_0lxo_mipsel.tar.bz2")
-md5sums=('27c641c4f6785fc647cdd3e44963a55c'
-         '09abd6a4e9ae7373a3151b61781ab2fe'
-         '921f108c7a4985f7f8b41d72ca9bf915'
-         'f18ac3f790b0daa43f21dda04cceb90b'
+        'ext4-options.patch')
+        #"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-libre-lemote_0lxo_mipsel.tar.bz2")
+md5sums=('5487da14ca81715a469c7594d39722fa'
+         '20cd44a8bc4056cfa0b9ce2cc659dd30'
+         'aaf85ef4f4c87959c07a5cef7c216788'
          'a8a3843046926eb7ab81312cd438c5c5'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
@@ -46,20 +46,19 @@ md5sums=('27c641c4f6785fc647cdd3e44963a55c'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
          '4cd79aa147825837dc8bc9f6b736c0a0'
-         'f36222e7ce20c8e4dc27376f9be60f6c'
-         'd796d625ace45a4e0aa676df9248d703')
-if [ "$CARCH" != "mips64el" ]; then
-    # Don't use the Loongson-specific patches on non-mips64el arches.
-    unset source[${#source[@]}-1]
-    unset md5sums[${#md5sums[@]}-1]
-fi
+         'bb7fd1aa23016c8057046b84fd4eb528')
+#if [ "$CARCH" != "mips64el" ]; then
+#    # Don't use the Loongson-specific patches on non-mips64el arches.
+#    unset source[${#source[@]}-1]
+#    unset md5sums[${#md5sums[@]}-1]
+#fi
 
 build() {
   cd "${srcdir}/linux-${_basekernel}"
 
-  if [ "${_basekernel}" != "${pkgver}" ]; then
-    patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
-  fi
+#  if [ "${_basekernel}" != "${pkgver}" ]; then
+#    patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
+#  fi
 
   # Add freedo as boot logo
   patch -Np1 -i "${srcdir}/boot-logo.patch"
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 5a50c4e04..6003887c9 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.6-1 Kernel Configuration
+# Linux/i386 3.3.0 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -17,11 +17,9 @@ CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_GPIO=y
@@ -40,7 +38,6 @@ CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ZONE_DMA32 is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -89,6 +86,7 @@ CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_AUDIT_WATCH=y
 CONFIG_AUDIT_TREE=y
+# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
 CONFIG_HAVE_GENERIC_HARDIRQS=y
 
 #
@@ -111,6 +109,7 @@ CONFIG_PREEMPT_RCU=y
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
+CONFIG_RCU_FAST_NO_HZ=y
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_RCU_BOOST is not set
 CONFIG_IKCONFIG=y
@@ -128,6 +127,7 @@ CONFIG_RESOURCE_COUNTERS=y
 CONFIG_CGROUP_MEM_RES_CTLR=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 # CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
+CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -135,6 +135,7 @@ CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_DEBUG_BLK_CGROUP is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
@@ -194,6 +195,7 @@ CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
+CONFIG_OPROFILE_NMI_TIMER=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -213,6 +215,9 @@ 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
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
 
 #
 # GCOV-based kernel profiling
@@ -237,6 +242,29 @@ CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_THROTTLING=y
 
 #
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+
+#
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
@@ -283,6 +311,7 @@ CONFIG_FREEZER=y
 #
 # Processor type and features
 #
+CONFIG_ZONE_DMA=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
@@ -335,8 +364,6 @@ CONFIG_M686=y
 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
@@ -407,6 +434,8 @@ CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_ARCH_DISCARD_MEMBLOCK=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_COMPACTION=y
@@ -422,8 +451,8 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_TRANSPARENT_HUGEPAGE=y
-# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
 CONFIG_CLEANCACHE=y
 # CONFIG_HIGHPTE is not set
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
@@ -438,6 +467,7 @@ CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
 CONFIG_EFI=y
+CONFIG_EFI_STUB=y
 CONFIG_SECCOMP=y
 CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_HZ_100 is not set
@@ -520,17 +550,17 @@ CONFIG_APM_DO_ENABLE=y
 # CPU Frequency scaling
 #
 CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
+CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 
 #
@@ -654,6 +684,7 @@ CONFIG_RAPIDIO_TSI500=y
 # Executable file formats / Emulations
 #
 CONFIG_BINFMT_ELF=y
+CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_HAVE_AOUT=y
 CONFIG_BINFMT_AOUT=m
@@ -667,6 +698,7 @@ CONFIG_NET=y
 #
 CONFIG_PACKET=y
 CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=m
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
 # CONFIG_XFRM_SUB_POLICY is not set
@@ -705,6 +737,7 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_LRO=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
+CONFIG_INET_UDP_DIAG=m
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
 CONFIG_TCP_CONG_CUBIC=y
@@ -756,12 +789,14 @@ CONFIG_BRIDGE_NETFILTER=y
 # Core Netfilter Configuration
 #
 CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_ACCT=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_PROCFS is not set
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CT_PROTO_DCCP=m
@@ -829,6 +864,7 @@ CONFIG_NETFILTER_XT_MATCH_CPU=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
@@ -840,6 +876,7 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
 CONFIG_NETFILTER_XT_MATCH_OSF=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
@@ -900,6 +937,11 @@ CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
 
 #
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
 # IPVS application helper
 #
 CONFIG_IP_VS_FTP=m
@@ -911,11 +953,11 @@ CONFIG_IP_VS_PE_SIP=m
 #
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
@@ -962,6 +1004,7 @@ CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_IP6_NF_TARGET_LOG=m
@@ -1112,9 +1155,12 @@ CONFIG_NET_SCH_FIFO=y
 CONFIG_DNS_RESOLVER=y
 CONFIG_BATMAN_ADV=m
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_OPENVSWITCH=m
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
+CONFIG_NETPRIO_CGROUP=m
+CONFIG_BQL=y
 
 #
 # Network testing
@@ -1181,8 +1227,6 @@ CONFIG_VLSI_FIR=m
 CONFIG_VIA_FIR=m
 CONFIG_MCS_FIR=m
 CONFIG_BT=m
-CONFIG_BT_L2CAP=y
-CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
@@ -1259,11 +1303,13 @@ CONFIG_NET_9P_VIRTIO=m
 CONFIG_CAIF=m
 # CONFIG_CAIF_DEBUG is not set
 CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
 CONFIG_CEPH_LIB=m
 # CONFIG_CEPH_LIB_PRETTYDEBUG is not set
 # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
 CONFIG_NFC=m
 CONFIG_NFC_NCI=m
+# CONFIG_NFC_LLCP is not set
 
 #
 # Near Field Communication (NFC) devices
@@ -1290,9 +1336,12 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=m
 CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_IRQ=y
+# CONFIG_DMA_SHARED_BUFFER is not set
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_MTD=m
@@ -1393,6 +1442,8 @@ CONFIG_MTD_BLOCK2MTD=m
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_DOCG3=m
+CONFIG_BCH_CONST_M=14
+CONFIG_BCH_CONST_T=4
 CONFIG_MTD_NAND_ECC=m
 CONFIG_MTD_NAND_ECC_SMC=y
 CONFIG_MTD_NAND=m
@@ -1430,6 +1481,7 @@ CONFIG_OF=y
 # Device Tree and Open Firmware support
 #
 CONFIG_PROC_DEVICETREE=y
+# CONFIG_OF_SELFTEST is not set
 CONFIG_OF_PROMTREE=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
@@ -1464,6 +1516,7 @@ CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_FD=m
 # CONFIG_BLK_DEV_XD is not set
 # CONFIG_PARIDE is not set
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_CPQ_CISS_DA=m
 # CONFIG_CISS_SCSI_TAPE is not set
@@ -1476,6 +1529,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DRBD=m
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_NVME=m
 CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_UB is not set
@@ -1490,8 +1544,11 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_RBD=m
+
+#
+# Misc devices
+#
 CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_MISC_DEVICES=y
 CONFIG_AD525X_DPOT=m
 CONFIG_AD525X_DPOT_I2C=m
 CONFIG_AD525X_DPOT_SPI=m
@@ -1891,6 +1948,9 @@ CONFIG_MII=m
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKEHARD=m
 CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 CONFIG_NETCONSOLE=m
@@ -1982,6 +2042,7 @@ CONFIG_TIGON3=m
 CONFIG_BNX2X=m
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
+CONFIG_NET_CALXEDA_XGMAC=m
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
@@ -2125,6 +2186,8 @@ CONFIG_EPIC100=m
 CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
+CONFIG_STMMAC_PLATFORM=m
+CONFIG_STMMAC_PCI=m
 # CONFIG_STMMAC_DEBUG_FS is not set
 # CONFIG_STMMAC_DA is not set
 CONFIG_STMMAC_RING=y
@@ -2167,6 +2230,7 @@ CONFIG_STE10XP=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MICREL_PHY=m
 # CONFIG_MDIO_BITBANG is not set
+CONFIG_MICREL_KS8995MA=m
 CONFIG_PLIP=m
 CONFIG_PPP=m
 CONFIG_PPP_BSDCOMP=m
@@ -2257,6 +2321,7 @@ CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
 CONFIG_ATH9K_RATE_CONTROL=y
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_CARL9170=m
@@ -2266,11 +2331,14 @@ CONFIG_CARL9170_WPC=y
 CONFIG_ATH6KL=m
 # CONFIG_ATH6KL_DEBUG is not set
 CONFIG_B43=m
+CONFIG_B43_BCMA=y
+# CONFIG_B43_BCMA_EXTRA is not set
 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
@@ -2292,6 +2360,7 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 CONFIG_BRCMUTIL=m
 CONFIG_BRCMSMAC=m
 CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_SDIO=y
 # CONFIG_BRCMDBG is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
@@ -2317,14 +2386,14 @@ CONFIG_IWLWIFI=m
 #
 # CONFIG_IWLWIFI_DEBUG is not set
 CONFIG_IWLWIFI_DEVICE_TRACING=y
-CONFIG_IWLWIFI_DEVICE_SVTOOL=y
-CONFIG_IWLWIFI_LEGACY=m
+CONFIG_IWLWIFI_DEVICE_TESTMODE=y
+# CONFIG_IWLWIFI_P2P is not set
+CONFIG_IWLEGACY=m
 
 #
 # Debugging Options
 #
-# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
-# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
+# CONFIG_IWLEGACY_DEBUG is not set
 CONFIG_IWL4965=m
 CONFIG_IWL3945=m
 CONFIG_IWM=m
@@ -2389,7 +2458,6 @@ CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
 CONFIG_WL12XX_SPI=m
 CONFIG_WL12XX_SDIO=m
-CONFIG_WL12XX_SDIO_TEST=m
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
@@ -2407,6 +2475,7 @@ CONFIG_WIMAX_I2400M_SDIO=m
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 # CONFIG_WAN is not set
 CONFIG_VMXNET3=m
+CONFIG_HYPERV_NET=m
 CONFIG_ISDN=y
 CONFIG_ISDN_I4L=m
 CONFIG_ISDN_PPP=y
@@ -2587,6 +2656,7 @@ CONFIG_KEYBOARD_QT2160=m
 CONFIG_KEYBOARD_GPIO=m
 CONFIG_KEYBOARD_GPIO_POLLED=m
 CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
 CONFIG_KEYBOARD_MATRIX=m
 # CONFIG_KEYBOARD_LM8323 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
@@ -2596,6 +2666,7 @@ CONFIG_KEYBOARD_MPR121=m
 # CONFIG_KEYBOARD_OPENCORES is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
+CONFIG_KEYBOARD_STMPE=m
 # CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=m
@@ -2663,11 +2734,13 @@ CONFIG_TOUCHSCREEN_AD7879=m
 CONFIG_TOUCHSCREEN_AD7879_I2C=m
 CONFIG_TOUCHSCREEN_AD7879_SPI=m
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
 CONFIG_TOUCHSCREEN_BU21013=m
 CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX=m
 CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GUNZE=m
 CONFIG_TOUCHSCREEN_ELO=m
@@ -2682,6 +2755,7 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
 CONFIG_TOUCHSCREEN_WM831X=m
 CONFIG_TOUCHSCREEN_WM97XX=m
 CONFIG_TOUCHSCREEN_WM9705=y
@@ -2701,6 +2775,7 @@ CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
 CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
 CONFIG_TOUCHSCREEN_USB_GOTOP=y
 CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
 CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
 CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
@@ -2711,6 +2786,7 @@ CONFIG_TOUCHSCREEN_TSC2005=m
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_PCAP=m
 CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_STMPE=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_AB8500_PONKEY=m
@@ -2723,6 +2799,8 @@ CONFIG_INPUT_MC13783_PWRBUTTON=m
 CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_GP2A=m
+CONFIG_INPUT_GPIO_TILT_POLLED=m
 CONFIG_INPUT_WISTRON_BTNS=m
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE2=m
@@ -3020,6 +3098,7 @@ CONFIG_GPIO_MAX7300=m
 CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_STMPE=y
 CONFIG_GPIO_TPS65912=m
 CONFIG_GPIO_WM831X=m
 CONFIG_GPIO_ADP5588=m
@@ -3086,7 +3165,7 @@ CONFIG_BATTERY_DS2760=m
 CONFIG_BATTERY_DS2780=m
 CONFIG_BATTERY_DS2782=m
 CONFIG_BATTERY_OLPC=m
-CONFIG_BATTERY_BQ20Z75=m
+CONFIG_BATTERY_SBS=m
 CONFIG_BATTERY_BQ27x00=m
 CONFIG_BATTERY_BQ27X00_I2C=y
 CONFIG_BATTERY_BQ27X00_PLATFORM=y
@@ -3095,7 +3174,9 @@ CONFIG_BATTERY_MAX17042=m
 CONFIG_CHARGER_PCF50633=m
 CONFIG_CHARGER_ISP1704=m
 CONFIG_CHARGER_MAX8903=m
+CONFIG_CHARGER_LP8727=m
 CONFIG_CHARGER_GPIO=m
+# CONFIG_CHARGER_MANAGER is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -3268,6 +3349,7 @@ CONFIG_SBC7240_WDT=m
 CONFIG_CPU5_WDT=m
 CONFIG_SMSC_SCH311X_WDT=m
 CONFIG_SMSC37B787_WDT=m
+CONFIG_VIA_WDT=m
 CONFIG_W83627HF_WDT=m
 CONFIG_W83697HF_WDT=m
 CONFIG_W83697UG_WDT=m
@@ -3316,7 +3398,11 @@ CONFIG_BCMA_POSSIBLE=y
 #
 # Broadcom specific AMBA
 #
-# CONFIG_BCMA is not set
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_DEBUG is not set
 
 #
 # Multifunction device drivers
@@ -3331,7 +3417,15 @@ CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
 CONFIG_MFD_TPS65912=y
 CONFIG_MFD_TPS65912_SPI=y
+CONFIG_MFD_STMPE=y
+
+#
+# STMPE Interface Drivers
+#
+CONFIG_STMPE_SPI=y
 # CONFIG_MFD_TMIO is not set
+CONFIG_PMIC_DA9052=y
+CONFIG_MFD_DA9052_SPI=y
 CONFIG_MFD_WM8400=m
 CONFIG_MFD_WM831X=y
 CONFIG_MFD_WM831X_SPI=y
@@ -3366,6 +3460,7 @@ CONFIG_REGULATOR_MAX8660=m
 CONFIG_REGULATOR_MAX8952=m
 CONFIG_REGULATOR_WM831X=m
 CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_DA9052=m
 CONFIG_REGULATOR_PCF50633=m
 CONFIG_REGULATOR_LP3971=m
 CONFIG_REGULATOR_LP3972=m
@@ -3408,6 +3503,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
 CONFIG_IR_MCE_KBD_DECODER=m
 CONFIG_IR_LIRC_CODEC=m
 CONFIG_RC_ATI_REMOTE=m
@@ -3449,7 +3545,6 @@ CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_CONTIG=m
 CONFIG_VIDEOBUF_DVB=m
 CONFIG_VIDEO_BTCX=m
 CONFIG_VIDEO_TVEEPROM=m
@@ -3545,6 +3640,7 @@ CONFIG_VIDEO_S5K6AA=m
 # Flash devices
 #
 CONFIG_VIDEO_ADP1653=m
+CONFIG_VIDEO_AS3645A=m
 
 #
 # Video improvement chips
@@ -3558,63 +3654,6 @@ CONFIG_VIDEO_UPD64083=m
 CONFIG_VIDEO_THS7303=m
 CONFIG_VIDEO_M52790=m
 CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_PMS=m
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_TIMBERDALE=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-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
-CONFIG_SOC_CAMERA_OV9740=m
 CONFIG_V4L_USB_DRIVERS=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
@@ -3628,6 +3667,7 @@ CONFIG_USB_GSPCA_CPIA1=m
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
 CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
 CONFIG_USB_GSPCA_KINECT=m
 CONFIG_USB_GSPCA_KONICA=m
 CONFIG_USB_GSPCA_MARS=m
@@ -3687,32 +3727,58 @@ CONFIG_USB_SN9C102=m
 CONFIG_USB_PWC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
 CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
+CONFIG_V4L_PCI_DRIVERS=y
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7164=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set
+# CONFIG_V4L_PLATFORM_DRIVERS is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_MEM2MEM_TESTDEV=m
 CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_CADET=m
-CONFIG_RADIO_RTRACK=m
-CONFIG_RADIO_RTRACK2=m
-CONFIG_RADIO_AZTECH=m
-CONFIG_RADIO_GEMTEK=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MIROPCM20=m
-CONFIG_RADIO_SF16FMI=m
-CONFIG_RADIO_SF16FMR2=m
-CONFIG_RADIO_TERRATEC=m
-CONFIG_RADIO_TRUST=m
-CONFIG_RADIO_TYPHOON=m
-CONFIG_RADIO_ZOLTRIX=m
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_DSBR=m
 CONFIG_RADIO_SI470X=y
 CONFIG_USB_SI470X=m
 CONFIG_I2C_SI470X=m
 CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI4713=m
 CONFIG_RADIO_TEA5764=m
 CONFIG_RADIO_SAA7706H=m
 CONFIG_RADIO_TEF6862=m
@@ -3723,6 +3789,7 @@ CONFIG_RADIO_WL1273=m
 # Texas Instruments WL128x FM driver (ST based)
 #
 CONFIG_RADIO_WL128X=m
+# CONFIG_V4L_RADIO_ISA_DRIVERS is not set
 CONFIG_DVB_MAX_ADAPTERS=8
 # CONFIG_DVB_DYNAMIC_MINORS is not set
 CONFIG_DVB_CAPTURE_DRIVERS=y
@@ -3995,6 +4062,9 @@ CONFIG_DRM_SIS=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_GMA600=y
+CONFIG_DRM_GMA3600=y
 CONFIG_STUB_POULSBO=m
 CONFIG_VGASTATE=m
 CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -4090,15 +4160,6 @@ CONFIG_BACKLIGHT_ADP8870=m
 CONFIG_BACKLIGHT_PCF50633=m
 
 #
-# Display device support
-#
-CONFIG_DISPLAY_SUPPORT=m
-
-#
-# Display hardware drivers
-#
-
-#
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
@@ -4144,6 +4205,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
 CONFIG_SND_VMASTER=y
+CONFIG_SND_KCTL_JACK=y
 CONFIG_SND_DMA_SGBUF=y
 CONFIG_SND_RAWMIDI_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
@@ -4320,7 +4382,6 @@ CONFIG_SND_PCMCIA=y
 CONFIG_SND_VXPOCKET=m
 CONFIG_SND_PDAUDIOCF=m
 CONFIG_SND_SOC=m
-CONFIG_SND_SOC_CACHE_LZO=y
 CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_ALL_CODECS is not set
 # CONFIG_SOUND_PRIME is not set
@@ -4384,10 +4445,10 @@ CONFIG_HID_PICOLCD_BACKLIGHT=y
 CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_PRIMAX=m
-CONFIG_HID_QUANTA=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_ROCCAT_COMMON=m
 CONFIG_HID_ROCCAT_ARVO=m
+CONFIG_HID_ROCCAT_ISKU=m
 CONFIG_HID_ROCCAT_KONE=m
 CONFIG_HID_ROCCAT_KONEPLUS=m
 CONFIG_HID_ROCCAT_KOVAPLUS=m
@@ -4398,6 +4459,7 @@ CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_GREENASIA=m
 CONFIG_GREENASIA_FF=y
+CONFIG_HID_HYPERV_MOUSE=m
 CONFIG_HID_SMARTJOYPLUS=m
 CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_HID_TOPSEED=m
@@ -4406,6 +4468,7 @@ CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_WACOM=m
 CONFIG_HID_WACOM_POWER_SUPPLY=y
 CONFIG_HID_WIIMOTE=m
+CONFIG_HID_WIIMOTE_EXT=y
 CONFIG_HID_ZEROPLUS=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
@@ -4427,8 +4490,7 @@ CONFIG_USB_DEVICEFS=y
 CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
-CONFIG_USB_DWC3=m
-# CONFIG_USB_DWC3_DEBUG is not set
+# CONFIG_USB_DWC3 is not set
 CONFIG_USB_MON=m
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
@@ -4443,6 +4505,7 @@ CONFIG_USB_XHCI_HCD=m
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_MV=y
 CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ISP1760_HCD=m
@@ -4461,6 +4524,9 @@ CONFIG_USB_R8A66597_HCD=m
 CONFIG_USB_RENESAS_USBHS_HCD=m
 CONFIG_USB_WHCI_HCD=m
 CONFIG_USB_HWA_HCD=m
+CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_MUSB_TUSB6010=m
+CONFIG_MUSB_PIO_ONLY=y
 CONFIG_USB_RENESAS_USBHS=m
 
 #
@@ -4611,7 +4677,9 @@ CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_USB_FUSB300=m
 CONFIG_USB_R8A66597=m
-CONFIG_USB_GADGET_DWC3=m
+CONFIG_USB_RENESAS_USBHS_UDC=m
+CONFIG_USB_MV_UDC=m
+CONFIG_USB_GADGET_MUSB_HDRC=m
 CONFIG_USB_M66592=m
 CONFIG_USB_AMD5536UDC=m
 CONFIG_USB_CI13XXX_PCI=m
@@ -4655,9 +4723,10 @@ CONFIG_USB_G_WEBCAM=m
 # OTG and related infrastructure
 #
 CONFIG_USB_OTG_UTILS=y
-CONFIG_USB_GPIO_VBUS=m
+# CONFIG_USB_GPIO_VBUS is not set
 CONFIG_NOP_USB_XCEIV=m
-CONFIG_AB8500_USB=m
+# CONFIG_AB8500_USB is not set
+# CONFIG_USB_MV_OTG is not set
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
@@ -4665,7 +4734,7 @@ CONFIG_UWB_I1480U=m
 CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
-CONFIG_MMC_CLKGATE=y
+# CONFIG_MMC_CLKGATE is not set
 
 #
 # MMC/SD/SDIO Card Drivers
@@ -4729,6 +4798,8 @@ CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_DELL_NETBOOKS=m
 CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_OT200=m
 CONFIG_LEDS_TRIGGERS=y
 
 #
@@ -4889,6 +4960,12 @@ CONFIG_VIRTIO_RING=y
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_MMIO=m
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
 CONFIG_STAGING=y
 CONFIG_ET131X=m
 CONFIG_SLICOSS=m
@@ -5035,6 +5112,10 @@ CONFIG_ASUS_OLED=m
 # CONFIG_PANEL is not set
 CONFIG_R8187SE=m
 CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_RTL8192E=m
 CONFIG_R8712U=m
 CONFIG_R8712_AP=y
@@ -5043,8 +5124,6 @@ CONFIG_RTS_PSTOR=m
 CONFIG_RTS5139=m
 # CONFIG_RTS5139_DEBUG is not set
 # CONFIG_TRANZPORT is not set
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
 CONFIG_IDE_PHISON=m
 CONFIG_LINE6_USB=m
 # CONFIG_LINE6_USB_DEBUG is not set
@@ -5067,8 +5146,6 @@ CONFIG_USB_SERIAL_QUATECH_USB2=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
 CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_MOUSE=m
 # CONFIG_VME_BUS is not set
 CONFIG_DX_SEP=m
 # CONFIG_IIO is not set
@@ -5109,10 +5186,6 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_DRM_PSB=m
-CONFIG_DRM_PSB_MRST=y
-CONFIG_DRM_PSB_MFLD=y
-CONFIG_DRM_PSB_CDV=y
 CONFIG_INTEL_MEI=m
 CONFIG_STAGING_MEDIA=y
 CONFIG_DVB_AS102=m
@@ -5144,6 +5217,11 @@ CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
 CONFIG_LIRC_TTUSBIR=m
 CONFIG_LIRC_ZILOG=m
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -5153,6 +5231,8 @@ CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_AIO=m
 CONFIG_FUJITSU_LAPTOP=m
 # CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_FUJITSU_TABLET=m
+CONFIG_AMILO_RFKILL=m
 CONFIG_TC1100_WMI=m
 CONFIG_HP_ACCEL=m
 CONFIG_HP_WMI=m
@@ -5205,8 +5285,6 @@ CONFIG_INTEL_IOMMU=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_VIRT_DRIVERS=y
-CONFIG_HYPERV=m
-CONFIG_HYPERV_UTILS=m
 # CONFIG_PM_DEVFREQ is not set
 
 #
@@ -5221,7 +5299,6 @@ CONFIG_DCDBAS=m
 CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=m
 # CONFIG_ISCSI_IBFT_FIND is not set
-CONFIG_SIGMA=m
 # CONFIG_GOOGLE_FIRMWARE is not set
 
 #
@@ -5235,8 +5312,6 @@ CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 # CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD=m
-# CONFIG_JBD_DEBUG is not set
 CONFIG_JBD2=m
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=m
@@ -5266,6 +5341,7 @@ CONFIG_OCFS2_FS_STATS=y
 # CONFIG_OCFS2_DEBUG_FS is not set
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
 CONFIG_NILFS2_FS=m
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=m
@@ -5401,6 +5477,7 @@ CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_ACL_SUPPORT=m
@@ -5436,29 +5513,6 @@ CONFIG_AFS_FSCACHE=y
 CONFIG_9P_FS=m
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS_POSIX_ACL=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=m
@@ -5530,7 +5584,7 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
+CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
@@ -5655,6 +5709,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_CPA_DEBUG is not set
 # CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
 
 #
 # Security options
@@ -5786,6 +5841,7 @@ CONFIG_CRYPTO_SALSA20=m
 CONFIG_CRYPTO_SALSA20_586=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SERPENT_SSE2_586=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -5833,6 +5889,8 @@ CONFIG_BINARY_PRINTF=y
 CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=m
@@ -5863,6 +5921,8 @@ CONFIG_DECOMPRESS_LZO=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_BCH_CONST_PARAMS=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -5873,6 +5933,7 @@ CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 441d23e6f..083e0e977 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.6-1 Kernel Configuration
+# Linux/x86_64 3.3.0 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -18,11 +18,9 @@ CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_HWEIGHT=y
@@ -42,7 +40,6 @@ CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ZONE_DMA32=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -91,6 +88,7 @@ CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_AUDIT_WATCH=y
 CONFIG_AUDIT_TREE=y
+# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
 CONFIG_HAVE_GENERIC_HARDIRQS=y
 
 #
@@ -113,6 +111,7 @@ CONFIG_PREEMPT_RCU=y
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=64
 # CONFIG_RCU_FANOUT_EXACT is not set
+CONFIG_RCU_FAST_NO_HZ=y
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_RCU_BOOST is not set
 CONFIG_IKCONFIG=y
@@ -130,6 +129,7 @@ CONFIG_RESOURCE_COUNTERS=y
 CONFIG_CGROUP_MEM_RES_CTLR=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 # CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
+CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -137,6 +137,7 @@ CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_DEBUG_BLK_CGROUP is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
@@ -196,6 +197,7 @@ CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
+CONFIG_OPROFILE_NMI_TIMER=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -215,6 +217,9 @@ 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
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
 
 #
 # GCOV-based kernel profiling
@@ -236,6 +241,29 @@ CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
 CONFIG_BLK_DEV_THROTTLING=y
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
 CONFIG_BLOCK_COMPAT=y
 
 #
@@ -285,6 +313,7 @@ CONFIG_FREEZER=y
 #
 # Processor type and features
 #
+CONFIG_ZONE_DMA=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
@@ -302,7 +331,7 @@ CONFIG_XEN=y
 CONFIG_XEN_DOM0=y
 CONFIG_XEN_PRIVILEGED_GUEST=y
 CONFIG_XEN_PVHVM=y
-CONFIG_XEN_MAX_DOMAIN_MEMORY=128
+CONFIG_XEN_MAX_DOMAIN_MEMORY=500
 CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_DEBUG_FS is not set
 CONFIG_KVM_CLOCK=y
@@ -320,8 +349,6 @@ CONFIG_NO_BOOTMEM=y
 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
@@ -391,6 +418,8 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_ARCH_DISCARD_MEMBLOCK=y
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTPLUG_SPARSE=y
 CONFIG_MEMORY_HOTREMOVE=y
@@ -409,8 +438,8 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_TRANSPARENT_HUGEPAGE=y
-# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y 
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
 CONFIG_CLEANCACHE=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -423,6 +452,7 @@ CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
 CONFIG_EFI=y
+CONFIG_EFI_STUB=y
 CONFIG_SECCOMP=y
 CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_HZ_100 is not set
@@ -502,17 +532,17 @@ CONFIG_SFI=y
 # CPU Frequency scaling
 #
 CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
+CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 
 #
@@ -611,6 +641,7 @@ CONFIG_RAPIDIO_TSI500=y
 #
 CONFIG_BINFMT_ELF=y
 CONFIG_COMPAT_BINFMT_ELF=y
+CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 # CONFIG_HAVE_AOUT is not set
 CONFIG_BINFMT_MISC=y
@@ -629,6 +660,7 @@ CONFIG_COMPAT_NETLINK_MESSAGES=y
 #
 CONFIG_PACKET=y
 CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=m
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
 # CONFIG_XFRM_SUB_POLICY is not set
@@ -667,6 +699,7 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_LRO=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
+CONFIG_INET_UDP_DIAG=m
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
 CONFIG_TCP_CONG_CUBIC=y
@@ -718,12 +751,14 @@ CONFIG_BRIDGE_NETFILTER=y
 # Core Netfilter Configuration
 #
 CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_ACCT=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_PROCFS is not set
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CT_PROTO_DCCP=m
@@ -791,6 +826,7 @@ CONFIG_NETFILTER_XT_MATCH_CPU=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
@@ -802,6 +838,7 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
 CONFIG_NETFILTER_XT_MATCH_OSF=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
@@ -862,6 +899,11 @@ CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
 
 #
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
 # IPVS application helper
 #
 CONFIG_IP_VS_FTP=m
@@ -873,11 +915,11 @@ CONFIG_IP_VS_PE_SIP=m
 #
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
@@ -924,6 +966,7 @@ CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_IP6_NF_TARGET_LOG=m
@@ -1070,9 +1113,12 @@ CONFIG_NET_SCH_FIFO=y
 CONFIG_DNS_RESOLVER=y
 CONFIG_BATMAN_ADV=m
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_OPENVSWITCH=m
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
+CONFIG_NETPRIO_CGROUP=m
+CONFIG_BQL=y
 CONFIG_HAVE_BPF_JIT=y
 CONFIG_BPF_JIT=y
 
@@ -1140,8 +1186,6 @@ CONFIG_VLSI_FIR=m
 CONFIG_VIA_FIR=m
 CONFIG_MCS_FIR=m
 CONFIG_BT=m
-CONFIG_BT_L2CAP=y
-CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
@@ -1218,11 +1262,13 @@ CONFIG_NET_9P_VIRTIO=m
 CONFIG_CAIF=m
 # CONFIG_CAIF_DEBUG is not set
 CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
 CONFIG_CEPH_LIB=m
 # CONFIG_CEPH_LIB_PRETTYDEBUG is not set
 # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
 CONFIG_NFC=m
 CONFIG_NFC_NCI=m
+# CONFIG_NFC_LLCP is not set
 
 #
 # Near Field Communication (NFC) devices
@@ -1249,9 +1295,12 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 CONFIG_SYS_HYPERVISOR=y
+# CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=m
 CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_IRQ=y
+# CONFIG_DMA_SHARED_BUFFER is not set
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_MTD=m
@@ -1350,6 +1399,8 @@ CONFIG_MTD_BLOCK2MTD=m
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_DOCG3=m
+CONFIG_BCH_CONST_M=14
+CONFIG_BCH_CONST_T=4
 CONFIG_MTD_NAND_ECC=m
 CONFIG_MTD_NAND_ECC_SMC=y
 CONFIG_MTD_NAND=m
@@ -1400,6 +1451,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_FD=m
 # CONFIG_PARIDE is not set
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_CPQ_CISS_DA=m
 # CONFIG_CISS_SCSI_TAPE is not set
@@ -1412,6 +1464,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DRBD=m
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_NVME=m
 CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_UB is not set
@@ -1428,8 +1481,11 @@ CONFIG_XEN_BLKDEV_BACKEND=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_RBD=m
+
+#
+# Misc devices
+#
 CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_MISC_DEVICES=y
 CONFIG_AD525X_DPOT=m
 CONFIG_AD525X_DPOT_I2C=m
 CONFIG_AD525X_DPOT_SPI=m
@@ -1805,6 +1861,9 @@ CONFIG_MII=m
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKEHARD=m
 CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 CONFIG_NETCONSOLE=m
@@ -1890,6 +1949,7 @@ CONFIG_TIGON3=m
 CONFIG_BNX2X=m
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
+CONFIG_NET_CALXEDA_XGMAC=m
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
@@ -2011,6 +2071,8 @@ CONFIG_EPIC100=m
 CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
+CONFIG_STMMAC_PLATFORM=m
+CONFIG_STMMAC_PCI=m
 # CONFIG_STMMAC_DEBUG_FS is not set
 # CONFIG_STMMAC_DA is not set
 CONFIG_STMMAC_RING=y
@@ -2053,6 +2115,7 @@ CONFIG_STE10XP=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MICREL_PHY=m
 # CONFIG_MDIO_BITBANG is not set
+CONFIG_MICREL_KS8995MA=m
 CONFIG_PLIP=m
 CONFIG_PPP=m
 CONFIG_PPP_BSDCOMP=m
@@ -2143,6 +2206,7 @@ CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
 CONFIG_ATH9K_RATE_CONTROL=y
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_CARL9170=m
@@ -2152,11 +2216,14 @@ CONFIG_CARL9170_WPC=y
 CONFIG_ATH6KL=m
 # CONFIG_ATH6KL_DEBUG is not set
 CONFIG_B43=m
+CONFIG_B43_BCMA=y
+# CONFIG_B43_BCMA_EXTRA is not set
 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
@@ -2178,6 +2245,7 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 CONFIG_BRCMUTIL=m
 CONFIG_BRCMSMAC=m
 CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_SDIO=y
 # CONFIG_BRCMDBG is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
@@ -2203,14 +2271,14 @@ CONFIG_IWLWIFI=m
 #
 # CONFIG_IWLWIFI_DEBUG is not set
 CONFIG_IWLWIFI_DEVICE_TRACING=y
-CONFIG_IWLWIFI_DEVICE_SVTOOL=y
-CONFIG_IWLWIFI_LEGACY=m
+CONFIG_IWLWIFI_DEVICE_TESTMODE=y
+# CONFIG_IWLWIFI_P2P is not set
+CONFIG_IWLEGACY=m
 
 #
 # Debugging Options
 #
-# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
-# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
+# CONFIG_IWLEGACY_DEBUG is not set
 CONFIG_IWL4965=m
 CONFIG_IWL3945=m
 CONFIG_IWM=m
@@ -2275,7 +2343,6 @@ CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
 CONFIG_WL12XX_SPI=m
 CONFIG_WL12XX_SDIO=m
-CONFIG_WL12XX_SDIO_TEST=m
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
@@ -2295,6 +2362,7 @@ CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
+CONFIG_HYPERV_NET=m
 CONFIG_ISDN=y
 CONFIG_ISDN_I4L=m
 CONFIG_ISDN_PPP=y
@@ -2459,6 +2527,7 @@ CONFIG_KEYBOARD_QT2160=m
 CONFIG_KEYBOARD_GPIO=m
 CONFIG_KEYBOARD_GPIO_POLLED=m
 CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
 CONFIG_KEYBOARD_MATRIX=m
 # CONFIG_KEYBOARD_LM8323 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
@@ -2468,6 +2537,7 @@ CONFIG_KEYBOARD_MPR121=m
 # CONFIG_KEYBOARD_OPENCORES is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
+CONFIG_KEYBOARD_STMPE=m
 # CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=m
@@ -2530,11 +2600,13 @@ CONFIG_TOUCHSCREEN_AD7879=m
 CONFIG_TOUCHSCREEN_AD7879_I2C=m
 CONFIG_TOUCHSCREEN_AD7879_SPI=m
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
 CONFIG_TOUCHSCREEN_BU21013=m
 CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX=m
 CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GUNZE=m
 CONFIG_TOUCHSCREEN_ELO=m
@@ -2548,6 +2620,7 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
 CONFIG_TOUCHSCREEN_WM831X=m
 CONFIG_TOUCHSCREEN_WM97XX=m
 CONFIG_TOUCHSCREEN_WM9705=y
@@ -2567,6 +2640,7 @@ CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
 CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
 CONFIG_TOUCHSCREEN_USB_GOTOP=y
 CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
 CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
 CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
@@ -2577,6 +2651,7 @@ CONFIG_TOUCHSCREEN_TSC2005=m
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_PCAP=m
 CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_STMPE=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_AB8500_PONKEY=m
@@ -2589,6 +2664,8 @@ CONFIG_INPUT_MC13783_PWRBUTTON=m
 CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_GP2A=m
+CONFIG_INPUT_GPIO_TILT_POLLED=m
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
@@ -2877,6 +2954,7 @@ CONFIG_GPIO_MAX7300=m
 CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_STMPE=y
 CONFIG_GPIO_TPS65912=m
 CONFIG_GPIO_WM831X=m
 CONFIG_GPIO_ADP5588=m
@@ -2942,7 +3020,7 @@ CONFIG_TEST_POWER=m
 CONFIG_BATTERY_DS2760=m
 CONFIG_BATTERY_DS2780=m
 CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_BQ20Z75=m
+CONFIG_BATTERY_SBS=m
 CONFIG_BATTERY_BQ27x00=m
 CONFIG_BATTERY_BQ27X00_I2C=y
 CONFIG_BATTERY_BQ27X00_PLATFORM=y
@@ -2951,7 +3029,9 @@ CONFIG_BATTERY_MAX17042=m
 CONFIG_CHARGER_PCF50633=m
 CONFIG_CHARGER_ISP1704=m
 CONFIG_CHARGER_MAX8903=m
+CONFIG_CHARGER_LP8727=m
 CONFIG_CHARGER_GPIO=m
+# CONFIG_CHARGER_MANAGER is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -3123,6 +3203,7 @@ CONFIG_SBC8360_WDT=m
 CONFIG_CPU5_WDT=m
 CONFIG_SMSC_SCH311X_WDT=m
 CONFIG_SMSC37B787_WDT=m
+CONFIG_VIA_WDT=m
 CONFIG_W83627HF_WDT=m
 CONFIG_W83697HF_WDT=m
 CONFIG_W83697UG_WDT=m
@@ -3165,7 +3246,11 @@ CONFIG_BCMA_POSSIBLE=y
 #
 # Broadcom specific AMBA
 #
-# CONFIG_BCMA is not set
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_DEBUG is not set
 
 #
 # Multifunction device drivers
@@ -3180,7 +3265,15 @@ CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
 CONFIG_MFD_TPS65912=y
 CONFIG_MFD_TPS65912_SPI=y
+CONFIG_MFD_STMPE=y
+
+#
+# STMPE Interface Drivers
+#
+CONFIG_STMPE_SPI=y
 # CONFIG_MFD_TMIO is not set
+CONFIG_PMIC_DA9052=y
+CONFIG_MFD_DA9052_SPI=y
 CONFIG_MFD_WM8400=m
 CONFIG_MFD_WM831X=y
 CONFIG_MFD_WM831X_SPI=y
@@ -3215,6 +3308,7 @@ CONFIG_REGULATOR_MAX8660=m
 CONFIG_REGULATOR_MAX8952=m
 CONFIG_REGULATOR_WM831X=m
 CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_DA9052=m
 CONFIG_REGULATOR_PCF50633=m
 CONFIG_REGULATOR_LP3971=m
 CONFIG_REGULATOR_LP3972=m
@@ -3257,6 +3351,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
 CONFIG_IR_MCE_KBD_DECODER=m
 CONFIG_IR_LIRC_CODEC=m
 CONFIG_RC_ATI_REMOTE=m
@@ -3298,7 +3393,6 @@ CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_CONTIG=m
 CONFIG_VIDEOBUF_DVB=m
 CONFIG_VIDEO_BTCX=m
 CONFIG_VIDEO_TVEEPROM=m
@@ -3394,6 +3488,7 @@ CONFIG_VIDEO_S5K6AA=m
 # Flash devices
 #
 CONFIG_VIDEO_ADP1653=m
+CONFIG_VIDEO_AS3645A=m
 
 #
 # Video improvement chips
@@ -3407,62 +3502,6 @@ CONFIG_VIDEO_UPD64083=m
 CONFIG_VIDEO_THS7303=m
 CONFIG_VIDEO_M52790=m
 CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_TIMBERDALE=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-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
-CONFIG_SOC_CAMERA_OV9740=m
 CONFIG_V4L_USB_DRIVERS=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
@@ -3476,6 +3515,7 @@ CONFIG_USB_GSPCA_CPIA1=m
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
 CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
 CONFIG_USB_GSPCA_KINECT=m
 CONFIG_USB_GSPCA_KONICA=m
 CONFIG_USB_GSPCA_MARS=m
@@ -3535,20 +3575,58 @@ CONFIG_USB_SN9C102=m
 CONFIG_USB_PWC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
 CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
+CONFIG_V4L_PCI_DRIVERS=y
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7164=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set
+# CONFIG_V4L_PLATFORM_DRIVERS is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_MEM2MEM_TESTDEV=m
 CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_DSBR=m
 CONFIG_RADIO_SI470X=y
 CONFIG_USB_SI470X=m
 CONFIG_I2C_SI470X=m
 CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI4713=m
 CONFIG_RADIO_TEA5764=m
 CONFIG_RADIO_SAA7706H=m
 CONFIG_RADIO_TEF6862=m
@@ -3825,6 +3903,9 @@ CONFIG_DRM_SIS=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_GMA600=y
+CONFIG_DRM_GMA3600=y
 CONFIG_STUB_POULSBO=m
 CONFIG_VGASTATE=m
 CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -3918,15 +3999,6 @@ CONFIG_BACKLIGHT_ADP8870=m
 CONFIG_BACKLIGHT_PCF50633=m
 
 #
-# Display device support
-#
-CONFIG_DISPLAY_SUPPORT=m
-
-#
-# Display hardware drivers
-#
-
-#
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
@@ -3971,6 +4043,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
 CONFIG_SND_VMASTER=y
+CONFIG_SND_KCTL_JACK=y
 CONFIG_SND_DMA_SGBUF=y
 CONFIG_SND_RAWMIDI_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
@@ -4110,7 +4183,6 @@ CONFIG_SND_PCMCIA=y
 CONFIG_SND_VXPOCKET=m
 CONFIG_SND_PDAUDIOCF=m
 CONFIG_SND_SOC=m
-CONFIG_SND_SOC_CACHE_LZO=y
 CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_ALL_CODECS is not set
 # CONFIG_SOUND_PRIME is not set
@@ -4174,10 +4246,10 @@ CONFIG_HID_PICOLCD_BACKLIGHT=y
 CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_PRIMAX=m
-CONFIG_HID_QUANTA=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_ROCCAT_COMMON=m
 CONFIG_HID_ROCCAT_ARVO=m
+CONFIG_HID_ROCCAT_ISKU=m
 CONFIG_HID_ROCCAT_KONE=m
 CONFIG_HID_ROCCAT_KONEPLUS=m
 CONFIG_HID_ROCCAT_KOVAPLUS=m
@@ -4188,6 +4260,7 @@ CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_GREENASIA=m
 CONFIG_GREENASIA_FF=y
+CONFIG_HID_HYPERV_MOUSE=m
 CONFIG_HID_SMARTJOYPLUS=m
 CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_HID_TOPSEED=m
@@ -4196,6 +4269,7 @@ CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_WACOM=m
 CONFIG_HID_WACOM_POWER_SUPPLY=y
 CONFIG_HID_WIIMOTE=m
+CONFIG_HID_WIIMOTE_EXT=y
 CONFIG_HID_ZEROPLUS=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
@@ -4217,8 +4291,7 @@ CONFIG_USB_DEVICEFS=y
 CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
-CONFIG_USB_DWC3=m
-# CONFIG_USB_DWC3_DEBUG is not set
+# CONFIG_USB_DWC3 is not set
 CONFIG_USB_MON=m
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
@@ -4233,6 +4306,7 @@ CONFIG_USB_XHCI_HCD=m
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_MV=y
 CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ISP1760_HCD=m
@@ -4251,6 +4325,9 @@ CONFIG_USB_R8A66597_HCD=m
 CONFIG_USB_RENESAS_USBHS_HCD=m
 CONFIG_USB_WHCI_HCD=m
 CONFIG_USB_HWA_HCD=m
+CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_MUSB_TUSB6010=m
+CONFIG_MUSB_PIO_ONLY=y
 CONFIG_USB_RENESAS_USBHS=m
 
 #
@@ -4400,7 +4477,9 @@ CONFIG_USB_GADGET=m
 CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_USB_R8A66597=m
-CONFIG_USB_GADGET_DWC3=m
+CONFIG_USB_RENESAS_USBHS_UDC=m
+CONFIG_USB_MV_UDC=m
+CONFIG_USB_GADGET_MUSB_HDRC=m
 CONFIG_USB_M66592=m
 CONFIG_USB_AMD5536UDC=m
 CONFIG_USB_CI13XXX_PCI=m
@@ -4443,9 +4522,10 @@ CONFIG_USB_G_WEBCAM=m
 # OTG and related infrastructure
 #
 CONFIG_USB_OTG_UTILS=y
-CONFIG_USB_GPIO_VBUS=m
+# CONFIG_USB_GPIO_VBUS is not set
 CONFIG_NOP_USB_XCEIV=m
-CONFIG_AB8500_USB=m
+# CONFIG_AB8500_USB is not set
+# CONFIG_USB_MV_OTG is not set
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
@@ -4453,7 +4533,7 @@ CONFIG_UWB_I1480U=m
 CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
-CONFIG_MMC_CLKGATE=y
+# CONFIG_MMC_CLKGATE is not set
 
 #
 # MMC/SD/SDIO Card Drivers
@@ -4518,6 +4598,8 @@ CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_DELL_NETBOOKS=m
 CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_OT200=m
 CONFIG_LEDS_TRIGGERS=y
 
 #
@@ -4678,6 +4760,12 @@ CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_MMIO=m
 
 #
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+
+#
 # Xen driver support
 #
 CONFIG_XEN_BALLOON=y
@@ -4695,6 +4783,7 @@ CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_SWIOTLB_XEN=y
 CONFIG_XEN_TMEM=y
 CONFIG_XEN_PCIDEV_BACKEND=m
+CONFIG_XEN_PRIVCMD=m
 CONFIG_STAGING=y
 CONFIG_ET131X=m
 CONFIG_SLICOSS=m
@@ -4796,6 +4885,10 @@ CONFIG_ASUS_OLED=m
 # CONFIG_PANEL is not set
 CONFIG_R8187SE=m
 CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_RTL8192E=m
 CONFIG_R8712U=m
 CONFIG_R8712_AP=y
@@ -4804,8 +4897,6 @@ CONFIG_RTS_PSTOR=m
 CONFIG_RTS5139=m
 # CONFIG_RTS5139_DEBUG is not set
 # CONFIG_TRANZPORT is not set
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
 CONFIG_IDE_PHISON=m
 CONFIG_LINE6_USB=m
 # CONFIG_LINE6_USB_DEBUG is not set
@@ -4828,8 +4919,6 @@ CONFIG_USB_SERIAL_QUATECH_USB2=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
 CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_MOUSE=m
 # CONFIG_VME_BUS is not set
 CONFIG_DX_SEP=m
 # CONFIG_IIO is not set
@@ -4870,10 +4959,6 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_DRM_PSB=m
-CONFIG_DRM_PSB_MRST=y
-CONFIG_DRM_PSB_MFLD=y
-CONFIG_DRM_PSB_CDV=y
 CONFIG_INTEL_MEI=m
 CONFIG_STAGING_MEDIA=y
 CONFIG_DVB_AS102=m
@@ -4905,6 +4990,11 @@ CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
 CONFIG_LIRC_TTUSBIR=m
 CONFIG_LIRC_ZILOG=m
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -4914,6 +5004,8 @@ CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_AIO=m
 CONFIG_FUJITSU_LAPTOP=m
 # CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_FUJITSU_TABLET=m
+CONFIG_AMILO_RFKILL=m
 CONFIG_HP_ACCEL=m
 CONFIG_HP_WMI=m
 CONFIG_MSI_LAPTOP=m
@@ -4960,14 +5052,13 @@ CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_AMD_IOMMU=y
 # CONFIG_AMD_IOMMU_STATS is not set
+CONFIG_AMD_IOMMU_V2=m
 CONFIG_DMAR_TABLE=y
 CONFIG_INTEL_IOMMU=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_IRQ_REMAP=y
 CONFIG_VIRT_DRIVERS=y
-CONFIG_HYPERV=m
-CONFIG_HYPERV_UTILS=m
 # CONFIG_PM_DEVFREQ is not set
 
 #
@@ -4982,7 +5073,6 @@ CONFIG_DCDBAS=m
 CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=m
 # CONFIG_ISCSI_IBFT_FIND is not set
-CONFIG_SIGMA=m
 # CONFIG_GOOGLE_FIRMWARE is not set
 
 #
@@ -4996,8 +5086,6 @@ CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 # CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD=m
-# CONFIG_JBD_DEBUG is not set
 CONFIG_JBD2=m
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=m
@@ -5027,6 +5115,7 @@ CONFIG_OCFS2_FS_STATS=y
 # CONFIG_OCFS2_DEBUG_FS is not set
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
 CONFIG_NILFS2_FS=m
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=m
@@ -5163,6 +5252,7 @@ CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_ACL_SUPPORT=m
@@ -5198,29 +5288,6 @@ CONFIG_AFS_FSCACHE=y
 CONFIG_9P_FS=m
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS_POSIX_ACL=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=m
@@ -5292,11 +5359,12 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
+CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
@@ -5415,6 +5483,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_CPA_DEBUG is not set
 # CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
 
 #
 # Security options
@@ -5549,6 +5618,7 @@ CONFIG_CRYPTO_SALSA20=m
 CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -5593,6 +5663,8 @@ CONFIG_BINARY_PRINTF=y
 CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=m
@@ -5622,6 +5694,8 @@ CONFIG_DECOMPRESS_LZO=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_BCH_CONST_PARAMS=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -5632,6 +5706,7 @@ CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
diff --git a/libre/linux-libre/ext4-options.patch b/libre/linux-libre/ext4-options.patch
index ef1b2417d..ea48c384b 100644
--- a/libre/linux-libre/ext4-options.patch
+++ b/libre/linux-libre/ext4-options.patch
@@ -47,3 +47,4 @@ index 502c61f..30de9cd 100644
  		default:
  			ext4_msg(sb, KERN_ERR,
  			       "Unrecognized mount option \"%s\" "
+
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 83df617a2..4b8d1dccb 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,16 +2,14 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.2.11-1-LIBRE
+KERNEL_VERSION=3.3.0-1-LIBRE
 
 post_install () {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
-  if command -v mkinitcpio 2>&1 > /dev/null; then
-    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-    mkinitcpio -p linux-libre${KERNEL_NAME}
-  fi
+  echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
+  mkinitcpio -p linux-libre${KERNEL_NAME}
 
   # compat symlinks for the official kernels only
   if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then
@@ -19,8 +17,9 @@ post_install () {
     [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
     if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
       # add compat symlinks for the initramfs images
-      ln -sf initramfs-linux-libre${KERNEL_NAME}.img /boot/kernel26${KERNEL_NAME}.img
-      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img /boot/kernel26${KERNEL_NAME}-fallback.img
+      ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
+      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
+        boot/kernel26${KERNEL_NAME}-fallback.img
       ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
     fi
   fi
@@ -52,10 +51,8 @@ post_upgrade() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
-  if command -v mkinitcpio 2>&1 > /dev/null; then
-    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-    mkinitcpio -p linux-libre${KERNEL_NAME}
-  fi
+  echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
+  mkinitcpio -p linux-libre${KERNEL_NAME}
 }
 
 post_remove() {
author	Michał Masłowski <mtjm@mtjm.eu>	2012-03-20 11:40:04 +0100
committer	Michał Masłowski <mtjm@mtjm.eu>	2012-03-20 11:40:04 +0100
commit	fa1021504c53eb066826883dab3918e432b93444 (patch)
tree	312e7333a30cb09f648a85ec1a78bfb151ade116
parent	65de768385d6ee97a2b45c807ab9955c642da7c0 (diff)
parent	99136e3a2e9f6f07a7ff08d5721bce354b853c8b (diff)